upgrade

Assets/CoolapeFrameData/verControl/.resModifyDate.v

@@ -358,7 +358,7 @@
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000
-/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132616712480000000
+/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132617930160000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000
@@ -399,7 +399,7 @@
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBAttachment.lua.meta,132415863480000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua,132429264590000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua.meta,132370178140000000
-/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,132616711850000000
+/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,132617499680000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua.meta,132368762790000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua,132404642920000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua.meta,132389399450000000
@@ -420,7 +420,7 @@
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua,132289129800000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua.meta,132289129800000000
-/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132615921880000000
+/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132617502670000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua.meta,132355452450000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua,132513098240000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua.meta,132289129810000000
@@ -514,7 +514,7 @@
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta,132387614100000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua,132415858340000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta,132394685710000000
-/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua,132616711170000000
+/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua,132617499770000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua.meta,132368777750000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOceanList.lua,132406397870000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOceanList.lua.meta,132404133410000000
@@ -659,7 +659,7 @@
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua.meta,132389272610000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua,132616709980000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua.meta,132366143690000000
-/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua,132616706920000000
+/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua,132617503240000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua.meta,132364876240000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPTaskList.lua,132412469240000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPTaskList.lua.meta,132405571360000000
@@ -761,11 +761,11 @@
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab.meta,132388537780000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab,132412480400000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta,132395131650000000
-/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132615904710000000
+/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132617930150000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388185850000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab,132406817650000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOceanList.prefab.meta,132403916110000000
-/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab,132615909780000000
+/Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab,132617930160000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab.meta,132401163870000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab,132410157360000000
 /Users/chenbin/Documents/working/devSpace/tianrun/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta,132395326430000000

Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v

@@ -1,7 +1,5 @@
 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,b60bdba3d6649838eed264246990fa99
-trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,3caa401eb431f21b9ee4e610c93dfd33
-trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,3ed4e7289bc339620e19a8d48807d388
 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
@@ -11,6 +9,7 @@ trCRM/upgradeRes/other/uiAtlas/order/Android/icon_5.unity3d,b6c45607f279eff0f963
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015
 trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be
 trCRM/upgradeRes/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,3c927618bc036253a99d5932fe22ed08
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,a87cc779c52b9efb2268b00587a35ebd
 trCRM/upgradeRes/other/uiAtlas/work/Android/img-icon.unity3d,13944f7af226165a21ba0524262b0de8
@@ -20,19 +19,17 @@ trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,39dd429081917b7cc5c
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,4ebb6aa9b3c61fc11d8b07aea9e57743
 trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,6e48b92fb900d09a2f5111b01a15821a
 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/other/uiAtlas/main/Android/icon_tel.unity3d,586649082835fac6de0aed41a685e106
 trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,0c0875362af4cd5a6a35cef8ac9d74e2
+trCRM/upgradeRes/priority/lua/db/DBRoot.lua,bda8f4be66a51defbebe6d7ef6a9884a
 trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
 trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099
-trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
 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/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372
-trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,a4f5e647fddd396eb8781f71325d89b4
 trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
 trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
 trCRM/upgradeRes/other/uiAtlas/mine/Android/img_authenticated.unity3d,a8f23a9c17d56c9441913e4977e3006b
@@ -47,18 +44,19 @@ 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/priority/lua/ui/panel/TRPProductDetail.lua,8b349ca65d41e650ebff14c3358e468d
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList2.lua,fb99342ba99217d194b5bd4665a2f15a
-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/work/Android/xiazai-icon.unity3d,8a7af096d5e511c34f6b01235b57d13e
 trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
 trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e
 trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,b554ca58c719e83ae8d0a32d5d6f1b9b
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
+trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,31c864befca4b564b72543d834a329fe
 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
 trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
@@ -75,16 +73,13 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a654
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,3b291f38637590e0fca816cae521a4f0
 trCRM/upgradeRes/other/uiAtlas/order/Android/gongsi.unity3d,204e3a238141978b021bf4ffbc73620a
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
-trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
 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/lua/ui/panel/TRPSelectServer.lua,50a46489d0d704df26d61ae9a2f5d5fe
 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,d235e6198245d1c693b5437d86b68f75
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
-trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,5c87cd598efd9c145911e50a14fc193e
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,21cb1977b7fe7cdedd9069d021cfd3e6
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,9b5df40e237fec33868826e1f12e2772
@@ -96,7 +91,7 @@ trCRM/upgradeRes/other/uiAtlas/work/Android/wenjian-icon.unity3d,780e57115babb2c
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa
 trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password.unity3d,04bebaa914245dd4d2376f9ded0ad15f
-trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac
+trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
 trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273
 trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d
@@ -122,6 +117,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,d3819b5019a9b8b
 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,1c45c795755a9f792896aa905f78af85
@@ -140,13 +136,13 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc7
 trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef
 trCRM/upgradeRes/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8
 trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab
-trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee
 trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5
 trCRM/upgradeRes/other/uiAtlas/order/Android/gou.unity3d,003393d384b7c8d6d0221b2e160bbb3e
 trCRM/upgradeRes/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellComFilterGroup.lua,8c33f89953c402f43b47022a71064cde
 trCRM/upgradeRes/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_4.unity3d,cb33f3103d8fb3c77e2f1683b1c89a3d
+trCRM/upgradeRes/other/uiAtlas/mine/Android/img_unauthorized.unity3d,2364907c4a676d92020083979d028c2e
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,1683cd2993884b1b11244d1f5ee700f4
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,0fec8598fddcc7b54f4794f16eaa59d8
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021
@@ -155,17 +151,17 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665e
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMakeCall.unity3d,a54467df24ee0ddec4db2840b8c3248e
-trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,4ce7c1fc57b76bd41ebc0a51e78819c5
+trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,3806ec152249eb94e44333da3a7ba9b4
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,0be1d92322048e7747b85f824bda77ec
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellFollowList.lua,e5cc27c8def2b9a255e47f3b707d8426
 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,c548932040c1620ede94e71a2bb0c8cc
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,06ea21012958c4b42ca8122d1515ed1f
 trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
 trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
-trCRM/upgradeRes/other/uiAtlas/call/Android/comingcall.unity3d,aa389eaf18e63450159f362bca58e8fc
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,6f98095a60bb1dc4f35037e6099493b1
 trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowList.unity3d,3aff465c0ca7aa53abcaa912a5961060
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536
@@ -174,12 +170,12 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellOrderList.lua,d4a79966004672384a6647
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
 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,5e57ae6031f9bd40070355f5a203315b
 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
 trCRM/upgradeRes/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,fae45952e1aa9de137196c40dab2e7b6
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCallLogDetail.lua,69ace8f049a97890a1138c1d1d2f51b6
-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,11 +184,11 @@ trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist2.lua,b2c461c179b6029994a9
 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,377b7e10166dfb91862f695664c56c4b
+trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,1045994ded084ebe67d8083f3ee92ffd
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
 trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,0bf5726a37d6aaccc3b8f78245aaeac4
 trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
-trCRM/upgradeRes/priority/lua/db/DBMessage.lua,600a647f8049db82cb19b2c13fea0df9
+trCRM/upgradeRes/priority/lua/db/DBMessage.lua,cd3cf15a071aa9cf7c8657f4d35426db
 trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,1f1fe6971f4702b5879e30715fb349e6
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
 trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
@@ -200,7 +196,6 @@ trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,bba5eea285cdb4d112f91b8c72524093
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMyInfor.unity3d,1d9ac53cf8d40f331c9be9a8223a47ce
 trCRM/upgradeRes/priority/lua/ui/panel/TRPProductList.lua,58bf1853609c6bd92a81fac50f5e1efc
