diff --git a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/NGUITools.cs b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/NGUITools.cs index 166d7ed..726b250 100644 --- a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/NGUITools.cs +++ b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/NGUITools.cs @@ -1768,6 +1768,7 @@ static public class NGUITools } } + /* public static bool isIphonex() { #if UNITY_IOS #if UNITY_2017_1_OR_NEWER @@ -1791,42 +1792,46 @@ static public class NGUITools #endif return false; } + */ + //static bool _isFringe = false; + //public static bool isFringe { // 刘海屏 + // get { + // return _isFringe || isIphonex (); + // } + // set { + // _isFringe = value; + // } + //} - static bool _isFringe = false; - public static bool isFringe { // 刘海屏 - get { - return _isFringe || isIphonex (); - } - set { - _isFringe = value; - } - } - - static float _rateFringe = 1; - public static float rateFringe { - get { - if (isFringe) { - return 734f / 812f; - } else { - return _rateFringe; - } - } - set { - _rateFringe = value; - } - } + //static float _rateFringe = 1; + //public static float rateFringe { + // get { + // if (isFringe) { + // return 734f / 812f; + // } else { + // return _rateFringe; + // } + // } + // set { + // _rateFringe = value; + // } + //} public static Vector4 _offsetRect; + static bool initOffsetRect = false; public static Vector4 offsetRect { get { - if (_offsetRect == null) - { + if (!initOffsetRect) + { + initOffsetRect = true; + Debug.LogWarning("Screen.safeArea)========"+Screen.safeArea); + Debug.LogWarning(Screen.width+","+ Screen.height); float left = Screen.safeArea.x; float right = Screen.width - Screen.safeArea.width - left; - float top = Screen.safeArea.y; - float bottom = Screen.height - Screen.safeArea.height - top; + float bottom = Screen.safeArea.y; + float top = Screen.height - Screen.safeArea.height - bottom; _offsetRect = new Vector4(left/Screen.width, top / Screen.height, right / Screen.width, bottom / Screen.height); } diff --git a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/UIWidget.cs b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/UIWidget.cs index b1da928..cae1bf8 100644 --- a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/UIWidget.cs +++ b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Internal/UIWidget.cs @@ -1126,6 +1126,7 @@ public class UIWidget : UIRect float leftOffset = offsetRect.x; float rightOffset = offsetRect.z; float topOffset = offsetRect.y; + float bottomOffset = offsetRect.w; UIPanel panel = null; #endregion @@ -1142,6 +1143,7 @@ public class UIWidget : UIRect leftOffset *= panel.width; rightOffset *= panel.width; topOffset *= panel.height; + bottomOffset *= panel.height; } else { leftOffset = 0; @@ -1154,7 +1156,13 @@ public class UIWidget : UIRect { lt = NGUIMath.Lerp(sides[0].x, sides[2].x, leftAnchor.relative) + leftAnchor.absolute + leftOffset; rt = NGUIMath.Lerp(sides[0].x, sides[2].x, rightAnchor.relative) + rightAnchor.absolute - rightOffset; - bt = NGUIMath.Lerp(sides[3].y, sides[1].y, bottomAnchor.relative) + bottomAnchor.absolute - topOffset; + if(bottomAnchor.absolute < 0) + { + bt = NGUIMath.Lerp(sides[3].y, sides[1].y, bottomAnchor.relative) + bottomAnchor.absolute - topOffset; + } else + { + bt = NGUIMath.Lerp(sides[3].y, sides[1].y, bottomAnchor.relative) + bottomAnchor.absolute + bottomOffset; + } tt = NGUIMath.Lerp(sides[3].y, sides[1].y, topAnchor.relative) + topAnchor.absolute - topOffset; mIsInFront = true; } @@ -1164,7 +1172,7 @@ public class UIWidget : UIRect Vector3 lp = GetLocalPos(leftAnchor, parent); lt = lp.x + leftAnchor.absolute + leftOffset; bt = lp.y + bottomAnchor.absolute - topOffset; - rt = lp.x + rightAnchor.absolute - rightOffset; + rt = lp.x + rightAnchor.absolute + rightOffset; tt = lp.y + topAnchor.absolute - topOffset; mIsInFront = (!hideIfOffScreen || lp.z >= 0f); } @@ -1243,6 +1251,7 @@ public class UIWidget : UIRect leftOffset *= panel.width; rightOffset *= panel.width; topOffset *= panel.height; + bottomOffset *= panel.height; } else { @@ -1254,11 +1263,11 @@ public class UIWidget : UIRect if (sides != null) { - bt = NGUIMath.Lerp(sides[3].y, sides[1].y, bottomAnchor.relative) + bottomAnchor.absolute - topOffset; + bt = NGUIMath.Lerp(sides[3].y, sides[1].y, bottomAnchor.relative) + bottomAnchor.absolute + bottomOffset; } else { - bt = GetLocalPos(bottomAnchor, parent).y + bottomAnchor.absolute - topOffset; + bt = GetLocalPos(bottomAnchor, parent).y + bottomAnchor.absolute + bottomOffset; } } else bt = pos.y - pvt.y * mHeight; diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v index 90f639e..bb37868 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -274,12 +274,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,132389094810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132389157760000000 /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,132388695560000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua,132389117080000000 /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 @@ -354,7 +354,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLVerManager.lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua,132300176910000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132388693580000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132389116860000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132389091550000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua.meta,132289221090000000 @@ -513,17 +513,17 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab.meta,132364353170000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab,132388402700000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132388441590000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132389157770000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab.meta,132372971640000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132388402890000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132388402790000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab.meta,132367521230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132388402680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132389154530000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab.meta,132372671680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab,132388402770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab,132389156040000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta,132370155540000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132388402840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132389154560000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab.meta,132370116810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab,132388441590000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab.meta,132369515950000000 @@ -533,7 +533,7 @@ /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,132388653080000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab.meta,132355322410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab,132388402780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab,132389154550000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab.meta,132289211980000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMask4Panel.prefab,132388402790000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMask4Panel.prefab.meta,132289129800000000 @@ -541,7 +541,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab.meta,132290983200000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab,132388402750000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab.meta,132375465810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab,132388402710000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab,132389154540000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab.meta,132373063990000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab,132388402890000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab.meta,132300379190000000 diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v index f7109e3..ebdef5b 100644 Binary files a/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v and b/Assets/CoolapeFrameData/verControl/IOS/ver4DevelopeMd5.v differ diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v b/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v index 5501e46..2793970 100644 --- a/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v +++ b/Assets/CoolapeFrameData/verControl/IOS/ver4Publish.v @@ -123,7 +123,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/work_icon_5.unity3d,d19f3e9445ea trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/work_ranking.unity3d,d6ec636ccfbf0c4525703871069765c5 trCRM/upgradeRes4Publish/priority/atlas/IOS/atlasAllReal.unity3d,5318be1a09feeb3aa3ccb1e7fb86dbd2 trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f -trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,71dd99dc998927bca633feb259d164a8 +trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,09859475ed7cb2fbcee9098c758656a4 trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes4Publish/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f @@ -155,7 +155,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa55337 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 -trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,d9a3b772a44fc11d3407de3194f06d51 +trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,96b4f88eea21e061eff2e3f76fbb623b trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,ce4513130e34ef66da98f9c3b1ec8299 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v b/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v index 8471047..581e1d3 100644 --- a/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v +++ b/Assets/CoolapeFrameData/verControl/IOS/ver4Upgrade.v @@ -6,7 +6,6 @@ trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6 trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_set2.unity3d,bca882d59188e7765fb55f9cf11f477e trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_remind.unity3d,671a3df29d39a9d6caf53bc9eaa8dde2 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelMine.unity3d,df795a0e3ea6e916db2a444c10717689 trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_3.unity3d,d095dbcdbab9d44c6aa63fa92e5f984b trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes/priority/ui/panel/IOS/PanelBackplate.unity3d,1ce1dbfaa8ab9959965e6e0a70a2feed @@ -15,7 +14,6 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelWWWProgress.unity3d,86786bd679b15924 trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_enterprise.unity3d,a8b0984f1a0b1b8dd9ceb487cc7d1884 trCRM/upgradeRes/other/uiAtlas/cust/IOS/follow.unity3d,6ec5096b527145f85d42630f1a59f2c2 trCRM/upgradeRes/other/uiAtlas/cust/IOS/funnel.unity3d,9eabb57135190dc338da14a450b63e72 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelModifyFiled.unity3d,915c4c913d69e73854874ee4de86d293 trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_order.unity3d,4761f197ec41cf9d98ad4be47bed3d1a trCRM/upgradeRes/other/uiAtlas/public/IOS/radio_full.unity3d,cc41b26969b05580412381ffcf7019cd trCRM/upgradeRes/other/uiAtlas/cust/IOS/get.unity3d,e15371fcae70c8c9ea93baab3f7cf286 @@ -23,17 +21,16 @@ 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/cust/IOS/cus_task.unity3d,747e55b8f7096ca0aad8270690100afd -trCRM/upgradeRes/priority/lua/CLLMainLua.lua,71dd99dc998927bca633feb259d164a8 +trCRM/upgradeRes/priority/lua/CLLMainLua.lua,09859475ed7cb2fbcee9098c758656a4 trCRM/upgradeRes/other/uiAtlas/cust/IOS/cus_followup.unity3d,53f6896e2d1d3bbb17bf916c681575ec trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 -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,ee83701c37a6f2fc91691546a2e4fbe7 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 trCRM/upgradeRes/other/uiAtlas/cust/IOS/position.unity3d,9bc2ac8854be9c3f6694f99d0f4bf1c1 trCRM/upgradeRes/priority/ui/panel/IOS/PanelLogin.unity3d,46bb818a908357037e63bede9cd2369d trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_bg_20.unity3d,0bea7b4023f2d6ab3e3ee160affec665 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelSetting.unity3d,295541b5f67a10ec7f81ec04acc3f4b4 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelResetPasswordStep3.unity3d,7f5131c43a7d8a6db9a15b2d928606e3 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0aecd09184717a8e03 trCRM/upgradeRes/other/uiAtlas/hotwheel/IOS/hotWheel_bg.unity3d,1842a9eb299cbf9d9e37bef4e7ced573 trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 @@ -41,6 +38,7 @@ trCRM/upgradeRes/other/uiAtlas/work/IOS/380bg.unity3d,2d66070d4c85a3d0d9b06bb682 trCRM/upgradeRes/other/uiAtlas/public/IOS/on_off_bg.unity3d,7a6e9b072b57dc847ede7eb1c679ee62 trCRM/upgradeRes/other/uiAtlas/coolape/IOS/logo.unity3d,a23619eae53064c611eeb49ba6ad21f6 trCRM/upgradeRes/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelSceneManager.unity3d,7c9a53dc83974a6cab329f0987511428 trCRM/upgradeRes/other/uiAtlas/cust/IOS/play2.unity3d,41dc3f7483b566a92f22718cc1363f12 trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 trCRM/upgradeRes/other/uiAtlas/login/IOS/log_visible.unity3d,af743a8a46a78caa3aab15ecb2d4f73d @@ -59,21 +57,20 @@ trCRM/upgradeRes/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f trCRM/upgradeRes/other/uiAtlas/public/IOS/button.unity3d,4a1c28e520ccb1f66e038bfe4e8057ab trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_me.unity3d,546388655250fedaa50785dd824d30ac trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b -trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_data.unity3d,d2c0627b468f06867987c41b74c84dce 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,63cc509261ff856e2833689b5c5391a0 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelResetPasswordStep3.unity3d,7f5131c43a7d8a6db9a15b2d928606e3 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelMine.unity3d,df795a0e3ea6e916db2a444c10717689 trCRM/upgradeRes/other/uiAtlas/login/IOS/log_password.unity3d,1dd1c1396c668d0a4dad1228ca0ec903 trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,3038704955b89cc61befb0fee37b14f3 -trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d 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/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustDetail.unity3d,7f72e43812c1b7c185141040f2266ba0 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustDetail.unity3d,67e4b4ddae25e50143bd09a1240a84e0 trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustListProc.unity3d,2a3ba4ea9a10c535f8918d67ee1d5a18 +trCRM/upgradeRes/other/uiAtlas/mine/IOS/log_bg.unity3d,6e86477cb2815f29ab537aa085b88b85 trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes/priority/ui/panel/IOS/PanelSplash.unity3d,f4061c91989b8832489c51d417e0baaf trCRM/upgradeRes/other/uiAtlas/cust/IOS/border.unity3d,29a0e90c8c75eaac236a3bf65ee28fd3 @@ -97,6 +94,7 @@ trCRM/upgradeRes/other/uiAtlas/news/IOS/news_2.unity3d,5b2f3543562cb611fd5b986f9 trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 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 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,62aff784a70e4a1bd0faa472176a0978 trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526 @@ -169,21 +167,23 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelMask4Panel.unity3d,6df5d4b74cb3e1858 trCRM/upgradeRes/other/uiAtlas/login/IOS/log_people.unity3d,834fdf5f5868cc4c905e95f8e41dbf20 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelSceneManager.unity3d,7c9a53dc83974a6cab329f0987511428 +trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_data.unity3d,d2c0627b468f06867987c41b74c84dce 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/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964 trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_work.unity3d,7fa96651b9f54de569c59611a7d07b6b +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,f90028f3e667f9e4df2a7f4aefefa701 trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes/priority/ui/other/IOS/reportform3.unity3d,bb0e87df12d6bcfa2339ec754bc17a06 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelMain.unity3d,bdf837ee04a698e2fcf129a95a9d1f2e +trCRM/upgradeRes/priority/ui/panel/IOS/PanelMain.unity3d,377a830527364388350bf0cb99031caf trCRM/upgradeRes/other/uiAtlas/icon/IOS/company_1.unity3d,3ff3b66fd2476d8245f07daeda300ab2 trCRM/upgradeRes/other/uiAtlas/cust/IOS/star.unity3d,3bcf43f59ae8c6b2920fbdfd3a5a3252 trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_news.unity3d,ccfb2fcc6908aaa0643bff4ccdb8fd1a trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf -trCRM/upgradeRes/other/uiAtlas/news/IOS/news_bg_num1.unity3d,244cfbdb8f31592e89902640ce1abeb6 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelModifyFiled.unity3d,915c4c913d69e73854874ee4de86d293 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 @@ -191,7 +191,7 @@ trCRM/upgradeRes/other/uiAtlas/news/IOS/new2_wait.unity3d,a593ecf733c7c21e1f7543 trCRM/upgradeRes/other/uiAtlas/cust/IOS/limt.unity3d,e40d61488fa008460f97c9e44b2956c7 trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,e1fb7ee5d50bd0ffc6561f5a4ec8426f trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c -trCRM/upgradeRes/other/uiAtlas/mine/IOS/log_bg.unity3d,6e86477cb2815f29ab537aa085b88b85 +trCRM/upgradeRes/other/uiAtlas/coolape/IOS/button.unity3d,c8009be975691b21cac9fdc55f343cc3 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_password.unity3d,614c3d4d72ec9ac573a471868326945f @@ -202,7 +202,7 @@ trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_news2.unity3d,534faecceb533b756cb7d trCRM/upgradeRes/priority/ui/panel/IOS/PanelSelectCompany.unity3d,051cc54004950403d20187f4daeb76fe trCRM/upgradeRes/other/uiAtlas/cust/IOS/search.unity3d,e47e0f93cf36d5b583ed74dd599e6036 trCRM/upgradeRes/other/uiAtlas/mine/IOS/me_set.unity3d,855ee24944fb29abc087341b9ce9d117 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustFilter.unity3d,f8ed6b398ab53ebe1bd35750a116eb58 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustFilter.unity3d,e6118a3302b74df64f4e27a2aa78c212 trCRM/upgradeRes/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 trCRM/upgradeRes/other/uiAtlas/cust/IOS/msg.unity3d,62a51311105a27bfca2fc2ac35c9aab8 trCRM/upgradeRes/priority/ui/panel/IOS/PanelPlaySoundRecord.unity3d,55768dcfcc17809be4ba65884167366b @@ -216,11 +216,11 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470 trCRM/upgradeRes/other/uiAtlas/cust/IOS/record.unity3d,ed6faf19e45aa99e37c622ef92e131dc trCRM/upgradeRes/other/uiAtlas/work/IOS/work_bg.unity3d,b014274b898e403aa52277f9a5978776 trCRM/upgradeRes/other/uiAtlas/mine/IOS/myset_clean_up.unity3d,7350d7ed4886070c5c0b79f3dcd5fe26 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelCalender.unity3d,2b45d569d212c3431f2351e10d1cc07e +trCRM/upgradeRes/priority/ui/panel/IOS/PanelCalender.unity3d,ae588e0ca94f343ae70549f0e1f4b7e6 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5 trCRM/upgradeRes/priority/ui/other/IOS/Frame2.unity3d,7dcd1d4f4868681c0e942ef76b8e0ae3 trCRM/upgradeRes/other/uiAtlas/cust/IOS/peo.unity3d,0d912c6c28bf962b0e1f28ac4f76d2ba -trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,d9a3b772a44fc11d3407de3194f06d51 +trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,96b4f88eea21e061eff2e3f76fbb623b trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e trCRM/upgradeRes/other/uiAtlas/public/IOS/company_bg.unity3d,6d7720ce23e31c17a508386fe837ab12 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 @@ -235,12 +235,12 @@ trCRM/upgradeRes/other/uiAtlas/coolape/IOS/password.unity3d,584af77561cb1dfe6aca trCRM/upgradeRes/priority/ui/other/IOS/InputText.unity3d,9594db6593af82ab5eb5cb4b87984bb5 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f trCRM/upgradeRes/priority/ui/panel/IOS/PanelTasks.unity3d,f4519bf810eaaae4b4addf5092426953 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,f90028f3e667f9e4df2a7f4aefefa701 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelSetting.unity3d,295541b5f67a10ec7f81ec04acc3f4b4 trCRM/upgradeRes/other/uiAtlas/guid/IOS/2.unity3d,2953bdc65ac46367feda300cfecd11bf trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 trCRM/upgradeRes/other/uiAtlas/cust/IOS/add.unity3d,678ae44b69930eede7020bb574f7ee11 -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 +trCRM/upgradeRes/other/uiAtlas/public/IOS/tips_2.unity3d,09643bb6fdab7301459fa4206afe89ee trCRM/upgradeRes/priority/lua/net/NetProto.lua,2b1dafe00efd5be052d2cdd3dcabef71 trCRM/upgradeRes/priority/ui/panel/IOS/PanelPopList.unity3d,9bd875bf8acc96aabae1fd4e4fe7601a trCRM/upgradeRes/other/uiAtlas/main/IOS/icon_me2.unity3d,f7a5b3fdea590751dea5877236e013c8 @@ -259,8 +259,8 @@ trCRM/upgradeRes/priority/ui/panel/IOS/PanelNewCust.unity3d,da583f7f3ae74b735739 trCRM/upgradeRes/priority/ui/panel/IOS/PanelSysMsgDetail.unity3d,b72c64d0d79d3f270f3df3620ef758ac trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 trCRM/upgradeRes/other/uiAtlas/guid/IOS/3.unity3d,c811075966bb6d036edcc94bb84302af -trCRM/upgradeRes/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d,a99601792bb8cd2016be48e1f2d36010 -trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustList.unity3d,ffbc461fe8fd19d6b822d00b1fbafaa7 +trCRM/upgradeRes/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d,72ba37b4b7b471b2fb423c64f6f8ae1b +trCRM/upgradeRes/priority/ui/panel/IOS/PanelCustList.unity3d,7800305b7518f71a79db26d4a74244a7 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 trCRM/upgradeRes/other/uiAtlas/cust/IOS/suc.unity3d,750f9f149f273d3f2643b3ff634705e4 trCRM/upgradeRes/other/uiAtlas/cust/IOS/bg.unity3d,bd8a8bbae53c33e67e357862b7e6228a diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeList.v index 7bdc5d6..1b17a09 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":""}] \ 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":""}] \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v index abcd34c..33eec3a 100644 --- a/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v +++ b/Assets/CoolapeFrameData/verControl/IOS/ver4UpgradeMd5.v @@ -24,7 +24,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,71dd99dc998927bca633feb259d164a8 +trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,09859475ed7cb2fbcee9098c758656a4 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/PanelPlaySoundRecord.unity3d,55768dcfcc17809be4ba65884167366b @@ -79,7 +79,7 @@ trCRM/upgradeRes4Publish/priority/ui/other/IOS/AlertRoot.unity3d,eebc73045921751 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,ce4513130e34ef66da98f9c3b1ec8299 -trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d,7f72e43812c1b7c185141040f2266ba0 +trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d,67e4b4ddae25e50143bd09a1240a84e0 trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSetting.unity3d,295541b5f67a10ec7f81ec04acc3f4b4 trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustListProc.unity3d,2a3ba4ea9a10c535f8918d67ee1d5a18 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 @@ -183,8 +183,8 @@ trCRM/upgradeRes4Publish/other/uiAtlas/public/IOS/tips_2.unity3d,09643bb6fdab730 trCRM/upgradeRes4Publish/other/uiAtlas/main/IOS/icon_work.unity3d,7fa96651b9f54de569c59611a7d07b6b trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes4Publish/priority/ui/other/IOS/reportform3.unity3d,bb0e87df12d6bcfa2339ec754bc17a06 -trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMain.unity3d,bdf837ee04a698e2fcf129a95a9d1f2e -trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d,a99601792bb8cd2016be48e1f2d36010 +trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMain.unity3d,377a830527364388350bf0cb99031caf +trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d,72ba37b4b7b471b2fb423c64f6f8ae1b trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/star.unity3d,3bcf43f59ae8c6b2920fbdfd3a5a3252 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes4Publish/other/uiAtlas/main/IOS/icon_news.unity3d,ccfb2fcc6908aaa0643bff4ccdb8fd1a @@ -207,7 +207,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/IOS/icon_news2.unity3d,534faecceb533 trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelSelectCompany.unity3d,051cc54004950403d20187f4daeb76fe trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/search.unity3d,e47e0f93cf36d5b583ed74dd599e6036 trCRM/upgradeRes4Publish/other/uiAtlas/mine/IOS/me_set.unity3d,855ee24944fb29abc087341b9ce9d117 -trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d,f8ed6b398ab53ebe1bd35750a116eb58 +trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d,e6118a3302b74df64f4e27a2aa78c212 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/msg.unity3d,62a51311105a27bfca2fc2ac35c9aab8 trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/work_icon_4.unity3d,d98d7815445c18b51e8c2abcc382f764 @@ -221,11 +221,11 @@ trCRM/upgradeRes4Publish/priority/ui/other/IOS/reportform1.unity3d,ec74ff1d9c24b trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/record.unity3d,ed6faf19e45aa99e37c622ef92e131dc trCRM/upgradeRes4Publish/other/uiAtlas/work/IOS/work_bg.unity3d,b014274b898e403aa52277f9a5978776 -trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d,2b45d569d212c3431f2351e10d1cc07e +trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d,ae588e0ca94f343ae70549f0e1f4b7e6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5 trCRM/upgradeRes4Publish/priority/ui/other/IOS/Frame2.unity3d,7dcd1d4f4868681c0e942ef76b8e0ae3 trCRM/upgradeRes4Publish/other/uiAtlas/cust/IOS/peo.unity3d,0d912c6c28bf962b0e1f28ac4f76d2ba -trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,d9a3b772a44fc11d3407de3194f06d51 +trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,96b4f88eea21e061eff2e3f76fbb623b trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e trCRM/upgradeRes4Publish/other/uiAtlas/public/IOS/company_bg.unity3d,6d7720ce23e31c17a508386fe837ab12 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526 @@ -255,7 +255,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustList.unity3d,ffbc461fe8fd19d6b822d00b1fbafaa7 +trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustList.unity3d,7800305b7518f71a79db26d4a74244a7 trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewCust.unity3d,da583f7f3ae74b735739055610dc0b98 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua index 79695fa..04931d6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua @@ -172,7 +172,6 @@ function CLLMainLua.begain() if not success then printe(msg) end - pcall(fitIphoneX) -- 处理开始 if (CLCfgBase.self.isEditMode) then diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua index 9dcadaa..ac124cd 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua @@ -593,20 +593,6 @@ function dump(obj) return dumpObj(obj, 0) end -function fitIphoneX() - local mode = SystemInfo.deviceModel - printw(mode) - if - string.find(mode, "iPhone10,3") or - string.find(mode, "iPhone10,6") or - string.find(mode, "iPhone11,3") or - string.find(mode, "iPhone11,6") or -- XS Max - string.find(mode, "iPhone11,8") or - string.find(mode, "iPhone12,1") - then -- xr - NGUITools.isFringe = true - end -end --******************************************************************* --******************************************************************* local borrowedSpList = {} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab index e190bdf..ac18fd0 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab @@ -956,7 +956,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 142 + mWidth: 158 mHeight: 46 mDepth: 1 autoResizeBoxCollider: 0 @@ -1197,7 +1197,7 @@ MonoBehaviour: topType: 1 atlasName: EmptyAtlas mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} - mSpriteName: public__empty + mSpriteName: news_news_bg mFillCenter: 1 isGrayMode: 0 --- !u!65 &6528574 @@ -1982,7 +1982,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 - mWidth: 46 + mWidth: 54 mHeight: 46 mDepth: 2 autoResizeBoxCollider: 0 @@ -2471,7 +2471,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 - mWidth: 46 + mWidth: 54 mHeight: 46 mDepth: 2 autoResizeBoxCollider: 0 @@ -2571,7 +2571,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 94 + mWidth: 102 mHeight: 46 mDepth: 1 autoResizeBoxCollider: 0 @@ -2671,7 +2671,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 - mWidth: 46 + mWidth: 54 mHeight: 46 mDepth: 2 autoResizeBoxCollider: 0 @@ -2874,7 +2874,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 5 - mWidth: 24 + mWidth: 12 mHeight: 46 mDepth: 2 autoResizeBoxCollider: 0 @@ -3154,7 +3154,7 @@ MonoBehaviour: atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} fontName: bitmapFont: {fileID: 0} - trueTypeFont: {fileID: 12800000, guid: e46a19587e058460294915bcf5f17a2d, type: 3} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} fontSize: 46 fontStyle: 0 backgroundSprite: icon2_xl @@ -3394,7 +3394,7 @@ MonoBehaviour: anchorOffset: 0 softBorderPadding: 1 renderQueue: 0 - startingRenderQueue: 3007 + startingRenderQueue: 3008 mClipTexture: {fileID: 0} mAlpha: 1 mClipping: 3 @@ -3508,7 +3508,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -3608,7 +3608,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 248 + mWidth: 256 mHeight: 46 mDepth: 9 autoResizeBoxCollider: 0 @@ -3865,7 +3865,7 @@ MonoBehaviour: atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} fontName: bitmapFont: {fileID: 0} - trueTypeFont: {fileID: 12800000, guid: e46a19587e058460294915bcf5f17a2d, type: 3} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} fontSize: 46 fontStyle: 0 backgroundSprite: icon2_xl @@ -4153,7 +4153,7 @@ MonoBehaviour: atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} fontName: bitmapFont: {fileID: 0} - trueTypeFont: {fileID: 12800000, guid: e46a19587e058460294915bcf5f17a2d, type: 3} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} fontSize: 46 fontStyle: 0 backgroundSprite: icon2_xl @@ -4785,7 +4785,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 5 - mWidth: 24 + mWidth: 12 mHeight: 46 mDepth: 2 autoResizeBoxCollider: 0 @@ -5066,7 +5066,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 5 - mWidth: 24 + mWidth: 14 mHeight: 46 mDepth: 2 autoResizeBoxCollider: 0 @@ -5388,7 +5388,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -6025,7 +6025,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -6830,7 +6830,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -6930,7 +6930,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -7114,7 +7114,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -8042,7 +8042,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -8679,7 +8679,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -8779,7 +8779,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9254,7 +9254,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9354,7 +9354,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9454,7 +9454,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9554,7 +9554,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9654,7 +9654,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9754,7 +9754,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9854,7 +9854,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -9954,7 +9954,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -10636,7 +10636,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -10736,7 +10736,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -10920,7 +10920,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -11227,7 +11227,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -11780,7 +11780,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -12294,7 +12294,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -12394,7 +12394,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -12824,7 +12824,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -13008,7 +13008,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -13108,7 +13108,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -13376,7 +13376,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -13560,7 +13560,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -13660,7 +13660,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -14051,7 +14051,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -14274,7 +14274,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -14374,7 +14374,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -14659,7 +14659,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -15005,7 +15005,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -15105,7 +15105,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -15748,7 +15748,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -15971,7 +15971,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -16239,7 +16239,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -17755,7 +17755,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -17939,7 +17939,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -18039,7 +18039,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -18139,7 +18139,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -19778,7 +19778,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -19878,7 +19878,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -19978,7 +19978,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -20078,7 +20078,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -20469,7 +20469,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -20653,7 +20653,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -20817,7 +20817,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -20917,7 +20917,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -21185,7 +21185,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -21285,7 +21285,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -21967,7 +21967,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -22190,7 +22190,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -22659,7 +22659,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -23050,7 +23050,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -23150,7 +23150,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -23787,7 +23787,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -24010,7 +24010,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -24194,7 +24194,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -24462,7 +24462,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -24976,7 +24976,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -25509,7 +25509,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -25816,7 +25816,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -26000,7 +26000,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -26604,7 +26604,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -26704,7 +26704,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -27173,7 +27173,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -27396,7 +27396,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -27910,7 +27910,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -28256,7 +28256,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -28479,7 +28479,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -29239,7 +29239,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -29837,7 +29837,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -29937,7 +29937,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -30244,7 +30244,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -30344,7 +30344,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -30651,7 +30651,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -30874,7 +30874,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -31058,7 +31058,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -31242,7 +31242,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -31342,7 +31342,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -31526,7 +31526,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -32454,7 +32454,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -32554,7 +32554,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -32738,7 +32738,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -32961,7 +32961,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -33475,7 +33475,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -33821,7 +33821,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -34089,7 +34089,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -34519,7 +34519,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -34703,7 +34703,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -35256,7 +35256,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -35479,7 +35479,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -35786,7 +35786,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -35886,7 +35886,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -35986,7 +35986,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -36293,7 +36293,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -36516,7 +36516,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -36700,7 +36700,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -36800,7 +36800,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -37353,7 +37353,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -37453,7 +37453,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 @@ -37637,7 +37637,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 24 + mWidth: 28 mHeight: 46 mDepth: 3 autoResizeBoxCollider: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab index 2331d83..5021b8d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab @@ -3531,7 +3531,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2504770935480554533} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalPosition: {x: -1, y: 100, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4162566259368932257} @@ -3567,14 +3567,14 @@ MonoBehaviour: absolute: 0 updateAnchors: 0 mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 + mPivot: 1 mWidth: 1127 - mHeight: 200 + mHeight: 300 mDepth: 0 autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 5.635 + aspectRatio: 3.7566667 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -3601,8 +3601,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1127, y: 200, z: 0} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1127, y: 300, z: 0} + m_Center: {x: 0, y: -150, z: 0} --- !u!1 &2519415641990000409 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab index 320bef7..4a7b181 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab @@ -44,19 +44,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: leftAnchor: - target: {fileID: 8585035547457419924} + target: {fileID: 0} relative: 0 absolute: -1 rightAnchor: - target: {fileID: 8585035547457419924} + target: {fileID: 0} relative: 1 absolute: 1 bottomAnchor: - target: {fileID: 8585035547457419924} - relative: 1 + target: {fileID: 0} + relative: 0 absolute: -264 topAnchor: - target: {fileID: 8585035547457419924} + target: {fileID: 0} relative: 1 absolute: -132 updateAnchors: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab index a7f3f16..10c0d46 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab @@ -1589,19 +1589,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: leftAnchor: - target: {fileID: 4675778075477740160} + target: {fileID: 0} relative: 0 absolute: -1 rightAnchor: - target: {fileID: 4675778075477740160} + target: {fileID: 0} relative: 1 absolute: 1 bottomAnchor: - target: {fileID: 4675778075477740160} - relative: 1 + target: {fileID: 0} + relative: 0 absolute: -264 topAnchor: - target: {fileID: 4675778075477740160} + target: {fileID: 0} relative: 1 absolute: -132 updateAnchors: 0 @@ -1613,7 +1613,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 23.287878 + aspectRatio: 8.537879 mType: 1 mFillDirection: 4 mFillAmount: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab index caad8c6..be2a5bd 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab @@ -331,7 +331,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 1, g: 1, b: 1, a: 1} mPivot: 4 - mWidth: 28 + mWidth: 24 mHeight: 28 mDepth: 5 autoResizeBoxCollider: 0 @@ -586,7 +586,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7022327509991051944} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalPosition: {x: -1, y: -66, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7022327509997799817} @@ -622,14 +622,14 @@ MonoBehaviour: absolute: 0 updateAnchors: 1 mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 + mPivot: 7 mWidth: 1127 - mHeight: 132 + mHeight: 300 mDepth: 0 autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 8.537879 + aspectRatio: 3.7566667 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -656,8 +656,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1127, y: 132, z: 0} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1127, y: 300, z: 0} + m_Center: {x: 0, y: 150, z: 0} --- !u!1 &7022327509997799818 GameObject: m_ObjectHideFlags: 0 @@ -1201,7 +1201,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7335709934747725402} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalPosition: {x: -1, y: 74, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3892230016645329233} @@ -1237,14 +1237,14 @@ MonoBehaviour: absolute: 0 updateAnchors: 1 mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 4 + mPivot: 1 mWidth: 1127 - mHeight: 147 + mHeight: 300 mDepth: 0 autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 7.6666665 + aspectRatio: 3.7566667 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -1271,5 +1271,5 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1127, y: 147, z: 0} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1127, y: 300, z: 0} + m_Center: {x: 0, y: -150, z: 0} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab index 4778493..5963cd2 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab @@ -62,7 +62,7 @@ MonoBehaviour: updateAnchors: 0 mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} mPivot: 4 - mWidth: 1645 + mWidth: 1125 mHeight: 2 mDepth: 0 autoResizeBoxCollider: 0 @@ -377,7 +377,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761906987369210533} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 749, y: 622, z: 0} + m_LocalPosition: {x: 489, y: 622, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2119631473691065750} @@ -610,7 +610,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3002109181846723355} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2, y: 0, z: 0} + m_LocalPosition: {x: -1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7752958444927509139} @@ -647,7 +647,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0, g: 0, b: 0, a: 0.3137255} mPivot: 4 - mWidth: 1647 + mWidth: 1127 mHeight: 2306 mDepth: -1 autoResizeBoxCollider: 1 @@ -680,7 +680,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1647, y: 2306, z: 0} + m_Size: {x: 1127, y: 2306, z: 0} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7035454758953000816 MonoBehaviour: @@ -925,7 +925,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4565902434335108937} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1, y: -1152, z: 0} + m_LocalPosition: {x: 0, y: -1152, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2119631473691065750} @@ -1779,7 +1779,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6684997010238823455} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1, y: -49, z: 0} + m_LocalPosition: {x: -1, y: 700, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2119631473691065750} @@ -1815,14 +1815,14 @@ MonoBehaviour: absolute: 0 updateAnchors: 0 mColor: {r: 1, g: 1, b: 1, a: 1} - mPivot: 7 - mWidth: 1645 - mHeight: 750 + mPivot: 1 + mWidth: 1125 + mHeight: 900 mDepth: 0 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1.5 + aspectRatio: 1.25 mType: 1 mFillDirection: 4 mFillAmount: 1 diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua index f073289..dc4949e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua index 4b40668..32c3548 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d index 8a939e9..2ce18fd 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCalender.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d index c766ced..8ef45ef 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustDetail.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d index 2bb60cc..8cfb53c 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustList.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustList.unity3d index caa87ab..bf1efdb 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustList.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustList.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMain.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMain.unity3d index f4b923c..babf95c 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMain.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMain.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d index 8a23279..c66f53c 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelMoreProc4Cust.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver index aa39dc9..94f5045 100644 --- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver +++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl.ver @@ -1 +1 @@ -r8 $trCRM/resVer/IOS/VerCtl/priority.ver8,2e44df0897bb7c1047865bfe9db57cf98 !trCRM/resVer/IOS/VerCtl/other.ver8,7a09ad6b904ba91bb4fe22525a5a7217 \ No newline at end of file +r8 $trCRM/resVer/IOS/VerCtl/priority.ver8,9fa70606325f90b7928e2f442d52016b8 !trCRM/resVer/IOS/VerCtl/other.ver8,7a09ad6b904ba91bb4fe22525a5a7217 \ No newline at end of file diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/priority.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/priority.ver index 609af98..75b7872 100644 Binary files a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/priority.ver and b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/IOS/VerCtl/priority.ver differ