mm

2020-08-07 07:27:09 +08:00
parent 113faa50ce
commit 0fd1912998
21 changed files with 578 additions and 56 deletions
--- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v
+++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v
@@ -321,7 +321,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132411813790000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132412299430000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000
@@ -363,7 +363,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua.meta,132358701520000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua,132409976120000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua.meta,132378001360000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua,132406798320000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua,132412293730000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua.meta,132395107700000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132411644460000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua.meta,132383043620000000
@@ -407,7 +407,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132394484680000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132411754680000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132412282140000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua.meta,132289221090000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png,132289129810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png.meta,132289129810000000
@@ -437,7 +437,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua.meta,132387249510000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua,132410740440000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua.meta,132289223570000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua,132407454660000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua,132412283450000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua.meta,132407429880000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilter.lua,132385114470000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellComFilter.lua.meta,132403960170000000
@@ -459,7 +459,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua.meta,132395463710000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132411096420000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua.meta,132378658180000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132403166270000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132412298780000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua.meta,132378223060000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua,132406750500000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua.meta,132398150030000000
@@ -570,11 +570,11 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta,132388537450000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua,132411772480000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta,132395119260000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132411795120000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132412298860000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta,132388185120000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua,132411772440000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua.meta,132403915750000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua,132411808730000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua,132412291310000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua.meta,132401163640000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua,132410151470000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta,132395326130000000
@@ -699,7 +699,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388185850000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab,132406817650000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab.meta,132403916110000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab,132410573890000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab,132412276230000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab.meta,132401163870000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab,132410157360000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta,132395326430000000
--- a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v
--- a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v
@@ -1,5 +1,6 @@
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,ad36b1df99250176f457b3cf9be575f5
-trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,c88f9a58e3779e527d39abc8ac377a39
+trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
+trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,73fc6a6904d24a90bee153e5aa1a78f4
 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
 trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c
@@ -17,15 +18,16 @@ trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,95dcc89073079e71809
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,4ebb6aa9b3c61fc11d8b07aea9e57743
 trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57
+trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_3.unity3d,4107b5fcc1b5ad0d073bf480cf35383b
 trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,0c0875362af4cd5a6a35cef8ac9d74e2
-trCRM/upgradeRes/priority/lua/db/DBRoot.lua,8acbe310f1c8202777ddc31620d51837
 trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
 trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099
 trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,5b0bc7852800d78eb83b002f38742783
 trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514
+trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
 trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
 trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,06ea21012958c4b42ca8122d1515ed1f
@@ -40,9 +42,11 @@ trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f1
 trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833
 trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1
+trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellProccessHis.lua,aa71710425778f3c33471a2cc00e5d7b
 trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
+trCRM/upgradeRes/priority/ui/panel/Android/PanelProductDetail.unity3d,44dc779e7b05ed8c29719f679317e058
 trCRM/upgradeRes/priority/ui/other/Android/InputTime.unity3d,0fec115941a2a08726c319b5316dd3fe
 trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
@@ -65,12 +69,14 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a654
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,3b291f38637590e0fca816cae521a4f0
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd
+trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectServer.unity3d,b0a074f0b8b0e1e564fe46561e957be8
 trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,5a651af95e2e6131a56bdb2c18457072
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
+trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,edb08aadfb350845c99e74978da9f7a9
@@ -90,10 +96,10 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680
 trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836
 trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,1c34bab7feeb2efde0ca860eb30d6029
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellAttachment.lua,a2a2646b04e3de80a094bdb73ba1d3bc
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellAttachment.lua,f154f14031a5880e25898ff927a27f5d
 trCRM/upgradeRes/priority/ui/panel/Android/PanelComFilter.unity3d,0613845e044731de1fd8117ada0c9cf8
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101
-trCRM/upgradeRes/priority/lua/db/DBTextures.lua,55ddfb8bcb4af790b9da55626412e92a
+trCRM/upgradeRes/priority/lua/db/DBTextures.lua,71acd79671664884eface47928cd8894
 trCRM/upgradeRes/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2
 trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,fb11b3b21f87b4060608ad02d723c39e
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
@@ -107,7 +113,6 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,e60401c35bddbb3
 trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetailSimple.unity3d,2d5672aefad3bded93f2d268fea9cfa8
 trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
-trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
 trCRM/upgradeRes/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b
 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40
@@ -145,7 +150,6 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectServer.lua,50a46489d0d704df26d61
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellFollowList.lua,0cfc64444ddae6d47e4e07a76a0fcbaf
 trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,f5affe00dd461e9a299bd64ce3fc80bb
-trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua,35ac4acdd74e7c09950bbb26fed5d010
 trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
 trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171
@@ -157,11 +161,11 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellOrderList.lua,d4a79966004672384a664700987d2533
 trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e
 trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua,522e60b5e11321ef12cb2466b5b249d2
-trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
 trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,91d8b656329579d0cc43e2170118ba21
 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
 trCRM/upgradeRes/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,54cb072f797503f7840dbf735852894f
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
 trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,3cc9a59870684a589fbdb2567cff402d
 trCRM/upgradeRes/other/uiAtlas/cust/Android/icon-right2.unity3d,fd76710e32054c40714241fbc6266af3
@@ -188,7 +192,7 @@ trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_6.unity3d,8b322b9a8ef8b6d91d677c61eb98ab30
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
 trCRM/upgradeRes/priority/ui/panel/Android/PanelBatchGetCusts.unity3d,0b16be6a28646d9dc972fab628556b57
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,0b73bcac6356a8a632785e860e684878
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,f0cedde396b52618d99ef95760a077e1
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,c1ee4768e591cf8a7d09574b6c1abf30
 trCRM/upgradeRes/priority/lua/ui/panel/TRPBindPhone.lua,c7ad2d414659e2aeecff5bba7f9f758d
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368
@@ -208,9 +212,7 @@ trCRM/upgradeRes/other/uiAtlas/order/Android/upload.unity3d,a7cb722ecba5f405105f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd1e08640243d
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_about.unity3d,3da9c9416127c69bc20c281f44520f6e
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815622ea707c3
 trCRM/upgradeRes/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05
-trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,6418723ac66fc8ab625db8d61cd2c07d
 trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
@@ -224,7 +226,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a0346395205
 trCRM/upgradeRes/priority/ui/panel/Android/PanelProductList.unity3d,ce2b5f16898ac8d2ed2ce48899dba847
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f
 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
-trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,cff73cd564d54caaa97d74ac808e2d07
+trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,50494f2e0672f8a5232d6fbf6016d12d
 trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4
 trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
@@ -235,7 +237,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,2962cf4d3dcc8531fe333030
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,121d472a9c63850e668a9eebbc6fc413
 trCRM/upgradeRes/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
 trCRM/upgradeRes/priority/ui/panel/Android/PanelBindPhone.unity3d,b4aca0f337304fefc9997c00886e75c1
-trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
+trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
 trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,092e641f83eef5ea9d25007ffcc73c32
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellComFilter.lua,2fb22f9248e4af86ab42482151a5b141
 trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,f6b401c59ed10b8b0d2d72e5eb056227
@@ -244,7 +246,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b
 trCRM/upgradeRes/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
 trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,a6dc405916d51c97422bf1862f3a8f5b
-trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
+trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,591672cab0a1e8e81ed68a1fb20f4d0c
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
 trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b
@@ -260,9 +262,10 @@ trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd
 trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3ddd6f65cf62f4a19
+trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc
 trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974
-trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set2.unity3d,e528f24899ef583c113ca69bbb510ebd
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9
 trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0
@@ -293,16 +296,14 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,39ea724db1c02f72c3a
 trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
 trCRM/upgradeRes/other/txt/Android/serviceProto.unity3d,f6aeade57bb43fc306fd9371e618297b
 trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a
-trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
-trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
+trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,e8e8c2a2a8f7c91ded00896bf6ce2bfb
 trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,52979aedf684a79bc667bbe73b508aca
 trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
-trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,3f37c374855b223c8138f39265635811
+trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,71cf7998ad430b8f944a08578558a076
 trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,c769d4034a021eb15ff4e63c62da3958
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,3847bb19ae8c2c8ead7aea9e881773a5
@@ -327,17 +328,17 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopTime.lua,ffdeaf9996a4aa6dda8f025fa
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec
 trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942
 trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,79adf0809fb5121f0fa306a8d96ae725
-trCRM/upgradeRes/priority/ui/panel/Android/PanelProductDetail.unity3d,44dc779e7b05ed8c29719f679317e058
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815622ea707c3
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2
 trCRM/upgradeRes/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7
-trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
+trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
 trCRM/upgradeRes/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6
 trCRM/upgradeRes/priority/lua/ui/panel/TRPBatchGetCusts.lua,824f77c2486687108fa391a8fb08a405
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,035626bac75e16f15bc825f6e0ded212
 trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
-trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
+trCRM/upgradeRes/priority/lua/db/DBRoot.lua,8acbe310f1c8202777ddc31620d51837
 trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
 trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
 trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c
@@ -346,15 +347,14 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectProduct.unity3d,360b504982d61fa054c5fde63586c81a
-trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
+trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
 trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_1.unity3d,47e903d836aa8bc08317cdc45d61907e
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
-trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,dae2d1afc8a5e2d7c996c6056aa42dc4
 trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43
 trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
 trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
-trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
+trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,dae2d1afc8a5e2d7c996c6056aa42dc4
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
-trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua,edeb733a40a67f9e0431e448b3356d95
--- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v
--- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v
@@ -1,6 +1,6 @@
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,ad36b1df99250176f457b3cf9be575f5
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d,c88f9a58e3779e527d39abc8ac377a39
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d,73fc6a6904d24a90bee153e5aa1a78f4
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
 trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c
@@ -95,10 +95,10 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetailSimple.unity3d,2d5672aefad3bded93f2d268fea9cfa8
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,1c34bab7feeb2efde0ca860eb30d6029
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua,a2a2646b04e3de80a094bdb73ba1d3bc
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua,f154f14031a5880e25898ff927a27f5d
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d,0613845e044731de1fd8117ada0c9cf8
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101
-trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua,55ddfb8bcb4af790b9da55626412e92a
+trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua,71acd79671664884eface47928cd8894
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,fb11b3b21f87b4060608ad02d723c39e
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
@@ -193,7 +193,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e
 trCRM/upgradeRes4Publish/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d,8b322b9a8ef8b6d91d677c61eb98ab30
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,0b73bcac6356a8a632785e860e684878
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,f0cedde396b52618d99ef95760a077e1
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,c1ee4768e591cf8a7d09574b6c1abf30
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua,c7ad2d414659e2aeecff5bba7f9f758d
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368
@@ -227,7 +227,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d764
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d,ce2b5f16898ac8d2ed2ce48899dba847
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
-trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,cff73cd564d54caaa97d74ac808e2d07
+trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,50494f2e0672f8a5232d6fbf6016d12d
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
@@ -302,7 +302,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellServer.lua,52979aedf684a79bc667bbe73b508aca
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,3f37c374855b223c8138f39265635811
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,71cf7998ad430b8f944a08578558a076
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,c769d4034a021eb15ff4e63c62da3958
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,3847bb19ae8c2c8ead7aea9e881773a5
--- a/Assets/trCRM/serversCfg/servers.json
+++ b/Assets/trCRM/serversCfg/servers.json
@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29006, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29000, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29004, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29006, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29000, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29004, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":0}}}
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua
@@ -3,6 +3,9 @@ local db = {}

 local dbUploadStatus = {}
 local isUploading = {}
+local isDownoading = {}
+local downloadCallback = {}
+local downloadDir = Utl.chgToSDCard(Path.Combine(Application.persistentDataPath, CLPathCfg.self.basePath, "download"))

 function DBTextures.init()
    InvokeEx.cancelInvoke(DBTextures.releaseTimeout)