-trCRM/upgradeRes/other/uiAtlas/call/Android/拨号_05.unity3d,5522296c264de7466efb294714946c16
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,8a6fc79368436f701198d4ffc027cfea
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
@@ -208,6 +203,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/PanelPopList2.unity3d,97cc645e2a1f06137579e1b0312cda11
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
+trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac
 trCRM/upgradeRes/priority/ui/panel/Android/PanelBatchGetCusts.unity3d,0b16be6a28646d9dc972fab628556b57
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,a86cba948b19853abefb86c46bfa7256
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,c1ee4768e591cf8a7d09574b6c1abf30
@@ -230,9 +226,12 @@ 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,52715f02cef3fe91925d033d1e6dfcdd
 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_tel2.unity3d,611e95b0cefc867205c6b9649291ae6c
+trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
 trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
@@ -255,7 +254,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,23b6659f9239c4c4565c
 trCRM/upgradeRes/priority/ui/panel/Android/PanelTaskList.unity3d,f2733549013073ee749f42f274b342de
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,430a3b167553c0fb2cb3f34c62065040
-trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,d93794a14279492785d6b0e1e1184d0c
+trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,82501e1fd21e59f144c840e3ed950151
 trCRM/upgradeRes/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSendSms.unity3d,339c862d9669bdd70e9e04c6a610cb9a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelBindPhone.unity3d,a63b7e106584f699fad374ec6043d0aa
@@ -268,9 +267,9 @@ trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,f6b401c59ed10b8b0d2d72
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21
 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
 trCRM/upgradeRes/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8
-trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
+trCRM/upgradeRes/other/uiAtlas/call/Android/comingcall.unity3d,aa389eaf18e63450159f362bca58e8fc
 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,a4f5e647fddd396eb8781f71325d89b4
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,4d6d237f3fc86b4fcf87eece0236c212
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
 trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b
@@ -306,12 +305,12 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5f407385f
 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,9c7edc982eae5989575747d2b8cad7ab
+trCRM/upgradeRes/priority/lua/net/NetProto.lua,e33f8317a2e21f082cf6e2c07f66a8df
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
 trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f
 trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836
 trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
-trCRM/upgradeRes/other/uiAtlas/mine/Android/img_unauthorized.unity3d,2364907c4a676d92020083979d028c2e
+trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowTask.unity3d,1ed97ae79f7838f8d57f7f05863217cc
 trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
@@ -324,9 +323,10 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelUserList.unity3d,f0dcb72e82e7dbf
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,39ea724db1c02f72c3a4eba281d6e7bf
 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/priority/lua/ui/panel/TRPNewOrder.lua,377b7e10166dfb91862f695664c56c4b
-trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
+trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,2cacaeb6845d8d0a0b16d726048a0216
 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
@@ -336,7 +336,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPMakeCall.lua,f8fd8e2319261f0952a9438a8
 trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
 trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,c2184a02caa0ca6c8bbf93301c204b26
 trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,b3278d2927045b007b629d8184db59f9
-trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,3847bb19ae8c2c8ead7aea9e881773a5
 trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,153a8fc20f3e2143fc487bd943213b73
@@ -350,28 +350,28 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd
-trCRM/upgradeRes/priority/lua/ui/panel/TRPProductDetail.lua,8b349ca65d41e650ebff14c3358e468d
+trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellTaskList.lua,55dc0892227d9f6f5092548293cdc9d8
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c
-trCRM/upgradeRes/other/uiAtlas/work/Android/xiazai-icon.unity3d,8a7af096d5e511c34f6b01235b57d13e
+trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,3ed4e7289bc339620e19a8d48807d388
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8
 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/priority/lua/db/DBAttachment.lua,b4567ff14ac46a7786957d39715fe5b0
 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,3c927618bc036253a99d5932fe22ed08
+trCRM/upgradeRes/other/uiAtlas/call/Android/拨号_05.unity3d,5522296c264de7466efb294714946c16
 trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
-trCRM/upgradeRes/priority/lua/db/DBRoot.lua,bda8f4be66a51defbebe6d7ef6a9884a
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowList4Cust.unity3d,b423a60a5239bebc95284477374e5f4d
 trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,69d132613124308f6925704c70afb20d
@@ -384,15 +384,15 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
 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,a925a19c2e119783665305efddb682b3
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_1.unity3d,47e903d836aa8bc08317cdc45d61907e
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
 trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43
 trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSendSms.lua,21ca579fc9f873db363be7a45cfc115f
-trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,1045994ded084ebe67d8083f3ee92ffd
+trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,5c87cd598efd9c145911e50a14fc193e
 trCRM/upgradeRes/other/uiAtlas/call/Android/拨号_03.unity3d,8bce0927f74079d303bc8354d231bee6
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,2cacaeb6845d8d0a0b16d726048a0216
+trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua,d7e729ad29ea6cabddfcca355458d9dd

Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v

@@ -1,5 +1,5 @@
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,ad36b1df99250176f457b3cf9be575f5
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d,3caa401eb431f21b9ee4e610c93dfd33
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d,b60bdba3d6649838eed264246990fa99
 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/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82
@@ -57,7 +57,7 @@ trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,b554ca58c719e8
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,0bf5726a37d6aaccc3b8f78245aaeac4
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d,8ac3bb50fa5c67200331f3bc71f70d30
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,4ce7c1fc57b76bd41ebc0a51e78819c5
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,3806ec152249eb94e44333da3a7ba9b4
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,31c864befca4b564b72543d834a329fe
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
 trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
@@ -192,7 +192,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d9
 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,1045994ded084ebe67d8083f3ee92ffd
-trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,600a647f8049db82cb19b2c13fea0df9
+trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,cd3cf15a071aa9cf7c8657f4d35426db
 trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,1f1fe6971f4702b5879e30715fb349e6
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
@@ -258,7 +258,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,a56567b7890
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d,f2733549013073ee749f42f274b342de
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,430a3b167553c0fb2cb3f34c62065040
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,d93794a14279492785d6b0e1e1184d0c
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,82501e1fd21e59f144c840e3ed950151
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSendSms.unity3d,339c862d9669bdd70e9e04c6a610cb9a
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d,a63b7e106584f699fad374ec6043d0aa
@@ -308,7 +308,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5
 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,9c7edc982eae5989575747d2b8cad7ab
+trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,e33f8317a2e21f082cf6e2c07f66a8df
 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

Assets/trCRM/serversCfg/servers.json

@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29004, "androidVer":"6de1daaea5bd6699242e890a98719216", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"6de1daaea5bd6699242e890a98719216", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29004, "androidVer":"c78481e5f51e86c500e469a70188a8ac", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"c78481e5f51e86c500e469a70188a8ac", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}}

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

@@ -97,6 +97,9 @@ DBMessage.onGetMessage = function(type, list, meta)
     ---@param v _DBMessage
     for i, v in ipairs(list) do
         v.NOTICETYPE = type
+        if v.NOTICETYPE == DBMessage.MsgType.Timeout then
+            v.READFLAG = v.remindingFlag == "Y" and 1 or 0
+        end
         table.insert(db.list[type], v) -- 倒序
     end
     -- //TODO:保存到本地
@@ -161,7 +164,7 @@ function DBMessage.getUnreadNum(type)
         local list = DBMessage.getMessages(DBMessage.MsgType.Timeout)
         ---@param v
         for i, v in ipairs(list) do
-            if v.ReadFlag == DBMessage.ReadFlag.unread then
+            if v.READFLAG == DBMessage.ReadFlag.unread then
                 count = count + 1
             end
         end

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

