2020-07-08

2020-07-08 08:01:34 +08:00
parent e344c54d82
commit 650da9efae
97 changed files with 1469 additions and 475 deletions
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e90704f9b614847d1b9f8c3cf9bf66e0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f56061be2e88745709fee0fe38af0054
+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/localization/Chinese.txt
+++ b/Assets/trCRM/upgradeRes4Publish/priority/localization/Chinese.txt
@@ -11,7 +11,7 @@ DayBefore=天前
 HourBefore=小时前
 MinutesBefore=分钟前
 SecondBefore=秒前
-Loading=拼命加载中...
+Loading=加载中...
 Version=版本
 EnterGame=点击开始游戏
 Click4Select=点击切换
--- 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/DBRoot.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.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/public/CLLIncludeBase.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.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/TRCellCustFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.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/panel/CLLPConfirm.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 42755029531dc440a9ec6fb968c61f40
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.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/TRPNewCust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d
--- 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/other/Android/reportform1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.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/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/PanelHotWheel.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.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/PanelNewCust.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d
--- 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/PanelTasks.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d