upgrade

2020-08-01 17:55:18 +08:00
parent 29a8a1dae3
commit 4435098171
160 changed files with 21247 additions and 2405 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/db/DBCust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.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/DBTextures.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.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/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b541276cc82b94a9ca1ccd29708110a9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dd23a5a7694c7434592235b27a150546
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.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/TRPBatchGetCusts.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBatchGetCusts.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBatchGetCusts.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBatchGetCusts.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4ee16bb6ce5f1477d982528792302756
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.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/TRPCustDetailSimple.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2975af0d021414c50bc23479fec00a6f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.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/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.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/TRPOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.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/TRPSelectServer.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b17467b32396e4f68b2ee0b392e1f6ab
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBatchGetCusts.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBatchGetCusts.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBatchGetCusts.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBatchGetCusts.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2bb7482bc874d44cb8b671a95c2a0f5a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/PanelCustDetailSimple.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetailSimple.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetailSimple.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetailSimple.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3f99a7ae714554b088b2c38d43fc17e7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/PanelFollowList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.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/PanelOceanList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOceanList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bc3ed04e8d6054b92ae81b39e208c3e7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d