up

2020-07-10 13:22:24 +08:00
parent 8c154e38ba
commit 9549990b66
108 changed files with 5668 additions and 888 deletions
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 792f5a6e2281f4e06a8695ec1ff7fadc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: aafce1a282bf849cca9b2b08c21a8623
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 83d4194d3a9f741dcae62f483ca86487
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 77e3a21effa4940f3989b025f6ac7824
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3573042c068e04d15985c73032e8961c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79ac1ffe4812d4201ae9e570316f6e6c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 76f2adbcdb5134927918e9a3b9d52af5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d98b545d4b74846468087d2247b7030d
+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/DBUser.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.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/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/TRCellGuidPage.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5eb41d8a0d01145e184021f3d6cea2f8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.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/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/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 511dd1d1e86fd426d82e75fb6c2b3e3c
+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/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b87e30870b8304d07bef78da76961c88
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/InputText.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.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/PanelCustFilter.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.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/PanelGuid.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 34d11f8ffcf994a9b9a4e6a4cecff31a
+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/PanelNewOrder.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2adba13bd337c405fa9e568b3d75be3b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: