mm

Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v

@@ -1,5 +1,4 @@
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,ad36b1df99250176f457b3cf9be575f5
-trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
 trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,c88f9a58e3779e527d39abc8ac377a39
 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
@@ -18,16 +17,15 @@ 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
@@ -42,23 +40,21 @@ 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
 trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,b554ca58c719e83ae8d0a32d5d6f1b9b
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
 trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
-trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,3f0976bdbc070d9cebc936e5c21735f1
+trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,2523412c3ec127c8fa249ccaf0131c5c
 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
 trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
 trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,b5d061757bdde7745f297b8dde6b69b0
 trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae
-trCRM/upgradeRes/priority/lua/ui/panel/TRPOceanList.lua,4ca8e89a07d1929a515f42a8421498bb
+trCRM/upgradeRes/priority/lua/ui/panel/TRPOceanList.lua,bb341e8933f89c7551fb3bc2a8f19dd1
 trCRM/upgradeRes/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d
 trCRM/upgradeRes/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f
@@ -69,14 +65,12 @@ 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,602888a7dd58a9fe98a61ee9c829aa84
+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
@@ -103,7 +97,7 @@ trCRM/upgradeRes/priority/lua/db/DBTextures.lua,55ddfb8bcb4af790b9da55626412e92a
 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
-trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetailSimple.lua,7528caabcee343a09a3bb7a67a56010f
+trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetailSimple.lua,b9363451fb74058d9a2948ae79a9b32f
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustListProc.lua,5173a3a248c9989a58e6097a409a94e7
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990
 trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e
@@ -113,6 +107,7 @@ 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
@@ -138,7 +133,7 @@ trCRM/upgradeRes/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,8f055265d33f40a2278e159a8ebf2b56
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_4.unity3d,cb33f3103d8fb3c77e2f1683b1c89a3d
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,1683cd2993884b1b11244d1f5ee700f4
-trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
+trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,277b9350b6eeced2c333ac9876acc888
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519
@@ -150,6 +145,7 @@ 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
@@ -161,11 +157,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
@@ -173,9 +169,9 @@ trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_2.unity3d,21a6309f8a86dcd7c2f90ece3e525f74
 trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,0cb329c53fbe9ba9c344874774a9c6fd
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
-trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,67229091a1debae2eba721f401409c2a
+trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,377b7e10166dfb91862f695664c56c4b
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
-trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,630b2e9e9355cbd9106b36b35d20fd3d
+trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,dfa25ea0e3b48c6396acca6e9ea4162c
 trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
 trCRM/upgradeRes/priority/lua/db/DBMessage.lua,77841c7eda6d675c5b3f8f8cec7c65ba
 trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,1f1fe6971f4702b5879e30715fb349e6
@@ -202,8 +198,8 @@ trCRM/upgradeRes/other/uiAtlas/work/Android/yuyue.unity3d,48a0b0f16711574af6c66f
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c
 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
 trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
-trCRM/upgradeRes/priority/lua/db/DBUser.lua,4b287e00da702dc06ba1acb5206f5e0a
+trCRM/upgradeRes/priority/lua/db/DBUser.lua,bf721b09d52a9e82388c173e009fec42
-trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
+trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,26b71aa4ebe7db385c5f159902022b6a
 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
 trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8
@@ -212,7 +208,9 @@ 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
@@ -231,13 +229,13 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d
 trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
-trCRM/upgradeRes/priority/ui/panel/Android/PanelTaskList.unity3d,bd3d518999533c00a5eb010b8b064987
+trCRM/upgradeRes/priority/ui/panel/Android/PanelTaskList.unity3d,54b72266d6e08a12ddd06aa19b114522
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
-trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,ea1fce9cedfdeb337bb3d253f8a9a609
+trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,2962cf4d3dcc8531fe333030f16ffb88
-trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,64012de583f1cd85584903ce68a0c812
+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/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
+trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
 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
@@ -246,8 +244,8 @@ 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/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
+trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
-trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,32466ec1a4b799de26e447f17cabc760
+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
 trCRM/upgradeRes/priority/ui/panel/Android/PanelAbout.unity3d,3538e59736f24d4411e83b0e041e1f66
@@ -262,10 +260,9 @@ 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/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
+trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
 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