@@ -306,6 +306,7 @@ NetProto.cmds = {
     updateUserPhone = "updateUserPhone", -- 更新用户手机号
     get_customerById = "get_customerById", -- 取得客户
     readNotice = "readNotice", -- 已读公告
+    wforder_cancel_reminder = "wforder_cancel_reminder", -- 已读到期提醒
     authorizedPhone = "authorizedPhone", -- 认证手机号
     preUpdatePho = "preUpdatePho", -- 绑定号码之前验证
 }
@@ -759,6 +760,14 @@ NetProto.send.readNotice = function(id, callback, timeOutSec)
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
+NetProto.send.wforder_cancel_reminder = function(id, callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.readNotice
+    content.orderId = id
+    content.groupId = NetProto.groupId
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
+
 NetProto.send.authorizedPhone = function(data, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.authorizedPhone
@@ -775,5 +784,7 @@ NetProto.send.preUpdatePho = function(phoneNo, callback, timeOutSec)
     content.groupId = NetProto.groupId
     NetProto.sendSocket(content, callback, timeOutSec)
 end
+
+
 ------------------------------------------------------
 return NetProto

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

@@ -109,6 +109,17 @@ function TRPSysMsgList:onClickCell(cell, data)
     elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
         getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)
     elseif data.NOTICETYPE == DBMessage.MsgType.Timeout then
+        -- 通知已读了
+        NetProto.send.wforder_cancel_reminder(
+            data.orderId,
+            function(content)
+                if content.success then
+                    data.READFLAG = DBMessage.ReadFlag.readed
+                    data.remindingFlag = "Y"
+                    self.uiobjs.LoopTable:refreshContentOnly()
+                end
+            end
+        )
         getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
     else
         printw("没有处理该消息类型", data.NOTICETYPE)

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

@@ -63,13 +63,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 3
-  mWidth: 230
+  mWidth: 554
   mHeight: 46
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 5
+  aspectRatio: 12.043478
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -83,7 +83,7 @@ MonoBehaviour:
   mEffectColor: {r: 0, g: 0, b: 0, a: 1}
   mSymbols: 1
   mEffectDistance: {x: 1, y: 1}
-  mOverflow: 2
+  mOverflow: 0
   mMaterial: {fileID: 0}
   mApplyGradient: 0
   mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -506,7 +506,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 751446475674479924}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 461, y: 103, z: 0}
+  m_LocalPosition: {x: 461, y: 90, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1249610349479200778}
@@ -572,13 +572,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 9060292173203855846}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 0}
     relative: 1
-    absolute: 0
+    absolute: -69
+  rightAnchor:
+    target: {fileID: 9060292173203855846}
+    relative: 1
+    absolute: -33
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -638,7 +638,7 @@ GameObject:
   - component: {fileID: 9141256182201856122}
   - component: {fileID: 6496410008280496209}
   m_Layer: 5
-  m_Name: LabelEndDate
+  m_Name: LabelStartDate
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -696,7 +696,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 59
+  aspectRatio: 5.9
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -740,7 +740,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: validEndTime
+  jsonKey: validStartTime
   formatValue: 
   labeName: {fileID: 0}
   defaultName: 
@@ -852,106 +852,6 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
---- !u!1 &1246448268994330712
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5492273475069516787}
-  - component: {fileID: 2404477135426433860}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5492273475069516787
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1246448268994330712}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 89, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1930179077374056429}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2404477135426433860
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1246448268994330712}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 9060292173203855846}
-    relative: 1
-    absolute: -199
-  rightAnchor:
-    target: {fileID: 9060292173203855846}
-    relative: 1
-    absolute: -115
-  bottomAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  updateAnchors: 0
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
-  mPivot: 4
-  mWidth: 84
-  mHeight: 42
-  mDepth: 7
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 2
-  keepCrispWhenShrunk: 1
-  mTrueTypeFont: {fileID: 0}
-  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u64CD\u4F5C"
-  mFontSize: 42
-  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 &1248641904593754930
 GameObject:
   m_ObjectHideFlags: 0