@@ -99,4 +102,66 @@ function DBTextures.cancelUpload(path, uploadPath)
    end
 end

+function DBTextures.hadDownloaded(name)
+    local localPath = Path.Combine(downloadDir, name)
+    if File.Exists(localPath) then
+        return true, localPath
+    end
+    return false, localPath
+end
+
+function DBTextures.download(name, url, callback)
+    downloadCallback[name] = callback
+    if isDownoading[name] then
+        return isDownoading[name]
+    end
+    local localPath = Path.Combine(downloadDir, name)
+    local _url = url
+    if File.Exists(localPath) then
+        _url = Path.Combine("file://", localPath)
+    end
+    local assetType
+    if MyUtl.isImage(name) then
+        assetType = CLAssetType.texture
+    else
+        assetType = CLAssetType.bytes
+    end
+
+    local www =
+        WWWEx.get(
+        _url,
+        nil,
+        CLAssetType.texture,
+        function(content, orgs)
+            isDownoading[name] = nil
+            if content then
+                local bytes
+                if assetType == CLAssetType.texture then
+                    bytes = content:GetRawTextureData()
+                else
+                    bytes = content
+                end
+                Directory.CreateDirectory(Path.GetDirectoryName(localPath))
+                File.WriteAllBytes(localPath, bytes)
+                Utl.doCallback(downloadCallback[name], content, localPath)
+                downloadCallback[name] = nil
+            else
+                MyUtl.toastW("下载附件为空")
+                Utl.doCallback(downloadCallback[name], content, nil)
+                downloadCallback[name] = nil
+            end
+        end,
+        function()
+            isDownoading[name] = nil
+            MyUtl.toastW("下载附件失败")
+            Utl.doCallback(downloadCallback[name], nil, nil)
+            downloadCallback[name] = nil
+        end,
+        nil,
+        true,
+        2
+    )
+    isDownoading[name] = www
+end
+
 return DBTextures
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
@@ -129,4 +129,18 @@ MyUtl.hidePhone = function(phone)
    end
 end

+MyUtl.Images = {
+    [".JPG"] = true,
+    [".JPEG"] = true,
+    [".PNG"] = true,
+    [".PDF"] = true,
+    [".BMP"] = true,
+    [".GIF"] = true,
+}
+
+---public 是图片
+MyUtl.isImage = function(path)
+    local extension = Path.GetExtension(path)
+    return MyUtl.Images[string.upper(extension)] or false
+end
 return MyUtl
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua
@@ -5,6 +5,8 @@ local csSelf = nil
 local transform = nil
 local mData = nil
 local uiobjs = {}
+local isDownLoading = false
+local www

 -- 初始化，只调用一次
 function _cell.init(csObj)
@@ -13,14 +15,29 @@ function _cell.init(csObj)
    uiobjs.Label = getCC(transform, "Label", "UILabel")
    uiobjs.ButtonDel = getChild(transform, "ButtonDel").gameObject
    uiobjs.SpriteIcon = getCC(transform, "SpriteIcon", "UISprite")
+
+    uiobjs.ButtonDownload = getChild(transform, "ButtonDownload").gameObject
+    uiobjs.DownloadProgress = getChild(transform, "DownloadProgress")
+    uiobjs.DownloadProgressLb = getCC(uiobjs.DownloadProgress, "Label", "UILabel")
 end

 -- 显示，
 -- 注意，c#侧不会在调用show时，调用refresh
 function _cell.show(go, data)
    mData = data
+    SetActive(uiobjs.ButtonDel, false)
    uiobjs.Label.text = mData.name
+    if MyUtl.isImage(mData.name) then
+        --//TODO:
+    else
+    end
+
    --//TODO:权限判断，如果有权限的可以考虑直接显示图片
+    if DBTextures.hadDownloaded(mData.name) then
+        SetActive(uiobjs.ButtonDownload, false)
+    else
+        SetActive(uiobjs.ButtonDownload, true)
+    end
 end

 -- 取得数据
