diff --git a/Assets/CoolapeFrame/Scripts/ui/NguiExtend/UIMoveToCell.cs b/Assets/CoolapeFrame/Scripts/ui/NguiExtend/UIMoveToCell.cs index 80a54a0..762f888 100644 --- a/Assets/CoolapeFrame/Scripts/ui/NguiExtend/UIMoveToCell.cs +++ b/Assets/CoolapeFrame/Scripts/ui/NguiExtend/UIMoveToCell.cs @@ -53,7 +53,7 @@ namespace Coolape float times = 0; // Update is called once per frame - void FixedUpdate () + void Update () { if (isMoveToNow) { times += speed * Time.unscaledDeltaTime; diff --git a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs index 809bc4b..7408096 100644 --- a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs +++ b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs @@ -22,7 +22,7 @@ public class CLUIElementPopList : UIEventListener ArrayList values = new ArrayList (); values.AddRange (poplist.valueItems); if (poplist.items.Count == 0) { - CLAlert.add (Localization.Get ("EmpyContent"), Color.white, 1, 1, false, Vector3.zero); + //CLAlert.add (Localization.Get ("EmpyContent"), Color.white, 1, 1, false, Vector3.zero); } CLUIPopListPanel.show (poplist.items, values, (Callback)onSelectedValue); } diff --git a/Assets/CoolapeFrameData/cfg/publishChannel.cfg b/Assets/CoolapeFrameData/cfg/publishChannel.cfg index f6af251..78062d9 100644 --- a/Assets/CoolapeFrameData/cfg/publishChannel.cfg +++ b/Assets/CoolapeFrameData/cfg/publishChannel.cfg @@ -1 +1 @@ -tBchannelMapq?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion<0.77ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<1000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngCchannelEnumW?GeneralBchannelKeyW?generalHchannelAliasEnumW>通过 \ No newline at end of file +tBchannelMapq?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion<0.78ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<1000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngCchannelEnumW?GeneralBchannelKeyW?generalHchannelAliasEnumW>通过 \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v index fdcb8d0..5c05594 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -7,9 +7,10 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/sound.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/things.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/.DS_Store,132382935540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/.DS_Store,132387593210000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust.meta,132370050250000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid.meta,132387593500000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel.meta,132358191610000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon.meta,132354924130000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login.meta,132357183660000000 @@ -40,7 +41,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/check.png.meta,132373051960000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_followup.png,132369178310000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_followup.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png,132369178310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png,132387463310000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png.meta,132370050430000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_tel.png,132369178310000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_tel.png.meta,132370050430000000 @@ -48,8 +49,10 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/del.png.meta,132373051970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/follow.png,132370137410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/follow.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png,132369985090000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png,132387463310000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png,132387463310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png.meta,132387559010000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/get.png,132370137410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/get.png.meta,132373051970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/important.png,132369985090000000 @@ -58,7 +61,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/input.png.meta,132370066210000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/kuang.png,132370137580000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/kuang.png.meta,132370139550000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png,132382189460000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png,132387463310000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png.meta,132382937770000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/more.png,132370137410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/more.png.meta,132373051970000000 @@ -66,6 +69,8 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/msg.png.meta,132373051970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/oean.png,132370137410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/oean.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png,132388221620000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png.meta,132388222820000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/pause.png,132374733320000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/pause.png.meta,132374737620000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/peo.png,132369178310000000 @@ -74,6 +79,8 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/phone.png.meta,132373051970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play.png,132374733320000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play.png.meta,132374737610000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png,132387463310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png.meta,132387559010000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/position.png,132370137410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/position.png.meta,132373051970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/record.png,132373001210000000 @@ -96,6 +103,12 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/time.png.meta,132373051980000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/write.png,132370137410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/write.png.meta,132373051980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png,132387591150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png.meta,132387593650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png,132387591150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png.meta,132387593650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png,132387591150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png.meta,132387593650000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_bg.png,131311223440000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_bg.png.meta,132358191870000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_prog.png,131311223440000000 @@ -228,7 +241,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132387317140000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132388304280000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000 @@ -260,7 +273,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfgTool.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/city/CLLCity.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/city/CLLCity.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua,132385653220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua,132388175550000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua.meta,132370178140000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,132381612130000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua.meta,132368762790000000 @@ -268,7 +281,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua.meta,132358701520000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua,132378178470000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua.meta,132378001360000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132384995900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132388104810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua.meta,132383043620000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/json/json.lua,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/json/json.lua.meta,132289129800000000 @@ -289,7 +302,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua.meta,132291379270000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPool.lua,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPool.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua,132359103480000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua,132387631170000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLQueue.lua,132387257440000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLQueue.lua.meta,132289129810000000 @@ -344,21 +357,23 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilter.lua.meta,132370154700000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilterGroup.lua,132383024660000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilterGroup.lua.meta,132370154670000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua,132386923370000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua,132387687330000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua.meta,132370115410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustProc.lua,132369992340000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustProc.lua.meta,132369989000000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua,132381516850000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua.meta,132376505230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132382931420000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132388248030000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua.meta,132378658180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132385653070000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132388254900000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua.meta,132378223060000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua,132387683750000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta,132387614100000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua,132369454510000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua.meta,132368777750000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua,132379832580000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua.meta,132378928680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua,132383049130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua,132387571400000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua.meta,132373690990000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua,132381618580000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua.meta,132364230620000000 @@ -371,7 +386,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/.DS_Store,132289134230000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132381377770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132388113060000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua.meta,132372977860000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua,132385986530000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua.meta,132289129800000000 @@ -383,7 +398,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSceneManager.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua,132387276090000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua,132386903250000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua,132388315620000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWWWProgress.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWWWProgress.lua.meta,132289129800000000 @@ -401,22 +416,26 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua.meta,132355739310000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua,132386902510000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua.meta,132367521030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132385653070000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132388215100000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua.meta,132372871250000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua,132381346090000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua,132387560070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua.meta,132370233760000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132386908200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132387560330000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua.meta,132370115140000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua,132370162600000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua.meta,132369988710000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua,132387685130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua.meta,132387611790000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua,132387297530000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua.meta,132355735820000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua,132387297660000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua.meta,132375465560000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua,132380867870000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua.meta,132373063880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132387296160000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132388172570000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua.meta,132370897440000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132388254850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta,132388185120000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua,132381390070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua.meta,132373879180000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPopCheckBoxs.lua,132379834520000000 @@ -427,7 +446,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua.meta,132357323740000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua,132387297760000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua.meta,132357325780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua,132387297880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua,132387319020000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua.meta,132358703190000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua,132369409870000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua.meta,132366143690000000 @@ -441,15 +460,15 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab.meta,132357347880000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame2.prefab,132378244010000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame2.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab,132385747890000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab,132388125050000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab.meta,132378911310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132385747810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132388125050000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab.meta,132378654680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab,132385747810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab,132388126900000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab.meta,132378243900000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132385741920000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab.meta,132378243860000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132385741910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132388125450000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab.meta,132378243880000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab,132384959410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab.meta,132362722920000000 @@ -463,16 +482,18 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab.meta,132372971640000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132384738550000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132386907730000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132387563840000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab.meta,132367521230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132386932640000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132388235590000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab.meta,132372671680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab,132385938650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab,132387589810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta,132370155540000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132386011620000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132388215300000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab.meta,132370116810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab,132372845470000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab.meta,132369515950000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab,132387684730000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta,132387602700000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab,132385938020000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab,132364419700000000 @@ -489,8 +510,10 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab.meta,132373063990000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab,132384058150000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab.meta,132300379190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab,132386932640000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab,132388180290000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab.meta,132374439140000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132388215300000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388185850000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132381390160000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab,132381361170000000 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v index 8cabb7b..1c48033 100644 Binary files a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v and b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v differ diff --git a/Assets/CoolapeFrameData/verControl/android/ver4Publish.v b/Assets/CoolapeFrameData/verControl/android/ver4Publish.v index 1629dc1..f6672ec 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Publish.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Publish.v @@ -9,23 +9,26 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd -trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d,bb4e1a1ce156f48fc0af330962865a62 +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a -trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,e5e9cb160e0ccd517bf7befd2155903a +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea -trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,f4012bc5f0a6dcb0680961a6d2bcc6ca +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f @@ -37,6 +40,9 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d7642f690531d9410ff6a trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8 +trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d +trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 +trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 @@ -82,6 +88,10 @@ trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 +trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 @@ -95,9 +105,9 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d8148 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa -trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,c9fd1e96628c3b9093a812942d507254 +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,2368a914edbd4ecf7534705770e24ac5 trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f -trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,f300e0babf50a8a8bdf5155bc55aeaf8 +trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,398a77c0c9146b949b3d0a6f60c6c4ed trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes4Publish/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f @@ -105,23 +115,23 @@ trCRM/upgradeRes4Publish/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e -trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,9e09f434e175ae942801f2ab140f8a49 +trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,8e970152224262213e454e36f3dd19a8 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3 trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 -trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,b29828bdf75c1313f28fc03d655ba812 +trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,d01c1b88bed8d5d777f76eca559b5b46 trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 -trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,2d55a0a98cb67bc889fe78fa359113ab +trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,df3108c65b288722530f80bb73893062 trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 -trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,008cb4d881e14d875fee20337a431a34 +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,c2a5eef306bbbbd5b186599bad616677 trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e8749743983d92 -trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,a4f7c7a82b82a9926f58dd9e6ae66fe4 +trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c -trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,6d54c7ee137c4a745daa3ea35fcfd9f9 -trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,26e455763621e8f9a8b1c7eeea902ea8 +trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 +trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes4Publish/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb @@ -129,10 +139,11 @@ 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,b4fab7ceb381ae89881b28d0d6bc8bc4 -trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,8d42818424c927516b7748b563e80a2a +trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,83992e86489ace88d35f10262e72d9fb +trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,3f6a80d9a6a96cf66a201e26fc39aa1f trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b @@ -140,76 +151,81 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,e1fb7ee5d50bd0ffc6561f5a4ec8426f trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,35ab67164fec969fe3513e00eff0b061 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,86d3ed6429ba39f0a99f2307b5c43854 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f6862fccaa49ba2e67a39f2 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,3178958635719c8c324791371ebf968a +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,9b2875e44fc9597805067fbbec8e75eb +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,77fe50c4c113517c376dbfc1bbacfed9 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,3a951bdbe3cc3dc7373f91f66fae568c +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,4a403cefd410e4c5011a98b2ed865bcb -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,715a81f356955cdad0a3f604e8062f4a +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,e7aa381e49a9c5aed143b69db6aad352 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,ee83701c37a6f2fc91691546a2e4fbe7 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,09a47b1c7f1d38c51874f1e99d4a4a83 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,3038704955b89cc61befb0fee37b14f3 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,90ebaab62abe0abdb396cfd7eb888780 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,3c1157bee5e84df48d3777bcb38b7281 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,0aa4dce53f215a57101982baaf3acd16 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,62aff784a70e4a1bd0faa472176a0978 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0aecd09184717a8e03 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,caafbebedb6fa0e3d3dc73bdcb0342b2 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,9bd3b1b78f19b29bc82c5f9d6c87168c +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,67766859d2cc993c94403fc253b8ca27 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,cb4111b5926ebb6a2a36a249c491a693 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,953cc6b4afbe01b33bfb6d6078f7daf4 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,acc55f1fa638736c777cd4dda324a459 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,499e82a6017037c6ed9f639f6a7d5a10 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a -trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,a0f5881ba7fd7555af332dbbb7e0ba97 +trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,1a7a4ee841c012b68aaaf139f34d14b6 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,783b58d933978a6418d3395f94b73437 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,be94a5ea478478b84db4dbd942015247 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,2dfb99c1dd4d71fbe434075838e74e20 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,2c5c3fac87fcc6b9296c6ce2bf4226ef -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,2779ed6a1d88a75d9ae23d71d232c1cb -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,17afb8f5b7000803125b255d2460ed61 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,bfec75cacbedc1126c89c90cdff3f887 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,af92a8050f9ab1c10cc6c56e40830c0c +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,e0be40f738885f4860890eb1a2983219 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,cbdac8525eebfa8b70b9b2a71826c67c trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,c1ea5284412c95722ce92c5804745ad9 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b @@ -219,7 +235,8 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,fdf819bff61 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,6badf11fa5b679dea751004ec507c4c7 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,f6367c75d38ecbf5607ed563867db24d +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,0e39d77bf9692b4de2a656764ba39617 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd @@ -229,11 +246,12 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,6c837c5717e2246a101874ca16bc45c9 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,1d8fae12343aa5be002cccf1f2f678ca +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,f70e550a65c00f8d2d636f4274931bb4 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,4fb60b2ce9256cf69814066a7ce97592 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v index f16a10a..5bfbf40 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v @@ -1,23 +1,24 @@ trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd -trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e +trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a +trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac trCRM/upgradeRes/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49 trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,6c837c5717e2246a101874ca16bc45c9 +trCRM/upgradeRes/priority/lua/db/DBCust.lua,8e970152224262213e454e36f3dd19a8 +trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc trCRM/upgradeRes/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 -trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 -trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b +trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,783b58d933978a6418d3395f94b73437 trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 -trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes/priority/lua/CLLMainLua.lua,398a77c0c9146b949b3d0a6f60c6c4ed trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 @@ -25,23 +26,23 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,ee83701c37a6f2fc91691546a trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,0aa4dce53f215a57101982baaf3acd16 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0aecd09184717a8e03 trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,4fb60b2ce9256cf69814066a7ce97592 trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e -trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,77fe50c4c113517c376dbfc1bbacfed9 -trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e +trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 trCRM/upgradeRes/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3 trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb -trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 -trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,e5e9cb160e0ccd517bf7befd2155903a -trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,6d54c7ee137c4a745daa3ea35fcfd9f9 +trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 +trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d +trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a trCRM/upgradeRes/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9 trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,fdf819bff61b0cecbeb489e5443fc6e0 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,2dfb99c1dd4d71fbe434075838e74e20 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0 @@ -52,11 +53,9 @@ trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c733 trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,462d7b1995685531a4628c24c1e89c42 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 -trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,9b2875e44fc9597805067fbbec8e75eb trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,3038704955b89cc61befb0fee37b14f3 -trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39 @@ -66,15 +65,18 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b33975 trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 -trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,2c5c3fac87fcc6b9296c6ce2bf4226ef +trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,bfec75cacbedc1126c89c90cdff3f887 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,3f6a80d9a6a96cf66a201e26fc39aa1f trCRM/upgradeRes/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab trCRM/upgradeRes/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc -trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,ef003163a56787371dd81f2ea6fed515 +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,cb4111b5926ebb6a2a36a249c491a693 +trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 +trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,90ebaab62abe0abdb396cfd7eb888780 trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 @@ -85,40 +87,44 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f4408 trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524 trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7 +trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 +trCRM/upgradeRes/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,0e21123d4ce49aa05196b4f4ab00fab8 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,86d3ed6429ba39f0a99f2307b5c43854 trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,c1ea5284412c95722ce92c5804745ad9 trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 -trCRM/upgradeRes/priority/lua/db/DBCust.lua,9e09f434e175ae942801f2ab140f8a49 +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe -trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 +trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 -trCRM/upgradeRes/priority/lua/db/DBUser.lua,b29828bdf75c1313f28fc03d655ba812 +trCRM/upgradeRes/priority/lua/db/DBUser.lua,d01c1b88bed8d5d777f76eca559b5b46 trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6 trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,953cc6b4afbe01b33bfb6d6078f7daf4 +trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 -trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 -trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,bb4e1a1ce156f48fc0af330962865a62 +trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23 trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e @@ -133,25 +139,26 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f6862fccaa49ba2e67a39f2 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,3178958635719c8c324791371ebf968a trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,e0be40f738885f4860890eb1a2983219 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd trCRM/upgradeRes/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa -trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd +trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 +trCRM/upgradeRes/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 trCRM/upgradeRes/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb +trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683 trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513 trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964 +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,0e39d77bf9692b4de2a656764ba39617 trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75 trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990 @@ -159,11 +166,12 @@ trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34 trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5 trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 -trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,f4012bc5f0a6dcb0680961a6d2bcc6ca +trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be trCRM/upgradeRes/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8 +trCRM/upgradeRes/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,e1fb7ee5d50bd0ffc6561f5a4ec8426f -trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 +trCRM/upgradeRes/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54 trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a @@ -171,20 +179,21 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,3c1157bee5e84df48d3777bcb38b7281 -trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7 trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,1a7a4ee841c012b68aaaf139f34d14b6 -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,17afb8f5b7000803125b255d2460ed61 -trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,cbdac8525eebfa8b70b9b2a71826c67c +trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 trCRM/upgradeRes/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d +trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a -trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 +trCRM/upgradeRes/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 @@ -194,16 +203,17 @@ trCRM/upgradeRes/priority/lua/net/CLLNet.lua,df3108c65b288722530f80bb73893062 trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 trCRM/upgradeRes/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5 +trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,83992e86489ace88d35f10262e72d9fb trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,3a951bdbe3cc3dc7373f91f66fae568c -trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 +trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,be94a5ea478478b84db4dbd942015247 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d +trCRM/upgradeRes/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 @@ -212,22 +222,22 @@ trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 -trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a -trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,715a81f356955cdad0a3f604e8062f4a +trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,e7aa381e49a9c5aed143b69db6aad352 trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,05f342abcc7962f49432a8cb1206e2fc -trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,b789c704b3d1bd1893d130b20fb80ef6 +trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,2368a914edbd4ecf7534705770e24ac5 +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,f6367c75d38ecbf5607ed563867db24d trCRM/upgradeRes/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 trCRM/upgradeRes/priority/lua/net/NetProto.lua,c2a5eef306bbbbd5b186599bad616677 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,62aff784a70e4a1bd0faa472176a0978 trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 -trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a -trCRM/upgradeRes/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54 +trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd +trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab @@ -236,6 +246,7 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,cb75e trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239 +trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a @@ -243,7 +254,7 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab trCRM/upgradeRes/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6 -trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,72ee9c6f764cc5ac1cdfdcd2a421e222 +trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,af92a8050f9ab1c10cc6c56e40830c0c trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v index 0f70567..22f6724 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v @@ -1 +1 @@ -[{"md5":"83db54bd186e56564559b7fe7ec2a8be", "name":"2020_06_09_20_51_56", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"852b36d50f2f0ce00eccc80db6bc90a8", "name":"2020_06_14_21_46_25", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48678082118825ed76d8db161dcaa5cd", "name":"2020_06_20_15_13_36", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6188d18083bf95616165d76c2041b90e", "name":"2020_06_20_15_48_55", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8881cf3c9691c0a734344aed5602c30c", "name":"2020_06_20_18_18_34", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2fd0a9e5ce5b42edeebe951171c1ed22", "name":"2020_07_01_20_58_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7b90e2f5881d8a1af537d69c4abf0037", "name":"2020_07_01_21_29_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"abb908553432e1a98008de2dae335477", "name":"2020_07_01_22_22_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"248d184f53bb2907277d004865bed27e", "name":"2020_07_02_10_08_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5de2ba51b6af6e896a72e6ba0d483fd7", "name":"2020_07_02_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"532f0cecf5aa77742c01988183936269", "name":"2020_07_02_10_23_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d91a8b5136448c3934d0c936fced2d81", "name":"2020_07_02_11_17_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"991793ef158bdde3e7d70a8f69178cb0", "name":"2020_07_02_11_24_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e74624581a23d2c051f66d949e52537", "name":"2020_07_02_11_47_16", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7bc64e0ac434fc831cfdd79e6448263", "name":"2020_07_02_11_48_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b08313a39f814ec82ea0c676b4abdfd0", "name":"2020_07_02_11_51_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40023ffc5fdfc497eb36b985591b1460", "name":"2020_07_02_11_55_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"929720526e51a4a8b81827bb0611e134", "name":"2020_07_02_12_34_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9cf65334eafd25813932e7797ac18364", "name":"2020_07_02_12_37_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"029093af4b6b56448c3b995326ec9a5e", "name":"2020_07_02_12_49_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f6c68dfc0d14a3d55957903af0978381", "name":"2020_07_02_12_51_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"86afa249af5db0a282f2bc472045b1a9", "name":"2020_07_02_12_53_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"29f14097aa74aba0aca1c3c56b2bd2bb", "name":"2020_07_05_14_55_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"874de9b2b6f7e0fd732e08b5ea59b03a", "name":"2020_07_05_15_27_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e44ed0d01c1393cf14e97a3b74ed9a11", "name":"2020_07_05_21_14_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ea9af802bcedca448cea33dbdc82c0af", "name":"2020_07_06_09_49_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"caf10f439c895c895281993c970ce498", "name":"2020_07_07_09_45_55", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48fe564cbc4d1e850feaf7d83db95e7d", "name":"2020_07_07_10_05_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a46aac41a106a00e083554f282affcad", "name":"2020_07_07_10_08_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad7f4dae1b60de21fda92c02e51a549b", "name":"2020_07_07_10_21_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad4e9a71aa1fbfbf09b2fded8b5268b4", "name":"2020_07_07_10_28_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65f76f395c64e70fe91e17faa5cfe1c0", "name":"2020_07_07_10_29_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e2719cb0d8417b42e9c169e102519047", "name":"2020_07_07_10_31_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77fb67623b2551aa5637a5c3e1a7a20b", "name":"2020_07_07_10_32_31", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c65e208afdf7325dc035e1ed30b5e882", "name":"2020_07_07_10_33_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"09f03a7efedcdee13e59e6e82e7e787f", "name":"2020_07_07_10_34_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"038fa1d071d5b6ba5eb97cae7ec44dfa", "name":"2020_07_07_10_41_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f9052a0f8588b4462c4b7484b273a81c", "name":"2020_07_07_13_51_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"fca57a14b9326d6b4bbe6a76fd14d2b3", "name":"2020_07_07_14_04_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"db29543735363798b292609f421505b2", "name":"2020_07_07_14_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48654c656fc5ee1de7b7e147e2423200", "name":"2020_07_07_14_19_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"06cf91af553fcd8cfeb17fdf1cb3b9bc", "name":"2020_07_07_14_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9d7d1eefc31cfa737befb6b151b41448", "name":"2020_07_07_14_20_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b39df8ca67d48cc85a3a36459e0329df", "name":"2020_07_07_15_07_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b1e0ddeb104f0cc994d6a4fad1113836", "name":"2020_07_07_14_02_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb0db9cc4641358853303c738de59bbe", "name":"2020_07_07_14_10_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4510eac2b9966d0e192f73dc9717e65d", "name":"2020_07_07_14_13_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a0fd1e686304d3f30e36d9616b52bec9", "name":"2020_07_07_14_15_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb253314e7a22106a7879ea1c19f7519", "name":"2020_07_07_14_16_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d133bbe311e292732d2b912362e49cfc", "name":"2020_07_07_14_18_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c076515cee1efa128b9037b327625899", "name":"2020_07_07_14_19_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"511d316e0eb5a14b9bdb9cfea8b9d27f", "name":"2020_07_07_15_59_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"061b5ab80025e127ebe5989ccf5f0cf0", "name":"2020_07_07_16_25_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e87dbbeb2c5f5f8fdf6fa10b7d69876", "name":"2020_07_07_16_27_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c39d52fc0764bd34d5290bca509298b4", "name":"2020_07_07_16_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b9dddfa50494ccea917ba30950bc9298", "name":"2020_07_07_16_32_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c644faf22a45c1b45f26fd319404ce32", "name":"2020_07_07_16_49_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5789a7880ebbcb55782155302b1a2ef4", "name":"2020_07_07_17_30_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"93d36e7f45d121367cc1711972a2cac1", "name":"2020_07_07_17_47_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3793c236cda944d5a9308dcdf818fd82", "name":"2020_07_07_18_55_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f9939500d4aa88338e898dac98edee0", "name":"2020_07_07_19_20_56", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c77123a8b28d7e5da3b70f7aaebb0d48", "name":"2020_07_07_19_26_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01889e33c81edc18e8ca5aa65166d3dd", "name":"2020_07_07_19_48_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c3b643abcee574491912ae03a3fb2c5f", "name":"2020_07_07_19_49_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c07e0f977c72720644ede63e17c85193", "name":"2020_07_07_20_08_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71b5e55707b8bfdbb4d13dbf9429d9e", "name":"2020_07_07_20_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9080c5a030fb57300860b809808fc832", "name":"2020_07_07_20_50_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3e7137c562bf90d3cfa8bbe37b1cc30", "name":"2020_07_07_21_12_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e8704b794aa8dcd82c02127010dba8c", "name":"2020_07_08_22_12_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e62b707f07ef5795372e23e5fbb97692", "name":"2020_07_08_22_14_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"54e0a143d9013b230920b7898be56361", "name":"2020_07_08_22_47_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71f02fca91b21e3ac8b668d1d86891c5", "name":"2020_07_08_23_06_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6116bfda92f11adc871feba849ad0a7", "name":"2020_07_09_08_52_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"197c33d30db832223da91066c3882917", "name":"2020_07_09_08_57_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f55f5e0f14dc1155b89d9868f6cb4884", "name":"2020_07_09_09_18_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dce47a78ddfe761905bfc095d7dcbc85", "name":"2020_07_09_09_20_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6db83be729a0e22f9993019551b1275b", "name":"2020_07_09_09_27_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file +[{"md5":"83db54bd186e56564559b7fe7ec2a8be", "name":"2020_06_09_20_51_56", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"852b36d50f2f0ce00eccc80db6bc90a8", "name":"2020_06_14_21_46_25", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48678082118825ed76d8db161dcaa5cd", "name":"2020_06_20_15_13_36", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6188d18083bf95616165d76c2041b90e", "name":"2020_06_20_15_48_55", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8881cf3c9691c0a734344aed5602c30c", "name":"2020_06_20_18_18_34", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2fd0a9e5ce5b42edeebe951171c1ed22", "name":"2020_07_01_20_58_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7b90e2f5881d8a1af537d69c4abf0037", "name":"2020_07_01_21_29_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"abb908553432e1a98008de2dae335477", "name":"2020_07_01_22_22_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"248d184f53bb2907277d004865bed27e", "name":"2020_07_02_10_08_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5de2ba51b6af6e896a72e6ba0d483fd7", "name":"2020_07_02_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"532f0cecf5aa77742c01988183936269", "name":"2020_07_02_10_23_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d91a8b5136448c3934d0c936fced2d81", "name":"2020_07_02_11_17_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"991793ef158bdde3e7d70a8f69178cb0", "name":"2020_07_02_11_24_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e74624581a23d2c051f66d949e52537", "name":"2020_07_02_11_47_16", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7bc64e0ac434fc831cfdd79e6448263", "name":"2020_07_02_11_48_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b08313a39f814ec82ea0c676b4abdfd0", "name":"2020_07_02_11_51_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40023ffc5fdfc497eb36b985591b1460", "name":"2020_07_02_11_55_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"929720526e51a4a8b81827bb0611e134", "name":"2020_07_02_12_34_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9cf65334eafd25813932e7797ac18364", "name":"2020_07_02_12_37_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"029093af4b6b56448c3b995326ec9a5e", "name":"2020_07_02_12_49_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f6c68dfc0d14a3d55957903af0978381", "name":"2020_07_02_12_51_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"86afa249af5db0a282f2bc472045b1a9", "name":"2020_07_02_12_53_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"29f14097aa74aba0aca1c3c56b2bd2bb", "name":"2020_07_05_14_55_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"874de9b2b6f7e0fd732e08b5ea59b03a", "name":"2020_07_05_15_27_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e44ed0d01c1393cf14e97a3b74ed9a11", "name":"2020_07_05_21_14_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ea9af802bcedca448cea33dbdc82c0af", "name":"2020_07_06_09_49_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"caf10f439c895c895281993c970ce498", "name":"2020_07_07_09_45_55", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48fe564cbc4d1e850feaf7d83db95e7d", "name":"2020_07_07_10_05_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a46aac41a106a00e083554f282affcad", "name":"2020_07_07_10_08_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad7f4dae1b60de21fda92c02e51a549b", "name":"2020_07_07_10_21_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad4e9a71aa1fbfbf09b2fded8b5268b4", "name":"2020_07_07_10_28_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65f76f395c64e70fe91e17faa5cfe1c0", "name":"2020_07_07_10_29_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e2719cb0d8417b42e9c169e102519047", "name":"2020_07_07_10_31_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77fb67623b2551aa5637a5c3e1a7a20b", "name":"2020_07_07_10_32_31", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c65e208afdf7325dc035e1ed30b5e882", "name":"2020_07_07_10_33_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"09f03a7efedcdee13e59e6e82e7e787f", "name":"2020_07_07_10_34_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"038fa1d071d5b6ba5eb97cae7ec44dfa", "name":"2020_07_07_10_41_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f9052a0f8588b4462c4b7484b273a81c", "name":"2020_07_07_13_51_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"fca57a14b9326d6b4bbe6a76fd14d2b3", "name":"2020_07_07_14_04_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"db29543735363798b292609f421505b2", "name":"2020_07_07_14_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48654c656fc5ee1de7b7e147e2423200", "name":"2020_07_07_14_19_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"06cf91af553fcd8cfeb17fdf1cb3b9bc", "name":"2020_07_07_14_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9d7d1eefc31cfa737befb6b151b41448", "name":"2020_07_07_14_20_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b39df8ca67d48cc85a3a36459e0329df", "name":"2020_07_07_15_07_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b1e0ddeb104f0cc994d6a4fad1113836", "name":"2020_07_07_14_02_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb0db9cc4641358853303c738de59bbe", "name":"2020_07_07_14_10_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4510eac2b9966d0e192f73dc9717e65d", "name":"2020_07_07_14_13_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a0fd1e686304d3f30e36d9616b52bec9", "name":"2020_07_07_14_15_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb253314e7a22106a7879ea1c19f7519", "name":"2020_07_07_14_16_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d133bbe311e292732d2b912362e49cfc", "name":"2020_07_07_14_18_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c076515cee1efa128b9037b327625899", "name":"2020_07_07_14_19_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"511d316e0eb5a14b9bdb9cfea8b9d27f", "name":"2020_07_07_15_59_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"061b5ab80025e127ebe5989ccf5f0cf0", "name":"2020_07_07_16_25_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e87dbbeb2c5f5f8fdf6fa10b7d69876", "name":"2020_07_07_16_27_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c39d52fc0764bd34d5290bca509298b4", "name":"2020_07_07_16_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b9dddfa50494ccea917ba30950bc9298", "name":"2020_07_07_16_32_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c644faf22a45c1b45f26fd319404ce32", "name":"2020_07_07_16_49_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5789a7880ebbcb55782155302b1a2ef4", "name":"2020_07_07_17_30_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"93d36e7f45d121367cc1711972a2cac1", "name":"2020_07_07_17_47_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3793c236cda944d5a9308dcdf818fd82", "name":"2020_07_07_18_55_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f9939500d4aa88338e898dac98edee0", "name":"2020_07_07_19_20_56", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c77123a8b28d7e5da3b70f7aaebb0d48", "name":"2020_07_07_19_26_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01889e33c81edc18e8ca5aa65166d3dd", "name":"2020_07_07_19_48_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c3b643abcee574491912ae03a3fb2c5f", "name":"2020_07_07_19_49_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c07e0f977c72720644ede63e17c85193", "name":"2020_07_07_20_08_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71b5e55707b8bfdbb4d13dbf9429d9e", "name":"2020_07_07_20_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9080c5a030fb57300860b809808fc832", "name":"2020_07_07_20_50_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3e7137c562bf90d3cfa8bbe37b1cc30", "name":"2020_07_07_21_12_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e8704b794aa8dcd82c02127010dba8c", "name":"2020_07_08_22_12_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e62b707f07ef5795372e23e5fbb97692", "name":"2020_07_08_22_14_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"54e0a143d9013b230920b7898be56361", "name":"2020_07_08_22_47_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71f02fca91b21e3ac8b668d1d86891c5", "name":"2020_07_08_23_06_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6116bfda92f11adc871feba849ad0a7", "name":"2020_07_09_08_52_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"197c33d30db832223da91066c3882917", "name":"2020_07_09_08_57_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f55f5e0f14dc1155b89d9868f6cb4884", "name":"2020_07_09_09_18_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dce47a78ddfe761905bfc095d7dcbc85", "name":"2020_07_09_09_20_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6db83be729a0e22f9993019551b1275b", "name":"2020_07_09_09_27_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e151c779182bdb13615ed656fb56fe82", "name":"2020_07_09_18_20_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6ec058f8223393df2dbd399cf01699f", "name":"2020_07_09_19_41_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71a8d5a4df42c98c74e346b9e943bf5", "name":"2020_07_10_07_58_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3576ab21bf1d7e103f31a63b7f367b90", "name":"2020_07_10_09_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"015d7b9f1dd9205bb91a7406c4d4c6f7", "name":"2020_07_10_12_53_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d8567597904a6031403d49fab9903d1d", "name":"2020_07_10_12_46_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v index 2ecea26..e758761 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v @@ -3,11 +3,13 @@ trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,6c837c5717e2246a101874ca16bc45c9 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 @@ -15,9 +17,9 @@ trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666c trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,715a81f356955cdad0a3f604e8062f4a +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,e7aa381e49a9c5aed143b69db6aad352 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,783b58d933978a6418d3395f94b73437 trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,398a77c0c9146b949b3d0a6f60c6c4ed @@ -31,19 +33,19 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,0aa4dce53f215a57101982baaf3acd16 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0aecd09184717a8e03 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,77fe50c4c113517c376dbfc1bbacfed9 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 -trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,e5e9cb160e0ccd517bf7befd2155903a -trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,6d54c7ee137c4a745daa3ea35fcfd9f9 +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d +trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9 @@ -57,7 +59,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79db trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,9b2875e44fc9597805067fbbec8e75eb trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,3038704955b89cc61befb0fee37b14f3 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 @@ -69,15 +71,15 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,2c5c3fac87fcc6b9296c6ce2bf4226ef +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,bfec75cacbedc1126c89c90cdff3f887 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,3f6a80d9a6a96cf66a201e26fc39aa1f trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,b789c704b3d1bd1893d130b20fb80ef6 +trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,ef003163a56787371dd81f2ea6fed515 +trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,90ebaab62abe0abdb396cfd7eb888780 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 @@ -91,15 +93,16 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7 +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,0e21123d4ce49aa05196b4f4ab00fab8 +trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,c1ea5284412c95722ce92c5804745ad9 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a @@ -107,7 +110,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab890 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,fdf819bff61b0cecbeb489e5443fc6e0 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc -trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,9e09f434e175ae942801f2ab140f8a49 +trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,8e970152224262213e454e36f3dd19a8 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 @@ -118,15 +121,17 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,953cc6b4afbe01b33bfb6d6078f7daf4 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,3a951bdbe3cc3dc7373f91f66fae568c +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5 -trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d,bb4e1a1ce156f48fc0af330962865a62 +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,462d7b1995685531a4628c24c1e89c42 @@ -141,12 +146,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,4fb60b2ce9256cf69814066a7ce97592 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,3c1157bee5e84df48d3777bcb38b7281 -trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f6862fccaa49ba2e67a39f2 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 +trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,3178958635719c8c324791371ebf968a trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,e0be40f738885f4860890eb1a2983219 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 @@ -163,13 +169,15 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8d trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,0e39d77bf9692b4de2a656764ba39617 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5 trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 -trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,f4012bc5f0a6dcb0680961a6d2bcc6ca +trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be +trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,e1fb7ee5d50bd0ffc6561f5a4ec8426f trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 @@ -180,25 +188,26 @@ trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d23 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c -trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,b29828bdf75c1313f28fc03d655ba812 +trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,d01c1b88bed8d5d777f76eca559b5b46 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,1a7a4ee841c012b68aaaf139f34d14b6 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,17afb8f5b7000803125b255d2460ed61 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,cbdac8525eebfa8b70b9b2a71826c67c trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,be94a5ea478478b84db4dbd942015247 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,cb4111b5926ebb6a2a36a249c491a693 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a @@ -211,6 +220,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb3 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d7642f690531d9410ff6a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 @@ -223,24 +233,25 @@ trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4f trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa -trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,05f342abcc7962f49432a8cb1206e2fc +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,2368a914edbd4ecf7534705770e24ac5 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,92f58a80dc40cb269679c222add79d32 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,c2a5eef306bbbbd5b186599bad616677 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,62aff784a70e4a1bd0faa472176a0978 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff -trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,72ee9c6f764cc5ac1cdfdcd2a421e222 +trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,af92a8050f9ab1c10cc6c56e40830c0c trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e -trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,86d3ed6429ba39f0a99f2307b5c43854 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,f6367c75d38ecbf5607ed563867db24d trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 diff --git a/Assets/trCRM/_scene/Main.unity b/Assets/trCRM/_scene/Main.unity index 64e18d8..f25bdf6 100644 --- a/Assets/trCRM/_scene/Main.unity +++ b/Assets/trCRM/_scene/Main.unity @@ -1143,7 +1143,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.05 + aspectRatio: 12.05 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -1334,7 +1334,7 @@ MonoBehaviour: autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1.3330443 + aspectRatio: 0.48872507 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -1806,7 +1806,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 5.3777776 + aspectRatio: 5.4 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png index c850a44..be1a5f3 100644 Binary files a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png index 29245eb..7c65414 100644 Binary files a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png new file mode 100644 index 0000000..1235848 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png.meta new file mode 100644 index 0000000..7a1f3bc --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 617710ce6d12c4737aadab0038dbc758 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png index 2cb47b2..6d8f65e 100644 Binary files a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png new file mode 100644 index 0000000..8a1838a Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png.meta new file mode 100644 index 0000000..22cda52 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e74c24d63f3a444be8ca5217dc6cdfcb +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png new file mode 100644 index 0000000..e58accc Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png.meta new file mode 100644 index 0000000..3cc1f8a --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4810c64eaf428441d83e82e3559dffe0 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid.meta new file mode 100644 index 0000000..07b48cd --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 475863b1bd0524118b26cbb7a144a5c5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png new file mode 100644 index 0000000..443f73e Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png.meta new file mode 100644 index 0000000..5580d1d --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 05bf168cc771d450584d73203e2357d1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png new file mode 100644 index 0000000..6bf7427 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png.meta new file mode 100644 index 0000000..2daed31 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 18718c26bd5694274bf115b6b47e6a03 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png new file mode 100644 index 0000000..0f7747e Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png.meta new file mode 100644 index 0000000..7f0cd7a --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d48e2c93ab2a7493a90e694ee9276d3b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab index 527c871..cf6e36a 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab @@ -748,8 +748,8 @@ MonoBehaviour: - name: cust_full_star x: 0 y: 0 - width: 47 - height: 45 + width: 51 + height: 49 borderLeft: 0 borderRight: 0 borderTop: 0 @@ -860,8 +860,8 @@ MonoBehaviour: - name: cust_cus_task x: 0 y: 0 - width: 74 - height: 64 + width: 40 + height: 35 borderLeft: 0 borderRight: 0 borderTop: 0 @@ -1280,8 +1280,8 @@ MonoBehaviour: - name: cust_limt x: 0 y: 0 - width: 35 - height: 35 + width: 39 + height: 39 borderLeft: 0 borderRight: 0 borderTop: 0 @@ -1403,6 +1403,90 @@ MonoBehaviour: paddingTop: 0 paddingBottom: 0 path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png + - name: cust_funnel + x: 0 + y: 0 + width: 42 + height: 44 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png + - name: cust_play2 + x: 0 + y: 0 + width: 81 + height: 81 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png + - name: guid_2 + x: 0 + y: 0 + width: 1019 + height: 1023 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png + - name: guid_1 + x: 0 + y: 0 + width: 1019 + height: 1023 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png + - name: guid_3 + x: 0 + y: 0 + width: 1019 + height: 1023 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png + - name: cust_order + x: 0 + y: 0 + width: 39 + height: 46 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png mPixelSize: 1 mReplacement: {fileID: 0} mCoordinates: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua index b6443fc..ab3f2f9 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua @@ -80,7 +80,11 @@ DBCust.onGetFilter = function(data) end DBCust.getFieldsByTask = function(taskValue) - return db.taskFields[taskValue] + taskValue = tostring(taskValue) + if not taskValue then + return {} + end + return db.taskFields[taskValue] or {} end DBCust.getFilter = function(filterName) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua index dcfb6e0..607ab77 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua @@ -6,15 +6,55 @@ DBUser = {} local db = {} +local icons = {} +local poplist = {} + function DBUser.onGetUsers(list) + poplist.options = ArrayList() + poplist.values = ArrayList() for i, v in ipairs(list) do db[v.loginNo] = v + poplist.options:Add(v.loginName) + poplist.values:Add(v.loginNo) end end +function DBUser.getPopList() + return poplist +end + function DBUser.getUserById(loginNo) return db[loginNo] end +function DBUser.getIcon(loginNo, callback) + ---@type _DBUser + local user = DBUser.getUserById(loginNo) + if user == nil or isNilOrEmpty(user.imageUrl) then + Utl.doCallback(callback, nil) + return + end + if icons[user.imageUrl] then + Utl.doCallback(callback, icons[user.imageUrl]) + return + end + WWWEx.get( + user.imageUrl, + nil, + CLAssetType.texture, + function(content, orgs) + content.name = user.imageUrl + icons[user.imageUrl] = content + Utl.doCallback(callback, content) + end, + function() + printe("取得头像失败") + end, + nil, + true, + 2 + ) +end + return DBUser diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua index 4075850..300d840 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua @@ -12,6 +12,7 @@ do local lastLoginBtn = "lastLoginBtn" local token = "token" local currGroup = "currGroup" + local showGuid = "showGuid" Prefs = {} @@ -113,4 +114,14 @@ do function Prefs.setCurrGroup(phone, val) PlayerPrefs.SetString(phone .. "_" .. currGroup, val) end + + function Prefs.getShowGuid() + local f = PlayerPrefs.GetInt(showGuid, 0) + return (f == 0 and true or false) + end + + function Prefs.setShowGuid(v) + local f = v and 0 or 1 + PlayerPrefs.SetInt(showGuid, f) + end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua index 671c96a..3f2bb2b 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua @@ -17,10 +17,11 @@ function _cell.init(csObj) uiobjs.LabelStatus = getCC(transform, "LabelStatus", "UIPopupList") -- uiobjs.LabelCustName = getCC(transform, "LabelCustName", "UILabel") -- uiobjs.SpriteStatus = getCC(transform, "SpriteStatus", "UISprite") - -- uiobjs.LabelServerNo = getCC(transform, "LabelServerNo", "UILabel") + uiobjs.LabelServerNo = getCC(transform, "LabelServerNo", "UILabel") ---@type CLUIFormRoot uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot") uiobjs.SpriteStatus = getChild(transform, "SpriteStatus") + uiobjs.SpriteHeadIcon = getCC(transform, "SpriteHeadBg/SpriteHeadIcon", "UITexture") end -- 显示， @@ -36,6 +37,24 @@ function _cell.show(go, data) else SetActive(uiobjs.SpriteStatus.gameObject, false) end + + _cell.setHeadIcon() +end + +function _cell.setHeadIcon() + ---@type _DBUser + local user = DBUser.getUserById(mData.serviceNo) + if user then + uiobjs.LabelServerNo.text = user.loginName + DBUser.getIcon( + mData.serviceNo, + function(texture) + if texture and texture.name == user.imageUrl then + uiobjs.SpriteHeadIcon.mainTexture = texture + end + end + ) + end end -- 取得数据 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua index 86a7c3b..f1db44d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua @@ -1,20 +1,29 @@ ---@class _ParamFieldAttr ---@field attrType ----@field ifMust +---@field ifMust boolean 1:true ---@field attrName ---@field attrValue ---@field id ---@field checkMin ---@field checkMax +---@field popOptions +---@field popValues +---@field donotJoinKey boolean 是否要拼接key ----@class _ParamCellExtendField ----@field +---@class _ParamCellExtendFiled +---@field isEditMode boolean +---@field attr _ParamFieldAttr +---@field onSelect function 当选择了poplist +---@field onClick function 当点击了输入框 +---@field onInputChange +---@field onMultTextInputChg -- xx单元 local _cell = {} ---@type Coolape.CLCellLua local csSelf = nil local transform = nil +---@type _ParamCellExtendFiled local mData = nil ---@type _ParamFieldAttr local attr @@ -56,6 +65,7 @@ end function _cell.show(go, data) mData = data attr = mData.attr + attr.ifMust = attr.ifMust or 0 if data.isEditMode then _cell.enabeldObj(uiobjs.boxCollider, true) @@ -80,21 +90,26 @@ function _cell.show(go, data) end _cell.enabeldObj(uiobjs.Label4, false) _cell.enabeldObj(uiobjs.SpriteRight, false) - + if uiobjs.ButtonReset then uiobjs.ButtonReset.disabled = true end end - local jsonKey = joinStr(attr.id, "_", attr.attrName) + local jsonKey + if attr.donotJoinKey then + jsonKey = attr.id + else + jsonKey = joinStr(attr.id, "_", attr.attrName) + end if uiobjs.element then uiobjs.element.valueIsNumber = false uiobjs.element.isPhoneNum = false - uiobjs.element.canNull = (attr.ifMust == 1 and false or true) + uiobjs.element.canNull = (attr.ifMust == 0 and true or false) uiobjs.element.jsonKey = jsonKey uiobjs.element.labeName.text = attr.attrName elseif uiobjs.checkbox then - uiobjs.checkbox.canNull = (attr.ifMust == 1 and false or true) + uiobjs.checkbox.canNull = (attr.ifMust == 0 and true or false) uiobjs.checkbox.jsonKey = jsonKey uiobjs.checkbox.labeName.text = attr.attrName end @@ -119,13 +134,17 @@ function _cell.show(go, data) uiobjs.checkbox:init(attr) elseif attr.attrType == DBCust.FieldType.popuplist then _cell.enabeldObj(uiobjs.input, false) - local strs = strSplit(attr.attrValue, "|") - local array = ArrayList() - array:Add("") - for i, v in ipairs(strs) do - array:Add(v) + if attr.popOptions then + uiobjs.popList:refreshItems(attr.popOptions, attr.popValues) + else + local strs = strSplit((attr.attrValue or ""), "|") + local array = ArrayList() + -- array:Add("") + for i, v in ipairs(strs) do + array:Add(v) + end + uiobjs.popList:refreshItems(array, array) end - uiobjs.popList:refreshItems(array, array) end end @@ -143,9 +162,14 @@ end function _cell.uiEventDelegate(go) if attr.attrType == DBCust.FieldType.multext then -- 说明大文本框改变了 - mData.parent.onMultTextInputChg() NGUITools.AddWidgetCollider(csSelf.gameObject, false) uiobjs.Label4.enabled = (uiobjs.element.value == "" and true or false) + Utl.doCallback(mData.onMultTextInputChg, csSelf.gameObject) + elseif + attr.attrType == DBCust.FieldType.number or attr.attrType == DBCust.FieldType.phone or + attr.attrType == DBCust.FieldType.text + then + Utl.doCallback(mData.onInputChange, csSelf.gameObject) end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua index 2990330..96f0854 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua @@ -1,18 +1,19 @@ --- xx单元 +---@class _ParamCellExtendFiledRoot +---@field data any +---@field fields table _ParamCellExtendFiled的list +---@field onFinish function 当加载完成 + +-- xx单元 local _cell = {} ---@type Coolape.CLCellLua local csSelf = nil local transform = nil +---@type _ParamCellExtendFiledRoot local mData = nil local uiobjs = {} ----@type _DBCust -local cust -local fields local fieldsObjs = {} -local isEditMode = true -local taskId = nil -local isFieldLoading = false -local oldtaskId +local queue = CLLQueue.new() +local isLoading = false -- 初始化，只调用一次 function _cell.init(csObj) @@ -27,10 +28,14 @@ end -- 显示， -- 注意，c#侧不会在调用show时，调用refresh function _cell.show(go, data) - mData = data - cust = data.data or {} - isEditMode = data.isEditMode - _cell.release() + queue:enQueue(data) + if not isLoading then + _cell.refresh() + end +end + +function _cell.refresh() + --[[ local taskId = tostring(cust.taskId) if (not isFieldLoading) or taskId ~= oldtaskId then isFieldLoading = true @@ -41,13 +46,23 @@ function _cell.show(go, data) _cell.initField(1, taskId) end end -end - -function _cell.initField(index, taskId) - if taskId ~= oldtaskId then + ]] + if queue:size() == 0 then return end - local fileAttr = fields[index] + _cell.release() + isLoading = true + mData = queue:deQueue() + if mData.fields and #(mData.fields) > 0 then + showHotWheel() + _cell.initField(1) + else + _cell.onFinisInitFields() + end +end + +function _cell.initField(index) + local fileAttr = mData.fields[index].attr local name = "" if fileAttr.attrType == DBCust.FieldType.popuplist then name = "InputPoplist" @@ -60,50 +75,51 @@ function _cell.initField(index, taskId) else name = "InputText" end - CLUIOtherObjPool.borrowObjAsyn(name, _cell.onLoadField, {index = index, taskId = taskId}) + CLUIOtherObjPool.borrowObjAsyn(name, _cell.onLoadField, index) end ---@param go UnityEngine.GameObject function _cell.onLoadField(name, go, orgs) - local index = orgs.index - local taskId = orgs.taskId - if taskId ~= oldtaskId then - hideHotWheel() - CLUIOtherObjPool.returnObj(go) - SetActive(go, false) - return - end + local index = orgs go.transform.parent = transform go.transform.localScale = Vector3.one go.transform.localEulerAngles = Vector3.zero - local fileAttr = fields[index] + ---@type _ParamCellExtendFiled + local param = mData.fields[index] local cell = go:GetComponent("CLCellLua") SetActive(go, true) - cell:init( - { - attr = fileAttr, - parent = _cell, - isEditMode = isEditMode, - onClick = mData.onClick, - onSelect = mData.onSelect - }, - nil - ) + --[[ + ---@type _ParamCellExtendFiled + local param = { + attr = fileAttr, + onMultTextInputChg = _cell.onMultTextInputChg, + isEditMode = isEditMode, + onClick = mData.onClick, + onSelect = mData.onSelect + } + ]] + if param.attr.attrType == DBCust.FieldType.multext then + -- 要设置一次 + param.orgOnMultTextInputChg = param.onMultTextInputChg + param.onMultTextInputChg = _cell.onMultTextInputChg + end + cell:init(param, nil) table.insert(fieldsObjs, cell) uiobjs.Table:Reposition() - if index == #fields then + if index == #(mData.fields) then _cell.onFinisInitFields() else - _cell.initField(index + 1, taskId) + _cell.initField(index + 1) end end function _cell.onFinisInitFields() - isFieldLoading = false + isLoading = false uiobjs.Table:Reposition() - uiobjs.formRoot:setValue(cust.jsonStr) + uiobjs.formRoot:setValue(mData.data) Utl.doCallback(mData.onFinish) hideHotWheel() + _cell.refresh() end function _cell.release() @@ -114,8 +130,16 @@ function _cell.release() fieldsObjs = {} end -function _cell.onMultTextInputChg() +function _cell.onMultTextInputChg(go) uiobjs.Table.repositionNow = true + ---@param v _ParamCellExtendFiled + if mData then + for i, v in ipairs(mData.fields) do + if v.attr.attrType == DBCust.FieldType.multext then + Utl.doCallback(v.orgOnMultTextInputChg, go) + end + end + end end -- 取得数据 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua new file mode 100644 index 0000000..ea271ed --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua @@ -0,0 +1,43 @@ +-- xx单元 +local _cell = {} +---@type Coolape.CLCellLua +local csSelf = nil +local transform = nil +local mData = nil +local uiobjs = {} + +-- 初始化，只调用一次 +function _cell.init(csObj) + csSelf = csObj + transform = csSelf.transform + uiobjs.SpriteIcon = getCC(transform, "SpriteIcon", "UISprite") + uiobjs.Label = getCC(transform, "Label", "UILabel") + uiobjs.Label2 = getCC(transform, "Label2", "UILabel") +end + +-- 显示， +-- 注意，c#侧不会在调用show时，调用refresh +function _cell.refresh(data, index) + mData = data + if mData then + SetActive(uiobjs.SpriteIcon.gameObject, true) + CLUIUtl.setSpriteFit(uiobjs.SpriteIcon, joinStr("guid_", mData.index)) + uiobjs.Label.text = mData.label + uiobjs.Label2.text = mData.label2 + else + SetActive(uiobjs.SpriteIcon.gameObject, false) + uiobjs.Label.text = "" + uiobjs.Label2.text = "" + end +end + +function _cell.refreshCurrent(index, data) +end + +-- 取得数据 +function _cell.getData() + return mData +end + +-------------------------------------------- +return _cell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta new file mode 100644 index 0000000..009ab43 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c0d53b2d702140a5aff3c3f027c4107 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua index 199830e..9c86cc0 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua @@ -22,7 +22,11 @@ end function _cell.show(go, data) mData = data uiobjs.formRoot:setValue(mData) - uiobjs.ButtonPlayVoice.isEnabled = (not isNilOrEmpty(mData.recordfile)) + if not isNilOrEmpty(mData.recordfile) then + SetActive(uiobjs.ButtonPlayVoice.gameObject, true) + else + SetActive(uiobjs.ButtonPlayVoice.gameObject, false) + end uiobjs.LabelLen.text = joinStr("录音:", DateEx.toStrCn(tonumber(mData.answertime)*1000)) end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua index 4f4ab46..b113197 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua @@ -220,7 +220,8 @@ function PanelCalender.onClickBtn(btnName) oldSelectedCell = nil curYear = DateTime.Now.Year curMonth = DateTime.Now.Month - csSelf:show() + PanelCalender.show() + PanelCalender.refresh() elseif btnName == "ButtonOkay" then CLPanelManager.hidePanel(csSelf) local dataStr = "" diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua index 9be2c7e..d3fa33a 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua @@ -124,6 +124,7 @@ function CLLPStart.onLoadPanelAfter(p) local count = #(lateLoadPanels) if (panelIndex >= count) then --已经加载完 + isLogined = true CLLPStart.connectServer() end end @@ -144,10 +145,11 @@ function CLLPStart.connectServer() -- showHotWheel() -- Net.self:connect(selectedServer.host, bio2number(selectedServer.port)) + isLogined = true NetProto.init( function(success) if success then - CLLPStart.doEnterGame() + CLLPStart.showGuid() else CLUIUtl.showConfirm( "与服务器失去联系", @@ -232,6 +234,14 @@ function CLLPStart.doEnterGame() end end +CLLPStart.showGuid = function() + if Prefs.getShowGuid() then + getPanelAsy("PanelGuid", onLoadedPanelTT, CLLPStart.doEnterGame) + else + CLLPStart.doEnterGame() + end +end + CLLPStart.hideSplash = function() local p2 = CLPanelManager.getPanel("PanelSplash") if (p2 ~= nil) then diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua index 4009a9d..a634cfc 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua @@ -35,6 +35,7 @@ function TRPCustDetail:init(csObj) uiobjs.InputCustType = getCC(uiobjs.DetailRoot.transform, "InputCustType", "UIPopupList") uiobjs.InputStatus = getCC(uiobjs.DetailRoot.transform, "InputStatus", "UIPopupList") uiobjs.InputFrom = getCC(uiobjs.DetailRoot.transform, "InputFrom", "UIPopupList") + uiobjs.InputLogin = getCC(uiobjs.DetailRoot.transform, "InputLogin", "UIPopupList") uiobjs.starGrid2 = getCC(uiobjs.DetailRoot.transform, "InputStars/Grid", "UIGrid") uiobjs.starGridPrefab2 = getChild(uiobjs.starGrid2.transform, "00000").gameObject @@ -80,6 +81,8 @@ function TRPCustDetail:show() uiobjs.InputFrom:refreshItems(optionInfor.options, optionInfor.values) optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.taskList) uiobjs.InputTask:refreshItems(optionInfor.options, optionInfor.values) + local poplist = DBUser.getPopList() + uiobjs.InputLogin:refreshItems(poplist.options, poplist.values) -- 设置星级 local stars = {} for i = 1, 5 do @@ -109,7 +112,9 @@ function TRPCustDetail:showDetail() SetActive(uiobjs.ExtendRoot.gameObject, true) SetActive(uiobjs.Records.gameObject, false) uiobjs.DetailRoot:setValue(self.mdata) - uiobjs.ExtendRoot:init({data = self.mdata, isEditMode = false}, nil) + + -- uiobjs.ExtendRoot:init({data = self.mdata, isEditMode = false}, nil) + self:showExtentFiles(self.mdata.taskId) -- 设置星级 local stars = {} @@ -123,6 +128,25 @@ function TRPCustDetail:showDetail() uiobjs.scrollView:ResetPosition() end +---public 显示扩展字段 +function TRPCustDetail:showExtentFiles(taskId) + ---@type _ParamCellExtendFiledRoot + local param = {} + param.data = self.mdata and self.mdata.jsonStr or {} + -- param.onFinish = self:wrapFunc(self.setExtendFieldsMode) + param.fields = {} + local fields = DBCust.getFieldsByTask(taskId) or {} + ---@type _ParamCellExtendFiled + local filedInfor + for i, v in ipairs(fields) do + filedInfor = {} + filedInfor.attr = v + filedInfor.isEditMode = false + table.insert(param.fields, filedInfor) + end + uiobjs.ExtendRoot:init(param, nil) +end + function TRPCustDetail:showRecords() SetActive(uiobjs.DetailRoot.gameObject, false) SetActive(uiobjs.ExtendRoot.gameObject, false) @@ -224,6 +248,9 @@ function TRPCustDetail:setEventDelegate() ButtonCall = function() MyUtl.callCust(self.mdata) end, + ButtonNewOrder = function() + getPanelAsy("PanelNewOrder", onLoadedPanelTT, self.mdata) + end, ButtonMore = function() getPanelAsy("PanelMoreProc4Cust", onLoadedPanelTT, self.mdata) end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua index 6a865d7..f7aec06 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua @@ -102,9 +102,11 @@ function TRPCustFilter:refreshFilterBtnStatus() if self:hadFilterVal() then uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc) uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc) + uiobjs.ButtonFilterSp.spriteName = "cust_funnel" else uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff999999) uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff999999) + uiobjs.ButtonFilterSp.spriteName = "cust_screen" end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua index a6b4834..dfd1da6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua @@ -104,9 +104,11 @@ function TRPCustList:refreshFilterBtnStatus() if self:hadFilterVal() then uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc) uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc) + uiobjs.ButtonFilterSp.spriteName = "cust_funnel" else uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff999999) uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff999999) + uiobjs.ButtonFilterSp.spriteName = "cust_screen" end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua new file mode 100644 index 0000000..808498a --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua @@ -0,0 +1,111 @@ +-- xx界面 +local TRPGuid = {} + +---@type Coolape.CLPanelLua +local csSelf = nil +---@type UnityEngine.Transform +local transform = nil +local uiobjs = {} +local callback + +-- 初始化，只会调用一次 +function TRPGuid.init(csObj) + csSelf = csObj + transform = csObj.transform + --[[ + 上的组件：getChild(transform, "offset", "Progress BarHong"):GetComponent("UISlider"); + --]] + ---@type UIGridPage + uiobjs.GridPage = getCC(transform, "PanelContent/Grid", "UIGridPage") + ---@type UIGrid + uiobjs.GridIndex = getCC(transform, "GridIndex", "UIGrid") + uiobjs.GridIndexPrefab = getChild(uiobjs.GridIndex.transform, "00000").gameObject + uiobjs.ButtonEnter = getChild(transform, "ButtonEnter").gameObject +end + +-- 设置数据 +function TRPGuid.setData(paras) + callback = paras +end + +--当有通用背板显示时的回调 +function TRPGuid.onShowFrame() +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPGuid.show() + SetActive(uiobjs.ButtonEnter, false) + uiobjs.GridPage.cellWidth = NumEx.getIntPart(MyUtl.getSizeAdjust() * Screen.width) + local pages = ArrayList() + pages:Add({index = 1, label = "业务轻松查看", label2 = "随时查看实时业绩情况"}) + pages:Add({index = 2, label = "客户随时跟进", label2 = "第一时间跟进客户记录消息内容"}) + pages:Add({index = 3, label = "订单高效处理", label2 = "随时随地及时处理各类客户订单"}) + uiobjs.GridPage:init(pages, TRPGuid.onShowPage, 0) +end + +function TRPGuid.onShowPage(index, data) + SetActive(uiobjs.ButtonEnter, index == 2) + local list = {} + for i = 0, 2 do + if i == index then + table.insert(list, true) + else + table.insert(list, false) + end + end + + CLUIUtl.resetList4Lua( + uiobjs.GridIndex, + uiobjs.GridIndexPrefab, + list, + function(cell, data) + local sp = cell:GetComponent("UISprite") + if data then + sp.color = ColorEx.getColor(0xff363636) + else + sp.color = ColorEx.getColor(0xff999999) + end + end + ) +end + +-- 刷新 +function TRPGuid.refresh() +end + +-- 关闭页面 +function TRPGuid.hide() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPGuid.procNetwork(cmd, succ, msg, paras) + --[[ + if(succ == NetSuccess) then + if(cmd == "xxx") then + -- TODO: + end + end + --]] +end + +-- 处理ui上的事件，例如点击等 +function TRPGuid.uiEventDelegate(go) + local goName = go.name + if(goName == "ButtonEnter") then + Prefs.setShowGuid(false) + hideTopPanel(csSelf) + Utl.doCallback(callback) + end +end + +-- 当顶层页面发生变化时回调 +function TRPGuid.onTopPanelChange(topPanel) +end + +-- 当按了返回键时，关闭自己（返值为true时关闭） +function TRPGuid.hideSelfOnKeyBack() + return true +end + +-------------------------------------------- +return TRPGuid diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua.meta new file mode 100644 index 0000000..1422bdb --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ccec78a7c3d1e429cb6e84a9be1dc177 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua index cedb80d..ec04e78 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua @@ -82,8 +82,10 @@ function TRPNewCust:show() uiobjs.InputFrom:refreshItems(optionInfor.options, optionInfor.values) optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.taskList) uiobjs.InputTask:refreshItems(optionInfor.options, optionInfor.values) - optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList) - uiobjs.InputLogin:refreshItems(optionInfor.options, optionInfor.values) + + -- optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList) + local poplist = DBUser.getPopList() + uiobjs.InputLogin:refreshItems(poplist.options, poplist.values) self:refreshContent() @@ -95,27 +97,31 @@ end function TRPNewCust:refreshContent() uiobjs.DetailRoot:setValue(self.mdata) - if self.isNewCust then - uiobjs.ExtendRoot:init( - { - data = self.mdata, - onFinish = self:wrapFunc(self.setExtendFieldsMode), - isEditMode = true - }, - nil - ) - else - uiobjs.ExtendRoot:init( - { - data = self.mdata, - isEditMode = true, - onFinish = self:wrapFunc(self.setExtendFieldsMode), - onClick = self:wrapFunc(self.onClickInputField4Extend), - onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) - }, - nil - ) - end + + -- if self.isNewCust then + -- uiobjs.ExtendRoot:init( + -- { + -- data = self.mdata, + -- onFinish = self:wrapFunc(self.setExtendFieldsMode), + -- isEditMode = true + -- }, + -- nil + -- ) + -- else + -- uiobjs.ExtendRoot:init( + -- { + -- data = self.mdata, + -- isEditMode = true, + -- onFinish = self:wrapFunc(self.setExtendFieldsMode), + -- onClick = self:wrapFunc(self.onClickInputField4Extend), + -- onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) + -- }, + -- nil + -- ) + -- end + + local taskId = self.mdata and self.mdata.taskId or nil + self:showExtentFiles(taskId) -- 设置星级 stars = {} @@ -126,6 +132,30 @@ function TRPNewCust:refreshContent() self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1) end +---public 显示扩展字段 +function TRPNewCust:showExtentFiles(taskId) + ---@type _ParamCellExtendFiledRoot + local param = {} + param.data = self.mdata and self.mdata.jsonStr or {} + -- param.isEditMode = true + param.onFinish = self:wrapFunc(self.setExtendFieldsMode) + param.fields = {} + local fields = DBCust.getFieldsByTask(taskId) or {} + ---@type _ParamCellExtendFiled + local filedInfor + for i, v in ipairs(fields) do + filedInfor = {} + filedInfor.attr = v + filedInfor.isEditMode = true + if not self.isNewCust then + filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend) + filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) + end + table.insert(param.fields, filedInfor) + end + uiobjs.ExtendRoot:init(param, nil) +end + function TRPNewCust:reposition() uiobjs.DetailRootTabel.repositionNow = true uiobjs.Table.repositionNow = true @@ -182,7 +212,7 @@ function TRPNewCust:setElementMode(el) else boxcollider.enabled = true end - + if ButtonReset then ButtonReset.disabled = (not self.isNewCust) end @@ -372,27 +402,7 @@ function TRPNewCust:setEventDelegate() ) end, InputTask = function() - if self.isNewCust then - uiobjs.ExtendRoot:init( - { - data = {taskId = uiobjs.InputTask.value}, - onFinish = self:wrapFunc(self.setExtendFieldsMode), - isEditMode = true - }, - nil - ) - else - uiobjs.ExtendRoot:init( - { - data = self.mdata, - isEditMode = true, - onFinish = self:wrapFunc(self.setExtendFieldsMode), - onClick = self:wrapFunc(self.onClickInputField4Extend), - onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) - }, - nil - ) - end + self:showExtentFiles(uiobjs.InputTask.value) end } end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua new file mode 100644 index 0000000..a1bd740 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua @@ -0,0 +1,448 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPNewOrder:TRBasePanel 邮件列表 +local TRPNewOrder = class("TRPNewOrder", TRBasePanel) + +local uiobjs = {} + +local stars = {} +-- 初始化，只会调用一次 +function TRPNewOrder:init(csObj) + TRPNewOrder.super.init(self, csObj) + self:initFiledsAttr() + self:setEventDelegate() + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0) + ---@type UIScrollView + uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView") + ---@type UITable + uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable") + ---@type CLUIFormRoot + uiobjs.DetailFromRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLUIFormRoot") + uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLCellLua") + ---@type UITable + uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable") + uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua") + ---@type CLUIFormRoot + uiobjs.ExtendFormRoot = uiobjs.ExtendRoot:GetComponent("CLUIFormRoot") + -- uiobjs.elements = uiobjs.DetailRoot.gameObject:GetComponentsInChildren(typeof(CLUIElement), true) + uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave") +end + +function TRPNewOrder:initFiledsAttr() + ---@type _ParamFieldAttr + local attr + self.baseFiledsAttr = {} + attr = {} + attr.attrName = "工单模板" + attr.id = "" + attr.attrType = DBCust.FieldType.popuplist + attr.ifMust = 1 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "工单名称" + attr.id = "" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 1 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "紧急程序" + attr.id = "" + attr.attrType = DBCust.FieldType.popuplist + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "客户号码" + attr.id = "phoneNo" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 1 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "所属任务" + attr.id = "taskId" + attr.attrType = DBCust.FieldType.popuplist + attr.ifMust = 0 + attr.donotJoinKey = true + local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.taskList) + attr.popOptions = popInfor.options + attr.popValues = popInfor.values + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "客户名称" + attr.id = "custName" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "公司名称" + attr.id = "companyName" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "联系地址" + attr.id = "address" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "订单内容" + attr.id = "" + attr.attrType = DBCust.FieldType.multext + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) +end + +-- 设置数据 +---@param paras _ParamTRPNewOrder +function TRPNewOrder:setData(paras) + if paras and paras.orderId and paras.orderId > 0 then + self.isNewOrder = false + self.mdata = paras + else + --//TODO:初始值 + self.isNewOrder = true + self.mdata = paras + end + if type(self.mdata.jsonStr) == "string" then + self.mdata.jsonStr = json.decode(self.mdata.jsonStr) + end + self.mdata.jsonStr = self.mdata.jsonStr or {} +end + +---public 当有通用背板显示时的回调 +---@param cs Coolape.CLPanelLua +function TRPNewOrder:onShowFrame(cs) + if cs.frameObj then + ---@type _BGFrame1Param + local d = {} + if self.isNewOrder then + d.title = "新建订单" + else + d.title = "修改订单" + end + d.panel = cs + cs.frameObj:init(d) + end +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPNewOrder:show() + self:refreshContent() + SetActive(uiobjs.ButtonSave.gameObject, self.isNewOrder) + + uiobjs.scrollView:ResetPosition() +end + +function TRPNewOrder:refreshContent() + self:showBaseFields() + local taskId = self.mdata and self.mdata.taskId or nil + self:showExtentFiles(taskId) + + self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1) +end + +function TRPNewOrder:showBaseFields() + ---@type _ParamCellExtendFiledRoot + local param = {} + param.data = self.mdata or {} + param.onFinish = self:wrapFunc(self.setExtendFieldsMode) + param.fields = {} + ---@type _ParamCellExtendFiled + local filedInfor + + for i, v in ipairs(self.baseFiledsAttr) do + -- 工单模板 + filedInfor = {} + filedInfor.attr = v + filedInfor.isEditMode = true + if filedInfor.attr.attrType == DBCust.FieldType.multext then + filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) + end + if not self.isNewOrder then + filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend) + filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) + end + table.insert(param.fields, filedInfor) + end + + uiobjs.DetailRoot:init(param, nil) +end + +---public 显示扩展字段 +function TRPNewOrder:showExtentFiles(taskId) + ---@type _ParamCellExtendFiledRoot + local param = {} + param.data = self.mdata and self.mdata.jsonStr or {} + -- param.isEditMode = true + param.onFinish = self:wrapFunc(self.setExtendFieldsMode) + param.fields = {} + local fields = DBCust.getFieldsByTask(taskId) or {} + ---@type _ParamCellExtendFiled + local filedInfor + for i, v in ipairs(fields) do + filedInfor = {} + filedInfor.attr = v + filedInfor.isEditMode = true + if filedInfor.attr.attrType == DBCust.FieldType.multext then + filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) + end + if not self.isNewOrder then + filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend) + filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) + end + table.insert(param.fields, filedInfor) + end + uiobjs.ExtendRoot:init(param, nil) +end + +function TRPNewOrder:reposition() + uiobjs.DetailRootTabel.repositionNow = true + uiobjs.Table.repositionNow = true +end + +function TRPNewOrder:setExtendFieldsMode() + local elements = uiobjs.ExtendRoot.gameObject:GetComponentsInChildren(typeof(CLUIElement), true) + for i = 0, elements.Length - 1 do + self:setElementMode(elements[i]) + end + self:reposition() +end + +function TRPNewOrder:setElementMode(el) + local isPopList = el:GetComponent("UIPopupList") + local isPopCheckbox = el:GetComponent("CLUICheckbox") + ---@type UIInput + local input = el:GetComponent("UIInput") + local inputOnGUI = el:GetComponent("UIInputOnGUI") + local boxcollider = el:GetComponent("BoxCollider") + local ButtonReset = getCC(el.transform, "ButtonReset", "MyInputReset") + + if (not self.isNewOrder) and (el.jsonKey == "taskId" or el.jsonKey == "phoneNo") then + boxcollider.enabled = false + else + boxcollider.enabled = true + end + + if ButtonReset then + ButtonReset.disabled = (not self.isNewOrder) + end + if input then + if isPopList or isPopCheckbox then + input.enabled = false + if inputOnGUI then + inputOnGUI.enabled = false + end + else + if self.isNewOrder then + input.enabled = true + if inputOnGUI then + inputOnGUI.enabled = true + end + else + input.enabled = false + if inputOnGUI then + inputOnGUI.enabled = false + end + end + end + end +end + +-- 刷新 +function TRPNewOrder:refresh() +end + +-- 关闭页面 +function TRPNewOrder:hide() + if uiobjs.ExtendRoot.luaTable then + uiobjs.ExtendRoot.luaTable.release() + end +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPNewOrder:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + if cmd == NetProto.cmds.update_customer then + self:refreshContent() + end + end +end + +function TRPNewOrder:onPopupFieldValChg(go) + if self.isNewOrder then + return + end + ---@type CLUIElement + local el = go:GetComponent("CLUIElement") + if el then + local err = el:checkValid() + if tostring(el.value) ~= tostring(self.mdata[el.jsonKey]) then + if isNilOrEmpty(err) then + self:sendModifymsg(el.jsonKey, el.value, false) + else + MyUtl.toastW(err) + end + end + end +end + +function TRPNewOrder:onClickInputField(go) + if self.isNewOrder then + return + end + + ---@type CLUIElement + local el = go:GetComponent("CLUIElement") + if el then + getPanelAsy( + "PanelModifyFiled", + onLoadedPanelTT, + { + label = el.labeName.text, + key = el.jsonKey, + value = el.value, + canNull = el.canNull, + callback = self:wrapFunc(self.onFinishSetField) + } + ) + end +end +function TRPNewOrder:onFinishSetField(key, val) + if tostring(val) ~= tostring(self.mdata[key]) then + self:sendModifymsg(key, val, false) + end +end + +function TRPNewOrder:sendModifymsg(key, val, isExtend) + local content = {} + content.id = self.mdata.custId + if isExtend then + content.jsonStr = {[key] = val} + else + content[key] = val + end + showHotWheel() + NetProto.send.update_customer( + content, + function(result, orgs) + hideHotWheel() + if result.success then + -- 更新本地数据 + if isExtend then + self.mdata.jsonStr[key] = val + else + self.mdata[key] = val + end + MyUtl.toastS("修改成功") + end + end + ) +end + +function TRPNewOrder:onPopupFieldValChg4Extend(go) + if self.isNewOrder then + return + end + ---@type CLUIElement + local el = go:GetComponent("CLUIElement") + if el then + local err = el:checkValid() + if (not isNilOrEmpty(el.value)) and tostring(el.value) ~= tostring(self.mdata.jsonStr[el.jsonKey]) then + if isNilOrEmpty(err) then + -- 有修改，发送数据 + self:sendModifymsg(el.jsonKey, el.value, true) + else + MyUtl.toastW(err) + end + end + end +end + +function TRPNewOrder:onClickInputField4Extend(go) + if self.isNewOrder then + return + end + + ---@type CLUIElement + local el = go:GetComponent("CLUIElement") + if el then + getPanelAsy( + "PanelModifyFiled", + onLoadedPanelTT, + { + label = el.labeName.text, + key = el.jsonKey, + value = el.value, + canNull = el.canNull, + callback = self:wrapFunc(self.onFinishSetField4Extend) + } + ) + end +end + +function TRPNewOrder:onFinishSetField4Extend(key, val) + if tostring(val) ~= tostring(self.mdata.jsonStr[key]) then + self:sendModifymsg(key, val, true) + end +end + +function TRPNewOrder:setEventDelegate() + self.EventDelegate = { + ButtonSave = function() + local err = uiobjs.DetailRoot:checkValid() + err = joinStr(err, uiobjs.ExtendFormRoot:checkValid()) + if not isNilOrEmpty(err) then + MyUtl.toastW(err) + return + end + + local cust = uiobjs.DetailRoot:getValue(true) + cust.customerLabel = self.mdata.customerLabel + local jsonStr = uiobjs.ExtendFormRoot:getValue(true) + cust.jsonStr = jsonStr + showHotWheel() + NetProto.send.save_customer( + cust, + function(content) + if content.success then + getPanelAsy("PanelCustDetail", onLoadedPanel, cust) + end + hideHotWheel() + end + ) + end, + InputTask = function() + self:showExtentFiles(uiobjs.InputTask.value) + end + } +end +-- 处理ui上的事件，例如点击等 +function TRPNewOrder:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPNewOrder:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPNewOrder diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta new file mode 100644 index 0000000..212613d --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3b9f5a5843f39450881fdb763d1ad219 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab index 38e0102..202699c 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab @@ -497,7 +497,7 @@ MonoBehaviour: target: {fileID: 6707647812568961046} relative: 0 absolute: 1 - updateAnchors: 0 + updateAnchors: 1 mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} mPivot: 4 mWidth: 1025 @@ -506,7 +506,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 535 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab index a1447a8..d7afa4d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab @@ -413,6 +413,13 @@ MonoBehaviour: field: name: go oneShot: 0 + - mTarget: {fileID: 114614343490987310} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 mValue: --- !u!114 &1657931634484404253 MonoBehaviour: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab index 91f4c86..ce2a5ea 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab @@ -1,106 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1031430753948494889 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5232087136787169813} - - component: {fileID: 4308909144031007613} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5232087136787169813 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1031430753948494889} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 250.87497, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 901305796782490446} - m_Father: {fileID: 3276146319859659945} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4308909144031007613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1031430753948494889} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0, g: 0, b: 0, a: 1} - mPivot: 4 - mWidth: 374 - mHeight: 90 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 13.2 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: "\u6DFB\u6DFB\u547C" - mFontSize: 90 - mFontStyle: 1 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mMaterial: {fileID: 0} - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 52 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 - isAppendEndingString: 0 - AppendString: '...' - fontName: EmptyFont --- !u!1 &2528687515838085996 GameObject: m_ObjectHideFlags: 0 @@ -131,7 +30,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 63480084012170021} - - {fileID: 5232087136787169813} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -208,106 +106,6 @@ MonoBehaviour: frameName: frameObj: {fileID: 0} titleKeyName: ---- !u!1 &6597490561069303931 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 901305796782490446} - - component: {fileID: 7489406785846308828} - m_Layer: 5 - m_Name: Label2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &901305796782490446 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6597490561069303931} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -81.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5232087136787169813} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7489406785846308828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6597490561069303931} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1} - mPivot: 4 - mWidth: 370 - mHeight: 40 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 9.45 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: TIANTIANFU - mFontSize: 40 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mMaterial: {fileID: 0} - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 14 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 - isAppendEndingString: 0 - AppendString: '...' - fontName: EmptyFont --- !u!1 &7309178494531336136 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab index dd67ca0..2331d83 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1177340835} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -993, z: 0} + m_LocalPosition: {x: -7201.4995, y: -993, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1558906886} @@ -418,7 +418,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.3043478 + aspectRatio: 17.152174 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -602,7 +602,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 300560038681990072} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -562.49976, y: -31.154175, z: 0} + m_LocalPosition: {x: -58.5, y: -30.904175, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4617885624738150900} @@ -667,6 +667,8 @@ GameObject: - component: {fileID: 2697910493527508736} - component: {fileID: 5505159239078827239} - component: {fileID: 712229426} + - component: {fileID: 7220670862699964352} + - component: {fileID: 9210945253873222577} m_Layer: 5 m_Name: InputLogin m_TagString: Untagged @@ -682,7 +684,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 327803728242433232} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -1607.9043, z: 0} + m_LocalPosition: {x: 0, y: -1608.5292, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7437227367285276943} @@ -838,6 +840,71 @@ MonoBehaviour: widget: {fileID: 8273262294696076073} offset: 0 sizeAdjust: 1 +--- !u!114 &7220670862699964352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 327803728242433232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3} + m_Name: + m_EditorClassIdentifier: + atlasName: + atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + fontName: + bitmapFont: {fileID: 0} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} + fontSize: 46 + fontStyle: 0 + backgroundSprite: public_button + highlightSprite: public_button + position: 0 + alignment: 1 + items: [] + valueItems: [] + padding: {x: 4, y: 4} + textColor: {r: 1, g: 1, b: 1, a: 1} + backgroundColor: {r: 1, g: 1, b: 1, a: 1} + highlightColor: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + isAnimated: 1 + isLocalized: 0 + openOn: 0 + onChange: + - mTarget: {fileID: 545570124874730216} + mMethodName: SetCurrentSelection + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + mSelectedItem: + mPanel: {fileID: 0} + mChild: {fileID: 0} + mBackground: {fileID: 0} + mHighlight: {fileID: 0} + mHighlightedLabel: {fileID: 0} + mLabelList: [] + mBgBorder: 0 + eventReceiver: {fileID: 0} + functionName: + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &9210945253873222577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 327803728242433232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &330521499854047422 GameObject: m_ObjectHideFlags: 0 @@ -863,7 +930,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330521499854047422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -80, z: 0} + m_LocalPosition: {x: 0, y: -79, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7500700651774525181} @@ -906,7 +973,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.36646 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -1469,106 +1536,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: jsonKey: ---- !u!1 &751307376757363818 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6132836565392535377} - - component: {fileID: 1351399831208777546} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6132836565392535377 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 751307376757363818} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 20, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5159241745770591247} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1351399831208777546 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 751307376757363818} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} - mPivot: 4 - mWidth: 46 - mHeight: 56 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.8214286 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: "\u2026" - mFontSize: 55 - mFontStyle: 1 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mMaterial: {fileID: 0} - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 - isAppendEndingString: 0 - AppendString: '...' - fontName: EmptyFont --- !u!1 &860567148227509470 GameObject: m_ObjectHideFlags: 0 @@ -1599,7 +1566,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 860567148227509470} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -812.7792, z: 0} + m_LocalPosition: {x: 0, y: -813.2792, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5102142972932297210} @@ -2139,106 +2106,6 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont ---- !u!1 &1397929183874512347 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8739419201363040371} - - component: {fileID: 8085971625840891050} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8739419201363040371 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1397929183874512347} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -35, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5159241745770591247} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8085971625840891050 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1397929183874512347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - rightAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} - mPivot: 4 - mWidth: 160 - mHeight: 40 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 4 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: "\u66F4\u591A\u64CD\u4F5C" - mFontSize: 40 - mFontStyle: 0 - mAlignment: 0 - mEncoding: 1 - mMaxLineCount: 0 - mEffectStyle: 0 - mEffectColor: {r: 0, g: 0, b: 0, a: 1} - mSymbols: 1 - mEffectDistance: {x: 1, y: 1} - mOverflow: 2 - mMaterial: {fileID: 0} - mApplyGradient: 0 - mGradientTop: {r: 1, g: 1, b: 1, a: 1} - mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 0 - mSpacingY: 0 - mUseFloatSpacing: 0 - mFloatSpacingX: 0 - mFloatSpacingY: 0 - mShrinkToFit: 0 - mMaxLineWidth: 0 - mMaxLineHeight: 0 - mLineWidth: 0 - mMultiline: 1 - isAppendEndingString: 0 - AppendString: '...' - fontName: EmptyFont --- !u!1 &1426590260397864594 GameObject: m_ObjectHideFlags: 0 @@ -2269,7 +2136,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426590260397864594} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -494.02917, z: 0} + m_LocalPosition: {x: 0, y: -493.65417, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5590651845147467471} @@ -2493,7 +2360,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -2593,7 +2460,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.40625 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -2639,8 +2506,8 @@ Transform: m_Children: - {fileID: 1740105619687658790} - {fileID: 4575105994691112643} + - {fileID: 2380481955376313973} - {fileID: 6732995427251295025} - - {fileID: 5159241745770591247} m_Father: {fileID: 4162566259368932257} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2920,13 +2787,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2115228301044587313} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 150, y: -0, z: 0} + m_LocalPosition: {x: 450, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 472846312293521342} - {fileID: 3420201465667432822} m_Father: {fileID: 2414504392305161023} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &4670816754697784367 BoxCollider: @@ -2975,6 +2842,87 @@ MonoBehaviour: field: name: go oneShot: 0 +--- !u!1 &2189763660186584061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2380481955376313973} + - component: {fileID: 7087557509142254429} + - component: {fileID: 2391197228026296955} + m_Layer: 5 + m_Name: ButtonNewOrder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2380481955376313973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2189763660186584061} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 150, y: -0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4322061232569096940} + - {fileID: 1405018313878959386} + m_Father: {fileID: 2414504392305161023} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7087557509142254429 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2189763660186584061} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 200, y: 150, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2391197228026296955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2189763660186584061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 3907190329897735174} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 0 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 6047075214505752480} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 --- !u!1 &2199864162267651639 GameObject: m_ObjectHideFlags: 0 @@ -3243,7 +3191,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.40625 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -3783,7 +3731,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 18.130434 + aspectRatio: 17.152174 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -4133,7 +4081,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -4440,7 +4388,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -4979,7 +4927,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3559394816311176333} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -1449.5292, z: 0} + m_LocalPosition: {x: 0, y: -1449.1542, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4819662503264524173} @@ -5368,7 +5316,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -5468,7 +5416,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.40625 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -5652,7 +5600,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.40625 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -5836,7 +5784,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.36646 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -5852,6 +5800,90 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!1 &3907190329897735174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4322061232569096940} + - component: {fileID: 5694144268210864777} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4322061232569096940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3907190329897735174} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 20, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2380481955376313973} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5694144268210864777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3907190329897735174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 40 + mHeight: 46 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.8695652 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_order + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &4153693591515764983 GameObject: m_ObjectHideFlags: 0 @@ -5878,7 +5910,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4153693591515764983} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -49.154186, z: 0} + m_LocalPosition: {x: 0, y: -48.904186, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1774050794054873230} @@ -6388,7 +6420,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -6488,7 +6520,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 18.130434 + aspectRatio: 17.152174 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -7007,11 +7039,11 @@ MonoBehaviour: leftAnchor: target: {fileID: 1558906886} relative: 1 - absolute: -172 + absolute: -171 rightAnchor: target: {fileID: 1558906886} relative: 1 - absolute: -88 + absolute: -89 bottomAnchor: target: {fileID: 0} relative: 0 @@ -7021,15 +7053,15 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 0 - mColor: {r: 0.15294118, g: 0.6313726, b: 0.38039216, a: 1} + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 - mWidth: 84 - mHeight: 100 + mWidth: 82 + mHeight: 82 mDepth: 5 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.84 + aspectRatio: 1 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -7042,7 +7074,7 @@ MonoBehaviour: topType: 1 atlasName: atlasAllReal mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} - mSpriteName: cust_play + mSpriteName: cust_play2 mFillCenter: 1 isGrayMode: 0 --- !u!114 &8456796200443986376 @@ -7302,7 +7334,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5660334014402219284} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -653.4042, z: 0} + m_LocalPosition: {x: 0, y: -653.9042, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 202214002988795572} @@ -7617,7 +7649,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8363,7 +8395,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8735,7 +8767,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6703740035418372569} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -177.27917, z: 0} + m_LocalPosition: {x: 0, y: -177.15417, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8310298469372947710} @@ -9065,7 +9097,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6767837784972515875} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -80, z: 0} + m_LocalPosition: {x: 0, y: -79, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7643411659082692046} @@ -9375,6 +9407,106 @@ MonoBehaviour: relativeOffset: {x: 0, y: 0} pixelOffset: {x: 0, y: 0} widgetContainer: {fileID: 0} +--- !u!1 &7336360260128999782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1405018313878959386} + - component: {fileID: 5125065396183744878} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1405018313878959386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7336360260128999782} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -35, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2380481955376313973} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5125065396183744878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7336360260128999782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 160 + mHeight: 40 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 3 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u65B0\u5EFA\u8BA2\u5355" + mFontSize: 40 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont --- !u!1 &7428833437562136517 GameObject: m_ObjectHideFlags: 0 @@ -9589,6 +9721,7 @@ Transform: m_Children: - {fileID: 5600722748418214410} - {fileID: 3526191170255772918} + - {fileID: 5159241745770591247} m_Father: {fileID: 5557578428968861269} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9778,7 +9911,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7951431186895751230} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -79, z: 0} + m_LocalPosition: {x: 0, y: -80, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 440404046271724123} @@ -9821,7 +9954,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.40625 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -9869,7 +10002,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7973368148020256193} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -1130.4042, z: 0} + m_LocalPosition: {x: 0, y: -1130.7792, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7940845372807097128} @@ -10122,7 +10255,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8028106504999526989} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -1289.7792, z: 0} + m_LocalPosition: {x: 0, y: -1290.0292, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2051568360674601483} @@ -10580,7 +10713,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5046301095161937844 Transform: m_ObjectHideFlags: 0 @@ -10589,7 +10722,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8334985969893456042} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -562.4998, y: -1777.6542, z: 0} + m_LocalPosition: {x: -7763.9995, y: -1777.6542, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6071405706008826123} @@ -11177,7 +11310,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.36646 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -11533,7 +11666,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9013061697839465457} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -971.02924, z: 0} + m_LocalPosition: {x: 0, y: -972.5292, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 374488194008687970} @@ -11927,7 +12060,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9087555744602308920} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00012207031, y: -335.77917, z: 0} + m_LocalPosition: {x: 0, y: -334.40417, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4854796181971935794} @@ -12194,6 +12327,7 @@ GameObject: - component: {fileID: 5159241745770591247} - component: {fileID: 7732116634627493807} - component: {fileID: 6174640367478495686} + - component: {fileID: 1887830263789464971} m_Layer: 5 m_Name: ButtonMore m_TagString: Untagged @@ -12208,14 +12342,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9142098859644463061} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 450, y: -0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 478, y: -66, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8739419201363040371} - - {fileID: 6132836565392535377} - m_Father: {fileID: 2414504392305161023} - m_RootOrder: 3 + m_Children: [] + m_Father: {fileID: 5859676712538490637} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &7732116634627493807 BoxCollider: @@ -12242,7 +12374,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} m_Name: m_EditorClassIdentifier: - tweenTarget: {fileID: 0} + tweenTarget: {fileID: 9142098859644463061} hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} @@ -12264,3 +12396,72 @@ MonoBehaviour: field: name: go oneShot: 0 +--- !u!114 &1887830263789464971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9142098859644463061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5557578428968861269} + relative: 1 + absolute: -116 + rightAnchor: + target: {fileID: 5557578428968861269} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 4 + mWidth: 66 + mHeight: 80 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.825 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u2026" + mFontSize: 80 + mFontStyle: 1 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab index 38eb497..320bef7 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab @@ -247,8 +247,8 @@ GameObject: m_Component: - component: {fileID: 215294783250459625} - component: {fileID: 215294783250459621} - - component: {fileID: 215294783250459620} - component: {fileID: 555250036354483927} + - component: {fileID: 7224689720949346561} m_Layer: 5 m_Name: ButtonFilter m_TagString: Untagged @@ -284,40 +284,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 200, y: 100, z: 0} m_Center: {x: -61.2, y: 0, z: 0} ---- !u!114 &215294783250459620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 215294783250459624} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenTarget: {fileID: 215294783250459624} - hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} - pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} - disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - duration: 0.2 - skipColorEffect: 1 - dragHighlight: 0 - hoverSprite: - pressedSprite: - disabledSprite: - hoverSprite2D: {fileID: 0} - pressedSprite2D: {fileID: 0} - disabledSprite2D: {fileID: 0} - pixelSnap: 0 - onClick: - - mTarget: {fileID: 4128751237254219587} - mMethodName: uiEventDelegate - mParameters: - - obj: {fileID: 0} - field: - name: go - oneShot: 0 --- !u!114 &555250036354483927 MonoBehaviour: m_ObjectHideFlags: 0 @@ -371,6 +337,40 @@ MonoBehaviour: mSpriteName: cust_screen mFillCenter: 1 isGrayMode: 0 +--- !u!114 &7224689720949346561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 215294783250459624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} + m_Name: + m_EditorClassIdentifier: + onHoverOver: [] + onHoverOut: [] + onPress: [] + onRelease: [] + onSelect: [] + onDeselect: [] + onClick: + - mTarget: {fileID: 4128751237254219587} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] --- !u!1 &453219090744782258 GameObject: m_ObjectHideFlags: 0 @@ -638,7 +638,7 @@ MonoBehaviour: rightAnchor: target: {fileID: 8411829511229606282} relative: 1 - absolute: -70 + absolute: -65 bottomAnchor: target: {fileID: 0} relative: 0 @@ -650,13 +650,13 @@ MonoBehaviour: updateAnchors: 0 mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} mPivot: 3 - mWidth: 35 - mHeight: 36 + mWidth: 40 + mHeight: 40 mDepth: 0 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.9722222 + aspectRatio: 1 mType: 1 mFillDirection: 4 mFillAmount: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab index cee0fc5..a7f3f16 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab @@ -577,7 +577,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1294460323545007280} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 75, y: 0, z: 0} + m_LocalPosition: {x: 80, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4402139153552763532} @@ -612,7 +612,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 mWidth: 96 mHeight: 48 @@ -794,9 +794,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2651964549563356416} - - component: {fileID: 508086861624727727} + - component: {fileID: 3036458382337456059} m_Layer: 5 - m_Name: Sprite + m_Name: SpriteHeadIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -816,7 +816,7 @@ Transform: m_Father: {fileID: 7844925731963972638} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &508086861624727727 +--- !u!114 &3036458382337456059 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -825,7 +825,7 @@ MonoBehaviour: m_GameObject: {fileID: 1437258854777228652} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3} m_Name: m_EditorClassIdentifier: leftAnchor: @@ -847,13 +847,13 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 1, g: 1, b: 1, a: 1} mPivot: 4 - mWidth: 90 - mHeight: 108 + mWidth: 144 + mHeight: 144 mDepth: 6 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.8333333 + aspectRatio: 1 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -864,11 +864,17 @@ MonoBehaviour: rightType: 1 bottomType: 1 topType: 1 - atlasName: atlasAllReal - mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} - mSpriteName: cust_peo - mFillCenter: 1 - isGrayMode: 0 + mRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + mTexture: {fileID: 0} + mMat: {fileID: 2100000, guid: 2ad608d4961f440808f08845745e5f23, type: 2} + mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3} + mBorder: {x: 0, y: 0, z: 0, w: 0} + mFixedAspect: 0 --- !u!1 &1505692092124808818 GameObject: m_ObjectHideFlags: 0 @@ -1178,7 +1184,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2173784275828466390} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 75, y: 0, z: 0} + m_LocalPosition: {x: 80, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 309589217806885855} @@ -1213,7 +1219,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 mWidth: 96 mHeight: 48 @@ -1281,7 +1287,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2831399258564446556} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -25, y: -135.75, z: 0} + m_LocalPosition: {x: -25, y: -136, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3423234776315785790} @@ -1364,15 +1370,15 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 0 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 mWidth: 50 - mHeight: 50 + mHeight: 44 mDepth: 8 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1 + aspectRatio: 1.1363636 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -1733,8 +1739,8 @@ GameObject: m_Component: - component: {fileID: 3835798374104603645} - component: {fileID: 3835798374104603633} - - component: {fileID: 3835798374104603632} - component: {fileID: 3491199891844855491} + - component: {fileID: 1855959389528402021} m_Layer: 5 m_Name: ButtonFilter m_TagString: Untagged @@ -1770,40 +1776,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 200, y: 100, z: 0} m_Center: {x: -61.2, y: 0, z: 0} ---- !u!114 &3835798374104603632 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3835798374104603644} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenTarget: {fileID: 3835798374104603644} - hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} - pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} - disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - duration: 0.2 - skipColorEffect: 1 - dragHighlight: 0 - hoverSprite: - pressedSprite: - disabledSprite: - hoverSprite2D: {fileID: 0} - pressedSprite2D: {fileID: 0} - disabledSprite2D: {fileID: 0} - pixelSnap: 0 - onClick: - - mTarget: {fileID: 1048171421149951831} - mMethodName: uiEventDelegate - mParameters: - - obj: {fileID: 0} - field: - name: go - oneShot: 0 --- !u!114 &3491199891844855491 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1857,6 +1829,40 @@ MonoBehaviour: mSpriteName: cust_screen mFillCenter: 1 isGrayMode: 0 +--- !u!114 &1855959389528402021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3835798374104603644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} + m_Name: + m_EditorClassIdentifier: + onHoverOver: [] + onHoverOut: [] + onPress: [] + onRelease: [] + onSelect: [] + onDeselect: [] + onClick: + - mTarget: {fileID: 1048171421149951831} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] --- !u!1 &3835798374569477312 GameObject: m_ObjectHideFlags: 0 @@ -1936,7 +1942,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4104646864322425063} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 75, y: 0, z: 0} + m_LocalPosition: {x: 80, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3406303600854706652} @@ -1971,7 +1977,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 mWidth: 96 mHeight: 48 @@ -2368,7 +2374,7 @@ GameObject: - component: {fileID: 7844925731963972638} - component: {fileID: 5194267468654516701} m_Layer: 5 - m_Name: Sprite + m_Name: SpriteHeadBg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2553,7 +2559,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 0 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 mWidth: 50 mHeight: 50 @@ -2601,7 +2607,6 @@ GameObject: m_Component: - component: {fileID: 2095307759858929251} - component: {fileID: 1788845653057746921} - - component: {fileID: 5585679814500181828} m_Layer: 5 m_Name: LabelServerNo m_TagString: Untagged @@ -2692,30 +2697,6 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont ---- !u!114 &5585679814500181828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5762016920945874999} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} - m_Name: - m_EditorClassIdentifier: - jsonKey: serviceNo - formatValue: - labeName: {fileID: 0} - defaultName: - canNull: 0 - checkIDCard: 0 - minLen: 0 - maxLen: 0 - spriteBg: {fileID: 0} - valueIsNumber: 0 - isPhoneNum: 0 - inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} --- !u!1 &6051844018995411775 GameObject: m_ObjectHideFlags: 0 @@ -3037,7 +3018,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 0 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} mPivot: 4 mWidth: 50 mHeight: 50 @@ -3391,12 +3372,12 @@ MonoBehaviour: mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} mPivot: 4 mWidth: 144 - mHeight: 36 + mHeight: 72 mDepth: 4 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 4 + aspectRatio: 2 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -3440,7 +3421,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: dealflag + jsonKey: dealFlag formatValue: labeName: {fileID: 0} defaultName: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab new file mode 100644 index 0000000..aaee069 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab @@ -0,0 +1,1927 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &479185124719760622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5536024466561348820} + - component: {fileID: 6923029789569079265} + - component: {fileID: 2553943050864134402} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5536024466561348820 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479185124719760622} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8471917503092676156} + m_Father: {fileID: 1792229327947651094} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6923029789569079265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479185124719760622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3004 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 4 + mClipRange: {x: 0, y: 0, z: 1125, w: 3000} + mClipSoftness: {x: 4, y: 4} + mDepth: 1 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &2553943050864134402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479185124719760622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3} + m_Name: + m_EditorClassIdentifier: + movement: 0 + dragEffect: 2 + restrictWithinPanel: 1 + disableDragIfFits: 0 + smoothDragStart: 1 + iOSDragEmulation: 1 + scrollWheelFactor: 0.25 + momentumAmount: 35 + dampenStrength: 9 + horizontalScrollBar: {fileID: 0} + verticalScrollBar: {fileID: 0} + showScrollBars: 1 + customMovement: {x: 1, y: 0} + contentPivot: 4 + scale: {x: 0, y: 0, z: 0} + relativePositionOnReset: {x: 0, y: 0} + centerOnChild: {fileID: 0} +--- !u!1 &1495084864314687400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6922127193226570266} + - component: {fileID: 3665528844288171420} + - component: {fileID: 5187134621532996139} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6922127193226570266 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495084864314687400} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 704703176362567997} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3665528844288171420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495084864314687400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 20 + mHeight: 20 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: news_new2_unread + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &5187134621532996139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495084864314687400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: + isNeedResetAtlase: 1 +--- !u!1 &1844170624272199028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6158616191975747822} + - component: {fileID: 6441700892624145728} + m_Layer: 5 + m_Name: SpriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6158616191975747822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844170624272199028} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 298.12497, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8848285928822947023} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6441700892624145728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844170624272199028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1020 + mHeight: 1024 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.99609375 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: guid_1 + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &2031767053065680327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8679095178949611599} + - component: {fileID: 6299984525094658540} + - component: {fileID: 1592448634419192764} + - component: {fileID: 8478058725912105578} + m_Layer: 5 + m_Name: SpriteBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8679095178949611599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031767053065680327} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1, y: -300, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1792229327947651094} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6299984525094658540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031767053065680327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1792229327947651094} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 1792229327947651094} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 1792229327947651094} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 1792229327947651094} + relative: 1 + absolute: 1 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1127 + mHeight: 2306 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.48872507 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!65 &1592448634419192764 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031767053065680327} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2306, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8478058725912105578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031767053065680327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2466f719a614d466c912caf920a292af, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 2553943050864134402} + draggablePanel: {fileID: 0} + _gridPage: {fileID: 5020641072538266059} +--- !u!1 &2300498574672545280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8471917503092676156} + - component: {fileID: 5566516399192011970} + - component: {fileID: 5020641072538266059} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8471917503092676156 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2300498574672545280} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8848285928822947023} + - {fileID: 882244852287599771} + - {fileID: 6314336339016707152} + m_Father: {fileID: 5536024466561348820} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5566516399192011970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2300498574672545280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddc557079ce844e7c935ca3f8bf4a6c5, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1.5 + moveCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &5020641072538266059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2300498574672545280} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40cac2ee22ec241d393cdeb505a161cd, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 0 + sorting: 0 + pivot: 3 + maxPerLine: 0 + cellWidth: 1125 + cellHeight: 0 + animateSmoothly: 0 + hideInactive: 0 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} + isLimitless: 0 + isReverse: 0 + dragSensitivity: 10 + page1: {fileID: 8203674786200340029} + page2: {fileID: 3901995379544073836} + page3: {fileID: 6126386713007076957} + currCell: 0 +--- !u!1 &3399093890158832319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2844211251562363011} + - component: {fileID: 3199532661980039904} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2844211251562363011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3399093890158832319} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -535.875, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6314336339016707152} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3199532661980039904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3399093890158832319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 242 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.0416665 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: New Label + mFontSize: 48 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &3670731129332488278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 882244852287599771} + - component: {fileID: 7726907294282030695} + - component: {fileID: 3901995379544073836} + m_Layer: 5 + m_Name: 00001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &882244852287599771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3670731129332488278} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5409456209421153035} + - {fileID: 8808962501116820697} + - {fileID: 6632715903531999219} + m_Father: {fileID: 8471917503092676156} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7726907294282030695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3670731129332488278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua + isNeedResetAtlase: 1 +--- !u!114 &3901995379544073836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3670731129332488278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a31b95fa2894ff1b1ad1f5cc40ed5b, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 2553943050864134402} + draggablePanel: {fileID: 0} + _gridPage: {fileID: 5020641072538266059} + uiLua: {fileID: 7726907294282030695} +--- !u!1 &3820409927088127760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8848285928822947023} + - component: {fileID: 65081560710846159} + - component: {fileID: 8203674786200340029} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8848285928822947023 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820409927088127760} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1125, y: -0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6158616191975747822} + - {fileID: 1855938768174188492} + - {fileID: 1121887569234086772} + m_Father: {fileID: 8471917503092676156} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &65081560710846159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820409927088127760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua + isNeedResetAtlase: 1 +--- !u!114 &8203674786200340029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820409927088127760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a31b95fa2894ff1b1ad1f5cc40ed5b, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 2553943050864134402} + draggablePanel: {fileID: 0} + _gridPage: {fileID: 5020641072538266059} + uiLua: {fileID: 65081560710846159} +--- !u!1 &4422147075237779219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6632715903531999219} + - component: {fileID: 4032502131484452528} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6632715903531999219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4422147075237779219} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -535.875, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 882244852287599771} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4032502131484452528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4422147075237779219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 242 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.0416665 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: New Label + mFontSize: 48 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &4748410586853453051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5048194760639710324} + - component: {fileID: 292884308576539063} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5048194760639710324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4748410586853453051} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1547750194051921287} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &292884308576539063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4748410586853453051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 192 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u7ACB\u5373\u5F00\u542F" + mFontSize: 48 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &4781509523224935096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8808962501116820697} + - component: {fileID: 1631085224733639368} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8808962501116820697 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4781509523224935096} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -447, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 882244852287599771} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1631085224733639368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4781509523224935096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 4 + mWidth: 362 + mHeight: 72 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.0277777 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: New Label + mFontSize: 72 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &5033315261985597396 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 704703176362567997} + - component: {fileID: 2959416519740845524} + m_Layer: 5 + m_Name: GridIndex + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &704703176362567997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5033315261985597396} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -778.375, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6922127193226570266} + m_Father: {fileID: 1792229327947651094} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2959416519740845524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5033315261985597396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 0 + sorting: 1 + pivot: 4 + maxPerLine: 0 + cellWidth: 60 + cellHeight: 200 + animateSmoothly: 0 + hideInactive: 0 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} +--- !u!1 &6924992494075224089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547750194051921287} + - component: {fileID: 5850448144635333824} + - component: {fileID: 7880096059217548348} + - component: {fileID: 6036168580665602787} + - component: {fileID: 7410021112347584995} + - component: {fileID: 7355762167988414963} + - component: {fileID: 7520282684974028251} + m_Layer: 5 + m_Name: ButtonEnter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1547750194051921287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924992494075224089} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -902, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5048194760639710324} + m_Father: {fileID: 1792229327947651094} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5850448144635333824 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924992494075224089} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 985, y: 130, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7880096059217548348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924992494075224089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 6924992494075224089} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 0 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 6891322588998634856} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &6036168580665602787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924992494075224089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5c041f61e4a9fbf4e830210f5d933ece, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 0} + hover: {x: 1.1, y: 1.1, z: 1.1} + pressed: {x: 1.05, y: 1.05, z: 1.05} + duration: 0.2 +--- !u!114 &7410021112347584995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924992494075224089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dd29bf6a1a4e4959964dd9f42dd62cc, type: 3} + m_Name: + m_EditorClassIdentifier: + audioClip: {fileID: 0} + trigger: 0 + volume: 1 + pitch: 1 + soundFileName: + soundName: +--- !u!114 &7355762167988414963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924992494075224089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 985 + mHeight: 130 + mDepth: 6 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.576923 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: public_button + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &7520282684974028251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6924992494075224089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 7355762167988414963} + offset: 70 + sizeAdjust: 1 +--- !u!1 &6972554594560958149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1121887569234086772} + - component: {fileID: 2435380376568849286} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1121887569234086772 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6972554594560958149} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -535.875, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8848285928822947023} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2435380376568849286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6972554594560958149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 242 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.0416665 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: New Label + mFontSize: 48 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &7297998177270434730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1620839400303131218} + - component: {fileID: 976261374897410252} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1620839400303131218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7297998177270434730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -447, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6314336339016707152} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &976261374897410252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7297998177270434730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 4 + mWidth: 362 + mHeight: 72 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.0277777 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: New Label + mFontSize: 72 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &7338415320295013390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1855938768174188492} + - component: {fileID: 2747222931743709173} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1855938768174188492 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7338415320295013390} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -447, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8848285928822947023} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2747222931743709173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7338415320295013390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 4 + mWidth: 362 + mHeight: 72 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.0277777 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: New Label + mFontSize: 72 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &7445868220899811988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1189597306576553825} + - component: {fileID: 6599555500036363238} + m_Layer: 5 + m_Name: SpriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1189597306576553825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7445868220899811988} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 298.12497, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6314336339016707152} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6599555500036363238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7445868220899811988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1020 + mHeight: 1024 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.99609375 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: guid_1 + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &7518268707665557901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1792229327947651094} + - component: {fileID: 6510854460345414197} + - component: {fileID: 6891322588998634856} + m_Layer: 5 + m_Name: PanelGuid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1792229327947651094 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7518268707665557901} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 300, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5536024466561348820} + - {fileID: 8679095178949611599} + - {fileID: 704703176362567997} + - {fileID: 1547750194051921287} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6510854460345414197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7518268707665557901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3000 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 0 + mClipRange: {x: 0, y: 0, z: 300, w: 200} + mClipSoftness: {x: 4, y: 4} + mDepth: 0 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &6891322588998634856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7518268707665557901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce565306cacc248a1b24bd45ee10228c, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua + isNeedBackplate: 0 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: + frameObj: {fileID: 0} +--- !u!1 &8075765302087328898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5409456209421153035} + - component: {fileID: 7633539733874642298} + m_Layer: 5 + m_Name: SpriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5409456209421153035 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8075765302087328898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 298.12497, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 882244852287599771} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7633539733874642298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8075765302087328898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1020 + mHeight: 1024 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.99609375 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: guid_1 + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &8217960255557513914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6314336339016707152} + - component: {fileID: 2128633092544413932} + - component: {fileID: 6126386713007076957} + m_Layer: 5 + m_Name: 00002 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6314336339016707152 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8217960255557513914} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1125, y: -0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1189597306576553825} + - {fileID: 1620839400303131218} + - {fileID: 2844211251562363011} + m_Father: {fileID: 8471917503092676156} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2128633092544413932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8217960255557513914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua + isNeedResetAtlase: 1 +--- !u!114 &6126386713007076957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8217960255557513914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a31b95fa2894ff1b1ad1f5cc40ed5b, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 2553943050864134402} + draggablePanel: {fileID: 0} + _gridPage: {fileID: 5020641072538266059} + uiLua: {fileID: 2128633092544413932} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta new file mode 100644 index 0000000..cffa2b5 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82ef3ff6197c04a64914dc351894e034 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab index c7f5257..3a22245 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab @@ -168,7 +168,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 3 + aspectRatio: 2 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -942,7 +942,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -1618,7 +1618,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.05 + aspectRatio: 0.7 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -1831,7 +1831,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.7208158 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -1885,7 +1885,7 @@ Transform: - {fileID: 3207085431439772024} - {fileID: 2471581978110294420} m_Father: {fileID: 3390144541938402065} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2560390054752067826 BoxCollider: @@ -2304,7 +2304,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -2417,7 +2417,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1.0800843 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -2501,7 +2501,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 17.695652 + aspectRatio: 16.717392 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -2757,7 +2757,7 @@ Transform: - {fileID: 789262735275859317} - {fileID: 4628537950900338942} m_Father: {fileID: 3390144541938402065} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6751297851416776549 BoxCollider: @@ -2876,7 +2876,7 @@ MonoBehaviour: formatValue: labeName: {fileID: 5263322817775662806} defaultName: - canNull: 0 + canNull: 1 checkIDCard: 0 minLen: 0 maxLen: 0 @@ -3566,7 +3566,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -3977,7 +3977,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.05 + aspectRatio: 0.7 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -4482,7 +4482,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 3.2232704 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -4666,7 +4666,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.9267631 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -4751,7 +4751,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -4976,7 +4976,7 @@ Transform: - {fileID: 3482620844373148757} - {fileID: 5672377779080983542} m_Father: {fileID: 3390144541938402065} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &4254620512524785935 BoxCollider: @@ -5240,7 +5240,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.8115598 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -5325,7 +5325,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -5439,7 +5439,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -5552,7 +5552,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 3 + aspectRatio: 2 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -5652,7 +5652,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1.2958281 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -5708,7 +5708,7 @@ Transform: - {fileID: 4071704006312063869} - {fileID: 3876318381393807578} m_Father: {fileID: 3390144541938402065} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &4438659352412322114 BoxCollider: @@ -6072,7 +6072,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 6.40625 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -6257,7 +6257,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -6370,7 +6370,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 2 + aspectRatio: 16.717392 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -6470,7 +6470,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1.6192733 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -6518,10 +6518,10 @@ Transform: m_Children: - {fileID: 1947286080708650753} - {fileID: 3531660715606027067} + - {fileID: 1949725440338219509} - {fileID: 2446954691429548344} - {fileID: 2264218936273892500} - {fileID: 2477535387824468061} - - {fileID: 1949725440338219509} - {fileID: 3677179600730480648} - {fileID: 8621140261478235053} - {fileID: 691154718777512327} @@ -7575,7 +7575,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.05 + aspectRatio: 0.7 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -7659,7 +7659,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 2 + aspectRatio: 16.717392 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8156,7 +8156,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 3 + aspectRatio: 2 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8256,7 +8256,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 2.1578948 + aspectRatio: 512.5 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -8340,7 +8340,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 3 + aspectRatio: 2 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8440,7 +8440,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.05 + aspectRatio: 0.7 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -8606,7 +8606,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 2 + aspectRatio: 16.717392 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9031,7 +9031,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9243,7 +9243,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9356,7 +9356,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.05 + aspectRatio: 0.7 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -9441,7 +9441,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.47826087 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab new file mode 100644 index 0000000..58c714b --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab @@ -0,0 +1,1275 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &610027238503312487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8665097120123855419} + - component: {fileID: 5647799528152426053} + - component: {fileID: 3714993786620258018} + - component: {fileID: 5210665958922376098} + m_Layer: 5 + m_Name: DetailRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8665097120123855419 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610027238503312487} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -30, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5497360001418282539} + m_Father: {fileID: 9092197074366352143} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5647799528152426053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610027238503312487} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3} + m_Name: + m_EditorClassIdentifier: + columns: 1 + direction: 0 + sorting: 0 + pivot: 1 + cellAlignment: 1 + hideInactive: 1 + keepWithinPanel: 0 + padding: {x: 0, y: -1} +--- !u!114 &3714993786620258018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610027238503312487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!114 &5210665958922376098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610027238503312487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua + isNeedResetAtlase: 1 +--- !u!1 &2425227412765712263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 695648132874815624} + - component: {fileID: 571659679455997282} + - component: {fileID: 1932517940806840157} + - component: {fileID: 8759181545180943153} + m_Layer: 5 + m_Name: ExtendRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &695648132874815624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2425227412765712263} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -1970, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5247068646262692398} + m_Father: {fileID: 9092197074366352143} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &571659679455997282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2425227412765712263} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3} + m_Name: + m_EditorClassIdentifier: + columns: 1 + direction: 0 + sorting: 0 + pivot: 1 + cellAlignment: 1 + hideInactive: 1 + keepWithinPanel: 0 + padding: {x: 0, y: -1} +--- !u!114 &1932517940806840157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2425227412765712263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!114 &8759181545180943153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2425227412765712263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua + isNeedResetAtlase: 1 +--- !u!1 &3280314110464383070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 997215499299402090} + - component: {fileID: 4352360680273720709} + - component: {fileID: 1222120552629598010} + - component: {fileID: 6685085258377628186} + m_Layer: 5 + m_Name: DragScroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &997215499299402090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3280314110464383070} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4718911951761293706} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4352360680273720709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3280314110464383070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4718911951761293706} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 4718911951761293706} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 4718911951761293706} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 4718911951761293706} + relative: 1 + absolute: -132 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 2172 + mDepth: 7 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.5179558 +--- !u!114 &1222120552629598010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3280314110464383070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 6096547598309516579} + draggablePanel: {fileID: 0} +--- !u!65 &6685085258377628186 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3280314110464383070} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 2172, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3329392447864977988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1665999059155992035} + - component: {fileID: 2848764068821164208} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1665999059155992035 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3329392447864977988} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -508, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5247068646262692398} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2848764068821164208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3329392447864977988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5247068646262692398} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 5247068646262692398} + relative: 0 + absolute: 58 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 4 + mWidth: 8 + mHeight: 50 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.16 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: work_work_color + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &3527172386429605029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3527172386429605034} + - component: {fileID: 3527172386429605033} + - component: {fileID: 3527172386429605032} + - component: {fileID: 3527172386429605035} + m_Layer: 5 + m_Name: ButtonSave + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3527172386429605034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527172386429605029} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 510, y: -66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3527172387164408645} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3527172386429605033 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527172386429605029} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 200, y: 100, z: 0} + m_Center: {x: -50, y: -0.22070312, z: 0} +--- !u!114 &3527172386429605032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527172386429605029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 3527172386429605029} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 1 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 6896994100725352575} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &3527172386429605035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527172386429605029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4718911951761293706} + relative: 1 + absolute: -163 + rightAnchor: + target: {fileID: 4718911951761293706} + relative: 1 + absolute: -51 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 5 + mWidth: 112 + mHeight: 56 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u4FDD\u5B58" + mFontSize: 56 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &3527172387164408644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3527172387164408645} + - component: {fileID: 3527172387164408650} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3527172387164408645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527172387164408644} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1152, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3527172386429605034} + m_Father: {fileID: 4718911951761293706} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3527172387164408650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3527172387164408644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3} + m_Name: + m_EditorClassIdentifier: + uiCamera: {fileID: 0} + container: {fileID: 0} + side: 3 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!1 &3724171473237482120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5247068646262692398} + - component: {fileID: 2287654651695807904} + - component: {fileID: 1640040814925413932} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5247068646262692398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724171473237482120} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: -51, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1665999059155992035} + - {fileID: 1897733842822869046} + m_Father: {fileID: 695648132874815624} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2287654651695807904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724171473237482120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 100 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 11.25 +--- !u!114 &1640040814925413932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724171473237482120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 2287654651695807904} + offset: 0 + sizeAdjust: 1 +--- !u!1 &3888980434100496168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5497360001418282539} + - component: {fileID: 3244412214061244712} + - component: {fileID: 8858939195524551998} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5497360001418282539 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3888980434100496168} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -49.529198, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1495824570655952721} + - {fileID: 7502164824848689371} + m_Father: {fileID: 8665097120123855419} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3244412214061244712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3888980434100496168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 100 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 11.25 +--- !u!114 &8858939195524551998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3888980434100496168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 3244412214061244712} + offset: 0 + sizeAdjust: 1 +--- !u!1 &5483648808180388224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1897733842822869046} + - component: {fileID: 8507857398850865573} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1897733842822869046 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5483648808180388224} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -482, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5247068646262692398} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8507857398850865573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5483648808180388224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1665999059155992035} + relative: 0 + absolute: 30 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mPivot: 3 + mWidth: 184 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u6269\u5C55\u4FE1\u606F" + mFontSize: 46 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 0 + mMaxLineCount: 1 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &5817392990340767882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4718911951761293706} + - component: {fileID: 3385083026084468723} + - component: {fileID: 6896994100725352575} + m_Layer: 5 + m_Name: PanelNewOrder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4718911951761293706 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5817392990340767882} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4808583122758801922} + - {fileID: 997215499299402090} + - {fileID: 3527172387164408645} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3385083026084468723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5817392990340767882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3000 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 0 + mClipRange: {x: 0, y: 0, z: 300, w: 200} + mClipSoftness: {x: 4, y: 4} + mDepth: 1 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &6896994100725352575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5817392990340767882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ff491def90b44724978eb9e0b2b558f, type: 3} + m_Name: + m_EditorClassIdentifier: + isPause: 0 + luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: +--- !u!1 &6759362610761014225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7502164824848689371} + - component: {fileID: 7770833769909366169} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7502164824848689371 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6759362610761014225} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -482, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5497360001418282539} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7770833769909366169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6759362610761014225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1495824570655952721} + relative: 0 + absolute: 30 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mPivot: 3 + mWidth: 184 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u57FA\u672C\u4FE1\u606F" + mFontSize: 46 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 0 + mMaxLineCount: 1 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &6940455585639554457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9092197074366352143} + - component: {fileID: 6290270110762764598} + m_Layer: 5 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9092197074366352143 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6940455585639554457} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 937, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8665097120123855419} + - {fileID: 695648132874815624} + m_Father: {fileID: 4808583122758801922} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6290270110762764598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6940455585639554457} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3} + m_Name: + m_EditorClassIdentifier: + columns: 1 + direction: 0 + sorting: 0 + pivot: 1 + cellAlignment: 1 + hideInactive: 1 + keepWithinPanel: 0 + padding: {x: 0, y: 30} +--- !u!1 &8174250477570590167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4808583122758801922} + - component: {fileID: 5642950828387400903} + - component: {fileID: 6096547598309516579} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4808583122758801922 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8174250477570590167} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 9092197074366352143} + m_Father: {fileID: 4718911951761293706} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5642950828387400903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8174250477570590167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3001 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: 0, y: 0, z: 1126, w: 2000} + mClipSoftness: {x: 4, y: 10} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &6096547598309516579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8174250477570590167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3} + m_Name: + m_EditorClassIdentifier: + movement: 1 + dragEffect: 2 + restrictWithinPanel: 1 + disableDragIfFits: 1 + smoothDragStart: 1 + iOSDragEmulation: 1 + scrollWheelFactor: 0.25 + momentumAmount: 35 + dampenStrength: 9 + horizontalScrollBar: {fileID: 0} + verticalScrollBar: {fileID: 0} + showScrollBars: 1 + customMovement: {x: 1, y: 0} + contentPivot: 1 + scale: {x: 0, y: 0, z: 0} + relativePositionOnReset: {x: 0, y: 0} + centerOnChild: {fileID: 0} +--- !u!1 &8432021983544835164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1495824570655952721} + - component: {fileID: 8362902182268461181} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1495824570655952721 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432021983544835164} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -508, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5497360001418282539} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8362902182268461181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432021983544835164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5497360001418282539} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 5497360001418282539} + relative: 0 + absolute: 58 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 4 + mWidth: 8 + mHeight: 50 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.16 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: work_work_color + mFillCenter: 1 + isGrayMode: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta new file mode 100644 index 0000000..9c38fb0 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f5ea0f57bfe6b45bf90cd1f5b0b1234f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d index 732fa85..3e61a38 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d index a1cc0a7..9c7f83e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d new file mode 100644 index 0000000..c006878 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d.meta new file mode 100644 index 0000000..c2290d0 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 792f5a6e2281f4e06a8695ec1ff7fadc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d index 5c9ae4e..06d476e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d new file mode 100644 index 0000000..8acc780 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d.meta new file mode 100644 index 0000000..a12f7e9 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aafce1a282bf849cca9b2b08c21a8623 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d new file mode 100644 index 0000000..d8640f0 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d.meta new file mode 100644 index 0000000..33d51fa --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 83d4194d3a9f741dcae62f483ca86487 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid.meta new file mode 100644 index 0000000..95cbbe0 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77e3a21effa4940f3989b025f6ac7824 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android.meta new file mode 100644 index 0000000..d528e54 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3573042c068e04d15985c73032e8961c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d new file mode 100644 index 0000000..c7a5627 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d.meta new file mode 100644 index 0000000..935c1b4 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 79ac1ffe4812d4201ae9e570316f6e6c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d new file mode 100644 index 0000000..81f7717 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d.meta new file mode 100644 index 0000000..1b6728e --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76f2adbcdb5134927918e9a3b9d52af5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d new file mode 100644 index 0000000..86ce70a Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d.meta new file mode 100644 index 0000000..284a99d --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d98b545d4b74846468087d2247b7030d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d index 10163e0..173c493 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua index 4f32983..87fa428 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua index ed848b1..8231505 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua index f5c62ec..073d3c1 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua index a0f48db..7228baf 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua index c577563..1169c2f 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua index a59c698..7486137 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua new file mode 100644 index 0000000..9788f2a Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua.meta new file mode 100644 index 0000000..e401ead --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5eb41d8a0d01145e184021f3d6cea2f8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua index aa87ecb..29f7e48 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua index 0dd5378..674710a 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua index 897cb53..db79919 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua index 6794474..90448c0 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua index eace96d..5d5ebb7 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua index df91c06..34ece10 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua new file mode 100644 index 0000000..571b642 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua.meta new file mode 100644 index 0000000..0675a52 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 511dd1d1e86fd426d82e75fb6c2b3e3c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua index bb53e49..08d668b 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua new file mode 100644 index 0000000..79b403b Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua.meta new file mode 100644 index 0000000..02690f5 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b87e30870b8304d07bef78da76961c88 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d index 663be44..6ed484e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d index e83f56b..dac4a6e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d index 89908cb..f325915 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d index b653a35..503995e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d index 9bc7021..b514bf3 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d index e8bb363..58f5898 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d new file mode 100644 index 0000000..4330765 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d.meta new file mode 100644 index 0000000..e6e49c7 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 34d11f8ffcf994a9b9a4e6a4cecff31a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d index bfe2c95..7fb80c6 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d new file mode 100644 index 0000000..26077b6 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d.meta new file mode 100644 index 0000000..d4dd600 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2adba13bd337c405fa9e568b3d75be3b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver index 359f951..56b723d 100644 --- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver +++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver @@ -1 +1 @@ -r8 (trCRM/resVer/Android/VerCtl/priority.ver8,9839ae131baab1e5cbca5d3e920ec6848 %trCRM/resVer/Android/VerCtl/other.ver8,c69c1c5ae55f0ba5763949a2afe5f103 \ No newline at end of file +r8 (trCRM/resVer/Android/VerCtl/priority.ver8,401cfac0e828e59143af1070a54c58d28 %trCRM/resVer/Android/VerCtl/other.ver8,a7d44349d0c8b0411713c8c78a36968e \ No newline at end of file diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver index e7c1165..992ce37 100644 --- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver +++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver @@ -1 +1 @@ -p e8 >trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d8,a35e85b68569bf1adc16bdee3a609fdd8 ?trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d8,7edfb781be444c18d010e533863340158 :trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d8,8c7beff66dc0cfe9f44082bdacc8007c8 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d8,eca0bd19a59ce72be19d7cdcbf9c5dac8 :trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d8,b460d3a275be876e0cfa0ca96777260f8 :trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d8,fffb80792073e4f2849c743d061d685a8 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d8,043e8a3cdee29da6e5c909432f25d6f88 =trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d8,efe93bdf676ef2d5195d52abe42ab8338 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d8,c16242cb394b0720d1c2e1e0289c1c4a8 @trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d8,2153c725242937cf5fce727da9626dad8 ;trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d8,b6060c4f6b1cf669b21b5d4f8b23efbe8 9trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d8,0634e3823e2492d32424733dd05779af8 ;trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d8,b13e253b3a1689bf665ea7c3edecc5198 8trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d8,ae412dff53c914bcfcd0ca92255bb33e8 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d8,8e81d4a650273e24b7f129d1f814f5fa8 ;trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d8,4f2c80de666b97ea02084f059d2a5ed08 7trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d8,939edcb747217aa4b0deb1d9a34f16b88 8trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d8,849e7b3d08491890c6e021896c8ec39c8 ?trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d8,2f74f17f1282c12ab63108377b4798e08 8trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d8,38bf54e9fbf1c1d8af2cead294d1b61e8 :trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d8,51120d82352e936df826b05696b89b198 9trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d8,aa21836aaae62d8f719a930aefe37ea78 ;trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d8,2ee604556b4fff6186f2bad067ed86958 DtrCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d8,4aee082b48104519ba82bad6aac83cf38 9trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d8,36e34519b910a11de3531994f607a1408 ;trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d8,3b42ecd8d30203eb5dcc65cb3a0ad8158 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d8,a35e85b68569bf1adc16bdee3a609fdd8 ?trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d8,7edfb781be444c18d010e533863340158 :trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d8,8c7beff66dc0cfe9f44082bdacc8007c8 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d8,eca0bd19a59ce72be19d7cdcbf9c5dac8 :trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d8,b460d3a275be876e0cfa0ca96777260f8 :trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d8,fffb80792073e4f2849c743d061d685a8 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d8,043e8a3cdee29da6e5c909432f25d6f88 >trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d8,c16242cb394b0720d1c2e1e0289c1c4a8 5trCRM/upgradeRes/other/uiAtlas/guid/Android/3.unity3d8,6fafc74e9a154b5b3c19accabd3e11b08 ;trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d8,b6060c4f6b1cf669b21b5d4f8b23efbe8 9trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d8,0634e3823e2492d32424733dd05779af8 ;trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d8,b13e253b3a1689bf665ea7c3edecc5198 8trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d8,ae412dff53c914bcfcd0ca92255bb33e8 5trCRM/upgradeRes/other/uiAtlas/guid/Android/2.unity3d8,6b83b2d5a2dfc1f08744077e669c3ed08 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d8,8e81d4a650273e24b7f129d1f814f5fa8 ;trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d8,4f2c80de666b97ea02084f059d2a5ed08 :trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d8,cb6f2a2b14c53ed86c122a4da2c3984b8 7trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d8,939edcb747217aa4b0deb1d9a34f16b88 8trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d8,849e7b3d08491890c6e021896c8ec39c8 ?trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d8,2f74f17f1282c12ab63108377b4798e08 8trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d8,38bf54e9fbf1c1d8af2cead294d1b61e8 :trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d8,51120d82352e936df826b05696b89b198 9trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d8,aa21836aaae62d8f719a930aefe37ea78 ;trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d8,2ee604556b4fff6186f2bad067ed86958 9trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d8,36e34519b910a11de3531994f607a1408 DtrCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d8,4aee082b48104519ba82bad6aac83cf38