@@ -1532,12 +1432,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 9060292173203855846}
+    target: {fileID: 0}
     relative: 0
     absolute: 221
   rightAnchor:
-    target: {fileID: 9060292173203855846}
+    target: {fileID: 0}
-    relative: 0
+    relative: 1
     absolute: 421
   bottomAnchor:
     target: {fileID: 0}
@@ -1612,6 +1512,132 @@ MonoBehaviour:
   valueIsNumber: 0
   isPhoneNum: 0
   inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+--- !u!1 &1990698820342002041
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2888083522769207224}
+  - component: {fileID: 1223225304729576048}
+  - component: {fileID: 320162446630990277}
+  m_Layer: 5
+  m_Name: LabelEndDate
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2888083522769207224
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1990698820342002041}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 383, y: -89, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4279089093416336491}
+  m_Father: {fileID: 1249610349479200778}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1223225304729576048
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1990698820342002041}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 9060292173203855846}
+    relative: 1
+    absolute: -247
+  rightAnchor:
+    target: {fileID: 9060292173203855846}
+    relative: 1
+    absolute: -11
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mPivot: 4
+  mWidth: 236
+  mHeight: 40
+  mDepth: 7
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 5.9
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: 2020-12-12
+  mFontSize: 40
+  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: 3
+  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!114 &320162446630990277
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1990698820342002041}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: validEndTime
+  formatValue: 
+  labeName: {fileID: 0}
+  defaultName: 
+  canNull: 0
+  checkIDCard: 0
+  minLen: 0
+  maxLen: 0
+  spriteBg: {fileID: 0}
+  valueIsNumber: 0
+  isPhoneNum: 0
+  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &2098083998297282035
 GameObject:
   m_ObjectHideFlags: 0
@@ -2042,12 +2068,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 9060292173203855846}
+    target: {fileID: 0}
     relative: 0
     absolute: 253
   rightAnchor:
-    target: {fileID: 9060292173203855846}
+    target: {fileID: 0}
-    relative: 0
+    relative: 1
     absolute: 379
   bottomAnchor:
     target: {fileID: 0}
@@ -2139,6 +2165,7 @@ Transform:
   - {fileID: 1930179077374056429}
   - {fileID: 6638322929124924262}
   - {fileID: 4537950500870522849}
+  - {fileID: 2888083522769207224}
   m_Father: {fileID: 6735670843721406284}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3258,13 +3285,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 9060292173203855846}
     relative: 0
-    absolute: 169
+    absolute: 93
   rightAnchor:
-    target: {fileID: 0}
+    target: {fileID: 9060292173203855846}
-    relative: 1
+    relative: 0
-    absolute: 253
+    absolute: 119
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -4079,11 +4106,10 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5041018495098694811}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 355, y: -89, z: 0}
+  m_LocalPosition: {x: 317, y: 89, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1070758113057642923}
-  - {fileID: 5492273475069516787}
   m_Father: {fileID: 1249610349479200778}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4149,11 +4175,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 9060292173203855846}
     relative: 1
-    absolute: -257
+    absolute: -270
   rightAnchor:
     target: {fileID: 9060292173203855846}
     relative: 1
-    absolute: -57
+    absolute: -120
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -4165,13 +4191,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
   mPivot: 4
-  mWidth: 200
+  mWidth: 150
   mHeight: 80
   mDepth: 8
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 2.5
+  aspectRatio: 0.225
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -5179,6 +5205,106 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
+--- !u!1 &6583210618890519892
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4279089093416336491}
+  - component: {fileID: 7361214436018673203}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4279089093416336491
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6583210618890519892}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 89, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2888083522769207224}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7361214436018673203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6583210618890519892}
+  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: 169
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 253
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 168
+  mHeight: 42
+  mDepth: 7
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 4
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u5230\u671F\u65E5\u671F"
+  mFontSize: 42
+  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 &6725638605002920449
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,d486f011ddecfb2fcd9671b9f5e8cc378	%trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,abde52b4ad73b695c12c0f094420fe138	%trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13