up

2020-07-21 22:50:03 +08:00
parent 4730b841ae
commit 3f114a6fca
69 changed files with 4668 additions and 1192 deletions
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6692746206a73455d83e6e588bdfacbc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3bb1a014c1cd64e87b3a2a7518aaec21
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6a63f7cf64914471ca9cdd281afcd2d4
+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/DBOrder.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.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/TRCellFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 300371f015be64ce59a552123d46c5fb
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/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/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.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/TRPProductDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 93eaf1fedda43428b9b204fa8966151a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPProductList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d43c6192ffe544896b8226340a67a264
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/ui/panel/Android/PanelCustDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.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/PanelProductDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2b78aaed634a04176ace0f7377f971a7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/PanelProductList.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: db21ef6811c3f414db72d8c21fa073ae
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d