@@ -28,5 +45,49 @@ function _cell.getData()
    return mData
 end

+function _cell.download()
+    if isDownLoading then
+        return
+    end
+
+    isDownLoading = true
+    SetActive(uiobjs.ButtonDownload, false)
+    www =
+        DBTextures.download(
+        mData.name,
+        mData.url,
+        function(content, localPath)
+            isDownLoading = false
+            www = nil
+            if content and localPath then
+                -- 附件下载完成
+                MyUtl.toastS(joinStr("附件已保存本地：" .. localPath))
+            else
+                SetActive(uiobjs.ButtonDownload, true)
+            end
+        end
+    )
+    _cell.refreshProgress()
+end
+
+function _cell.refreshProgress()
+    if www == nil then
+        SetActive(uiobjs.DownloadProgress.gameObject, false)
+        return
+    else
+        SetActive(uiobjs.DownloadProgress.gameObject, true)
+        local progressVal = www.downloadProgress or 0 -- downloadProgress uploadProgress
+        uiobjs.LabelPersent.text = joinStr(math.floor(progressVal * 100), "%")
+    end
+
+    csSelf:invoke4Lua(_cell.refreshProgress, 0.1)
+end
+
+function _cell.uiEventDelegate(go)
+    if go.name == "ButtonDownload" then
+        _cell.download()
+    end
+end
+
 --------------------------------------------
 return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
@@ -105,10 +105,10 @@ function _cell.onFinisInitFields()
    uiobjs.Table.repositionNow = true
    hideHotWheel()

+    isLoading = false
    csSelf:invoke4Lua(
        function()
            Utl.doCallback(mData.onFinish, csSelf.gameObject)
-            isLoading = false
            -- 再次处理
            _cell.refresh()
        end,
@@ -121,6 +121,8 @@ function _cell.release()
        SetActive(v.gameObject, false)
        CLUIOtherObjPool.returnObj(v.gameObject)
    end
+    
+    isLoading = false
    fieldsObjs = {}
    count = 0
 end
@@ -144,7 +146,7 @@ end

 function _cell.OnDisable()
    if #(fieldsObjs) > 0 then
-        printe("动态加载的字段没有释放" .. csSelf.name)
+        printw("动态加载的字段没有释放" .. csSelf.name)
    end
 end
 --------------------------------------------
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
@@ -294,6 +294,21 @@ function TRPOrderDetail:initAttachmentCell(cell, data)
 end

 function TRPOrderDetail:onClickAttachment(cell, data)
+    local had, path = DBTextures.hadDownloaded(data.name)
+    if had then
+        CLUIUtl.showConfirm(
+            joinStr("附件已保存本地：", path),
+            false,
+            "打开",
+            function()
+                Application.OpenURL(joinStr("file://", path))
+            end,
+            "取消",
+            nil
+        )
+    else
+        MyUtl.toastW("附件未下载完成，暂时无法查看")
+    end
 end

 function TRPOrderDetail:showRecords()
@@ -493,7 +508,6 @@ function TRPOrderDetail:addAttachment(go)
    end
 end

-
 function TRPOrderDetail:onGetImage(path)
    if isNilOrEmpty(path) then
        return
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
@@ -487,7 +487,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 196174554914487288}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -132, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6081736162149425773}
@@ -1103,7 +1103,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 473791057614103523}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -31400.748, y: -30.904175, z: 0}
+  m_LocalPosition: {x: -31532.748, y: -30.904175, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4805047464567458223}
@@ -1158,6 +1158,238 @@ MonoBehaviour:
  isPause: 0
  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
  isNeedResetAtlase: 1
