up

2020-07-14 22:04:03 +08:00
parent e54411e2c2
commit a47cabede2
119 changed files with 5115 additions and 1061 deletions
--- a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4217e7cc0173d41cfba3ab8d03d42260
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2bd85c33f7a8a41ec9c474e622fc55f5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9dbcf0d323c8f40dc8d566e67d1c3dd7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: eeda25c7541e64df6b1920374596b21d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b2fbbe53fe16f4f3487d65e8f5ac99b9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d