@@ -275,17 +272,17 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a93
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831
 trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
 trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
-trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5f407385fe15980c
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
 trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,1ccaafb32c2b12b3cf5070636dc25009
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b
-trCRM/upgradeRes/priority/lua/net/NetProto.lua,fc2430aa8357e524a4520d0e6204956c
+trCRM/upgradeRes/priority/lua/net/NetProto.lua,3ce99787132055f59cc97974b5c6c467
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
 trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee
-trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowTask.unity3d,34c682a1e2b1d13643fb9bcef8cfbf29
+trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowTask.unity3d,73a07c0ddd4f7edc73445c9fd2248fa2
 trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
 trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
@@ -296,14 +293,16 @@ 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/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
+trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
-trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0
+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,d69a767e5d6a6a5cc33fce98464d3bc1
+trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,3f37c374855b223c8138f39265635811
 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
@@ -311,10 +310,10 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,152602fd1be6119a10e28e488090baa7
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,541231e1c35628ede741212fba8f217d
 trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7
-trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,29c95ef46d9adeb7d310ac073ca4ef26
 trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
-trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,2d2d5de07a37eaf1da757feda1951b17
+trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,73db544d3da38058ab3385f2c3e4f665
 trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6
 trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd
@@ -324,21 +323,21 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellTaskList.lua,d51c12f9e5de1f5db917d82
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c
 trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,d75b0e5651468028373c4f326937d460
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8
-trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopTime.lua,0e26b4cf8f9bfde695d5fcd64009c06a
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopTime.lua,ffdeaf9996a4aa6dda8f025faccbbe1e
 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/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815622ea707c3
+trCRM/upgradeRes/priority/ui/panel/Android/PanelProductDetail.unity3d,44dc779e7b05ed8c29719f679317e058
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2
 trCRM/upgradeRes/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7
-trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
+trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
 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/priority/lua/db/DBRoot.lua,8acbe310f1c8202777ddc31620d51837
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 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
@@ -347,14 +346,15 @@ 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/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
+trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
 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/lua/ui/panel/TRPAbout.lua,dae2d1afc8a5e2d7c996c6056aa42dc4
+trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
+trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua,edeb733a40a67f9e0431e448b3356d95

Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v

@@ -52,15 +52,15 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c8
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,b554ca58c719e83ae8d0a32d5d6f1b9b
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,630b2e9e9355cbd9106b36b35d20fd3d
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,dfa25ea0e3b48c6396acca6e9ea4162c
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d,8ac3bb50fa5c67200331f3bc71f70d30
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,9a6d3e61d449a2c1e42dfb76aab1c295
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,3f0976bdbc070d9cebc936e5c21735f1
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,2523412c3ec127c8fa249ccaf0131c5c
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
 trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,b5d061757bdde7745f297b8dde6b69b0
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,4ca8e89a07d1929a515f42a8421498bb
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,bb341e8933f89c7551fb3bc2a8f19dd1
 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d
@@ -75,7 +75,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua,50a46489d0d704df26d61ae9a2f5d5fe
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,602888a7dd58a9fe98a61ee9c829aa84
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,5a651af95e2e6131a56bdb2c18457072
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
@@ -102,7 +102,7 @@ trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua,55ddfb8bcb4af790b9da5562
 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
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua,7528caabcee343a09a3bb7a67a56010f
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua,b9363451fb74058d9a2948ae79a9b32f
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,5173a3a248c9989a58e6097a409a94e7
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e
@@ -140,7 +140,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c623
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,8f055265d33f40a2278e159a8ebf2b56
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d,cb33f3103d8fb3c77e2f1683b1c89a3d
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,1683cd2993884b1b11244d1f5ee700f4
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,277b9350b6eeced2c333ac9876acc888
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519
@@ -176,7 +176,7 @@ trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e36591
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d,21a6309f8a86dcd7c2f90ece3e525f74
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,0cb329c53fbe9ba9c344874774a9c6fd
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,67229091a1debae2eba721f401409c2a
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,377b7e10166dfb91862f695664c56c4b
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,dae2d1afc8a5e2d7c996c6056aa42dc4
 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,77841c7eda6d675c5b3f8f8cec7c65ba
