uu

2020-07-28 21:02:59 +08:00
parent 5a53995fff
commit 8c38fea011
120 changed files with 7097 additions and 1930 deletions
--- a/Assets/trCRM/upgradeRes4Publish/other/txt.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae3d232dba3554931b0e8943a411214f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/Android.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/Android.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c71cdfad3e1e44312ad1fb4ebefb11de
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/txt/Android/serviceProto.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7130f447a196548159841e75109a6f46
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/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/ui/cell/TRCellComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilter.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilter.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilter.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 81f3adf660755442e87d00e452b48f2a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 40e154f8811854b3e9fe53e8ea5d45fc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRCellOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOceanList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 974377b5151c04c1589f8ff3a027ed40
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua
--- 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/TRPAbout.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.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/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/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.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/TRPMoreProc4Cust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.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/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/TRPOceanList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f69e14c4301e74562ada01752c0f5fd6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPProductList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.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/TRPSelectServer.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: da0f504c05cd64157a296dabdd4fba5c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/ui/other/Android/InputDate.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.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/InputTime.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.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/PanelCalender.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.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/PanelFollowFilter.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d
--- 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/PanelMoreProc4Cust.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.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/PanelOceanList.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOceanList.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 174284940b2ef461cac2505b56dbacae
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/PanelSelectProduct.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectServer.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectServer.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectServer.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectServer.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d0ebb796bbba941088bb183edfbfb626
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d