From 4221cf486caef7b22d41d37929d11d9d8ca00928 Mon Sep 17 00:00:00 2001 From: chenbin Date: Thu, 16 Jul 2020 23:06:09 +0800 Subject: [PATCH] upgrade --- .../verControl/.resModifyDate.v | 8 +-- .../verControl/IOS/ver4DevelopeMd5.v | Bin 26515 -> 26515 bytes .../verControl/IOS/ver4Upgrade.v | 48 +++++++++--------- .../verControl/IOS/ver4UpgradeList.v | 2 +- .../verControl/IOS/ver4UpgradeMd5.v | 4 +- Assets/trCRM/Scripts/Main/MyMain.cs | 10 ++-- .../priority/lua/CLLMainLua.lua | 44 +++++++++++----- .../priority/lua/net/CLLNet.lua | 2 +- .../priority/lua/net/NetProto.lua | 6 +-- .../priority/lua/public/CLLIncludeBase.lua | 2 + .../priority/lua/toolkit/KKLogListener.lua | 2 +- .../priority/ui/panel/PanelHotWheel.prefab | 14 ++--- .../ui/panel/PanelPlaySoundRecord.prefab | 2 +- .../priority/lua/CLLMainLua.lua | Bin 6356 -> 6356 bytes .../ui/panel/IOS/PanelHotWheel.unity3d | Bin 7233 -> 7226 bytes .../ui/panel/IOS/PanelPlaySoundRecord.unity3d | Bin 13051 -> 13052 bytes .../trCRM/resVer/IOS/VerCtl.ver | 2 +- .../trCRM/resVer/IOS/VerCtl/other.ver | Bin 12096 -> 12096 bytes .../trCRM/resVer/IOS/VerCtl/priority.ver | Bin 14919 -> 14919 bytes ProjectSettings/QualitySettings.asset | Bin 5100 -> 6405 bytes 20 files changed, 84 insertions(+), 62 deletions(-) diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v index 5501607..dd4b5b0 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -289,12 +289,12 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132393322430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132393414070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/.DS_Store,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua,132393345290000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua,132393404920000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/battle.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio.meta,132289129800000000 @@ -562,7 +562,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta,132392091690000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab,132388402660000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab,132388402710000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab,132393411800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab,132392092810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab.meta,132355322410000000 @@ -584,7 +584,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta,132388652660000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132392092800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132393284050000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132393414070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab,132388441590000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab.meta,132378946840000000 diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v index c2ecefd4a0716a7e7bf846a71a75defda7e71651..dc5b5de5d05e4c34a0d5390979dcb657cf3772b8 100644 GIT binary patch delta 141 zcmW;Eu?@m75CA|$NKlX#3DJ-O(a`um`M19TCSV8q-=2dJkX%r+0VoTwL1sWKg2WAQ zb!zI=-0ocu9z#l&qlW+-IT|XF=n$btk@~o->wDJL?P31<9G4x_0D&B5KP1n9Afg%7 ofiM|j8BgtQ(*<9Myd+oDa>$8$D+Qr3b0pEX6?8kBImmf6zzFl+GkSQdN+N4_wzc&v0%&C03cHvTw)@I p@i!tE`a`*?R?HMp@+Bz|h!^KHr;r^Xs}sAPD!a`V{cHO>{sH4mDw_ZR diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v b/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v index 10a62e4..9f9e174 100644 --- a/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v +++ b/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v @@ -22,11 +22,10 @@ trCRM/upgradeRes/other/uiAtlas/hotwheel/IOS/hotWheel_prog.unity3d,f71546fbb57c42 trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes/other/uiAtlas/icon/IOS/icon_26_no.unity3d,d39394e00d037c17920ed100a1d4be40 trCRM/upgradeRes/other/uiAtlas/work/IOS/380bg.unity3d,2d66070d4c85a3d0d9b06bb68260f2b7 -trCRM/upgradeRes/priority/lua/CLLMainLua.lua,5bbe3b6bf2cfc6515d3ec0da8254f50e +trCRM/upgradeRes/priority/lua/CLLMainLua.lua,c6ae9613093f7196a7ca542c2a339dbf trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_followup.unity3d,53f6896e2d1d3bbb17bf916c681575ec trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 -trCRM/upgradeRes/other/uiAtlas/coolape/IOS/button.unity3d,c8009be975691b21cac9fdc55f343cc3 trCRM/upgradeRes/other/uiAtlas/public/IOS/check_full.unity3d,d2a9f4ed2598e59dc161cce43869979d trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 @@ -43,11 +42,11 @@ trCRM/upgradeRes/other/uiAtlas/coolape/IOS/logo.unity3d,a23619eae53064c611eeb49b trCRM/upgradeRes/priority/lua/db/DBRoot.lua,c89d42f4c6ebe72da436e07ee70f69ad trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233 trCRM/upgradeRes/other/uiAtlas/cust/IOS/play2.unity3d,41dc3f7483b566a92f22718cc1363f12 -trCRM/upgradeRes/other/uiAtlas/order/IOS/system.unity3d,f5f16b0b52fb5f0c303a7b202391d491 trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 trCRM/upgradeRes/other/uiAtlas/login/IOS/log_visible.unity3d,af743a8a46a78caa3aab15ecb2d4f73d -trCRM/upgradeRes/priority/ui/panel/IOS/PanelPlaySoundRecord.unity3d,60929032f8a97496416cb4c326a44c79 +trCRM/upgradeRes/other/uiAtlas/cust/IOS/pause.unity3d,8eff010febb0a0d6365a65fed01cf38d trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 +trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_2.unity3d,f8983e295d741411b2dbc2cfa1646ce3 trCRM/upgradeRes/other/uiAtlas/cust/IOS/right.unity3d,3d5aa57f1b9a4c63ceac9f3f8e9a588a trCRM/upgradeRes/other/uiAtlas/news/IOS/news_bg_num2.unity3d,3fdc6a699415a020e28933e632fd5baa trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a @@ -63,7 +62,7 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelSelectProduct.unity3d,3b0d3f91deb859 trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_me.unity3d,546388655250fedaa50785dd824d30ac trCRM/upgradeRes/priority/ui/panel/IOS/PanelConfirm2.unity3d,ad24a77e6cd58b9d89fd442efdfa05e6 trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,43d2d24799b0e783c0759d0c52f8c5d7 -trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_data.unity3d,d2c0627b468f06867987c41b74c84dce +trCRM/upgradeRes/other/uiAtlas/cust/IOS/time.unity3d,3798702a6f194c1ce9e5e9b15836239f trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 trCRM/upgradeRes/priority/ui/panel/IOS/ToastRoot.unity3d,202053ab489839884b0569f173796cfe trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,39703716cb222091e69ae0eefbf54f5f @@ -74,6 +73,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22b trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a trCRM/upgradeRes/priority/ui/other/IOS/AlertRoot.unity3d,eebc730459217511668036a3271830cb trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelCalender.unity3d,66ce0428f4ca3b7330f4c2aa8b888b80 trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,0fc6aaf236b8ee14c9660ddb68f63b1d trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustDetail.unity3d,855f2d538bba57e326e79fa8e84bb733 trCRM/upgradeRes/priority/ui/panel/IOS/PanelSetting.unity3d,85dba78e346759826ffd9185b0607b5e @@ -85,7 +85,6 @@ trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 trCRM/upgradeRes/other/uiAtlas/cust/IOS/border.unity3d,29a0e90c8c75eaac236a3bf65ee28fd3 trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_work2.unity3d,8579e52d8aa949abce514ec4682d95e5 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,48fffb94cf7ab94e6c0b2e542bf2d08e -trCRM/upgradeRes/other/uiAtlas/work/IOS/work_ranking.unity3d,d6ec636ccfbf0c4525703871069765c5 trCRM/upgradeRes/priority/ui/panel/IOS/PanelNewOrder.unity3d,153148ef6086c94aff5088a8423c39d1 trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 trCRM/upgradeRes/priority/ui/other/IOS/InputMultText.unity3d,73425d8a2b18989fc3bcab94c1252165 @@ -94,10 +93,11 @@ trCRM/upgradeRes/priority/ui/other/IOS/InputPoplist.unity3d,07d0619610a83ca444d1 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 trCRM/upgradeRes/other/uiAtlas/order/IOS/upload.unity3d,595de11108017f12c98da808c51ce0fe trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 +trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 trCRM/upgradeRes/priority/ui/other/IOS/InputCheckboxs.unity3d,c470c4ec6d33a70ddb2395c805189c9b trCRM/upgradeRes/other/uiAtlas/news/IOS/news_2.unity3d,5b2f3543562cb611fd5b986f93b9d450 trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 -trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_task.unity3d,747e55b8f7096ca0aad8270690100afd +trCRM/upgradeRes/other/uiAtlas/public/IOS/radio.unity3d,0c43a7ba6ffa8229a8639635ce0ce238 trCRM/upgradeRes/priority/ui/panel/IOS/PanelNewFollow.unity3d,eaf41d7480e0f36f8beb37aa4442b6e1 trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_4.unity3d,ff6d1ab367bc0bfd8603ac8f246cb66c trCRM/upgradeRes/other/uiAtlas/news/IOS/news_bg_num1.unity3d,244cfbdb8f31592e89902640ce1abeb6 @@ -107,11 +107,10 @@ trCRM/upgradeRes/other/uiAtlas/login/IOS/log_bg.unity3d,f3add14e03472a28d56315b2 trCRM/upgradeRes/other/uiAtlas/cust/IOS/phone.unity3d,917fe8084ceb86ffe99a91119401b398 trCRM/upgradeRes/priority/ui/other/IOS/reportform2.unity3d,a937de39eb62c1955c5e582bc2c5c7e0 trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_check.unity3d,c374b4c94e874e2602d8c2293981c22e -trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_peo.unity3d,9e7f6d7cf29af9e5fb02befb5121ad49 trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_1.unity3d,0ce47cb41a1c039d116f0a1176ffdc82 trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_fingerprint.unity3d,c8c718e4646589cb5c1e9fa92165ae98 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelHotWheel.unity3d,e3508a556e1e6330f6128b4280d5a28f +trCRM/upgradeRes/priority/ui/panel/IOS/PanelHotWheel.unity3d,df8e2af7c56b7911ab45f4d92ef35961 trCRM/upgradeRes/other/uiAtlas/cust/IOS/input.unity3d,cecd60bbaff9e81a94c98a20c5525a14 trCRM/upgradeRes/priority/lua/db/DBCust.lua,f5d617f7342053a0236bb93b9d1a1e46 trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 @@ -129,7 +128,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/IOS/order.unity3d,e30128770395be6e2634c10acd trCRM/upgradeRes/priority/atlas/IOS/atlasAllReal.unity3d,6da826a9b7b5796ef22e3cc0f59c76dc trCRM/upgradeRes/other/uiAtlas/coolape/IOS/input.unity3d,85676a4ff405d2c3bf8bdabd99d40745 trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 -trCRM/upgradeRes/other/uiAtlas/cust/IOS/time.unity3d,3798702a6f194c1ce9e5e9b15836239f +trCRM/upgradeRes/other/uiAtlas/work/IOS/work_ranking.unity3d,d6ec636ccfbf0c4525703871069765c5 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 trCRM/upgradeRes/other/uiAtlas/cust/IOS/write.unity3d,46db82a1fde728812cfa97c68aca4020 trCRM/upgradeRes/other/uiAtlas/order/IOS/add.unity3d,76e45a9f49114ef76b198d59e3f9b124 @@ -138,20 +137,19 @@ trCRM/upgradeRes/priority/ui/other/IOS/Frame1.unity3d,e0760bb76b26b81b295e4a1d55 trCRM/upgradeRes/other/uiAtlas/cust/IOS/full_star.unity3d,1e26fbb1830f8f2b34f5cc3bd279e4ac trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 trCRM/upgradeRes/priority/ui/panel/IOS/PanelStart.unity3d,f86ac64b15f6d871f734ed7ac5a145a7 -trCRM/upgradeRes/other/uiAtlas/coolape/IOS/name.unity3d,36243d44e09cf15a30c136f4e8f7b06e trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,ef981e78f783343271b8c655f358084c trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef -trCRM/upgradeRes/other/uiAtlas/cust/IOS/pause.unity3d,8eff010febb0a0d6365a65fed01cf38d +trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 trCRM/upgradeRes/other/uiAtlas/work/IOS/work_color.unity3d,0f386613e266039c15d6dc1dfa8643bc trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_time.unity3d,79a2d5d9c6d24cc63998911a623d9244 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelPlaySoundRecord.unity3d,60929032f8a97496416cb4c326a44c79 trCRM/upgradeRes/priority/ui/panel/IOS/PanelConfirm.unity3d,f640423f07bd0d7f4dbb5f0a76c5867c trCRM/upgradeRes/other/uiAtlas/guid/IOS/1.unity3d,7f93940e3dc101e21d69ad8a25b43e53 trCRM/upgradeRes/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d,72ba37b4b7b471b2fb423c64f6f8ae1b trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 -trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_opinion.unity3d,a6972381cca3a2e78a7e6ffd2b6f2748 trCRM/upgradeRes/other/uiAtlas/public/IOS/button.unity3d,4a1c28e520ccb1f66e038bfe4e8057ab trCRM/upgradeRes/other/uiAtlas/public/IOS/check.unity3d,615efa024329ca180668ab885cded3c7 trCRM/upgradeRes/other/uiAtlas/work/IOS/work_head_bg.unity3d,4621f18a14df4d78d9f8475b6b561467 @@ -166,7 +164,7 @@ trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_5.unity3d,d19f3e9445ea7caf2ab8 trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa trCRM/upgradeRes/other/uiAtlas/cust/IOS/task.unity3d,aa21e488c5f526e12886cae586f30375 trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_3.unity3d,af4d8fecaed77fb37428cbd9c347f919 -trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 +trCRM/upgradeRes/other/uiAtlas/coolape/IOS/name.unity3d,36243d44e09cf15a30c136f4e8f7b06e trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_notice.unity3d,6ebfcad9d2385d00b275e41b69bf5633 trCRM/upgradeRes/other/uiAtlas/logo/IOS/logo2.unity3d,41c5912127597703a9c1ab2848c89ff6 trCRM/upgradeRes/other/uiAtlas/cust/IOS/record.unity3d,ed6faf19e45aa99e37c622ef92e131dc @@ -183,8 +181,9 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelSceneManager.unity3d,7c9a53dc83974a6 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes/other/uiAtlas/news/IOS/news_4.unity3d,ae0c7c492a9ff216765d0a98f32604db trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 -trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_2.unity3d,09643bb6fdab7301459fa4206afe89ee +trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_remind.unity3d,28b12417bc85c9ba865a36339c5df145 trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_work.unity3d,7fa96651b9f54de569c59611a7d07b6b +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,4bf6daac6cc6e35679ca2bad64b0c18e trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,ea247a154e19eb79e678e12ba8b52e06 trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 @@ -199,16 +198,17 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelModifyFiled.unity3d,915c4c913d69e738 trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e trCRM/upgradeRes/priority/ui/panel/IOS/PanelGuid.unity3d,43ae7eeceb485a4ea356016016238450 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a -trCRM/upgradeRes/other/uiAtlas/public/IOS/radio.unity3d,0c43a7ba6ffa8229a8639635ce0ce238 +trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_task.unity3d,747e55b8f7096ca0aad8270690100afd trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_wait.unity3d,a593ecf733c7c21e1f754328c9601139 trCRM/upgradeRes/other/uiAtlas/cust/IOS/limt.unity3d,e40d61488fa008460f97c9e44b2956c7 trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c trCRM/upgradeRes/other/uiAtlas/mine/IOS/log_bg.unity3d,6e86477cb2815f29ab537aa085b88b85 +trCRM/upgradeRes/other/uiAtlas/cust/IOS/check.unity3d,8617a2ac9187216cfb81f8b712181055 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 trCRM/upgradeRes/other/uiAtlas/news/IOS/news_3.unity3d,267178166037b19856d0a3a481ee810d trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_password.unity3d,614c3d4d72ec9ac573a471868326945f -trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_customer.unity3d,eba6ba58a8149e369e8e02b8cac777c8 +trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_data.unity3d,d2c0627b468f06867987c41b74c84dce trCRM/upgradeRes/other/uiAtlas/cust/IOS/screen.unity3d,ed29a75e7c18989d91862b317f781586 trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_news2.unity3d,534faecceb533b756cb7df4aa8f13d05 @@ -220,7 +220,7 @@ trCRM/upgradeRes/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 trCRM/upgradeRes/other/uiAtlas/cust/IOS/msg.unity3d,62a51311105a27bfca2fc2ac35c9aab8 trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_4.unity3d,d98d7815445c18b51e8c2abcc382f764 trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_unread.unity3d,11f64f47835f9a2dc98f55d5d95d524a -trCRM/upgradeRes/other/uiAtlas/work/IOS/work_icon_2.unity3d,f8983e295d741411b2dbc2cfa1646ce3 +trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_customer.unity3d,eba6ba58a8149e369e8e02b8cac777c8 trCRM/upgradeRes/other/uiAtlas/cust/IOS/important.unity3d,5a0439d61813daf35289712322e7f066 trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214 trCRM/upgradeRes/priority/ui/other/IOS/InputDate.unity3d,9097dbe00f62ab8729e579d48878625f @@ -229,7 +229,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b trCRM/upgradeRes/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 trCRM/upgradeRes/priority/lua/net/CLLNet.lua,df3108c65b288722530f80bb73893062 trCRM/upgradeRes/other/uiAtlas/public/IOS/on_off.unity3d,1bd2636935bdcbcf3d55a69f873c44ad -trCRM/upgradeRes/priority/ui/panel/IOS/PanelCalender.unity3d,66ce0428f4ca3b7330f4c2aa8b888b80 +trCRM/upgradeRes/other/uiAtlas/order/IOS/system.unity3d,f5f16b0b52fb5f0c303a7b202391d491 trCRM/upgradeRes/other/uiAtlas/login/IOS/log_people.unity3d,834fdf5f5868cc4c905e95f8e41dbf20 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc trCRM/upgradeRes/priority/ui/other/IOS/Frame2.unity3d,7dcd1d4f4868681c0e942ef76b8e0ae3 @@ -241,7 +241,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 -trCRM/upgradeRes/other/uiAtlas/cust/IOS/check.unity3d,8617a2ac9187216cfb81f8b712181055 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f trCRM/upgradeRes/other/uiAtlas/logo/IOS/logo.unity3d,1b95b61e7f4824e57f67ef78bfd4e592 trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e8749743983d92 @@ -253,9 +253,9 @@ trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,1cd7b0d9c92e9fce1eb3b99195fe trCRM/upgradeRes/other/uiAtlas/guid/IOS/2.unity3d,2953bdc65ac46367feda300cfecd11bf trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0 -trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 +trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_opinion.unity3d,a6972381cca3a2e78a7e6ffd2b6f2748 trCRM/upgradeRes/other/uiAtlas/cust/IOS/add.unity3d,678ae44b69930eede7020bb574f7ee11 -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e +trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_2.unity3d,09643bb6fdab7301459fa4206afe89ee trCRM/upgradeRes/priority/lua/net/NetProto.lua,b621e94605f1f6e106a80cfcfc39e6ca trCRM/upgradeRes/priority/ui/panel/IOS/PanelPopList.unity3d,9bd875bf8acc96aabae1fd4e4fe7601a trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_me2.unity3d,f7a5b3fdea590751dea5877236e013c8 @@ -268,7 +268,7 @@ trCRM/upgradeRes/other/uiAtlas/order/IOS/ipt_bg.unity3d,b1698fd4a965642b0908672f trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f trCRM/upgradeRes/other/uiAtlas/hotwheel/IOS/loading.unity3d,ae3b70b6c5220e215b73d037edd9a45a trCRM/upgradeRes/other/uiAtlas/coolape/IOS/user.unity3d,5e6e50cd8a40d64ae2c58a2d531676fa -trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 +trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_1.unity3d,f8e9f5aec240b7818a58b7674fd14939 trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 @@ -283,7 +283,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/IOS/suc.unity3d,750f9f149f273d3f2643b3ff6347 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,121935e641c34f4e3f9293381d7ff359 trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,59750609585193c66d08adfa8544d946 trCRM/upgradeRes/priority/ui/panel/IOS/PanelSysMsgList.unity3d,3d0a1fd9c4b5d05b268bb73d3c810127 -trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_remind.unity3d,28b12417bc85c9ba865a36339c5df145 +trCRM/upgradeRes/other/uiAtlas/coolape/IOS/button.unity3d,c8009be975691b21cac9fdc55f343cc3 trCRM/upgradeRes/priority/ui/panel/IOS/PanelWebView.unity3d,18c6bf9e3f56cfe57f6d0dece1b40843 trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a trCRM/upgradeRes/priority/ui/panel/IOS/PanelResetPasswordStep1.unity3d,4fc94b9e78d750a20154ff155cfccbfe diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v index 972a56d..97e8ac5 100644 --- a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v +++ b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v @@ -1 +1 @@ -[{"md5":"7cea40769130dc5038fe89c11a8a93b4", "name":"2020_07_10_22_48_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8d20a2ebc95c3de0326c2268cd0a5b3e", "name":"2020_07_10_23_32_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f4a725f0bda3498aacbbad2c8a62b085", "name":"2020_07_10_23_40_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b30346bad7f0a7817ec446846d9448f7", "name":"2020_07_10_23_42_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9b0766ddc30e9eb0c3fb26346ec2c09d", "name":"2020_07_10_23_46_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"95b27778bfd5966abe00749d5c0cc698", "name":"2020_07_10_23_48_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"82545003cc15d2908472019870d6e65c", "name":"2020_07_11_10_51_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"be70573a2a73960dbf92dbe764f1f7c2", "name":"2020_07_11_11_36_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9a0408961fb319f2aed9b08915565dc4", "name":"2020_07_11_12_31_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1b5c44c805ac41d990e8c011ee43e638", "name":"2020_07_11_12_33_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9e04af0c4ae5b56f18f230fa12231e1e", "name":"2020_07_11_12_36_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6bd2990a8512191575b07055d9d513b6", "name":"2020_07_11_17_12_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01cec030fdadb6d2fbf27f5152419c59", "name":"2020_07_11_17_28_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"75db55deb1c5d18d22d5c2b420b58eb4", "name":"2020_07_11_17_28_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5534a8103096a4e2a7cfcec7ef47ebd7", "name":"2020_07_11_17_31_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4dc638b45b740131d5f22585c40cf387", "name":"2020_07_11_17_41_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"890806f5a75ee8564f6dd5948850f477", "name":"2020_07_11_17_42_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c8d92b485eb8e9655e4c74b16752d5df", "name":"2020_07_11_17_45_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e7dc6aa1b1b266de6491a77105bf41b7", "name":"2020_07_11_17_47_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e26aa371a8288edb400a1467cae3a33a", "name":"2020_07_11_17_49_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c52c364cf1f90096ae4606694e03b6a6", "name":"2020_07_11_18_32_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a99e8d6448735aa77058741ec4bb75aa", "name":"2020_07_11_20_55_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"352d384522981bf1438027ff3dfd2053", "name":"2020_07_11_21_03_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a5bb15a810f464404044cc16e0e56d17", "name":"2020_07_11_21_33_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"266edce5f25b7d9291132019d76fa032", "name":"2020_07_11_21_45_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71dc4e8f51270030d1685387728dfcc2", "name":"2020_07_11_21_46_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a859708964c5c1cfb3ac62d4da5fa162", "name":"2020_07_14_22_08_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3c9361752e3e009a68bc34be39eaa146", "name":"2020_07_15_20_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1262cc1e850deb68ccba6c345074f413", "name":"2020_07_16_07_13_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f1b5547270c3bd91a7b3e1e5c19edd9e", "name":"2020_07_16_08_57_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file +[{"md5":"7cea40769130dc5038fe89c11a8a93b4", "name":"2020_07_10_22_48_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8d20a2ebc95c3de0326c2268cd0a5b3e", "name":"2020_07_10_23_32_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f4a725f0bda3498aacbbad2c8a62b085", "name":"2020_07_10_23_40_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b30346bad7f0a7817ec446846d9448f7", "name":"2020_07_10_23_42_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9b0766ddc30e9eb0c3fb26346ec2c09d", "name":"2020_07_10_23_46_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"95b27778bfd5966abe00749d5c0cc698", "name":"2020_07_10_23_48_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"82545003cc15d2908472019870d6e65c", "name":"2020_07_11_10_51_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"be70573a2a73960dbf92dbe764f1f7c2", "name":"2020_07_11_11_36_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9a0408961fb319f2aed9b08915565dc4", "name":"2020_07_11_12_31_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1b5c44c805ac41d990e8c011ee43e638", "name":"2020_07_11_12_33_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9e04af0c4ae5b56f18f230fa12231e1e", "name":"2020_07_11_12_36_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6bd2990a8512191575b07055d9d513b6", "name":"2020_07_11_17_12_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01cec030fdadb6d2fbf27f5152419c59", "name":"2020_07_11_17_28_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"75db55deb1c5d18d22d5c2b420b58eb4", "name":"2020_07_11_17_28_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5534a8103096a4e2a7cfcec7ef47ebd7", "name":"2020_07_11_17_31_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4dc638b45b740131d5f22585c40cf387", "name":"2020_07_11_17_41_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"890806f5a75ee8564f6dd5948850f477", "name":"2020_07_11_17_42_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c8d92b485eb8e9655e4c74b16752d5df", "name":"2020_07_11_17_45_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e7dc6aa1b1b266de6491a77105bf41b7", "name":"2020_07_11_17_47_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e26aa371a8288edb400a1467cae3a33a", "name":"2020_07_11_17_49_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c52c364cf1f90096ae4606694e03b6a6", "name":"2020_07_11_18_32_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a99e8d6448735aa77058741ec4bb75aa", "name":"2020_07_11_20_55_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"352d384522981bf1438027ff3dfd2053", "name":"2020_07_11_21_03_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a5bb15a810f464404044cc16e0e56d17", "name":"2020_07_11_21_33_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"266edce5f25b7d9291132019d76fa032", "name":"2020_07_11_21_45_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71dc4e8f51270030d1685387728dfcc2", "name":"2020_07_11_21_46_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a859708964c5c1cfb3ac62d4da5fa162", "name":"2020_07_14_22_08_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3c9361752e3e009a68bc34be39eaa146", "name":"2020_07_15_20_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1262cc1e850deb68ccba6c345074f413", "name":"2020_07_16_07_13_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f1b5547270c3bd91a7b3e1e5c19edd9e", "name":"2020_07_16_08_57_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e1fe2b2d5913bd872275080b6dd03bb", "name":"2020_07_16_10_35_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e11b0c19bff384c0e3efe7814c8a2559", "name":"2020_07_16_10_46_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v index ca4ae7b..bca66bf 100644 --- a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v +++ b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v @@ -26,7 +26,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/IOS/hotWheel_prog.unity3d,f71546 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes4Publish/other/uiAtlas/icon/IOS/icon_26_no.unity3d,d39394e00d037c17920ed100a1d4be40 trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/cus_task.unity3d,747e55b8f7096ca0aad8270690100afd -trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,5bbe3b6bf2cfc6515d3ec0da8254f50e +trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,c6ae9613093f7196a7ca542c2a339dbf trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/cus_followup.unity3d,53f6896e2d1d3bbb17bf916c681575ec trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelLogin.unity3d,343bc109372a07e69e03826df97bd0b5 @@ -56,7 +56,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/IOS/news_bg_num2.unity3d,3fdc6a69941 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/IOS/loading.unity3d,ae3b70b6c5220e215b73d037edd9a45a trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9 -trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelHotWheel.unity3d,e3508a556e1e6330f6128b4280d5a28f +trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelHotWheel.unity3d,df8e2af7c56b7911ab45f4d92ef35961 trCRM/upgradeRes4Publish/other/uiAtlas/news/IOS/news_bg.unity3d,64c5142dc2ace4a338bac2b103207f36 trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/work_bg_noshadow.unity3d,c56930cafa0823cbe54854859039cc43 trCRM/upgradeRes4Publish/other/uiAtlas/login/IOS/log_no.unity3d,e167bfde724e7a2c40bec51945931877 diff --git a/Assets/trCRM/Scripts/Main/MyMain.cs b/Assets/trCRM/Scripts/Main/MyMain.cs index 5a80326..bd6ba29 100644 --- a/Assets/trCRM/Scripts/Main/MyMain.cs +++ b/Assets/trCRM/Scripts/Main/MyMain.cs @@ -12,11 +12,11 @@ public class MyMain : CLMainBase public override void Start() { base.Start(); - if (Application.platform == RuntimePlatform.Android) - { - ApplicationChrome.dimmed = dimmed; - ApplicationChrome.statusBarState = statusBarMode; - } + //if (Application.platform == RuntimePlatform.Android) + //{ + // ApplicationChrome.dimmed = dimmed; + // ApplicationChrome.statusBarState = statusBarMode; + //} } public override void init() { diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua index 9037e50..25635a0 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua @@ -36,18 +36,13 @@ CLLMainLua.init = function() ReporterMessageReceiver.self:setLua() end -- 设置显示状态栏 - -- Screen.fullScreen = false - -- AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR) - -- AndroidStatusBar.statusBarState = AndroidStatusBar.States.Visible - -- AndroidStatusBar.dimmed = false - -- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN) - -- CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible - -- CS.ApplicationChrome.dimmed = false - - -- CS.ApplicationChrome.setSoftInputMode(CS.ApplicationChrome.ADJUST_RESIZE); + local success, msg = pcall(CLLMainLua.setAndroidStatusBar) + if not success then + printe(msg) + end --设置帧率 - Application.targetFrameRate = 10 + Application.targetFrameRate = 30 -- QualitySettings.SetQualityLevel(1, false) Time.fixedDeltaTime = 0.5 @@ -67,13 +62,38 @@ CLLMainLua.init = function() -- fps.enabled = false -- end - -- 统计sprite的使用情况 if CLCfgBase.self.isEditMode and CLCfgBase.self.isContBorrowSpriteTimes then UIAtlas.onBorrowSpriteCallback = onBorrowedSpriteCB end end +function CLLMainLua.setAndroidStatusBar() + printe(SystemInfo.deviceName, "====", SystemInfo.deviceModel) + if CLPathCfg.self.platform ~= "Android" then + return + end + local mode = SystemInfo.deviceModel + if string.find(mode, "huawei") then + AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN) + AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR) + else + ApplicationChrome.statusBarState = ApplicationChrome.States.Visible + ApplicationChrome.dimmed = false + end + + -- Screen.fullScreen = false + -- AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR) + -- AndroidStatusBar.statusBarState = AndroidStatusBar.States.Visible + + -- AndroidStatusBar.dimmed = false + -- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN) + + -- CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible + -- CS.ApplicationChrome.dimmed = false + -- CS.ApplicationChrome.setSoftInputMode(CS.ApplicationChrome.ADJUST_RESIZE); +end + -- 当离线调用 function CLLMainLua.onOffline() local ok, result = pcall(procOffLine) @@ -107,7 +127,7 @@ function CLLMainLua.OnApplicationPause(isPause) GC.Collect() else -- 设置帧率 - Application.targetFrameRate = 10 + Application.targetFrameRate = 30 end for k, v in pairs(mApplicationPauseDelegate) do Utl.doCallback(v, isPause) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua index 81e0cc4..8f80dd6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua @@ -125,7 +125,7 @@ function CLLNet.dispatch(map) if (succ ~= NetSuccess) then retInfor.msg = Localization.Get(joinStr("Error_", succ)) - MyUtl.toastE(retInfor.msg) + MyUtl.toastW(retInfor.msg) hideHotWheel() else -- success diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua index 235e886..71d553d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua @@ -65,7 +65,7 @@ local dispatch = function(content, params) printe(joinStr("cmd:[", cmd, "]code:[", code, "]msg:", msg)) -- retInfor.msg = Localization.Get(joinStr("Error_", succ)) if not isNilOrEmpty(msg) then - MyUtl.toastE(msg) + MyUtl.toastW(msg) end hideHotWheel() else @@ -106,7 +106,7 @@ end NetProto.sendGet = function(cmd, map, callback, failedCallback, orgs, _baseUrl) if isNilOrEmpty(NetProto.sign) and (cmd ~= NetProto.cmds.getTokenForAPI) then - MyUtl.toastE("与服务器失去联络，请重试！") + MyUtl.toastW("与服务器失去联络，请重试！") NetProto.init() return end @@ -154,7 +154,7 @@ function NetProto.init(callback) end end, function() - MyUtl.toastE("取得会话ID失败！") + MyUtl.toastW("取得会话ID失败！") Utl.doCallback(callback, false) end ) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua index b73e01f..1bc25b4 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua @@ -103,6 +103,8 @@ B2OutputStream = CS.Coolape.B2OutputStream CLAlert = CS.Coolape.CLAlert ---@type Coolape.AndroidStatusBar AndroidStatusBar = CS.Coolape.AndroidStatusBar +---@type Coolape.ApplicationChrome +ApplicationChrome = CS.ApplicationChrome ---other ---@type MyMain diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua index 1519d63..991202f 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua @@ -4,7 +4,7 @@ KKLogListener = {} function KKLogListener.OnLogError(log) -- 当有异常日志时 if MyUtl then - MyUtl.toastE("有异常日志，请在屏幕画圈查看详细！") + MyUtl.toastW("有异常日志，请在屏幕画圈查看详细！") end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab index d6067a9..aa04b40 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab @@ -61,7 +61,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} mPivot: 4 mWidth: 116 mHeight: 116 @@ -248,14 +248,14 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 ignoreTimeScale: 1 - delay: 0 - duration: 0.5 + delay: 0.5 + duration: 1 steeperCurves: 0 tweenGroup: 0 onFinished: [] eventReceiver: {fileID: 0} callWhenFinished: - from: 0.01 + from: 0.05 to: 1 --- !u!1 &1125343093923812 GameObject: @@ -296,7 +296,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1125343093923812} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} m_Name: @@ -318,7 +318,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} mPivot: 4 mWidth: 400 mHeight: 300 @@ -403,7 +403,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 1, g: 1, b: 1, a: 1} + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} mPivot: 4 mWidth: 286 mHeight: 50 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab index 5fb9982..402e45f 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab @@ -687,7 +687,7 @@ MonoBehaviour: m_EditorClassIdentifier: audioSource: {fileID: 0} mUrl: - mDefaultAudioType: 20 + mDefaultAudioType: 13 myClip: {fileID: 0} isPlaying: 0 --- !u!1 &2195943103738195833 diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua index e6228a765c2f6dc79edc967aff3cebc68ac56979..3884eda59686d00fd5d135d89d31d0648bb41867 100644 GIT binary patch literal 6356 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 WaXCEk^|MZhU7>gauBb8mG_EK9GEfo# literal 6356 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 diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelHotWheel.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelHotWheel.unity3d index 315653d39e3748d27203b0f6861ce882347bdfae..2b6c97c2909cd1f62a46941dda91327f12ecb9d5 100644 GIT binary patch delta 198 zcmX?TvCCqDs;?CT1A`+FM+33590Mc6CPoH^m>dQM>EjH{d<-123=C2XA0!x9oE@EX zlakB~%`8pQ49yKqQ%uZ_6O#;0k}Z>y49v`v43blgHWmp>ly3{ngqBp6tn9i4QI zlhO=KObpD@QWK3WO_Ebm6I0Ag5);iVj13YKQ%#IF770nI^fM^*x-d8hxSru=Wt$_) z6~e;L$RMoWV6VX-$&kX}a`Q%n-Q?v`*Vr2vefU=}FivieHe#BsY2qyj#My>{~>&i9^3=Q@G Dyi_nQ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPlaySoundRecord.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelPlaySoundRecord.unity3d index 99ebeb48a98cf577dfb1a8347ec472822b9ab843..1c085676ea488d556e6569d428fba36755130755 100644 GIT binary patch delta 105 zcmeyJ`X_aQs_!2L1_nnUjs{|9IR-|CO^gf-2Td3lj5-;Z`4~8485pD(K1eXII6FG& znk1zdnHU%w85<=VTAHLL877&TrKA{IrdpVorWz(EZ!B^!;*n=}V&LF0Fy)`Y$vAnh GksSc?Nf;Oa delta 104 zcmey9`a5-ks_$QcOY)VZkEY{8VZ}OS$()BJF6*74$!lmyqH;GvVkJ!<_-K0nHjAnKUCG*EGyE^ zKRH=eVe$hNm&q4d6((O$=bL;<`5jn~fgQcOY)VZkEZ1H54ZM>Nzl)OcoT9-+Y_Jhimd;W`)TY6gW4p<$uULSxFAW;hp?Z z#emTYtY)3?H2%qjtO}F=^YcxYE0LO98Ys4TLY*Q%~Y#UO^kYF#DOLBv@^a-5Bx{`% zWu+2HT*iuXSrr;1$H%m7o0au?jJfaO&9!hBWaJu(gyzFt(qX0ZI#xO>MOtK%F;yf& zCzXtA%|)YQW{>bqEVJ%?*;qLqX89Eu9he92jN-i++V)$RULL@N0&{y{f{UX)gW#7o l*)3iUBh!tZEOhome2ydI^S>50BEnD1Nd$H}Hjnv+`~zT&OL_nR delta 241 zcmW;FKT88K9EWjYE?Nspu@%%}TUt28HgK2RFUCn{H*qb({mH$8ZcfgE%XgPjMFa=M zya4S~1zp^I8xBrZ#|Iwx%to`(W6T*L6$4BM(u3c#4rQ6snaN6(m${*s3hnZ!NUfrz zq{!ho*v8>n&0mPOReY{XoO1F{ja%Mvnj)JL85cXFbyS*I*(^~uDkxR9#JCdrtBtSa zKa;gE+^Txst8tcKD*E_V5|c{XUxq6SY=3@)IBV?Tyf6Lh&O1jv9L}SKgUu?Q>%uqX kgTP53ab&gc>7M}UZWrUWz)N!xcU{HgKl5Rh{I$Jdza@7}-T(jq diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 816455b0df6f13426d58bd5bedd9bdce2404a3ba..1df90db954dd3406d198e6b832e9464391c0d0fe 100644 GIT binary patch literal 6405 zcmeHM-%r~x5Ps*cFc0hrP*VzMeJh{>QcJsrADgBLx$(7lbK=Z)pk>ZV5xM zO{1uNft)Yb^LO|8&ex4kt!{^S+uqv7dFz<0C+oz}aWjdyneMRdK!%(3n&&mwwzjs? z)y6(~=dFE6s6YiDjN#E(H`fRWuY1F<5SSCrpe-m0Ne#ss6i3~AV3(jYmr;}KX4;2| zQV^NkQj>U@w8HRKm5n-T6B5x7ngk6`Nk`sgqL@!Wboltj9Lgjz)(LduhBA4V`&2v* zKueLB%&FAZLf%(0-AN`--74gVR0os+T5+XETpJn%=!lo@tWZ7!s``RP&>M|3pd&lZ zVs5GK#|R_(xV>XPjfXmoT<6Cm)vN7gpZ!fTO&{x<* z+YKx+*=;_r$Zn6`1+qWn?6R`G3yddWb^<-9?rtHT9nx8`|J&95O%vYY_}Z)cewG9) z!dDW0@6D9=6YNo|>7KVjMKkX{x^#C>g{PZ&*UGG!Z@kj_Zud6d%s;!n{~_J&>yJ0{ zxsShX=B%-hEm*(=Fj-+j=MFKcYL# zte60H5*))@Fi literal 5100 zcmeI0ON(XK_K^jWS$5a~Ru4*Qr)zc_d%DN&p50ka zqbE!>@!|nZd>r(EH;gec9yoY0fuk1^HO6=&h+Mq6{{P+8GtZ`B* z^>tNkcZ;lhUS#7n5xHCBE?h+R?C#&cb8u(>-fF-6y|}oT%K`3U%i`keH(tHD@2d;n zk8i#)u`7S^n?s-*dPP>T8EKzL3tbkYN=qb%zb|^FbulNcK0vyPb54GSEk`8pL1v=; zkFej4GX20ctjK$E{U|Y$vyWUN?~VLyMIW+6M-TV_>Sv7oYLsI?eR2f0!>H2Fnl@jR z^1l{5SD^pZDgW!pqr6&hynahW}#teHs3%;hWk#j>B(;-yiYLylxu4Im5Z2IPR7V-+7?R6Nhg7FSU8RAJ-#BeP9QXspoh@Id-^E z)?sM7GlA4jk2HK=yP;_S$eN_<;;NdKy4}=H(Vm$NN4$m`N-(P|Z$2>BNga4jBeXr& zfRgW>(UmSRqJoODbkbqe4npNtv@t)Xm0xm{t0$_}KquZ!pFQO|W?(E08;n^~7UZmH zsj1+NanI5+?P%AU($pGAsGDKK*U4m+YX@HFdv&{VB5nypxuHGe*eXDLB=D+XN%^5& zaVQqGQ+h^+Dw>L~l@r=EJ*lfsJUh&D8g|pR<4k+Xw}LTM(IW_$uS#BEN4@6C3vMNj zn&Vl+7)WZWY1bOH;>2iC&uK@35Uy(&f84IuR6Q6%=;jcdEVis6$BErTT&8tg*F1k= zxM4x>Esc|iiT1T0l(awQ^N!xqT{R;yliF&SJC_|mHOFj6ADx)gZ#Hy*=+;f7Ce=bk z1)&*R1(@*3y5lM91fo@TY~1KBINYdKwO_W+rYM93SQS{Aal82KMOCg~4ZAaAScBGR z=_q0xdcNpp#c5dDI-z{b7|SQDdVY;79Ile;sIIDp(_ZX6vAB;q>00z)(y6bMRwA$x zft3iXL|`QX|F;P6otf{)eCIu-{e^tdo9~_j|L?{B`|3k@XfJ$u;liPJ&Ye4W<#O@R zAJ?xRqHV{fyQj#9=g&v&#=)rIIT^p`<%7?gEc0D8_TPFLMLY?MWF&O?|8!XmkzYE< zq$`&%FROuLFQtL;7}u8FsHNxDndiUji02fGVR>L+Ae!G&u_&N@DIJW_5j>N!jX4>g zWs&@_EO9?*6SpUE1;`<>i^MTrN&^}DW$y>Sc|_}iLQv-Yp&fH)tapcH87-UxQ@c-F z%cW)GA?QT=tQM}-lTPR>T$A;a=!nPJH1gkdNCEDWV5Qb51uUh5-+TD&XvnpE&$c2P zYAZJIJdP{N{5EsUcJXX#dHM3Z9ad%|&iIwegHf4&%6O--l;gQN?#I4UdipTlm!nwo u+su>=C-XtRj7M0VAF9`b*p?bznf96!=*)gxw{~eZ@