@@ -203,8 +203,8 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/yuyue.unity3d,48a0b0f1671157
 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
-trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,4b287e00da702dc06ba1acb5206f5e0a
+trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,bf721b09d52a9e82388c173e009fec42
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,26b71aa4ebe7db385c5f159902022b6a
 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8
@@ -233,10 +233,10 @@ trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201e
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d,bd3d518999533c00a5eb010b8b064987
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d,54b72266d6e08a12ddd06aa19b114522
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,ea1fce9cedfdeb337bb3d253f8a9a609
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,2962cf4d3dcc8531fe333030f16ffb88
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,64012de583f1cd85584903ce68a0c812
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,121d472a9c63850e668a9eebbc6fc413
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d,b4aca0f337304fefc9997c00886e75c1
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
@@ -248,7 +248,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be66
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,a6dc405916d51c97422bf1862f3a8f5b
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,32466ec1a4b799de26e447f17cabc760
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,591672cab0a1e8e81ed68a1fb20f4d0c
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d,3538e59736f24d4411e83b0e041e1f66
@@ -274,16 +274,16 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831
 trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5f407385fe15980c
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,1ccaafb32c2b12b3cf5070636dc25009
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b
-trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,fc2430aa8357e524a4520d0e6204956c
+trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,3ce99787132055f59cc97974b5c6c467
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d,34c682a1e2b1d13643fb9bcef8cfbf29
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d,73a07c0ddd4f7edc73445c9fd2248fa2
 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
@@ -297,22 +297,22 @@ trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed4
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,e8e8c2a2a8f7c91ded00896bf6ce2bfb
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
 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,d69a767e5d6a6a5cc33fce98464d3bc1
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,3f37c374855b223c8138f39265635811
 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
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,152602fd1be6119a10e28e488090baa7
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,541231e1c35628ede741212fba8f217d
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,29c95ef46d9adeb7d310ac073ca4ef26
 trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,2d2d5de07a37eaf1da757feda1951b17
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,73db544d3da38058ab3385f2c3e4f665
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f
@@ -324,7 +324,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0c
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectServer.unity3d,b0a074f0b8b0e1e564fe46561e957be8
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,d75b0e5651468028373c4f326937d460
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua,0e26b4cf8f9bfde695d5fcd64009c06a
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua,ffdeaf9996a4aa6dda8f025faccbbe1e
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,79adf0809fb5121f0fa306a8d96ae725

Assets/trCRM/serversCfg/servers.json

@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"e23d94501e73e162b6fa272c173ca973", "port":29006, "androidVer":"3395e596f57b806c18bb98680676ea2c", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"e23d94501e73e162b6fa272c173ca973", "port":29000, "androidVer":"3395e596f57b806c18bb98680676ea2c", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"e23d94501e73e162b6fa272c173ca973", "port":29004, "androidVer":"3395e596f57b806c18bb98680676ea2c", "isDev":0}}}
+{"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}}}

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua

@@ -14,6 +14,12 @@ DBUser.FilterGroup = {
     group = "group"
 }
 
+function DBUser.clean()
+    db = {}
+    poplist = {}
+    rolePermission = {}
+end
+
 function DBUser.onGetUsers(list, groupList, permissions)
     local options = ArrayList()
     local values = ArrayList()
@@ -66,14 +72,18 @@ end
 
 function DBUser.refreshUserInfor(loginNo, loginName)
     local infor = DBUser.getPopList(DBUser.FilterGroup.user)
-    for i, v in ipairs(infor.values or {}) do
+    if infor and infor.values then
-        if v == loginNo then
+        local count = infor.values.Count
-            infor.options[i] = loginName
+        for i = 0, count - 1 do
-            break
+            local v = infor.values[i]
+            if v == loginNo then
+                infor.options[i] = loginName
+                break
+            end
         end
     end
 
-    local list = DBUser.getFilters(DBUser.FilterGroup.user)
+    local list = DBUser.getFilters(DBUser.FilterGroup.user) or {}
     for i, v in ipairs(list or {}) do
         if v.value == loginNo then
             v.name = loginNo

Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua

@@ -13,7 +13,6 @@ local port = 29004
 local baseUrl = joinStr("http://", host, ":", port, "/open_api/")
 local socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
 
-
 NetProto.setSever = function(_host, _port)
     host = _host
     port = _port
@@ -84,12 +83,15 @@ local dispatch = function(content, params)
     for k, p in pairs(PanelListener) do
         ListenerQueue:enQueue(p)
     end
+    ---@type Coolape.CLPanelLua
     local p
     while (ListenerQueue:size() > 0) do
         ---@type coolape.Coolape.CLPanelBase
         p = ListenerQueue:deQueue()
-        if p then
+        if p and (not p:IsNull()) and p.gameObject.activeInHierarchy then
             p:procNetwork(cmd, code, msg, map)
+        else
+            NetProto.removePanelListener(p)
         end
     end
 end
@@ -212,14 +214,14 @@ end
 ---@param p Coolape.CLPanelBase
 function NetProto.addPanelListener(p)
     if p then
-        PanelListener[p] = p
+        PanelListener[p.name] = p
     end
 end
 
 ---@param p Coolape.CLPanelBase
 function NetProto.removePanelListener(p)
     if p then
-        PanelListener[p] = nil
+        PanelListener[p.name] = nil
     end
 end
 
@@ -300,7 +302,7 @@ NetProto.cmds = {
     updateUserInfo = "updateUserInfo", -- 更新用户信息
     updateUserPhone = "updateUserPhone", -- 更新用户手机号
     get_customerById = "get_customerById", -- 取得客户
-    readNotice = "readNotice", -- 已读公告
+    readNotice = "readNotice" -- 已读公告
 }
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
@@ -616,7 +618,7 @@ NetProto.send.selectProductInfo = function(searchKey, page, callback, timeOutSec
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
-NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec)
+NetProto.send.createWfInfo = function(workFlowInfo, wfOptions, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.createWfInfo
     local user = DBUser.getUserById(NetProto.loginNo)
@@ -625,6 +627,7 @@ NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec)
     content.loginNo = NetProto.loginNo
     content.groupId = NetProto.groupId
     content.workFlowInfo = workFlowInfo
+    content.wfOptions = wfOptions
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua

@@ -75,6 +75,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function CLLPPopList.hideSelfOnKeyBack()
+    if NetProto and csSelf then
+        NetProto.removePanelListener(csSelf)
+    end
     return true
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua

@@ -211,6 +211,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function CLLPPopTime.hideSelfOnKeyBack()
+    if NetProto and csSelf then
+        NetProto.removePanelListener(csSelf)
+    end
     return true
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua

@@ -93,6 +93,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function CLLPWebView.hideSelfOnKeyBack()
+    if NetProto and csSelf then
+        NetProto.removePanelListener(csSelf)
+    end
     return true
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua

@@ -48,6 +48,10 @@ function CSPMain.setBottomBtns()
     CLUIUtl.resetList4Lua(objs.bottomGrid, objs.bottomCellPrefab, bottomBtns, CSPMain.initBottomBtn)
 end
 
+function CSPMain.refreshBtns()
+    CLUIUtl.resetList4Lua(objs.bottomGrid, objs.bottomCellPrefab, bottomBtns, CSPMain.initBottomBtn2)
+end
+
 function CSPMain.initBottomBtn(cell, data)
     data.width = objs.bottomGrid.cellWidth
     cell:init(data, CSPMain.onClickBottonBtn)
@@ -56,6 +60,10 @@ function CSPMain.initBottomBtn(cell, data)
     end
 end
 
+function CSPMain.initBottomBtn2(cell, data)
+    cell:init(data, CSPMain.onClickBottonBtn)
+end
+
 function CSPMain.onClickBottonBtn(cell, data)
     cell.luaTable.setSelected(true)
     objs.LabelTitle.text = data.name
@@ -77,13 +85,11 @@ end
 
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function CSPMain.procNetwork(cmd, succ, msg, paras)
-    --[[
+    if (succ == NetSuccess) then
-        if(succ == 1) then
+        if cmd == NetProto.cmds.readNotice then
-          if(cmd == "xxx") then
+            CSPMain.refreshBtns()
-            -- TODO:
-          end
         end
-        --]]
+    end
 end
 
 -- 处理ui上的事件，例如点击等

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua

@@ -27,6 +27,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function TRBasePanel:hideSelfOnKeyBack()
+    if NetProto and self.csSelf then
+        NetProto.removePanelListener(self.csSelf)
+    end
     return true
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetailSimple.lua

@@ -38,6 +38,8 @@ function TRPCustDetailSimple:init(csObj)
     uiobjs.starGridPrefab2 = getChild(uiobjs.starGrid2.transform, "00000").gameObject
     uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua")
     uiobjs.SysRoot = getCC(uiobjs.Table.transform, "SysRoot", "CLCellLua")
+
+    uiobjs.ButtonGet = getChild(self.transform, "AnchorBottom/offset/ButtonGet").gameObject
 end
 
 function TRPCustDetailSimple:prepareMoreData()
@@ -107,8 +109,9 @@ end
 -- 设置数据
 ---@param paras _ParamTRPCustDetailSimple
 function TRPCustDetailSimple:setData(paras)
+    self.isShowButtonGet = paras.isShowButtonGet
     ---@type _DBCust
-    self.mdata = paras
+    self.mdata = paras.cust
     self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)
     if type(self.mdata.jsonStr) == "string" then
         self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