+--- !u!1 &505517071713258037
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1360912303918495723}
+  - component: {fileID: 3834450592202181646}
+  - component: {fileID: 8497169072743663993}
+  - component: {fileID: 8198695786030183274}
+  m_Layer: 5
+  m_Name: ButtonDownload
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1360912303918495723
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_LocalRotation: {x: 0, y: 0, z: 1, w: -0.00000004371139}
+  m_LocalPosition: {x: 88, y: -88, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1467516596806451442}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3834450592202181646
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 260, y: 260, z: 0}
+  m_Center: {x: 88.91, y: -88.6, z: 0}
+--- !u!114 &8497169072743663993
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 505517071713258037}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 5746343202289990627}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &8198695786030183274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mPivot: 4
+  mWidth: 60
+  mHeight: 60
+  mDepth: 7
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: order_upload
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!1 &565501314856477289
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3074807661475435551}
+  - component: {fileID: 2409807572937764693}
+  - component: {fileID: 4581390671853285643}
+  m_Layer: 5
+  m_Name: Sprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3074807661475435551
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565501314856477289}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 707187227634174975}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2409807572937764693
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565501314856477289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 200
+  mDepth: 5
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: hotwheel_loading
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &4581390671853285643
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565501314856477289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf6484591c9cb0e409f5c53c6978a95d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rotationsPerSecond: {x: 0, y: 0, z: 0.1}
+  ignoreTimeScale: 0
 --- !u!1 &704041659391080358
 GameObject:
  m_ObjectHideFlags: 0
@@ -2016,7 +2248,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1217192100569320354}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -171.62, z: 0}
+  m_LocalPosition: {x: 0, y: -181.5, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1467516596806451442}
@@ -4935,7 +5167,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3294423761365210736}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 846, z: 0}
+  m_LocalPosition: {x: -132, y: 846, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 9131447998686714841}
@@ -8139,6 +8371,38 @@ MonoBehaviour:
  mSpriteName: order_icon_5
  mFillCenter: 1
  isGrayMode: 0
+--- !u!1 &5432750105014609252
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 707187227634174975}
+  m_Layer: 5
+  m_Name: DownloadProgress
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &707187227634174975
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5432750105014609252}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3074807661475435551}
+  - {fileID: 781240651225443395}
+  m_Father: {fileID: 1467516596806451442}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5505984191990585591
 GameObject:
  m_ObjectHideFlags: 0
@@ -8256,7 +8520,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2.5882354
+  aspectRatio: 1
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -8850,7 +9114,7 @@ MonoBehaviour:
  mPivot: 4
  mWidth: 88
  mHeight: 94
-  mDepth: 7
+  mDepth: 2
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
@@ -10006,7 +10270,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6741796850072368115}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -23484.998, y: -31.529205, z: 0}
+  m_LocalPosition: {x: -23616.998, y: -31.529205, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1962320147976321985}
@@ -10063,6 +10327,106 @@ MonoBehaviour:
  isPause: 0
  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
  isNeedResetAtlase: 1
+--- !u!1 &6780551916686076506
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 781240651225443395}
+  - component: {fileID: 4039382246727516577}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &781240651225443395
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6780551916686076506}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 707187227634174975}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4039382246727516577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6780551916686076506}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 86
+  mHeight: 32
+  mDepth: 6
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2.6875
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: 100%
+  mFontSize: 32
+  mFontStyle: 1
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 2
+  mMaterial: {fileID: 0}
+  mApplyGradient: 1
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
 --- !u!1 &6790636284997338301
 GameObject:
  m_ObjectHideFlags: 0
@@ -11798,12 +12162,14 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7988814047750342368}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -425.61, y: -0, z: 0}
+  m_LocalPosition: {x: 0, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 8958346099814627774}
  - {fileID: 4601844564519845584}
  - {fileID: 593301531348764212}
+  - {fileID: 707187227634174975}
+  - {fileID: 1360912303918495723}
  m_Father: {fileID: 4713050183387073493}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12145,7 +12511,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8147893687025928433}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -39727.246, y: -1777.6542, z: 0}
+  m_LocalPosition: {x: -39859.246, y: -1777.6542, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6267045741486055760}
@@ -12763,7 +13129,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7192762038683279864
 Transform:
  m_ObjectHideFlags: 0
@@ -13825,7 +14191,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 9199839785384366174}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -132, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5238886842196287200}
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.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/TRCellAttachment.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.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/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,b1f7521d5a7aa1c234d530bec1ec77bf8	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,58839a7593d0cc9db0e1a5937a57e7968	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver