This commit is contained in:
2020-08-04 21:58:27 +08:00
parent a7b47a6827
commit f913a2a0aa
91 changed files with 1671 additions and 965 deletions

View File

@@ -783,7 +783,6 @@ public class UIScrollView : MonoBehaviour
{
if (restrictWithinPanel && mPanel.clipping != UIDrawCall.Clipping.None)
RestrictWithinBounds(dragEffect == DragEffect.None, canMoveHorizontally, canMoveVertically);
if (mDragStarted && onDragFinished != null) onDragFinished();
if (!mShouldMove && onStoppedMoving != null)
onStoppedMoving();

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f
trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,2ffdb1ed3f613fc68d0329e1e87ce96e
trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,ee20f4d47e0451f153d77d4c0d0da47a
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
@@ -19,12 +19,12 @@ trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473
trCRM/upgradeRes/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57
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,9b217886b0d4e1f822353194c1befd0b
trCRM/upgradeRes/priority/lua/db/DBRoot.lua,2fac1189744a4e00891b46d79cf037ac
trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,0c0875362af4cd5a6a35cef8ac9d74e2
trCRM/upgradeRes/priority/lua/db/DBRoot.lua,3b2f7f6d066a93d94754334c6b0b8ba3
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,9554ed8a82d4fd43604e86983a995f09
trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,5b0bc7852800d78eb83b002f38742783
trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514
trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
@@ -49,12 +49,12 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b
trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445
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,08c71eabfdf2735604a5f44b2533288b
trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,3f0976bdbc070d9cebc936e5c21735f1
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,5a0421a465971e0f409444025e1e4fb4
trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae
trCRM/upgradeRes/priority/lua/ui/panel/TRPOceanList.lua,0d3aebdcc462cf629b226b8f3062f43c
trCRM/upgradeRes/priority/lua/ui/panel/TRPOceanList.lua,0e9abcbfdd89a4264c02d1b1fd94cd10
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
@@ -62,14 +62,14 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowFilter.unity3d,8ac3bb50fa5
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_check.unity3d,19ab7fd3e0e61658db44cb333c6fad0e
trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75
trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
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/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,c4cd6ec5f8d5904422650c4b87e784ee
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,602888a7dd58a9fe98a61ee9c829aa84
trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
@@ -77,7 +77,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,2b1cfdf95c65071b1f480d80156
trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,5480da33da4b7e12970dd61ffeaf3719
trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,92609cd7540a8f576ddfcf8a219c479e
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372
trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa
trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f
@@ -97,8 +97,8 @@ 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,34e3b20ac04e210899172d9dcc52d83d
trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetailSimple.lua,29adc9bfa2c554aded7b025e032e9c40
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustListProc.lua,ed63252ecb5ba3c85bd6f03741c3ea2e
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetailSimple.lua,7528caabcee343a09a3bb7a67a56010f
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
trCRM/upgradeRes/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b
@@ -130,7 +130,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca9
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/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3
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
@@ -140,13 +140,13 @@ 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/PanelNewOrder.unity3d,4773f89ecf406535c7fa76998be390b1
trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,5b25a51eed2e704282548d90961076a1
trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,0be1d92322048e7747b85f824bda77ec
trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectServer.lua,50a46489d0d704df26d61ae9a2f5d5fe
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,08efdc6a2d7e8cbcc566c165f8be1228
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
trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
@@ -156,30 +156,30 @@ trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a41
trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69
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,c040b1943969ac6b45490cefd11d56ed
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,ccefe1d1013cb50451beb1a1bce080f0
trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,0cc07b44a903641398d6c296b5df2721
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,1fed6ece17c84668a9a8ac23bdb6ce13
trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
trCRM/upgradeRes/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,d6391fba95cc1e47d6110091209578f9
trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,07126517955d022169bbd02def384ade
trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,3cc9a59870684a589fbdb2567cff402d
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,a929e8a7fd7ba3bc89bdda0686b6d7dd
trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,49926a1da54d63038c01bcb2ee05c415
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,6e2e45005c89570bae55b3df5a0148f7
trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,969c4735df749df41cb9a07b80e6a5f8
trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,630b2e9e9355cbd9106b36b35d20fd3d
trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
trCRM/upgradeRes/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60
trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969
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
trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8
trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,bba5eea285cdb4d112f91b8c72524093
trCRM/upgradeRes/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540
trCRM/upgradeRes/priority/lua/ui/panel/TRPProductList.lua,69e0f8071709a1d510030a4dc8ab5f99
trCRM/upgradeRes/priority/lua/ui/panel/TRPProductList.lua,58bf1853609c6bd92a81fac50f5e1efc
trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,d3efb2dd1b3e769aa3946f36641ff205
trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
@@ -197,7 +197,7 @@ 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,c9708d4e6c1d5427d57a7a9f98d1118b
trCRM/upgradeRes/priority/lua/db/DBUser.lua,4b287e00da702dc06ba1acb5206f5e0a
trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -210,7 +210,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc83
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,553833fd9a7e590ecc216f27f06e6954
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
trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
@@ -223,15 +223,15 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a0346395205
trCRM/upgradeRes/priority/ui/panel/Android/PanelProductList.unity3d,865ea5c97c84ee9321cea2973413c2e2
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f
trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,97c49c665b4f8cd7ea4aa1e7fbe59c19
trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,cff73cd564d54caaa97d74ac808e2d07
trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4
trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
trCRM/upgradeRes/priority/ui/panel/Android/PanelTaskList.unity3d,bd3d518999533c00a5eb010b8b064987
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,6d4d720014af3d81a8939c6db2ff6b77
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,6886a2c8ed19484ae5c4e715a5615dac
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,44d27d9aa244dd7bb4d039d627a96ad7
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,64012de583f1cd85584903ce68a0c812
trCRM/upgradeRes/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
trCRM/upgradeRes/priority/ui/panel/Android/PanelBindPhone.unity3d,b4aca0f337304fefc9997c00886e75c1
trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
@@ -242,14 +242,14 @@ trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc
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/priority/lua/ui/panel/CSPTasks.lua,8cca9814b1002af33eeb1288432750b9
trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,59990f469a3b4c4d3cb6f9d6ca518a99
trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,642ddf850a0f1f2c20b23d2cccaac415
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,32466ec1a4b799de26e447f17cabc760
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
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414
trCRM/upgradeRes/priority/lua/ui/panel/TRPTaskList.lua,79d40e9adae8a9ea488eb5c73857b335
trCRM/upgradeRes/priority/lua/ui/panel/TRPTaskList.lua,1798231882ed1ffee8ce2fe6492c7b36
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c7400323115d8be90421d
trCRM/upgradeRes/priority/lua/CLLMainLua.lua,03e0034303243936aec483752bdecfc9
trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695
@@ -272,8 +272,8 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728
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/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7
trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,9f724970fec0c744c7753ce22fa4c4fb
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,f000f7d25ec91a2208d2c18493fec81a
trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
@@ -287,7 +287,7 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b
trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233
trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,4820cbe7f1f16ec63ed1dd8426533483
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,3ff82a44063ae45c15a4d4bcaa99ff3f
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,bcebb5a35d387e2bb40771169017f69a
trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,4ae16367e048f6856c2eec27230c19c3
trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
trCRM/upgradeRes/other/txt/Android/serviceProto.unity3d,f6aeade57bb43fc306fd9371e618297b
@@ -301,22 +301,22 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e
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,6237287e52af8af3de8ffced10ef5d9e
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,d69a767e5d6a6a5cc33fce98464d3bc1
trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14
trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,6b6bd07455bdee8e74ee39eda0aafd05
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/json/json.lua,a2914572290611d3da35f4a7eec92022
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,478ea086d35467ce7f99c2a77feeb83f
trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,54c833b711f3dea947b5db57dbc4f367
trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,6f04603760bd1ceed90cba39d1207228
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
trCRM/upgradeRes/priority/lua/ui/panel/TRPProductDetail.lua,d1f8d07d0f1f956e3f2c1c5c0a987b9c
trCRM/upgradeRes/priority/lua/ui/panel/TRPProductDetail.lua,3dc8162a924b39216912d011f05ee774
trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7
trCRM/upgradeRes/priority/lua/ui/cell/TRCellTaskList.lua,d51c12f9e5de1f5db917d82a63585b85
trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c
@@ -349,10 +349,10 @@ trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9
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,71d2cb408fb525eaf6873ef6a1e6ea33
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,557000073e3da28450e4d476b25dd398
trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d,2ffdb1ed3f613fc68d0329e1e87ce96e
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d,ee20f4d47e0451f153d77d4c0d0da47a
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c
@@ -22,12 +22,12 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15
trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d,4107b5fcc1b5ad0d073bf480cf35383b
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,9b217886b0d4e1f822353194c1befd0b
trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,2fac1189744a4e00891b46d79cf037ac
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,0c0875362af4cd5a6a35cef8ac9d74e2
trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,3b2f7f6d066a93d94754334c6b0b8ba3
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBatchGetCusts.unity3d,0b16be6a28646d9dc972fab628556b57
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,9554ed8a82d4fd43604e86983a995f09
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,5b0bc7852800d78eb83b002f38742783
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
@@ -42,7 +42,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_password2.unity3d,5dc8
trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527
trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,d1f8d07d0f1f956e3f2c1c5c0a987b9c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,3dc8162a924b39216912d011f05ee774
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua,aa71710425778f3c33471a2cc00e5d7b
trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
@@ -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,622d3ea7e4f9aa1d11f6492cabffa445
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,969c4735df749df41cb9a07b80e6a5f8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,630b2e9e9355cbd9106b36b35d20fd3d
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d,8ac3bb50fa5c67200331f3bc71f70d30
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,4773f89ecf406535c7fa76998be390b1
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,08c71eabfdf2735604a5f44b2533288b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,3f0976bdbc070d9cebc936e5c21735f1
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,5a0421a465971e0f409444025e1e4fb4
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,0d3aebdcc462cf629b226b8f3062f43c
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua,0e9abcbfdd89a4264c02d1b1fd94cd10
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
@@ -69,21 +69,21 @@ trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_check.unity3d,19ab7fd3e0e61658db44cb333c6fad0e
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,3b291f38637590e0fca816cae521a4f0
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd
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,c4cd6ec5f8d5904422650c4b87e784ee
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,ccefe1d1013cb50451beb1a1bce080f0
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,602888a7dd58a9fe98a61ee9c829aa84
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
trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,4820cbe7f1f16ec63ed1dd8426533483
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,5480da33da4b7e12970dd61ffeaf3719
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,92609cd7540a8f576ddfcf8a219c479e
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f
@@ -102,8 +102,8 @@ 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,34e3b20ac04e210899172d9dcc52d83d
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua,29adc9bfa2c554aded7b025e032e9c40
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,ed63252ecb5ba3c85bd6f03741c3ea2e
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua,7528caabcee343a09a3bb7a67a56010f
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
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b
@@ -137,7 +137,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914b
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellComFilterGroup.lua,8c33f89953c402f43b47022a71064cde
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3
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
@@ -147,13 +147,13 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a16
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,5b25a51eed2e704282548d90961076a1
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,0be1d92322048e7747b85f824bda77ec
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua,0cfc64444ddae6d47e4e07a76a0fcbaf
trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,f5affe00dd461e9a299bd64ce3fc80bb
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,08efdc6a2d7e8cbcc566c165f8be1228
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,35ac4acdd74e7c09950bbb26fed5d010
trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171
trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
@@ -163,29 +163,29 @@ trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62
trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua,d4a79966004672384a664700987d2533
trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua,c040b1943969ac6b45490cefd11d56ed
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua,522e60b5e11321ef12cb2466b5b249d2
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,0cc07b44a903641398d6c296b5df2721
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,1fed6ece17c84668a9a8ac23bdb6ce13
trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,7f2087299796c187eb9866c14f4afcf8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,d6391fba95cc1e47d6110091209578f9
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,07126517955d022169bbd02def384ade
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,3cc9a59870684a589fbdb2567cff402d
trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d,21a6309f8a86dcd7c2f90ece3e525f74
trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,a929e8a7fd7ba3bc89bdda0686b6d7dd
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,49926a1da54d63038c01bcb2ee05c415
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,6e2e45005c89570bae55b3df5a0148f7
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,71d2cb408fb525eaf6873ef6a1e6ea33
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,dae2d1afc8a5e2d7c996c6056aa42dc4
trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60
trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969
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
trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,bba5eea285cdb4d112f91b8c72524093
trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua,69e0f8071709a1d510030a4dc8ab5f99
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua,58bf1853609c6bd92a81fac50f5e1efc
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,d3efb2dd1b3e769aa3946f36641ff205
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
@@ -202,7 +202,7 @@ 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,c9708d4e6c1d5427d57a7a9f98d1118b
trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,4b287e00da702dc06ba1acb5206f5e0a
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -214,7 +214,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_about.unity3d,3da9c941612
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05
trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,553833fd9a7e590ecc216f27f06e6954
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,6418723ac66fc8ab625db8d61cd2c07d
trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
@@ -226,7 +226,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d764
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d,865ea5c97c84ee9321cea2973413c2e2
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,97c49c665b4f8cd7ea4aa1e7fbe59c19
trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,cff73cd564d54caaa97d74ac808e2d07
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
@@ -234,8 +234,8 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d,bd3d518999533c00a5eb010b8b064987
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,6d4d720014af3d81a8939c6db2ff6b77
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,6886a2c8ed19484ae5c4e715a5615dac
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,44d27d9aa244dd7bb4d039d627a96ad7
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,64012de583f1cd85584903ce68a0c812
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
@@ -245,14 +245,14 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e
trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8cca9814b1002af33eeb1288432750b9
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,59990f469a3b4c4d3cb6f9d6ca518a99
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,23c1f8a0e9f8df7cc569803f3e553729
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,642ddf850a0f1f2c20b23d2cccaac415
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,32466ec1a4b799de26e447f17cabc760
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
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua,79d40e9adae8a9ea488eb5c73857b335
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua,1798231882ed1ffee8ce2fe6492c7b36
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c7400323115d8be90421d
trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,03e0034303243936aec483752bdecfc9
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695
@@ -274,8 +274,8 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d
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/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,9f724970fec0c744c7753ce22fa4c4fb
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,f000f7d25ec91a2208d2c18493fec81a
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
@@ -287,7 +287,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7c
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,3ff82a44063ae45c15a4d4bcaa99ff3f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,bcebb5a35d387e2bb40771169017f69a
trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,4ae16367e048f6856c2eec27230c19c3
trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
@@ -301,22 +301,22 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellServer.lua,52979aedf684a79bc667bbe73b508aca
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,6237287e52af8af3de8ffced10ef5d9e
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,d69a767e5d6a6a5cc33fce98464d3bc1
trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,6b6bd07455bdee8e74ee39eda0aafd05
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/json/json.lua,a2914572290611d3da35f4a7eec92022
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,478ea086d35467ce7f99c2a77feeb83f
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,54c833b711f3dea947b5db57dbc4f367
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,fd4b28f1cdf003bb4207e7a3064cffb8
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,6f04603760bd1ceed90cba39d1207228
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
trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua,557000073e3da28450e4d476b25dd398
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua,f436c880f71e048db7b82de41e881b8f
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua,d51c12f9e5de1f5db917d82a63585b85
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c

View File

@@ -46,7 +46,7 @@ MonoBehaviour:
material: {fileID: 0}
mSprites: []
mPixelSize: 1
mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
mReplacement: {fileID: 0}
mCoordinates: 0
sprites: []
_isBorrowSpriteMode: 1

View File

@@ -1 +1 @@
{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29006, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29000, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29004, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":0}}}
{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29006, "androidVer":"4b673ccbca28edf447c48db26c8d845e", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29000, "androidVer":"4b673ccbca28edf447c48db26c8d845e", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29004, "androidVer":"4b673ccbca28edf447c48db26c8d845e", "isDev":0}}}

View File

@@ -6,5 +6,13 @@
{
"path": "../../UnityAPI"
}
]
],
"settings": {
"files.exclude": {
"**/.prefab": true
},
"search.exclude": {
"**/*.prefab": true
}
}
}

View File

@@ -25,13 +25,13 @@ end
DBRoot.funcs = {
[NetProto.cmds.announcement_query] = function(data) -- 公告
DBMessage.onGetMessage(DBMessage.MsgType.Sys, data.result)
DBMessage.onGetMessage(DBMessage.MsgType.Sys, data.result.data)
end,
[NetProto.cmds.booking_query] = function(data) -- 待跟进客户
DBMessage.onGetMessage(DBMessage.MsgType.Task4Cust, data.result)
DBMessage.onGetMessage(DBMessage.MsgType.Task4Cust, data.result.data)
end,
[NetProto.cmds.replenish_query] = function(data) -- 待跟进客户
DBMessage.onGetMessage(DBMessage.MsgType.Task4Support, data.result)
DBMessage.onGetMessage(DBMessage.MsgType.Task4Support, data.result.data)
end,
[NetProto.cmds.filter_customers] = function(data) -- 过滤条件
DBCust.onGetFilter(data.result)

View File

@@ -6,8 +6,11 @@ local timeOut = 60 * 1000
DBStatistics.clean = function()
end
DBStatistics.custtype_report = function(callback)
if db.custtype_report == nil or lastGetTime.custtype_report == nil or DateEx.nowMS - lastGetTime.custtype_report > 0 then
DBStatistics.custtype_report = function(callback, force)
if
force or db.custtype_report == nil or lastGetTime.custtype_report == nil or
DateEx.nowMS - lastGetTime.custtype_report > 0
then
lastGetTime.custtype_report = DateEx.nowMS + timeOut
NetProto.send.custtype_report(
nil,
@@ -23,8 +26,8 @@ DBStatistics.custtype_report = function(callback)
end
end
DBStatistics.order_report = function(callback)
if db.order_report == nil or lastGetTime.order_report == nil or DateEx.nowMS - lastGetTime.order_report > 0 then
DBStatistics.order_report = function(callback, force)
if force or db.order_report == nil or lastGetTime.order_report == nil or DateEx.nowMS - lastGetTime.order_report > 0 then
lastGetTime.order_report = DateEx.nowMS + timeOut
NetProto.send.order_report(
nil,
@@ -40,8 +43,11 @@ DBStatistics.order_report = function(callback)
end
end
DBStatistics.target_report = function(callback)
if db.target_report == nil or lastGetTime.target_report == nil or DateEx.nowMS - lastGetTime.target_report > 0 then
DBStatistics.target_report = function(callback, force)
if
force or db.target_report == nil or lastGetTime.target_report == nil or
DateEx.nowMS - lastGetTime.target_report > 0
then
lastGetTime.target_report = DateEx.nowMS + timeOut
NetProto.send.target_report(
nil,

View File

@@ -66,7 +66,7 @@ end
function DBUser.refreshUserInfor(loginNo, loginName)
local infor = DBUser.getPopList(DBUser.FilterGroup.user)
for i, v in ipairs(infor.values) do
for i, v in ipairs(infor.values or {}) do
if v == loginNo then
infor.options[i] = loginName
break
@@ -74,7 +74,7 @@ function DBUser.refreshUserInfor(loginNo, loginName)
end
local list = DBUser.getFilters(DBUser.FilterGroup.user)
for i, v in ipairs(list) do
for i, v in ipairs(list or {}) do
if v.value == loginNo then
v.name = loginNo
break

View File

@@ -5,8 +5,8 @@ MyUtl.init = function(panel)
MyUtl.getUIContent(panel)
end
local _TopHeight_ = 132
local _BottomHeight_ = 147
MyUtl.defaultTopHeight = 132
MyUtl.defaultBottomHeight = 147
local _ContentRect
local _sizeAdjust
@@ -17,8 +17,8 @@ MyUtl.getUIContent = function(panel, top, bottom, forceCal)
-- end
local sizeAdjust = UIRoot.GetPixelSizeAdjustment(panel.gameObject)
local height = Screen.height * sizeAdjust
top = top or _TopHeight_
bottom = bottom or _BottomHeight_
top = top or MyUtl.defaultTopHeight
bottom = bottom or MyUtl.defaultBottomHeight
local offsetRect = NGUITools.offsetRect
top = top + offsetRect.y * height
bottom = bottom + offsetRect.w * height
@@ -123,9 +123,9 @@ MyUtl.hidePhone = function(phone)
return phone
end
if #phone > 8 then
return joinStr(string.sub(phone, 1, 4), "****", string.sub(phone, 9))
return joinStr(string.sub(phone, 1, 3), "****", string.sub(phone, 8))
else
return joinStr(string.sub(phone, 1, 4), "****")
return joinStr(string.sub(phone, 1, 3), "****")
end
end

View File

@@ -34,7 +34,8 @@ function _cell.show(go, data)
if content.success then
_cell.refreshContent(content.result)
end
end
end,
data.forceRefresh or false
)
end

View File

@@ -28,7 +28,8 @@ function _cell.show(go, data)
if content.success then
_cell.refreshContent(content.result)
end
end
end,
data.forceRefresh or false
)
end

View File

@@ -50,7 +50,8 @@ function _cell.show(go, data)
uiobjs.formRoot:setValue(mData)
end
end
end,
data.forceRefresh or false
)
end

View File

@@ -266,7 +266,6 @@ end
--设置进度条
function CLLPSplash.onProgress(...)
do return end
local args = {...}
local all = args[1] -- 总量
local v = args[2] -- 当前值

View File

@@ -15,7 +15,7 @@ function CSPMine.init(csObj)
CSPMine.contentRect = MyUtl.getUIContent(csSelf, nil, nil, true)
objs.Content = getCC(transform, "PanelContent", "UIPanel")
MyUtl.setContentView(objs.Content, 147 + 370)
MyUtl.setContentView(objs.Content, MyUtl.defaultBottomHeight + 370)
---@type CLUIFormRoot
objs.Top = getCC(transform, "Top", "CLUIFormRoot")

View File

@@ -1,13 +1,16 @@
-- xx界面
local CSPMsg = {}
---@type Coolape.CLPanelLua
local csSelf = nil
local transform = nil
CSPMsg.sizeAdjust = 1
CSPMsg.contentRect = Vector4.zero
local isShowdDragFrefresh = false
local dragVal = Vector3.zero
local objs = {}
local defaulList = {
{icon="news_news_1", bgColor=0xfff1c40f,type=DBMessage.MsgType.Sys, name="公告"},
{icon = "news_news_1", bgColor = 0xfff1c40f, type = DBMessage.MsgType.Sys, name = "公告"}
-- {icon="news_news_2", bgColor=0xff2990dc,type=DBMessage.MsgType.SysNotice, name="系统消息"},
-- {icon="news_news_3", bgColor=0xff1abc9c,type=DBMessage.MsgType.Task, name="待办任务"},
}
@@ -29,6 +32,9 @@ function CSPMsg.init(csObj)
---@type UITable
objs.Table = getCC(objs.scrollView.transform, "Table", "UITable")
objs.LoopGrid = getCC(objs.Table.transform, "msgList/Grid", "CLUILoopGrid")
objs.ButtonEndList = getChild(objs.Table.transform, "ButtonEndList")
objs.ButtonHeadList = getCC(objs.Table.transform, "ButtonHeadList", "UILabel")
end
-- 设置数据
@@ -37,9 +43,49 @@ end
-- 显示在c#中。show为调用refreshshow和refresh的区别在于当页面已经显示了的情况当页面再次出现在最上层时只会调用refresh
function CSPMsg.show()
CSPMsg.setList()
objs.Content.onClipMove = CSPMsg.onClipMove
objs.scrollView.onDragStarted = CSPMsg.onDragStart
objs.scrollView.onDragFinished = CSPMsg.onDragEnd
end
function CSPMsg.setList()
objs.LoopGrid:setList(defaulList, CSPMsg.initCell)
objs.Table:Reposition()
objs.scrollView:ResetPosition()
csSelf:invoke4Lua(CSPMsg.repositon, 0.1)
end
function CSPMsg.onClipMove(panel)
if (not isShowdDragFrefresh) and objs.ButtonHeadList.isVisible then
isShowdDragFrefresh = true
dragVal = objs.Content.transform.localPosition
end
end
function CSPMsg.onDragStart()
objs.ButtonHeadList.transform.localPosition = Vector3.up * 30
SetActive(objs.ButtonHeadList.gameObject, true)
dragVal = Vector3.zero
isShowdDragFrefresh = false
end
function CSPMsg.onDragEnd()
SetActive(objs.ButtonHeadList.gameObject, false)
local offset = objs.Content.transform.localPosition - dragVal
if offset.y < -50 then
-- 刷数据
NetProto.send.announcement_query()
end
if isShowdDragFrefresh then
CSPMsg.repositon()
end
end
function CSPMsg.repositon()
objs.scrollView:ResetPosition()
end
function CSPMsg.initCell(cell, data)

View File

@@ -1,12 +1,15 @@
-- xx界面
local CSPTasks = {}
---@type Coolape.CLPanelLua
local csSelf = nil
local transform = nil
CSPTasks.sizeAdjust = 1
CSPTasks.contentRect = Vector4.zero
local uiobjs = {}
local headData = {}
local dragVal = Vector3.zero
local isShowdDragFrefresh = false
-- 初始化,只会调用一次
function CSPTasks.init(csObj)
@@ -15,12 +18,16 @@ function CSPTasks.init(csObj)
CSPTasks.setEventDelegate()
CSPTasks.contentRect = MyUtl.getUIContent(csSelf, 360 + 220)
---@type UIPanel
uiobjs.Content = getCC(transform, "PanelContent", "UIPanel")
uiobjs.Content.transform.localPosition = Vector3.zero
uiobjs.Content.clipOffset = Vector2.zero
uiobjs.Content.baseClipRegion = CSPTasks.contentRect
uiobjs.TableContent = getCC(uiobjs.Content.transform, "Table", "UITable")
---@type UILabel
uiobjs.LabelDragRefresh = getCC(uiobjs.TableContent.transform, "LabelDragRefresh", "UILabel")
SetActive(uiobjs.LabelDragRefresh.gameObject, false)
---@type UIGrid
local CustManageGrid = getCC(uiobjs.TableContent.transform, "CustManage/grid", "UIGrid")
@@ -59,21 +66,32 @@ function CSPTasks.setData(paras)
end
-- 取得头像
CSPTasks.refreshData()
end
function CSPTasks.refreshData()
NetProto.send.person_view_query()
NetProto.send.sales_view_query()
if CSPTasks.reportform then
CSPTasks.reportform:init({forceRefresh = true}, nil)
end
end
-- 显示在c#中。show为调用refreshshow和refresh的区别在于当页面已经显示了的情况当页面再次出现在最上层时只会调用refresh
function CSPTasks.show()
local list = {}
for i = 1, 100 do
list[i] = i
end
-- uiobjs.TableTask:setList(list, nil)
uiobjs.ToggleOrder:Set(true)
CSPTasks.showReportform("reportform2")
uiobjs.scrollView:ResetPosition()
csSelf:invoke4Lua(
function()
uiobjs.scrollView:ResetPosition()
end,
0.1
)
uiobjs.Content.onClipMove = CSPTasks.onClipMove
uiobjs.scrollView.onDragStarted = CSPTasks.onDragStart
uiobjs.scrollView.onDragFinished = CSPTasks.onDragEnd
end
function CSPTasks.onClickBottonBtn(cell)
@@ -94,8 +112,34 @@ function CSPTasks.setHeadInfor()
)
end
function CSPTasks.onClipMove(panel)
if (not isShowdDragFrefresh) and uiobjs.LabelDragRefresh.isVisible then
isShowdDragFrefresh = true
dragVal = uiobjs.Content.transform.localPosition
end
end
function CSPTasks.onDragStart()
uiobjs.LabelDragRefresh.transform.localPosition = Vector3.zero
SetActive(uiobjs.LabelDragRefresh.gameObject, true)
dragVal = Vector3.zero
isShowdDragFrefresh = false
end
function CSPTasks.onDragEnd()
SetActive(uiobjs.LabelDragRefresh.gameObject, false)
local offset = uiobjs.Content.transform.localPosition - dragVal
if offset.y < -50 then
-- 刷数据
CSPTasks.refreshData()
end
if isShowdDragFrefresh then
uiobjs.scrollView:ResetPosition()
end
end
-- 关闭页面
function CSPTasks.hide()
csSelf:cancelInvoke4Lua()
if CSPTasks.reportform then
CLUIOtherObjPool.returnObj(CSPTasks.reportform.gameObject)
SetActive(CSPTasks.reportform.gameObject, false)

View File

@@ -10,7 +10,7 @@ function TRPAbout:init(csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 500, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 500, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
---@type UITable

View File

@@ -15,7 +15,7 @@ function TRPComFilter:init(csObj)
TRPComFilter.super.init(self, csObj)
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 50, 190)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 50, 190)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength

View File

@@ -11,7 +11,7 @@ function TRPCustDetail:init(csObj)
self:prepareMoreData()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 400 + 160 + 60, 200)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 160 + 60, 200)
uiobjs.bottomGrid = getCC(self.transform, "AnchorBottom/offset/Grid", "UIGrid")
local width = NumEx.getIntPart(CSPMain.contentRect.z / 4)
uiobjs.bottomGrid.cellWidth = width
@@ -261,6 +261,12 @@ function TRPCustDetail:reposition()
uiobjs.Table:Reposition()
uiobjs.scrollView.disableDragIfFits = true
uiobjs.scrollView:ResetPosition()
self.csSelf:invoke4Lua(
function()
uiobjs.scrollView:ResetPosition()
end,
0.1
)
end
---public 显示扩展字段
@@ -358,7 +364,7 @@ function TRPCustDetail:showOrders()
SetActive(uiobjs.Records.gameObject, false)
SetActive(uiobjs.OrderRoot.gameObject, true)
SetActive(uiobjs.MoreRoot.gameObject, false)
if self.orders == nil or #(self.orders.data) then
SetActive(uiobjs.ButtonEndListOrder.gameObject, true)
else
@@ -395,10 +401,10 @@ function TRPCustDetail:onOrderEndList(tail)
printw("到最后了==" .. tail.name)
if self.orders and self.orders.meta.current_page < self.orders.meta.total_pages then
showHotWheel()
-- //TODO:取得下一页
-- 取得下一页
NetProto.send.workFlowQuery({custId = self.mdata.custId}, "", self.orders.meta.current_page + 1)
else
uiobjs.ButtonEndListOrder.localPosition = tail.transform.localPosition + Vector3.up * -270
uiobjs.ButtonEndListOrder.localPosition = tail.transform.localPosition + Vector3.up * -240
SetActive(uiobjs.ButtonEndListOrder.gameObject, true)
end
end

View File

@@ -11,7 +11,7 @@ function TRPCustDetailSimple:init(csObj)
self:prepareMoreData()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 400 + 40, 200)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 200)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")

View File

@@ -9,7 +9,7 @@ function TRPCustList:init(csObj)
TRPCustList.super.init(self, csObj)
self:setEventDelegate()
self:initFilters()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 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")
@@ -112,6 +112,11 @@ function TRPCustList:showList(list)
self:wrapFunc(self.onEndList)
)
uiobjs.scrollView:ResetPosition()
self.csSelf:invoke4Lua(self.reposition, 0.1)
end
function TRPCustList:reposition()
uiobjs.scrollView:ResetPosition()
end
function TRPCustList:appList(list)

View File

@@ -9,7 +9,7 @@ function TRPCustListProc:init(csObj)
TRPCustListProc.super.init(self, csObj)
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 30, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 30, 0)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength

View File

@@ -14,7 +14,7 @@ function TRPFollowFilter:init(csObj)
TRPFollowFilter.super.init(self, csObj)
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 50, 190)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 50, 190)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength

View File

@@ -9,7 +9,7 @@ function TRPFollowList:init(csObj)
TRPFollowList.super.init(self, csObj)
self:initFilters()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
---@type UIInput
uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
@@ -120,6 +120,11 @@ function TRPFollowList:showList(list)
self:wrapFunc(self.onEndList)
)
uiobjs.scrollView:ResetPosition()
self.csSelf:invoke4Lua(self.repositon, 0.1)
end
function TRPFollowList:repositon()
uiobjs.scrollView:ResetPosition()
end
function TRPFollowList:appList(list)
@@ -137,7 +142,7 @@ function TRPFollowList:onShowRefreshFlg()
end
function TRPFollowList:onhideRefreshFlg()
SetActive(uiobjs.ButtonHeadList.gameObject, false)
if uiobjs.Grid.list.Count == 0 then
if uiobjs.Grid.list.Count == 0 then
uiobjs.scrollView:ResetPosition()
end
end

View File

@@ -10,7 +10,7 @@ function TRPMyInfor:init(csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 40 + 300, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 40 + 300, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -177,10 +177,12 @@ function TRPMyInfor:onClickField(go)
elseif el.jsonKey == "closeLog" then
if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
ReporterMessageReceiver.self.gameObject:SetActive(false)
MyUtl.toast("日志监听已关闭")
end
elseif el.jsonKey == "openLog" then
if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
ReporterMessageReceiver.self.gameObject:SetActive(true)
MyUtl.toast("日志监听已打开,画圈可查看")
end
else
getPanelAsy(

View File

@@ -11,7 +11,7 @@ function TRPNewCust:init(csObj)
TRPNewCust.super.init(self, csObj)
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -39,7 +39,7 @@ end
-- 设置数据
---@param paras _ParamTRPNewCust
function TRPNewCust:setData(paras)
if paras and paras.custId > 0 then
if paras and paras.custId and paras.custId > 0 then
self.isNewCust = false
self.mdata = paras
self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)

View File

@@ -11,7 +11,7 @@ function TRPNewFollow:init(csObj)
TRPNewFollow.super.init(self, csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength

View File

@@ -11,7 +11,7 @@ function TRPNewFollowSimple:init(csObj)
TRPNewFollowSimple.super.init(self, csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength

View File

@@ -11,7 +11,7 @@ function TRPNewFollowTask:init(csObj)
TRPNewFollowTask.super.init(self, csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength

View File

@@ -11,7 +11,7 @@ function TRPNewOrder:init(csObj)
TRPNewOrder.super.init(self, csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength

View File

@@ -9,7 +9,7 @@ function TRPOceanList:init(csObj)
TRPOceanList.super.init(self, csObj)
self:setEventDelegate()
self:initFilters()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 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")
@@ -101,6 +101,11 @@ function TRPOceanList:showList(list)
self:wrapFunc(self.onEndList)
)
uiobjs.scrollView:ResetPosition()
self.csSelf:invoke4Lua(self.reposition, 0.1)
end
function TRPOceanList:reposition()
uiobjs.scrollView:ResetPosition()
end
function TRPOceanList:appList(list)

View File

@@ -25,7 +25,7 @@ function TRPOrderDetail:init(csObj)
---@type UIToggle
uiobjs.ToggleDetail = getCC(uiobjs.ToggleGrid.transform, "ToggleDetail", "UIToggle")
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 160 + 30, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 160 + 30, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -215,6 +215,12 @@ function TRPOrderDetail:reposition()
uiobjs.Table:Reposition()
uiobjs.scrollView.disableDragIfFits = true
uiobjs.scrollView:ResetPosition()
self.csSelf:invoke4Lua(
function()
uiobjs.scrollView:ResetPosition()
end,
0.1
)
end
function TRPOrderDetail:showBaseFileds()
@@ -432,7 +438,8 @@ function TRPOrderDetail:setEventDelegate()
self.currToggle = 5
self:showSubOrders()
end,
ButtonAddAttachment = function()
ButtonAddAttachment = function(go)
self:addAttachment(go)
end,
ButtonAddMoney = function()
end,
@@ -442,11 +449,65 @@ function TRPOrderDetail:setEventDelegate()
end
}
end
function TRPOrderDetail:addAttachment(go)
-- 添加附件
---@type UIPopupList
local popList = go:GetComponent("UIPopupList")
if popList.value == "1" then
-- 相机
local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage))
if permission ~= NativeCamera.Permission.Granted then
if permission == NativeCamera.Permission.ShouldAsk then
NativeCamera.RequestPermission()
else
CLUIUtl.showConfirm(
"没有使用相机的权限,打开设置允许使用相机",
function()
if not MyCamera.openSetting() then
MyUtl.toastW("打开权限设置失败")
end
end,
nil
)
end
end
elseif popList.value == "2" then
local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage))
if permission ~= NativeGallery.Permission.Granted then
if permission == NativeGallery.Permission.ShouldAsk then
NativeGallery.RequestPermission()
else
CLUIUtl.showConfirm(
"没有使用相册的权限,打开设置允许使用相册",
function()
if not MyGallery.openSetting() then
MyUtl.toastW("打开权限设置失败")
end
end,
nil
)
end
NativeCamera.RequestPermission()
end
end
end
function TRPOrderDetail:onGetImage(path)
if isNilOrEmpty(path) then
return
end
-- table.insert(self.images, {path = path, onDelete = self:wrapFunc(self.onDelImage)})
--//TODO:
MyUtl.toastW("接口要修改")
end
-- 处理ui上的事件例如点击等
function TRPOrderDetail:uiEventDelegate(go)
local func = self.EventDelegate[go.name]
if func then
func()
func(go)
end
end

View File

@@ -9,7 +9,7 @@ function TRPOrderList:init(csObj)
TRPOrderList.super.init(self, csObj)
self:setEventDelegate()
self:initFilters()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 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")
@@ -123,6 +123,13 @@ function TRPOrderList:showList(list)
self:wrapFunc(self.onHeadList),
self:wrapFunc(self.onEndList)
)
self:reposition()
self.csSelf:invoke4Lua(self.reposition, 0.1)
end
function TRPOrderList:reposition()
uiobjs.scrollView:ResetPosition()
end

View File

@@ -10,7 +10,7 @@ function TRPProductDetail:init(csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength

View File

@@ -31,7 +31,7 @@ end
-- 显示在c#中。show为调用refreshshow和refresh的区别在于当页面已经显示了的情况当页面再次出现在最上层时只会调用refresh
function TRPProductList:show()
uiobjs.InputSeachKey.value = ""
showHotWheel()
-- showHotWheel()
NetProto.send.selectProductInfo(uiobjs.InputSeachKey.value, 1)
self:showList({})
end
@@ -47,8 +47,14 @@ function TRPProductList:showList(products)
SetActive(uiobjs.ButtonEndList.gameObject, true)
end
uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList))
self:reposition()
self.csSelf:invoke4Lua(self.reposition, 0.1)
end
function TRPProductList:reposition()
uiobjs.scrollView:ResetPosition()
end
function TRPProductList:appList(products)
local list = {}
for i, v in ipairs(products or {}) do

View File

@@ -48,8 +48,13 @@ function TRPSelectProduct:showList(products)
table.insert(list, {data = v, isSelected = selectedMap[v.id] and true or false})
end
uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList))
self.csSelf:invoke4Lua(self.reposition, 0.1)
end
function TRPSelectProduct:reposition()
uiobjs.scrollView:ResetPosition()
end
function TRPSelectProduct:appList(list)
SetActive(uiobjs.ButtonEndList.gameObject, false)
uiobjs.Grid:appendList(list)

View File

@@ -91,6 +91,9 @@ function TRPSetting:setEventDelegate()
pcall(releaseRes4GC, true)
end
--- 释放资源结束-------------------------------
--//TODO: 还要把已经下载了的附件也删除掉
pcall(cleanRes)
local panel = CLPanelManager.getPanel(CLMainBase.self.firstPanel)
if panel then

View File

@@ -13,7 +13,7 @@ function TRPSysMsgDetail:init(csObj)
---@type UIScrollView
self.uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
self.uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
MyUtl.setContentView(self.uiobjs.scrollView, 132 + 100 + 56 + 25 + 30 + 45, 0)
MyUtl.setContentView(self.uiobjs.scrollView, MyUtl.defaultTopHeight + 100 + 56 + 25 + 30 + 45, 0)
self.uiobjs.LabelContent = getCC(self.uiobjs.scrollView.transform, "LabelContent", "UILabel")
self.uiobjs.LabelTitle = getCC(self.transform, "Top/LabelTitle", "UILabel")
self.uiobjs.LabelTime = getCC(self.transform, "Top/LabelTime", "UILabel")

View File

@@ -9,7 +9,7 @@ function TRPSysMsgList:init(csObj)
self:setEventDelegate()
self.uiobjs = {}
self.uiobjs.PanelContent = getCC(self.transform, "PanelContent", "UIPanel")
MyUtl.setContentView(self.uiobjs.PanelContent, nil, 0)
MyUtl.setContentView(self.uiobjs.PanelContent, MyUtl.defaultTopHeight + 30, 0)
---@type UIScrollView
self.uiobjs.scrollView = self.uiobjs.PanelContent:GetComponent("UIScrollView")
self.uiobjs.Table = getCC(self.uiobjs.PanelContent.transform, "Table", "UITable")
@@ -91,11 +91,15 @@ end
---@param data _DBMessage
function TRPSysMsgList:onClickCell(cell, data)
if data.NOTICETYPE == DBMessage.MsgType.Sys then
NetProto.send.readNotice(data.ID, function(content)
if content.success then
data.READFLAG = DBMessage.ReadFlag.readed
NetProto.send.readNotice(
data.ID,
function(content)
if content.success then
data.READFLAG = DBMessage.ReadFlag.readed
self.uiobjs.LoopTable:refreshContentOnly()
end
end
end)
)
getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)

View File

@@ -9,7 +9,7 @@ function TRPTaskList:init(csObj)
TRPTaskList.super.init(self, csObj)
self:setEventDelegate()
self:initFilters()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 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")
@@ -135,6 +135,11 @@ function TRPTaskList:showList(list)
self:wrapFunc(self.onHeadList),
self:wrapFunc(self.onEndList)
)
self:reposition()
self.csSelf:invoke4Lua(self.reposition, 0.1)
end
function TRPTaskList:reposition()
uiobjs.scrollView:ResetPosition()
end

View File

@@ -1172,6 +1172,7 @@ GameObject:
- component: {fileID: 6102102815046021231}
- component: {fileID: 1757157169552089458}
- component: {fileID: 7285716023077109019}
- component: {fileID: 7012387384596937387}
m_Layer: 5
m_Name: 000000
m_TagString: Untagged
@@ -1308,6 +1309,21 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
jsonKey:
--- !u!114 &7012387384596937387
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 384054098155761993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 6102102815046021231}
offset: 50
sizeAdjust: 1
--- !u!1 &433861596741914714
GameObject:
m_ObjectHideFlags: 0
@@ -3332,7 +3348,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey: money
jsonKey: salePrice
formatValue: "\u8BA2\u5355\u91D1\u989D\uFF1A{0}"
labeName: {fileID: 0}
defaultName:
@@ -5331,7 +5347,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3335925071625191991}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 110, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7066844989434100784}
@@ -10389,7 +10405,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6507410882875161292}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -817, z: 0}
m_LocalPosition: {x: 0, y: -953.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8625017959052448412}
@@ -13524,12 +13540,12 @@ MonoBehaviour:
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 180
mHeight: 36
mHeight: 72
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5
aspectRatio: 2.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -13543,7 +13559,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}

View File

@@ -147,12 +147,12 @@ MonoBehaviour:
mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
mPivot: 4
mWidth: 44
mHeight: 43
mHeight: 44
mDepth: 3
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.0232558
aspectRatio: 1
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -647,7 +647,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3433090576014742667}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -440, y: 0, z: 0}
m_LocalPosition: {x: -440, y: -0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 115906781541627961}
@@ -686,12 +686,12 @@ MonoBehaviour:
mColor: {r: 0.94509804, g: 0.76862746, b: 0.05882353, a: 1}
mPivot: 4
mWidth: 143
mHeight: 145
mHeight: 144
mDepth: 1
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.99310344
aspectRatio: 0.9930556
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -788,6 +788,94 @@ MonoBehaviour:
OnShowHeadListCallbacks: []
OnHideHeadListCallbacks: []
OnEndListCallbacks: []
--- !u!1 &3880385944865881628
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6043606001102860164}
- component: {fileID: 4663210212859776047}
- component: {fileID: 8111949300693443825}
- component: {fileID: 1146093707276046720}
m_Layer: 5
m_Name: ButtonEndList
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &6043606001102860164
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3880385944865881628}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.000061035156, y: -339.15424, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6824730079511602782}
m_Father: {fileID: 7559427024191909535}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &4663210212859776047
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3880385944865881628}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1125, y: 87.74999, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8111949300693443825
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3880385944865881628}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 7417440583944426218}
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: []
--- !u!114 &1146093707276046720
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3880385944865881628}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &4440088906197307186
GameObject:
m_ObjectHideFlags: 0
@@ -846,7 +934,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 0}
scrollView: {fileID: 3722797921129174865}
draggablePanel: {fileID: 0}
--- !u!114 &5936379021244286420
MonoBehaviour:
@@ -1054,7 +1142,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.5
aspectRatio: 2
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1154,7 +1242,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.04761905
aspectRatio: 16.357143
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1286,6 +1374,163 @@ MonoBehaviour:
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &6713830457336055895
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3784162148691699609}
- component: {fileID: 8837570472974794998}
- component: {fileID: 2012938702108678750}
- component: {fileID: 8465575509868255547}
- component: {fileID: 4324701237407708404}
m_Layer: 5
m_Name: ButtonHeadList
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3784162148691699609
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6713830457336055895}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.000061035156, y: -34.65422, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7559427024191909535}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8837570472974794998
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6713830457336055895}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1125, y: 87.74999, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &2012938702108678750
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6713830457336055895}
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: 1
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
--- !u!114 &8465575509868255547
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6713830457336055895}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!114 &4324701237407708404
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6713830457336055895}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 1125
mHeight: 50
mDepth: 11
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 22.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u4E0B\u62C9\u5237\u65B0"
mFontSize: 46
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: 0
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 &6904648129028073836
GameObject:
m_ObjectHideFlags: 0
@@ -1311,12 +1556,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6904648129028073836}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2, y: -118, z: 0}
m_LocalPosition: {x: -2, y: -187, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3557982717651279387}
m_Father: {fileID: 7559427024191909535}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4461323368321500846
MonoBehaviour:
@@ -1356,6 +1601,106 @@ MonoBehaviour:
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 11.25
--- !u!1 &7417440583944426218
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6824730079511602782}
- component: {fileID: 5473991566102628421}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6824730079511602782
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7417440583944426218}
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: 6043606001102860164}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5473991566102628421
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7417440583944426218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 1125
mHeight: 50
mDepth: 11
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 22.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u65E0\u66F4\u591A\u4FE1\u606F"
mFontSize: 46
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: 0
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 &7559427024191909528
GameObject:
m_ObjectHideFlags: 0
@@ -1384,8 +1729,10 @@ Transform:
m_LocalPosition: {x: 0, y: -226.46, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3784162148691699609}
- {fileID: 4952826910999883875}
- {fileID: 5526176270147194935}
- {fileID: 6043606001102860164}
m_Father: {fileID: 7559427025382814600}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1609,7 +1956,7 @@ MonoBehaviour:
movement: 1
dragEffect: 2
restrictWithinPanel: 1
disableDragIfFits: 1
disableDragIfFits: 0
smoothDragStart: 1
iOSDragEmulation: 1
scrollWheelFactor: 0.25
@@ -1752,7 +2099,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9025999471674548422}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1, y: -85, z: 0}
m_LocalPosition: {x: -2479, y: -85, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4089383056281043756}
@@ -1760,7 +2107,7 @@ Transform:
- {fileID: 848496764181751289}
- {fileID: 7572607641653716598}
m_Father: {fileID: 7559427024191909535}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &7825856739466353785
BoxCollider:

View File

@@ -12752,11 +12752,11 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7192762038683279864}
- component: {fileID: 7391624919638342989}
- component: {fileID: 4817941406756770796}
- component: {fileID: 1598720523563585989}
- component: {fileID: 2520617879880372827}
- component: {fileID: 602889232740327463}
- component: {fileID: 1960237429817037261}
- component: {fileID: 7061102315160850978}
m_Layer: 5
m_Name: ButtonAddAttachment
m_TagString: Untagged
@@ -12780,21 +12780,6 @@ Transform:
m_Father: {fileID: 4713050183387073493}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7391624919638342989
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8804607366196574388}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
m_Name:
m_EditorClassIdentifier:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua
isNeedResetAtlase: 1
--- !u!114 &4817941406756770796
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -12875,7 +12860,7 @@ MonoBehaviour:
mSpriteName: news_news_bg
mFillCenter: 1
isGrayMode: 0
--- !u!114 &602889232740327463
--- !u!114 &1960237429817037261
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -12884,30 +12869,66 @@ MonoBehaviour:
m_GameObject: {fileID: 8804607366196574388}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 8804607366196574388}
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:
atlasName:
atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
fontName:
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
fontSize: 46
fontStyle: 0
backgroundSprite: mine_me_opinion
highlightSprite: mine_me_opinion
position: 0
alignment: 1
items:
- "\u76F8\u673A"
- "\u4ECE\u76F8\u518C\u9009\u62E9"
valueItems:
- 1
- 2
padding: {x: 4, y: 4}
textColor: {r: 1, g: 1, b: 1, a: 1}
backgroundColor: {r: 1, g: 1, b: 1, a: 1}
highlightColor: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
isAnimated: 1
isLocalized: 0
openOn: 0
onChange: []
mSelectedItem: "\u76F8\u673A"
mPanel: {fileID: 0}
mChild: {fileID: 0}
mBackground: {fileID: 0}
mHighlight: {fileID: 0}
mHighlightedLabel: {fileID: 0}
mLabelList: []
mBgBorder: 0
eventReceiver: {fileID: 0}
functionName: OnSelectionChange
textScale: 0
font: {fileID: 0}
textLabel: {fileID: 0}
--- !u!114 &7061102315160850978
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8804607366196574388}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
m_Name:
m_EditorClassIdentifier:
onSelect:
- mTarget: {fileID: 5860156637446539259}
mMethodName: uiEventDelegate
mParameters:
- obj: {fileID: 0}
field:
name: go
name:
oneShot: 0
--- !u!1 &8829601327712278063
GameObject:

View File

@@ -2385,16 +2385,16 @@ MonoBehaviour:
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 180
mHeight: 36
mHeight: 72
mDepth: 7
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5
aspectRatio: 2.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u5BA2\u6237\u7684\u540D\u5B57"
mText: "\u5BA2\u6237\u7684\u540D\u5B57\u5BA2\u6237\u7684\u540D\u5B57"
mFontSize: 36
mFontStyle: 0
mAlignment: 0
@@ -2404,7 +2404,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}
@@ -2471,7 +2471,7 @@ MonoBehaviour:
mLabelList: []
mBgBorder: 0
eventReceiver: {fileID: 0}
functionName: OnSelectionChange
functionName:
textScale: 0
font: {fileID: 0}
textLabel: {fileID: 0}
@@ -2767,7 +2767,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3008
startingRenderQueue: 3007
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3

View File

@@ -891,7 +891,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1177300157851115119}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.75, y: -1020.7793, z: 0}
m_LocalPosition: {x: 0, y: -1171.9043, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6055523243253628620}
@@ -899,7 +899,7 @@ Transform:
- {fileID: 867552299179297213}
- {fileID: 3299771093228243413}
m_Father: {fileID: 2972147044405579785}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1270337521464514563
MonoBehaviour:
@@ -980,14 +980,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1265221955037360746}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -547.65424, z: 0}
m_LocalPosition: {x: 0, y: -698.0293, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8514462368567531946}
- {fileID: 5963455614962161935}
- {fileID: 4757940232671147693}
m_Father: {fileID: 2972147044405579785}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7435333877463623657
MonoBehaviour:
@@ -2407,6 +2407,7 @@ Transform:
m_LocalPosition: {x: 0, y: -142.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7842026390970306112}
- {fileID: 2414056310727233539}
- {fileID: 8808936561438781430}
- {fileID: 8843266203698922333}
@@ -2665,14 +2666,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3398351578709515305}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -74.15427, z: 0}
m_LocalPosition: {x: 0, y: -224.02927, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5687123867571877963}
- {fileID: 184360130306287280}
- {fileID: 7740471187378746629}
m_Father: {fileID: 2972147044405579785}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4689739255238786590
MonoBehaviour:
@@ -3372,7 +3373,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 250
aspectRatio: 502.5
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -3758,6 +3759,106 @@ MonoBehaviour:
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &5598247988735069751
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7842026390970306112}
- component: {fileID: 7186500816148371164}
m_Layer: 5
m_Name: LabelDragRefresh
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &7842026390970306112
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5598247988735069751}
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: 2972147044405579785}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7186500816148371164
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5598247988735069751}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 200
mHeight: 50
mDepth: 6
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u4E0B\u62C9\u5237\u65B0"
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 &5636350171229174243
GameObject:
m_ObjectHideFlags: 0
@@ -5937,7 +6038,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8146871752058326566}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -481, y: 0, z: 0}
m_LocalPosition: {x: -478, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4695632568452137690}

View File

@@ -1 +1 @@
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,f866c7edbc8b45c009428cc94deb176e8 %trCRM/resVer/Android/VerCtl/other.ver8,2eefe052e318b31f1af603804a16c317
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,f4d7fbdcc98d7915aaaa949f686a5d698 %trCRM/resVer/Android/VerCtl/other.ver8,2eefe052e318b31f1af603804a16c317