@@ -130,6 +133,12 @@ end
 
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPCustDetailSimple:show()
+    SetActive(uiobjs.ButtonGet, self.isShowButtonGet or false)
+    if self.isShowButtonGet then
+        MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 200)
+    else
+        MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 0)
+    end
     self.records = nil
     self.orders = nil
     local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua

@@ -307,6 +307,11 @@ function TRPMyInfor:onGetImage(path)
         function(content)
             hideHotWheel()
             if content and content.success then
+                local user = DBUser.getUserById(self.mdata.loginNo)
+                if user then
+                    user.imageUrl = joinStr("file://", path)
+                    self:setHeadInfor()
+                end
                 NetProto.send.personal_data_query()
                 MyUtl.toastS("头像更改成功")
             else

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua

@@ -396,7 +396,7 @@ function TRPNewCust:setEventDelegate()
                 cust,
                 function(content)
                     if content.success then
-                        getPanelAsy("PanelCustDetail", onLoadedPanel, cust)
+                        getPanelAsy("PanelCustDetail", onLoadedPanel, content.result)
                     end
                     hideHotWheel()
                 end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua

@@ -24,6 +24,7 @@ function TRPNewFollow:init(csObj)
     uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
 
     uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
+    uiobjs.ButtonCustDetail = getChild(self.transform, "ButtonCustDetail")
 end
 
 ---public 当有通用背板显示时的回调
@@ -130,6 +131,18 @@ end
 
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPNewFollow:show()
+    if self.isNewFollow then
+        SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+    else
+        ---@type Coolape.CLPanelLua
+        local panel = CLPanelManager.getPanel("PanelCustDetail")
+        if panel and panel.gameObject.activeInHierarchy then
+            SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+        else
+            SetActive(uiobjs.ButtonCustDetail.gameObject, true)
+        end
+    end
+
     self:refreshContent()
     SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
 
@@ -245,6 +258,25 @@ function TRPNewFollow:setEventDelegate()
         end,
         InputTask = function()
             self:showExtentFiles(uiobjs.InputTask.value)
+        end,
+        ButtonCustDetail = function()
+            showHotWheel()
+            NetProto.send.get_customerById(
+                self.mdata.custId,
+                function(content)
+                    hideHotWheel()
+                    if content.success then
+                        local cust = content.result
+                        if cust then
+                            getPanelAsy(
+                                "PanelCustDetailSimple",
+                                onLoadedPanelTT,
+                                {cust = cust, isShowButtonGet = false}
+                            )
+                        end
+                    end
+                end
+            )
         end
     }
 end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua

@@ -11,7 +11,7 @@ function TRPNewFollowTask:init(csObj)
     TRPNewFollowTask.super.init(self, csObj)
     self:initFiledsAttr()
     self:setEventDelegate()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 190)
     ---@type UIScrollView
     uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
     uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -24,6 +24,7 @@ function TRPNewFollowTask:init(csObj)
     uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
 
     uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
+    uiobjs.ButtonCustDetail = getChild(self.transform, "ButtonCustDetail")
 end
 
 function TRPNewFollowTask:initFiledsAttr()
@@ -94,9 +95,20 @@ function TRPNewFollowTask:onShowFrame(cs)
     end
 end
 
