up

2020-07-18 21:12:14 +08:00
parent 1361db18a9
commit 33dc6cea60
214 changed files with 16596 additions and 3104 deletions
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 173df25fed01c441eb9600fe63f880b3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/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/DBTextures.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e67a54f6ee6eb48d3bdf508b7f49a8b8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.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/TRCellCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 08f5bec5571c74aadad4c0252afdb3f9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRCellImage.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fd20c4f60b60c4bcbaddcb97b134e30f
+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/CSPMine.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.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/TRPAbout.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2b282ef315c694029a0af5137981673f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPCustFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.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/TRPFollowList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c603be048c08947f09c99a1be798ab15
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPMyInfor.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d03e52d07dd7a4c779114f2331e503d7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPNewFollow.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 742df36fe37354743a58186541e8c2b4
+guid: ebc887b7984d94986bbe7880e09ef509
 DefaultImporter:
  externalObjects: {}
  userData: 
--- 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/TRPNewFollowSimple.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 742df36fe37354743a58186541e8c2b4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPNewFollowTask.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8e3da4fe415d54af89d0699a61beea57
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ce3af19d2bcdb40db85eb4cb01b2d8ed
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0dc4043b054c44f63966f0e4a14d2417
+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/PanelAbout.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4e9d543de0e014f12842844607ec03fa
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.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/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/PanelCustListProc.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.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/PanelFollowList.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 781262c40185d4991ab82e0aa1e7aa10
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79e5e3d80263e44cba9306e6e7368046
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d.meta
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4a45da331129c46b9b9d9a68160e3d38
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/PanelOrderList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 96de0639e94ed4ffca98aff0923ab798
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d.meta