diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v index bf98f8a..3be50c7 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -187,6 +187,14 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio.png.meta,132378906780000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio_full.png,132378740800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio_full.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png.meta,132387308870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png.meta,132387308870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png.meta,132387308880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png.meta,132387308880000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png,132384733440000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png.meta,132384750880000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/icon_bg.png,132382189960000000 @@ -220,7 +228,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132387288720000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132387312590000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000 @@ -273,7 +281,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132387273840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132387297060000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua.meta,132355452450000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua,132386912690000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua.meta,132289129810000000 @@ -302,7 +310,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132386936760000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132387270160000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132387296420000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua.meta,132289221090000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png.meta,132289129810000000 @@ -310,7 +318,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve.lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua,132387281130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua,132387312130000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua.meta,132387250260000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua.meta,132289129800000000 @@ -383,7 +391,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua.meta,132290913220000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua,132363128810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua.meta,132289134270000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua,132386909160000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua,132387297370000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua.meta,132290982930000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua,132369424200000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua.meta,132300378700000000 @@ -401,13 +409,13 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua.meta,132370115140000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua,132370162600000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua.meta,132369988710000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua,132386909160000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua,132387297530000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua.meta,132355735820000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua,132386909160000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua,132387297660000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua.meta,132375465560000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua,132380867870000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua.meta,132373063880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132387274470000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132387296160000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua.meta,132370897440000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua,132381390070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua.meta,132373879180000000 @@ -417,9 +425,9 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua.meta,132357319630000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua,132363220740000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua.meta,132357323740000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua,132386910990000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua,132387297760000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua.meta,132357325780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua,132386910990000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua,132387297880000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua.meta,132358703190000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua,132369409870000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua.meta,132366143690000000 @@ -501,7 +509,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectCompany.prefab.meta,132354941680000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab,132364419680000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab,132386907720000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab,132387311420000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelStart.prefab,132386907720000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelStart.prefab.meta,132289129800000000 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v index 132ff1e..a4a8ff2 100644 Binary files a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v and b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v differ diff --git a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v index 950ef91..16662cb 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v @@ -1,7 +1,7 @@ trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a -trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,26e455763621e8f9a8b1c7eeea902ea8 +trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac @@ -10,19 +10,20 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,6c837c5717e2246a101874ca16bc45c9 trCRM/upgradeRes/priority/lua/db/DBCust.lua,9e09f434e175ae942801f2ab140f8a49 trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 -trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc trCRM/upgradeRes/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 +trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 trCRM/upgradeRes/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,715a81f356955cdad0a3f604e8062f4a trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 -trCRM/upgradeRes/priority/lua/CLLMainLua.lua,f300e0babf50a8a8bdf5155bc55aeaf8 +trCRM/upgradeRes/priority/lua/CLLMainLua.lua,398a77c0c9146b949b3d0a6f60c6c4ed trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e -trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,499e82a6017037c6ed9f639f6a7d5a10 -trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 +trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 +trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 +trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,3f6a80d9a6a96cf66a201e26fc39aa1f trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,ee83701c37a6f2fc91691546a2e4fbe7 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 @@ -34,7 +35,7 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5 trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,77fe50c4c113517c376dbfc1bbacfed9 trCRM/upgradeRes/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3 trCRM/upgradeRes/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54 -trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,caafbebedb6fa0e3d3dc73bdcb0342b2 +trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,e5e9cb160e0ccd517bf7befd2155903a trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,6d54c7ee137c4a745daa3ea35fcfd9f9 @@ -51,11 +52,11 @@ trCRM/upgradeRes/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3ddd6f65cf62f4a19 trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,462d7b1995685531a4628c24c1e89c42 +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe -trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,09a47b1c7f1d38c51874f1e99d4a4a83 +trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,3038704955b89cc61befb0fee37b14f3 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39 @@ -67,17 +68,18 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15 trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,2c5c3fac87fcc6b9296c6ce2bf4226ef trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee -trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,8d42818424c927516b7748b563e80a2a +trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 trCRM/upgradeRes/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 -trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,f6512e8d842e68d9141c7a99e38e951f +trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,ef003163a56787371dd81f2ea6fed515 trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,90ebaab62abe0abdb396cfd7eb888780 -trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 +trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 @@ -92,19 +94,18 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0 trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 -trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,1d8fae12343aa5be002cccf1f2f678ca -trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 +trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,0e21123d4ce49aa05196b4f4ab00fab8 trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,c1ea5284412c95722ce92c5804745ad9 trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 -trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc +trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513 trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 @@ -117,6 +118,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9 trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6 trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 +trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 @@ -125,13 +127,15 @@ trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,bb4e1a1ce156f48fc0af330962865a62 trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23 trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,462d7b1995685531a4628c24c1e89c42 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd1e08640243d trCRM/upgradeRes/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2 -trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 +trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1 trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29 trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 @@ -140,17 +144,18 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f6862fccaa4 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa -trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd +trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 trCRM/upgradeRes/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,4a403cefd410e4c5011a98b2ed865bcb -trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,9bd3b1b78f19b29bc82c5f9d6c87168c +trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb +trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e trCRM/upgradeRes/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990 @@ -165,16 +170,17 @@ trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a +trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f -trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd +trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,4f1f48150ba3501b43b8107efd376e84 trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,3c1157bee5e84df48d3777bcb38b7281 trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683 trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 -trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 +trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7 trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d -trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,a0f5881ba7fd7555af332dbbb7e0ba97 +trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,1a7a4ee841c012b68aaaf139f34d14b6 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,17afb8f5b7000803125b255d2460ed61 trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 trCRM/upgradeRes/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 @@ -182,9 +188,9 @@ trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2 trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 -trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe trCRM/upgradeRes/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 -trCRM/upgradeRes/priority/lua/net/CLLNet.lua,2d55a0a98cb67bc889fe78fa359113ab +trCRM/upgradeRes/priority/lua/net/CLLNet.lua,df3108c65b288722530f80bb73893062 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe trCRM/upgradeRes/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5 @@ -205,16 +211,16 @@ trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e874974398 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f -trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964 trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,c9fd1e96628c3b9093a812942d507254 +trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,05f342abcc7962f49432a8cb1206e2fc trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,b789c704b3d1bd1893d130b20fb80ef6 -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,acc55f1fa638736c777cd4dda324a459 -trCRM/upgradeRes/priority/lua/net/NetProto.lua,255dd8338bdd678cea0b2b97b549639a +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 +trCRM/upgradeRes/priority/lua/net/NetProto.lua,c2a5eef306bbbbd5b186599bad616677 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,72ee9c6f764cc5ac1cdfdcd2a421e222 @@ -228,8 +234,9 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898b trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,cb75e55817036828325bfb30a2fd1630 trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e -trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 +trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239 +trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 trCRM/upgradeRes/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v index d13544f..2188347 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v @@ -1 +1 @@ -[{"md5":"83db54bd186e56564559b7fe7ec2a8be", "name":"2020_06_09_20_51_56", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"852b36d50f2f0ce00eccc80db6bc90a8", "name":"2020_06_14_21_46_25", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48678082118825ed76d8db161dcaa5cd", "name":"2020_06_20_15_13_36", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6188d18083bf95616165d76c2041b90e", "name":"2020_06_20_15_48_55", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8881cf3c9691c0a734344aed5602c30c", "name":"2020_06_20_18_18_34", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2fd0a9e5ce5b42edeebe951171c1ed22", "name":"2020_07_01_20_58_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7b90e2f5881d8a1af537d69c4abf0037", "name":"2020_07_01_21_29_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"abb908553432e1a98008de2dae335477", "name":"2020_07_01_22_22_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"248d184f53bb2907277d004865bed27e", "name":"2020_07_02_10_08_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5de2ba51b6af6e896a72e6ba0d483fd7", "name":"2020_07_02_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"532f0cecf5aa77742c01988183936269", "name":"2020_07_02_10_23_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d91a8b5136448c3934d0c936fced2d81", "name":"2020_07_02_11_17_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"991793ef158bdde3e7d70a8f69178cb0", "name":"2020_07_02_11_24_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e74624581a23d2c051f66d949e52537", "name":"2020_07_02_11_47_16", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7bc64e0ac434fc831cfdd79e6448263", "name":"2020_07_02_11_48_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b08313a39f814ec82ea0c676b4abdfd0", "name":"2020_07_02_11_51_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40023ffc5fdfc497eb36b985591b1460", "name":"2020_07_02_11_55_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"929720526e51a4a8b81827bb0611e134", "name":"2020_07_02_12_34_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9cf65334eafd25813932e7797ac18364", "name":"2020_07_02_12_37_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"029093af4b6b56448c3b995326ec9a5e", "name":"2020_07_02_12_49_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f6c68dfc0d14a3d55957903af0978381", "name":"2020_07_02_12_51_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"86afa249af5db0a282f2bc472045b1a9", "name":"2020_07_02_12_53_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"29f14097aa74aba0aca1c3c56b2bd2bb", "name":"2020_07_05_14_55_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"874de9b2b6f7e0fd732e08b5ea59b03a", "name":"2020_07_05_15_27_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e44ed0d01c1393cf14e97a3b74ed9a11", "name":"2020_07_05_21_14_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ea9af802bcedca448cea33dbdc82c0af", "name":"2020_07_06_09_49_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"caf10f439c895c895281993c970ce498", "name":"2020_07_07_09_45_55", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48fe564cbc4d1e850feaf7d83db95e7d", "name":"2020_07_07_10_05_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a46aac41a106a00e083554f282affcad", "name":"2020_07_07_10_08_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad7f4dae1b60de21fda92c02e51a549b", "name":"2020_07_07_10_21_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad4e9a71aa1fbfbf09b2fded8b5268b4", "name":"2020_07_07_10_28_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65f76f395c64e70fe91e17faa5cfe1c0", "name":"2020_07_07_10_29_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e2719cb0d8417b42e9c169e102519047", "name":"2020_07_07_10_31_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77fb67623b2551aa5637a5c3e1a7a20b", "name":"2020_07_07_10_32_31", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c65e208afdf7325dc035e1ed30b5e882", "name":"2020_07_07_10_33_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"09f03a7efedcdee13e59e6e82e7e787f", "name":"2020_07_07_10_34_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"038fa1d071d5b6ba5eb97cae7ec44dfa", "name":"2020_07_07_10_41_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f9052a0f8588b4462c4b7484b273a81c", "name":"2020_07_07_13_51_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"fca57a14b9326d6b4bbe6a76fd14d2b3", "name":"2020_07_07_14_04_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"db29543735363798b292609f421505b2", "name":"2020_07_07_14_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48654c656fc5ee1de7b7e147e2423200", "name":"2020_07_07_14_19_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"06cf91af553fcd8cfeb17fdf1cb3b9bc", "name":"2020_07_07_14_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9d7d1eefc31cfa737befb6b151b41448", "name":"2020_07_07_14_20_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b39df8ca67d48cc85a3a36459e0329df", "name":"2020_07_07_15_07_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b1e0ddeb104f0cc994d6a4fad1113836", "name":"2020_07_07_14_02_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb0db9cc4641358853303c738de59bbe", "name":"2020_07_07_14_10_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4510eac2b9966d0e192f73dc9717e65d", "name":"2020_07_07_14_13_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a0fd1e686304d3f30e36d9616b52bec9", "name":"2020_07_07_14_15_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb253314e7a22106a7879ea1c19f7519", "name":"2020_07_07_14_16_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d133bbe311e292732d2b912362e49cfc", "name":"2020_07_07_14_18_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c076515cee1efa128b9037b327625899", "name":"2020_07_07_14_19_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"511d316e0eb5a14b9bdb9cfea8b9d27f", "name":"2020_07_07_15_59_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"061b5ab80025e127ebe5989ccf5f0cf0", "name":"2020_07_07_16_25_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e87dbbeb2c5f5f8fdf6fa10b7d69876", "name":"2020_07_07_16_27_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c39d52fc0764bd34d5290bca509298b4", "name":"2020_07_07_16_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b9dddfa50494ccea917ba30950bc9298", "name":"2020_07_07_16_32_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c644faf22a45c1b45f26fd319404ce32", "name":"2020_07_07_16_49_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5789a7880ebbcb55782155302b1a2ef4", "name":"2020_07_07_17_30_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"93d36e7f45d121367cc1711972a2cac1", "name":"2020_07_07_17_47_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3793c236cda944d5a9308dcdf818fd82", "name":"2020_07_07_18_55_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f9939500d4aa88338e898dac98edee0", "name":"2020_07_07_19_20_56", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c77123a8b28d7e5da3b70f7aaebb0d48", "name":"2020_07_07_19_26_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01889e33c81edc18e8ca5aa65166d3dd", "name":"2020_07_07_19_48_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c3b643abcee574491912ae03a3fb2c5f", "name":"2020_07_07_19_49_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c07e0f977c72720644ede63e17c85193", "name":"2020_07_07_20_08_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71b5e55707b8bfdbb4d13dbf9429d9e", "name":"2020_07_07_20_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9080c5a030fb57300860b809808fc832", "name":"2020_07_07_20_50_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3e7137c562bf90d3cfa8bbe37b1cc30", "name":"2020_07_07_21_12_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e8704b794aa8dcd82c02127010dba8c", "name":"2020_07_08_22_12_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e62b707f07ef5795372e23e5fbb97692", "name":"2020_07_08_22_14_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"54e0a143d9013b230920b7898be56361", "name":"2020_07_08_22_47_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71f02fca91b21e3ac8b668d1d86891c5", "name":"2020_07_08_23_06_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file +[{"md5":"83db54bd186e56564559b7fe7ec2a8be", "name":"2020_06_09_20_51_56", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"852b36d50f2f0ce00eccc80db6bc90a8", "name":"2020_06_14_21_46_25", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48678082118825ed76d8db161dcaa5cd", "name":"2020_06_20_15_13_36", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6188d18083bf95616165d76c2041b90e", "name":"2020_06_20_15_48_55", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8881cf3c9691c0a734344aed5602c30c", "name":"2020_06_20_18_18_34", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2fd0a9e5ce5b42edeebe951171c1ed22", "name":"2020_07_01_20_58_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7b90e2f5881d8a1af537d69c4abf0037", "name":"2020_07_01_21_29_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"abb908553432e1a98008de2dae335477", "name":"2020_07_01_22_22_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"248d184f53bb2907277d004865bed27e", "name":"2020_07_02_10_08_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5de2ba51b6af6e896a72e6ba0d483fd7", "name":"2020_07_02_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"532f0cecf5aa77742c01988183936269", "name":"2020_07_02_10_23_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d91a8b5136448c3934d0c936fced2d81", "name":"2020_07_02_11_17_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"991793ef158bdde3e7d70a8f69178cb0", "name":"2020_07_02_11_24_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e74624581a23d2c051f66d949e52537", "name":"2020_07_02_11_47_16", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7bc64e0ac434fc831cfdd79e6448263", "name":"2020_07_02_11_48_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b08313a39f814ec82ea0c676b4abdfd0", "name":"2020_07_02_11_51_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40023ffc5fdfc497eb36b985591b1460", "name":"2020_07_02_11_55_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"929720526e51a4a8b81827bb0611e134", "name":"2020_07_02_12_34_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9cf65334eafd25813932e7797ac18364", "name":"2020_07_02_12_37_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"029093af4b6b56448c3b995326ec9a5e", "name":"2020_07_02_12_49_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f6c68dfc0d14a3d55957903af0978381", "name":"2020_07_02_12_51_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"86afa249af5db0a282f2bc472045b1a9", "name":"2020_07_02_12_53_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"29f14097aa74aba0aca1c3c56b2bd2bb", "name":"2020_07_05_14_55_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"874de9b2b6f7e0fd732e08b5ea59b03a", "name":"2020_07_05_15_27_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e44ed0d01c1393cf14e97a3b74ed9a11", "name":"2020_07_05_21_14_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ea9af802bcedca448cea33dbdc82c0af", "name":"2020_07_06_09_49_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"caf10f439c895c895281993c970ce498", "name":"2020_07_07_09_45_55", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48fe564cbc4d1e850feaf7d83db95e7d", "name":"2020_07_07_10_05_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a46aac41a106a00e083554f282affcad", "name":"2020_07_07_10_08_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad7f4dae1b60de21fda92c02e51a549b", "name":"2020_07_07_10_21_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad4e9a71aa1fbfbf09b2fded8b5268b4", "name":"2020_07_07_10_28_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65f76f395c64e70fe91e17faa5cfe1c0", "name":"2020_07_07_10_29_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e2719cb0d8417b42e9c169e102519047", "name":"2020_07_07_10_31_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77fb67623b2551aa5637a5c3e1a7a20b", "name":"2020_07_07_10_32_31", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c65e208afdf7325dc035e1ed30b5e882", "name":"2020_07_07_10_33_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"09f03a7efedcdee13e59e6e82e7e787f", "name":"2020_07_07_10_34_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"038fa1d071d5b6ba5eb97cae7ec44dfa", "name":"2020_07_07_10_41_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f9052a0f8588b4462c4b7484b273a81c", "name":"2020_07_07_13_51_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"fca57a14b9326d6b4bbe6a76fd14d2b3", "name":"2020_07_07_14_04_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"db29543735363798b292609f421505b2", "name":"2020_07_07_14_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48654c656fc5ee1de7b7e147e2423200", "name":"2020_07_07_14_19_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"06cf91af553fcd8cfeb17fdf1cb3b9bc", "name":"2020_07_07_14_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9d7d1eefc31cfa737befb6b151b41448", "name":"2020_07_07_14_20_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b39df8ca67d48cc85a3a36459e0329df", "name":"2020_07_07_15_07_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b1e0ddeb104f0cc994d6a4fad1113836", "name":"2020_07_07_14_02_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb0db9cc4641358853303c738de59bbe", "name":"2020_07_07_14_10_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4510eac2b9966d0e192f73dc9717e65d", "name":"2020_07_07_14_13_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a0fd1e686304d3f30e36d9616b52bec9", "name":"2020_07_07_14_15_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb253314e7a22106a7879ea1c19f7519", "name":"2020_07_07_14_16_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d133bbe311e292732d2b912362e49cfc", "name":"2020_07_07_14_18_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c076515cee1efa128b9037b327625899", "name":"2020_07_07_14_19_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"511d316e0eb5a14b9bdb9cfea8b9d27f", "name":"2020_07_07_15_59_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"061b5ab80025e127ebe5989ccf5f0cf0", "name":"2020_07_07_16_25_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e87dbbeb2c5f5f8fdf6fa10b7d69876", "name":"2020_07_07_16_27_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c39d52fc0764bd34d5290bca509298b4", "name":"2020_07_07_16_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b9dddfa50494ccea917ba30950bc9298", "name":"2020_07_07_16_32_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c644faf22a45c1b45f26fd319404ce32", "name":"2020_07_07_16_49_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5789a7880ebbcb55782155302b1a2ef4", "name":"2020_07_07_17_30_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"93d36e7f45d121367cc1711972a2cac1", "name":"2020_07_07_17_47_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3793c236cda944d5a9308dcdf818fd82", "name":"2020_07_07_18_55_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f9939500d4aa88338e898dac98edee0", "name":"2020_07_07_19_20_56", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c77123a8b28d7e5da3b70f7aaebb0d48", "name":"2020_07_07_19_26_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01889e33c81edc18e8ca5aa65166d3dd", "name":"2020_07_07_19_48_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c3b643abcee574491912ae03a3fb2c5f", "name":"2020_07_07_19_49_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c07e0f977c72720644ede63e17c85193", "name":"2020_07_07_20_08_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71b5e55707b8bfdbb4d13dbf9429d9e", "name":"2020_07_07_20_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9080c5a030fb57300860b809808fc832", "name":"2020_07_07_20_50_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3e7137c562bf90d3cfa8bbe37b1cc30", "name":"2020_07_07_21_12_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e8704b794aa8dcd82c02127010dba8c", "name":"2020_07_08_22_12_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e62b707f07ef5795372e23e5fbb97692", "name":"2020_07_08_22_14_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"54e0a143d9013b230920b7898be56361", "name":"2020_07_08_22_47_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71f02fca91b21e3ac8b668d1d86891c5", "name":"2020_07_08_23_06_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6116bfda92f11adc871feba849ad0a7", "name":"2020_07_09_08_52_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"197c33d30db832223da91066c3882917", "name":"2020_07_09_08_57_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f55f5e0f14dc1155b89d9868f6cb4884", "name":"2020_07_09_09_18_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dce47a78ddfe761905bfc095d7dcbc85", "name":"2020_07_09_09_20_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v index 23ba68e..7ef179a 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v @@ -1,6 +1,6 @@ trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd -trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,26e455763621e8f9a8b1c7eeea902ea8 +trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac @@ -12,7 +12,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df3 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,b789c704b3d1bd1893d130b20fb80ef6 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,715a81f356955cdad0a3f604e8062f4a @@ -20,7 +20,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 -trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,f300e0babf50a8a8bdf5155bc55aeaf8 +trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,398a77c0c9146b949b3d0a6f60c6c4ed trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a @@ -28,8 +28,9 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c9 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,499e82a6017037c6ed9f639f6a7d5a10 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,0aa4dce53f215a57101982baaf3acd16 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 @@ -58,7 +59,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,09a47b1c7f1d38c51874f1e99d4a4a83 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,3038704955b89cc61befb0fee37b14f3 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39 @@ -70,16 +71,18 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf587891 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,2c5c3fac87fcc6b9296c6ce2bf4226ef trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee -trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,8d42818424c927516b7748b563e80a2a +trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,3f6a80d9a6a96cf66a201e26fc39aa1f trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,b789c704b3d1bd1893d130b20fb80ef6 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,f6512e8d842e68d9141c7a99e38e951f +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,ef003163a56787371dd81f2ea6fed515 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,90ebaab62abe0abdb396cfd7eb888780 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e @@ -91,14 +94,14 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,1d8fae12343aa5be002cccf1f2f678ca +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,0e21123d4ce49aa05196b4f4ab00fab8 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,c1ea5284412c95722ce92c5804745ad9 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d @@ -110,7 +113,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2d trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 -trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,2d55a0a98cb67bc889fe78fa359113ab +trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,df3108c65b288722530f80bb73893062 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 @@ -144,10 +147,10 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f68 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd -trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,a0f5881ba7fd7555af332dbbb7e0ba97 +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,cb75e55817036828325bfb30a2fd1630 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 @@ -155,8 +158,8 @@ trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887b trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd1e08640243d trCRM/upgradeRes4Publish/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,4a403cefd410e4c5011a98b2ed865bcb -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,9bd3b1b78f19b29bc82c5f9d6c87168c +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964 @@ -168,6 +171,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,f4012bc5f0a6dcb0680961a6d2bcc6ca trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,4f1f48150ba3501b43b8107efd376e84 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5 @@ -182,7 +186,7 @@ trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 -trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 +trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,1a7a4ee841c012b68aaaf139f34d14b6 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,17afb8f5b7000803125b255d2460ed61 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 @@ -190,6 +194,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062 @@ -206,20 +211,22 @@ trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb3 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d7642f690531d9410ff6a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e8749743983d92 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,caafbebedb6fa0e3d3dc73bdcb0342b2 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa -trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,c9fd1e96628c3b9093a812942d507254 +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,05f342abcc7962f49432a8cb1206e2fc trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,acc55f1fa638736c777cd4dda324a459 -trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,255dd8338bdd678cea0b2b97b549639a +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,c2a5eef306bbbbd5b186599bad616677 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 diff --git a/Assets/trCRM/_scene/Main.unity b/Assets/trCRM/_scene/Main.unity index d2564ad..64e18d8 100644 --- a/Assets/trCRM/_scene/Main.unity +++ b/Assets/trCRM/_scene/Main.unity @@ -1137,17 +1137,17 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1} mPivot: 4 - mWidth: 370 + mWidth: 482 mHeight: 40 mDepth: 1 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 9.25 + aspectRatio: 6.05 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: TIANTIANFU + mText: Daily Work mFontSize: 40 mFontStyle: 0 mAlignment: 0 @@ -1162,7 +1162,7 @@ MonoBehaviour: mApplyGradient: 0 mGradientTop: {r: 1, g: 1, b: 1, a: 1} mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 14 + mSpacingX: 26 mSpacingY: 0 mUseFloatSpacing: 0 mFloatSpacingX: 0 @@ -1334,7 +1334,7 @@ MonoBehaviour: autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.48872507 + aspectRatio: 1.3330443 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -1800,17 +1800,17 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0, g: 0, b: 0, a: 1} mPivot: 4 - mWidth: 374 + mWidth: 486 mHeight: 90 mDepth: 1 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 4.1555557 + aspectRatio: 5.3777776 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: "\u6DFB\u6DFB\u547C" + mText: "\u6DFB\u6DFB\u529E\u516C" mFontSize: 90 mFontStyle: 1 mAlignment: 0 @@ -1825,7 +1825,7 @@ MonoBehaviour: mApplyGradient: 0 mGradientTop: {r: 1, g: 1, b: 1, a: 1} mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 52 + mSpacingX: 42 mSpacingY: 0 mUseFloatSpacing: 0 mFloatSpacingX: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png new file mode 100644 index 0000000..70953db Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png.meta new file mode 100644 index 0000000..1b3f027 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b3602a1bf2771401eab0f04723deffd9 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png new file mode 100644 index 0000000..9960cb6 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png.meta new file mode 100644 index 0000000..4b47b92 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 11959c00a22884859a0409088e0a042e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png new file mode 100644 index 0000000..cd9ad55 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png.meta new file mode 100644 index 0000000..8d3e0be --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 591906f577ed54a08aaffba924d729c9 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png new file mode 100644 index 0000000..16dfdda Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png.meta new file mode 100644 index 0000000..ef6d61e --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6cbcf01f86f3647a0ad2e6c5714ecda3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab index 804bc75..527c871 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab @@ -1347,6 +1347,62 @@ MonoBehaviour: paddingTop: 0 paddingBottom: 0 path: trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png + - name: public_tips_2 + x: 0 + y: 0 + width: 80 + height: 80 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png + - name: public_tips_1 + x: 0 + y: 0 + width: 80 + height: 80 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png + - name: public_tips_3 + x: 0 + y: 0 + width: 80 + height: 80 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png + - name: public_tips_4 + x: 0 + y: 0 + width: 80 + height: 80 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png mPixelSize: 1 mReplacement: {fileID: 0} mCoordinates: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua index 09383bd..69f9d52 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua @@ -109,7 +109,7 @@ end NetProto.sendGet = function(cmd, map, callback, failedCallback, orgs, _baseUrl) if isNilOrEmpty(NetProto.sign) and (cmd ~= NetProto.cmds.getTokenForAPI) then - CLAlert.add("与服务器失去联络,请重试!", Color.white, 1) + MyUtl.toastE("与服务器失去联络,请重试!") NetProto.init() return end @@ -152,12 +152,12 @@ function NetProto.init(callback) onGetToken(data.result) Utl.doCallback(callback, true) else - CLAlert.add(data.msg, Color.white, 1) + MyUtl.toastW(data.msg) Utl.doCallback(callback, false) end end, function() - CLAlert.add("取得会话ID失败!", Color.white, 1) + MyUtl.toastE("取得会话ID失败!") Utl.doCallback(callback, false) end ) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua index a72050b..476bffc 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua @@ -80,7 +80,7 @@ MyUtl.doCall = function(custId, phoneNo) function(content) hideHotWheel() if content.success then - CLAlert.add("拨号成功!", Color.white, 5) + MyUtl.toastS("拨号成功!") end end ) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua index 2e49ff6..db112fc 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua @@ -24,20 +24,20 @@ function _cell.show(go, data) local spriteName = "" local colorIcon if mData.type == CLToastRoot.Type.success then - spriteName = "cust_suc" + spriteName = "public_tips_2" colorIcon = Color.green elseif mData.type == CLToastRoot.Type.warning then - spriteName = "cust_suc" + spriteName = "public_tips_3" colorIcon = Color.yellow elseif mData.type == CLToastRoot.Type.error then - spriteName = "cust_suc" + spriteName = "public_tips_4" colorIcon = Color.red else - spriteName = "cust_suc" + spriteName = "public_tips_1" colorIcon = Color.white end uiobjs.SpriteIcon.color = colorIcon - uiobjs.SpriteIcon.spriteName = spriteName + CLUIUtl.setSpriteFit(uiobjs.SpriteIcon, spriteName) uiobjs.tweenAlpha.delay = mData.staySec or 1 uiobjs.tweenAlpha:ResetToBeginning() uiobjs.tweenAlpha:Play(true) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua index 2ceac5c..fbe3bd3 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua @@ -105,7 +105,7 @@ function CSPMine.onGetLocation(locInfor) ) getPanelAsy("PanelWebView", onLoadedPanelTT, {url = url}) else - CLAlert.add(location.msg, Color.white, 1) + MyUtl.toastW(location.msg) if code == 8 or code == 9 or code == 5 then -- 打开gps MyLocation.self:guidSwitchGps() diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua index 7f8d2b7..6f20d6c 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua @@ -113,7 +113,7 @@ function TRPLogin:setEventDelegate() end end, function() - CLAlert.add("登录失败,请确保网络通畅!", Color.white, 1) + MyUtl.toastW("登录失败,请确保网络通畅!") end ) end, diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua index 29395d8..2f087f0 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua @@ -59,7 +59,7 @@ function TRPModifyFiled:setEventDelegate() ButtonOkay = function() local err = uiobjs.element:checkValid() if not isNilOrEmpty(err) then - CLAlert.add(err, Color.white, 1) + MyUtl.toastW(err) return end Utl.doCallback(self.mdata.callback, self.mdata.key, uiobjs.Input.value) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua index 63c1812..cedb80d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua @@ -312,7 +312,7 @@ function TRPNewCust:onPopupFieldValChg4Extend(go) -- 有修改,发送数据 self:sendModifymsg(el.jsonKey, el.value, true) else - MyUtl.toastE(err) + MyUtl.toastW(err) end end end @@ -352,7 +352,7 @@ function TRPNewCust:setEventDelegate() local err = uiobjs.DetailRoot:checkValid() err = joinStr(err, uiobjs.ExtendFormRoot:checkValid()) if not isNilOrEmpty(err) then - MyUtl.toastE(err) + MyUtl.toastW(err) return end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua index 2b17fa8..68cd7a9 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua @@ -62,7 +62,7 @@ end function TRPResetPasswordStep3:procNetwork(cmd, succ, msg, paras) if (succ == NetSuccess) then if cmd == NetProto.cmds.updateLoginNoPwd then - CLAlert.add("密码修改成功", Color.green, 0) + MyUtl.toastS("密码修改成功") hideTopPanel() hideTopPanel() hideTopPanel() diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua index 3a5e2b9..92e9764 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua @@ -92,7 +92,7 @@ function TRPSelectCompany:setEventDelegate() self.EventDelegate = { ButtonRight = function() if selectedCompany == nil then - CLAlert.add("请选择要进入的公司", Color.white, 0) + MyUtl.toastW("请选择要进入的公司") return end -- 缓存一下,下次进来后就不用再先公司了 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab index 85ab92c..d781d06 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab @@ -430,7 +430,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1360523796241388} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.57044226, y: 22.4, z: 0} + m_LocalPosition: {x: -0.57044226, y: 112.399994, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4506292931704418} @@ -537,7 +537,6 @@ Transform: - {fileID: 4506292931704418} - {fileID: 4098723856805998} - {fileID: 4525616215859032} - - {fileID: 223460704660280301} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -638,7 +637,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1617362407899682} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 57.9, z: 0} + m_LocalPosition: {x: 0, y: 147.9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4080061421678368} @@ -802,7 +801,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1681857750492670} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1, y: 13, z: 0} + m_LocalPosition: {x: -1, y: 103, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4506292931704418} @@ -1117,207 +1116,6 @@ MonoBehaviour: callWhenFinished: from: 0.3 to: 1 ---- !u!1 &791695792701113897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4506719672661420977} - - component: {fileID: 5221257317028059316} - m_Layer: 5 - m_Name: Label2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4506719672661420977 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791695792701113897} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -81.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 223460704660280301} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5221257317028059316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791695792701113897} - 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.4339623, g: 0.4339623, b: 0.4339623, a: 1} - mPivot: 4 - mWidth: 370 - mHeight: 40 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 9.25 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: TIANTIANFU - mFontSize: 40 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 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: 14 - 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 &5670893069891110169 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 223460704660280301} - - component: {fileID: 7247584930376180958} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &223460704660280301 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5670893069891110169} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 250.87497, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4506719672661420977} - m_Father: {fileID: 4228491702010106} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7247584930376180958 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5670893069891110169} - 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, g: 0, b: 0, a: 1} - mPivot: 4 - mWidth: 374 - mHeight: 90 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 4.1555557 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: "\u6DFB\u6DFB\u547C" - mFontSize: 90 - mFontStyle: 1 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mMaterial: {fileID: 0} - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 52 - 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 &6328643013924818452 GameObject: m_ObjectHideFlags: 0 @@ -1443,7 +1241,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7381716524038025871} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 95.5, z: 0} + m_LocalPosition: {x: 0, y: 185.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8342146830181434174} diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d new file mode 100644 index 0000000..9d5e2ac Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d.meta new file mode 100644 index 0000000..5c24f16 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4aec2d5fb6dea4354a55420c77385130 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d new file mode 100644 index 0000000..cf9e6b5 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d.meta new file mode 100644 index 0000000..17dc2cb --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 38bcab69790354549aa5d8d7ee162fb0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d new file mode 100644 index 0000000..4bb3630 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d.meta new file mode 100644 index 0000000..69cb09b --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fe075ce29af694e3ba6469dcbb41c317 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d new file mode 100644 index 0000000..07bcce7 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d.meta new file mode 100644 index 0000000..caa1ff2 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0cf439c3f20a4493a8d266c92760ea98 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d index 27ef475..10163e0 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua index f02c02d..9efac30 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua index 64b41be..ae6105e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua index 49ca1ab..ea2c8b4 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua index 2168b3f..6b19cb9 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua index 6c27a9b..dd02eaa 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua index 9309b56..d7d0146 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua index 9c322db..bb53e49 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua index b2ed403..24254d8 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua index 10406af..facefe0 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d index f52d1e0..0d9404e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver index 54ea819..644be5e 100644 --- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver +++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver @@ -1 +1 @@ -r8 (trCRM/resVer/Android/VerCtl/priority.ver8,edb7f0ed87d5176b12e69d39f0ea3f828 %trCRM/resVer/Android/VerCtl/other.ver8,a0ae422d5465689aa97c50da2ca98180 \ No newline at end of file +r8 (trCRM/resVer/Android/VerCtl/priority.ver8,241b9b5b77670a8256133d20d12e59438 %trCRM/resVer/Android/VerCtl/other.ver8,c69c1c5ae55f0ba5763949a2afe5f103 \ No newline at end of file diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver index 18a3d20..872c21f 100644 --- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver +++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver @@ -1 +1 @@ -p a8 >trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d8,a35e85b68569bf1adc16bdee3a609fdd8 ?trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d8,7edfb781be444c18d010e533863340158 :trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d8,8c7beff66dc0cfe9f44082bdacc8007c8 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d8,eca0bd19a59ce72be19d7cdcbf9c5dac8 :trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d8,b460d3a275be876e0cfa0ca96777260f8 :trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d8,fffb80792073e4f2849c743d061d685a8 ?trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d8,d1cf8069716943cc112a2946b22efddd8 9trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d8,a6ce8e74b0631e79ce2e03f2fed3baea8 @trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d8,bfdbfc9e1fd1f91de555c0801d278d258 AtrCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d8,6a41f099b79cda5941cf720c1452b5a58 @trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d8,884f69f0dd0c2a58af5ad891f23e985e8 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d8,043e8a3cdee29da6e5c909432f25d6f88 >trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d8,c16242cb394b0720d1c2e1e0289c1c4a8 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d8,8e81d4a650273e24b7f129d1f814f5fa8 ;trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d8,4f2c80de666b97ea02084f059d2a5ed08 7trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d8,939edcb747217aa4b0deb1d9a34f16b88 8trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d8,849e7b3d08491890c6e021896c8ec39c8 ?trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d8,2f74f17f1282c12ab63108377b4798e08 8trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d8,38bf54e9fbf1c1d8af2cead294d1b61e8 :trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d8,51120d82352e936df826b05696b89b198 9trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d8,aa21836aaae62d8f719a930aefe37ea78 ;trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d8,2ee604556b4fff6186f2bad067ed86958 ?trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d8,651d81480c5ea1ff8aa4ccdf7e0a60588 ;trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d8,3b42ecd8d30203eb5dcc65cb3a0ad8158 9trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d8,36e34519b910a11de3531994f607a140 \ No newline at end of file +p e8 >trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d8,a35e85b68569bf1adc16bdee3a609fdd8 ?trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d8,7edfb781be444c18d010e533863340158 :trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d8,8c7beff66dc0cfe9f44082bdacc8007c8 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d8,eca0bd19a59ce72be19d7cdcbf9c5dac8 9trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d8,b991891eb2939a880c223d677605faf48 :trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d8,fffb80792073e4f2849c743d061d685a8 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d8,c16242cb394b0720d1c2e1e0289c1c4a8 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d8,043e8a3cdee29da6e5c909432f25d6f88 ?trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d8,3bcd13c7b2003a1bcf92aaa4d2dbf6fe8 >trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d8,8e81d4a650273e24b7f129d1f814f5fa8 ;trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d8,4f2c80de666b97ea02084f059d2a5ed08