-
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPNewFollowTask:show()
+    if self.isNewFollow then
+        SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+    else
+        ---@type Coolape.CLPanelLua
+        local panel = CLPanelManager.getPanel("PanelCustDetail")
+        if panel and panel.gameObject.activeInHierarchy then
+            SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+        else
+            SetActive(uiobjs.ButtonCustDetail.gameObject, true)
+        end
+    end
+
     self:refreshContent()
     SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
 
@@ -244,6 +256,25 @@ function TRPNewFollowTask:setEventDelegate()
                     end
                 end
             )
+        end,
+        ButtonCustDetail = function()
+            showHotWheel()
+            NetProto.send.get_customerById(
+                self.mdata.custId,
+                function(content)
+                    hideHotWheel()
+                    if content.success then
+                        local cust = content.result
+                        if cust then
+                            getPanelAsy(
+                                "PanelCustDetailSimple",
+                                onLoadedPanelTT,
+                                {cust = cust, isShowButtonGet = false}
+                            )
+                        end
+                    end
+                end
+            )
         end
     }
 end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua

@@ -576,16 +576,17 @@ function TRPNewOrder:setEventDelegate()
             order.wfType = "0" -- 0：正常工单，1：退货工单
 
             -- 附件
+            local wfOptions = {}
             if self.images and #(self.images) > 0 then
-                order.wfOptions = {}
                 for i, v in ipairs(self.images) do
-                    table.insert(order.wfOptions, v.uploadInfor)
+                    table.insert(wfOptions, v.uploadInfor)
                 end
             end
             -----------------------------------
             showHotWheel()
             NetProto.send.createWfInfo(
                 order,
+                wfOptions,
                 function(content)
                     if content.success then
                         MyUtl.toastS("订单创建成功")

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua

@@ -9,7 +9,11 @@ function TRPOceanList:init(csObj)
     TRPOceanList.super.init(self, csObj)
     self:setEventDelegate()
     self:initFilters()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
+    MyUtl.setContentView(
+        getChild(self.transform, "PanelContent"),
+        MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40,
+        0
+    )
     uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
     uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
     uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
@@ -165,7 +169,7 @@ function TRPOceanList:onClickCell(cell, data)
             if content.success then
                 local cust = content.result
                 if cust then
-                    getPanelAsy("PanelCustDetailSimple", onLoadedPanelTT, cust)
+                    getPanelAsy("PanelCustDetailSimple", onLoadedPanelTT, {cust = cust, isShowButtonGet = true})
                 end
             end
         end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua

@@ -65,7 +65,8 @@ function TRPSelectProduct:initCell(cell, data)
 end
 
 function TRPSelectProduct:onClickCell(cell, data)
-    getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
+    -- getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
+    cell.luaTable.selected(not data.isSelected)
 end
 
 function TRPSelectProduct:onEndList(tail)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua

@@ -71,6 +71,9 @@ function TRPSetting:setEventDelegate()
                 function()
                     Prefs.setCurrGroup(Prefs.getUserName(), "")
                     Prefs.setUserPsd("")
+                    if DBUser then
+                        DBUser.clean()
+                    end
                     hideTopPanel(self.csSelf)
                     hideTopPanel()
                     hideTopPanel()
@@ -91,7 +94,10 @@ function TRPSetting:setEventDelegate()
                         pcall(releaseRes4GC, true)
                     end
                     --- 释放资源结束-------------------------------
-                    
+                    if DBUser then
+                        DBUser.clean()
+                    end
+
                     --//TODO: 还要把已经下载了的附件也删除掉
 
                     pcall(cleanRes)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua

@@ -91,15 +91,18 @@ end
 ---@param data _DBMessage
 function TRPSysMsgList:onClickCell(cell, data)
     if data.NOTICETYPE == DBMessage.MsgType.Sys then
-        NetProto.send.readNotice(
+        if data.READFLAG == DBMessage.ReadFlag.unread then
-            data.ID,
+            -- 通知已读了
-            function(content)
+            NetProto.send.readNotice(
-                if content.success then
+                data.ID,
-                    data.READFLAG = DBMessage.ReadFlag.readed
+                function(content)
-                    self.uiobjs.LoopTable:refreshContentOnly()
+                    if content.success then
+                        data.READFLAG = DBMessage.ReadFlag.readed
+                        self.uiobjs.LoopTable:refreshContentOnly()
+                    end
                 end
-            end
+            )
-        )
+        end
         getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
     elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
         getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab

@@ -1,5 +1,255 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &434944184094226890
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6682180655267840600}
+  - component: {fileID: 3830175393093446653}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6682180655267840600
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 434944184094226890}
+  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: 4819853030377762302}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3830175393093446653
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 434944184094226890}
+  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: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 50
+  mDepth: 9
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u5BA2\u6237\u8BE6\u60C5"
+  mFontSize: 50
+  mFontStyle: 0
+  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: 0
+  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 &830934663996654735
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4819853030377762302}
+  - component: {fileID: 3033119408603187193}
+  - component: {fileID: 8172204838477360270}
+  - component: {fileID: 709341874417829216}
+  - component: {fileID: 946006603145748808}
+  m_Layer: 5
+  m_Name: ButtonCustDetail
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4819853030377762302
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -1042, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6682180655267840600}
+  m_Father: {fileID: 5001673685575848814}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3033119408603187193
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1025, y: 160, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8172204838477360270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 830934663996654735}
+  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: 6602973367304329883}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &709341874417829216
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  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: 5001673685575848814}
+    relative: 0
+    absolute: 30
+  topAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 0
+    absolute: 190
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1025
+  mHeight: 160
+  mDepth: 8
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 6.40625
+  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: public_button
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &946006603145748808
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 709341874417829216}
+  offset: 50
+  sizeAdjust: 1
 --- !u!1 &892331021296762499
 GameObject:
   m_ObjectHideFlags: 0
