up

2020-07-26 11:12:32 +08:00
parent 67a1f974bf
commit 53e9c8d4ce
69 changed files with 15012 additions and 105 deletions
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9ae1850a3edcd4fe2bd4145ec59282d9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ed36701dac27e4d5d8a54758b64bc73c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 19caf6b8bc88645a9826dca77f683c1e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e578ce3b372744eda938b791f8ab6714
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f89993e7806224921b207b940a918942
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1a838ba2c196241e1a6513bedca4e322
+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/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c672adce06da64a3c92437bd234f9fd6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.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/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fcc61e962f3fb45efbdf4abcdce63033
+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/ui/panel/Android/PanelCalender.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.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/PanelOrderDetail.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 54623cb3d417d46f581e43bb69fbf4a6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d