@@ -411,6 +661,7 @@ Transform:
   - {fileID: 5093278721696270566}
   - {fileID: 703582893891920782}
   - {fileID: 3811868574385527201}
+  - {fileID: 4819853030377762302}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -609,7 +860,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3001
+  startingRenderQueue: 3003
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab

@@ -179,6 +179,106 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1125, y: 2172, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4315722042513260696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5950202487608235859}
+  - component: {fileID: 1207288853966562064}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5950202487608235859
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4315722042513260696}
+  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: 7490712211079302417}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1207288853966562064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4315722042513260696}
+  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: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 50
+  mDepth: 9
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u5BA2\u6237\u8BE6\u60C5"
+  mFontSize: 50
+  mFontStyle: 0
+  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: 0
+  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 &4329241472409898578
 GameObject:
   m_ObjectHideFlags: 0
@@ -379,6 +479,156 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
+--- !u!1 &5113059414826645774
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7490712211079302417}
+  - component: {fileID: 7487699256290532919}
+  - component: {fileID: 1283151448246207708}
+  - component: {fileID: 3696125885157695568}
+  - component: {fileID: 4144100815855023860}
+  m_Layer: 5
+  m_Name: ButtonCustDetail
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7490712211079302417
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -1042, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5950202487608235859}
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &7487699256290532919
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1025, y: 160, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1283151448246207708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 0}
+  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: 0
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 6003453472346918249}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &3696125885157695568
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  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: 5592195152047375516}
+    relative: 0
+    absolute: 30
+  topAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 190
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1025
+  mHeight: 160
+  mDepth: 8
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 6.40625
+  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: public_button
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &4144100815855023860
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 3696125885157695568}
+  offset: 50
+  sizeAdjust: 1
 --- !u!1 &6655210489690858908
 GameObject:
   m_ObjectHideFlags: 0
@@ -411,6 +661,7 @@ Transform:
   - {fileID: 5646390679247249172}
   - {fileID: 85942781782062204}
   - {fileID: 4329241472409898579}
+  - {fileID: 7490712211079302417}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -609,7 +860,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3001
+  startingRenderQueue: 3003
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTaskList.prefab

@@ -2062,7 +2062,7 @@ MonoBehaviour:
   EffectList: []
   frameName: Frame1
   frameObj: {fileID: 0}
-  titleKeyName: "\u9884\u7EA6\u7BA1\u7406"
+  titleKeyName: "\u9884\u7EA6\u8BB0\u5F55"
 --- !u!1 &5119801468621564870
 GameObject:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,f3cf33ada5db65fe7234fd990379ee638	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,b1f7521d5a7aa1c234d530bec1ec77bf8	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee