diff --git a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementDate.cs b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementDate.cs index 4e7758d..9506a1b 100644 --- a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementDate.cs +++ b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementDate.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; public class CLUIElementDate : UIEventListener { public bool isSetTime = false; + public bool isDateRange = false; public List onChange = new List(); UIInput _input; @@ -25,13 +26,13 @@ public class CLUIElementDate : UIEventListener public void OnClick () { - if (input != null && !string.IsNullOrEmpty (input.value)) { - DateTime d = DateTime.Parse (input.value); -// DateTime d = DateTime.ParseExact(input.value, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture); - CLUIFormUtl.showCalender (d.Year, d.Month, (Callback)onGetDate, isSetTime); - } else { - CLUIFormUtl.showCalender ((Callback)onGetDate, isSetTime); - } + //if (input != null && !string.IsNullOrEmpty (input.value)) { + // DateTime d = DateTime.Parse (input.value); + // CLUIFormUtl.showCalender (d.Year, d.Month, (Callback)onGetDate, isSetTime, isDateRange); + //} else { + // CLUIFormUtl.showCalender ((Callback)onGetDate, isSetTime, isDateRange); + //} + CLUIFormUtl.showCalender(input.value, (Callback)onGetDate, isSetTime, isDateRange); } public void onGetDate (params object[] paras) diff --git a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementTime.cs b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementTime.cs new file mode 100644 index 0000000..09bc4f2 --- /dev/null +++ b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementTime.cs @@ -0,0 +1,59 @@ +using UnityEngine; +using System.Collections; +using System; +using Coolape; +using System.Collections.Generic; + +[RequireComponent (typeof(UIInput))] +public class CLUIElementTime : UIEventListener +{ + public List onChange = new List(); + UIInput _input; + + public UIInput input { + get { + if (_input == null) { + _input = GetComponent (); + if (_input != null) { + _input.enabled = false; + } + } + return _input; + } + } + + public void OnClick () + { + Hashtable map = new Hashtable(); + map["time"] = input.value; + map["callback"]= (Callback)onGetDate; + CLPanelManager.getPanelAsy("PanelPopTime", (Callback)onGetCalenderPanel, map); + } + + public static void onGetCalenderPanel(params object[] orgs) + { + CLPanelBase p = orgs[0] as CLPanelBase; + Hashtable map = orgs[1] as Hashtable; + if (p == null) + { + return; + } + p.setData(map); + CLPanelManager.showTopPanel(p, true, true); + } + + public void onGetDate (params object[] paras) + { + input.value = paras [0].ToString (); + ExecuteOnChange(); + } + + + protected void ExecuteOnChange() + { + if (EventDelegate.IsValid(onChange)) + { + EventDelegate.Execute(onChange, gameObject); // modify by chenbin + } + } +} diff --git a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementTime.cs.meta b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementTime.cs.meta new file mode 100644 index 0000000..c2a2837 --- /dev/null +++ b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementTime.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: c3cdf5f2b8d8745a69ee31dc45d16005 +timeCreated: 1517308118 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CoolapeFrame/Scripts/ui/form/CLUIFormUtl.cs b/Assets/CoolapeFrame/Scripts/ui/form/CLUIFormUtl.cs index 27b9736..cc79311 100644 --- a/Assets/CoolapeFrame/Scripts/ui/form/CLUIFormUtl.cs +++ b/Assets/CoolapeFrame/Scripts/ui/form/CLUIFormUtl.cs @@ -177,20 +177,13 @@ namespace Coolape /// Paras. public static void showCalender(params object[] paras) { - if (paras != null && paras.Length >= 4) - { - ArrayList list = new ArrayList(); - list.Add(paras[0]);//year); - list.Add(paras[1]);//month); - list.Add(paras[2]);//callback); - list.Add(paras[3]);//isSetTime); + ArrayList list = new ArrayList(); + list.Add(paras[0]);//defaultDate); + list.Add(paras[1]);//callback); + list.Add(paras[2]);//isSetTime); + list.Add(paras[3]);//isDateRange); - CLPanelManager.getPanelAsy("PanelCalender", (Callback)onGetCalenderPanel, list); - } - else - { - showCalender(System.DateTime.Now.Year, System.DateTime.Now.Month, paras[0], paras[1]); - } + CLPanelManager.getPanelAsy("PanelCalender", (Callback)onGetCalenderPanel, list); } public static void onGetCalenderPanel(params object[] orgs) diff --git a/Assets/CoolapeFrameData/cfg/publishChannel.cfg b/Assets/CoolapeFrameData/cfg/publishChannel.cfg index cb125b6..abd2721 100644 --- a/Assets/CoolapeFrameData/cfg/publishChannel.cfg +++ b/Assets/CoolapeFrameData/cfg/publishChannel.cfg @@ -1 +1 @@ -tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion<0.95ImKeystoreNamePath8 +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.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7CmSubChannel<2000FmBundleVersion;0.3ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform;iosEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmaeBGeneraliOSHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathp#?152x152OtrCRM/xRes/icon/180.png=76x76OtrCRM/xRes/icon/114.pngL1024x1024(App Store)PtrCRM/xRes/icon/1024.png=57x57OtrCRM/xRes/icon/114.png?120x120OtrCRM/xRes/icon/120.pngK20x20(Notification)OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.png=96x96OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.pngH40x40(Spotlight)OtrCRM/xRes/icon/114.pngJ120x120(Spotlight)OtrCRM/xRes/icon/120.pngK60x60(Notification)OtrCRM/xRes/icon/114.png=48x48OtrCRM/xRes/icon/114.pngK40x40(Notification)OtrCRM/xRes/icon/114.png=72x72OtrCRM/xRes/icon/114.png?180x180OtrCRM/xRes/icon/180.png=36x36OtrCRM/xRes/icon/114.pngG29x29(Settings)OtrCRM/xRes/icon/114.png?114x114OtrCRM/xRes/icon/114.pngG58x58(Settings)OtrCRM/xRes/icon/114.pngH80x80(Spotlight)OtrCRM/xRes/icon/114.pngG87x87(Settings)OtrCRM/xRes/icon/114.png?167x167OtrCRM/xRes/icon/180.pngCchannelEnumX?GeneralBGeneraliOSBchannelKeyX?generalBgeneraliOSHchannelAliasEnumX>通用A通用iOS \ No newline at end of file +tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion<0.96ImKeystoreNamePath8 +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.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7CmSubChannel<2000FmBundleVersion;0.3ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform;iosEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmaeBGeneraliOSHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathp#?152x152OtrCRM/xRes/icon/180.png=76x76OtrCRM/xRes/icon/114.pngL1024x1024(App Store)PtrCRM/xRes/icon/1024.png=57x57OtrCRM/xRes/icon/114.png?120x120OtrCRM/xRes/icon/120.pngK20x20(Notification)OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.pngH40x40(Spotlight)OtrCRM/xRes/icon/114.png?167x167OtrCRM/xRes/icon/180.pngJ120x120(Spotlight)OtrCRM/xRes/icon/120.pngK60x60(Notification)OtrCRM/xRes/icon/114.pngH80x80(Spotlight)OtrCRM/xRes/icon/114.png=48x48OtrCRM/xRes/icon/114.pngK40x40(Notification)OtrCRM/xRes/icon/114.png=72x72OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.pngG29x29(Settings)OtrCRM/xRes/icon/114.png?114x114OtrCRM/xRes/icon/114.pngG58x58(Settings)OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngG87x87(Settings)OtrCRM/xRes/icon/114.png?180x180OtrCRM/xRes/icon/180.pngCchannelEnumX?GeneralBGeneraliOSBchannelKeyX?generalBgeneraliOSHchannelAliasEnumX>通用A通用iOS \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v index 02cc1be..2cd7902 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -186,6 +186,10 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password2.png.meta,132388581360000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_remind.png,132388430540000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_remind.png.meta,132388581360000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png,132400369480000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png.meta,132400460830000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png,132400369480000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png.meta,132400460840000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_bg_20.png,132364409570000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_bg_20.png.meta,132364422850000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_notice.png,132364409570000000 @@ -297,7 +301,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,132398165180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132400734290000000 /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 @@ -333,7 +337,7 @@ /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,132390879140000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua.meta,132368762790000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua,132398133350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua,132399704190000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua.meta,132389399450000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua,132395111970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua.meta,132358701520000000 @@ -341,7 +345,7 @@ /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/DBTextures.lua,132395115510000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua.meta,132395107700000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132398163770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132399720100000000 /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 @@ -354,7 +358,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132398145790000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132400733690000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua.meta,132355452450000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua,132395548460000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua.meta,132289129810000000 @@ -383,7 +387,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132394484680000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132397934670000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132399667510000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua.meta,132289221090000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png.meta,132289129810000000 @@ -403,8 +407,10 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame2.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderDay.lua,132379574590000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderDay.lua.meta,132372979000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua,132379548310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua,132399540890000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua.meta,132372979000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua,132398843010000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua.meta,132398827910000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPoplist.lua,132375652310000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPoplist.lua.meta,132372990210000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua,132391267030000000 @@ -425,11 +431,11 @@ /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/TRCellEmptySpace.lua,132397117480000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua.meta,132395463710000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132397119150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132400454420000000 /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,132395508020000000 /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/TRCellFollowList.lua,132398160390000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua,132399719540000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua.meta,132398150030000000 /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 @@ -437,7 +443,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta,132394685710000000 /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/TRCellOrderList.lua,132395953940000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua,132399719590000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua.meta,132397024660000000 /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 @@ -458,7 +464,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,132388113060000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132399541870000000 /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 @@ -466,6 +472,8 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPHotWheel.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua,132384246060000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua.meta,132384230110000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua,132399429370000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua.meta,132398741580000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSceneManager.lua,132289129800000000 /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,132393336840000000 @@ -488,21 +496,25 @@ /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/TRPAbout.lua,132395510560000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua.meta,132395478930000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua,132400715170000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua.meta,132400495480000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua,132399704540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua.meta,132370233760000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua,132389290650000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua.meta,132389285830000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua,132391020080000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua,132399715490000000 /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,132398162820000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132400306090000000 /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,132394398930000000 -/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,132392912840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132399684500000000 /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/TRPEditPrice.lua,132391744840000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua.meta,132391705230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua,132398158420000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua,132399718980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua.meta,132398574490000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua,132399606350000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua.meta,132395296940000000 /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 @@ -512,7 +524,7 @@ /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/TRPMyInfor.lua,132395565340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua,132400723760000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua.meta,132395345760000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132395457540000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua.meta,132370897440000000 @@ -524,7 +536,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta,132395119260000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132395565070000000 /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/TRPOrderList.lua,132395327770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua,132400343730000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta,132395326130000000 /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 @@ -534,9 +546,9 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductDetail.lua.meta,132398113050000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductList.lua,132398130780000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductList.lua.meta,132398096200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua,132389372680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua,132400734100000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua.meta,132357319630000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua,132389372680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua,132400723180000000 /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,132389372680000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua.meta,132357325780000000 @@ -544,7 +556,7 @@ /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/TRPSelectProduct.lua,132398130700000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua.meta,132390388350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua,132395961820000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua,132400528400000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua.meta,132389272610000000 /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 @@ -562,7 +574,7 @@ /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,132395500650000000 /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,132396065680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132398858230000000 /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,132395500650000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab.meta,132378243900000000 @@ -570,6 +582,8 @@ /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,132395500650000000 /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/InputTime.prefab,132398858230000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab.meta,132398789220000000 /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 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform2.prefab,132382133180000000 @@ -580,24 +594,28 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta,132395481440000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab,132381333780000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132395210550000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab,132400528000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab.meta,132400498270000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132400508000000000 /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,132395124750000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab,132399685140000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab.meta,132370155540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132400521450000000 /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/PanelConfirm2.prefab,132395125170000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm2.prefab.meta,132389286040000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132395124770000000 /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,132398162940000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132399733230000000 /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,132395124780000000 -/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,132397067510000000 /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,132395125180000000 /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/PanelEditPrice.prefab,132395125170000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta,132391705920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab,132399607630000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab.meta,132398574820000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab,132398162950000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta,132395297380000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab,132395125160000000 @@ -630,7 +648,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta,132395131650000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132395497470000000 /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/PanelOrderList.prefab,132397056420000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab,132399685140000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta,132395326430000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132395124930000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000 @@ -638,11 +656,13 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab.meta,132378946840000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab,132395124920000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab.meta,132372993660000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab,132398858240000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab.meta,132398741890000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductDetail.prefab,132398122110000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductDetail.prefab.meta,132398113520000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductList.prefab,132398127210000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductList.prefab.meta,132398104410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab,132395124910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab,132400734290000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab.meta,132357319780000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab,132395124910000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab.meta,132357323920000000 @@ -654,7 +674,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectCompany.prefab.meta,132354941680000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab,132398097940000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab.meta,132389524930000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab,132395124890000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab,132400521520000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab.meta,132389267620000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab,132395124890000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab.meta,132289129800000000 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v index df9fab7..40625b2 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 e42d7e7..b25227b 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Publish.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Publish.v @@ -99,8 +99,11 @@ trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43 +trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/upload.unity3d,a7cb722ecba5f405105f0cfda4695e74 +trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d +trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 @@ -129,7 +132,7 @@ 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,ea072d32d1080c13d24c10eb53dc010e +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,55cfd5f40e2669326dd366522de31c59 trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,c0cae0cd02eba21111cf005f6c608901 trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e @@ -141,17 +144,17 @@ trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e36591 trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,2f2053280548f71c751e948c547e461a trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 -trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,076cfb6761ed5c0568690aa273d8ee37 +trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,36ed1c264dfd1ae3177ad79aedbbb8ee trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971 trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua,fd2b6a27eee4bcec69b1fd1b4bec92ba -trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,f5151070816fc7da19ae939c9533bbf9 +trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,dcc8f3212c0cce2d8ed777953ec6fb73 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,947abdf2c019f44a26211acf6f31e2dd trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 -trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,893ed87112f952601de99951d4f0707d +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,485ffd7498e79efddaf28d71715e1c8f trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,f5e5f59f6686a4b6d8453067d35acaa0 trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e @@ -175,7 +178,8 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f7 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua,04eda18a177de8ef755cbade62b61097 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e @@ -188,12 +192,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,e8d23c8a62c8d943f788657b3a534a94 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua,c5fb5e1103ef14a9b27db0d69f574e0a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua,035626bac75e16f15bc825f6e0ded212 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua,b2827429c70df8b7aa8e87451a96bf67 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua,078920175f85f04660584bddb359b7ab trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d @@ -201,12 +206,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ff 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,232cf2b7f74f088e8b44c4c47cda5e95 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,5663378b77289e7d351bdf90a6aabcc2 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/CLLPPopTime.lua,965d275ae8e835eb7fe5f780643ab7f2 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,756c08832a0f69ec66e386da4fd35ca7 @@ -215,18 +221,19 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df96a841ce2f91 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,b27eae62169a50c49ede43bb033a1f3b +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,2f0072451a922be026f9192dee40c7a2 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,115e144ee4dc1ac4480815907a2dc493 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,136f547ac123ba772549c7ea3636a66a trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,42de16eb98a338177801da06f8fc5895 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua,16e141ce97b996500731068496341f18 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,6102cd8f436e88d65aed7c35b0fcf64d trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 @@ -240,11 +247,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,0c9076d943ba5d1b3 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,3655882d094b886c89c7e48099136a46 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,cba4b2f5ee3df14ce326ed032d987e81 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua,17c97e4927cb90121178558f48513b07 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,59750609585193c66d08adfa8544d946 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,827ce406521163bc4719c10adf4b7b38 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,dabd3a6e76a5743b94d861be9a735795 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a @@ -253,25 +262,27 @@ trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c 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,a929e8a7fd7ba3bc89bdda0686b6d7dd -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,b9645fe9ff5972788d341acc70b7be30 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,712c17139d4e0769a2c1ebfb326d3d1a trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,99670420a41bf33b055763d28c547a26 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d,a448a640c08bd93fff4605cb5f73dde9 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,be823cc190422b16ab6b38b6dbc5143b trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d,2c583d1e0c0eabc9e831a40c2be189e8 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,56aa22c08fd4a18488f213a650f67ff1 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,94d52531d0092ba2608f03ee5b41d22a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,cc945b5bffde4fec044e5660d2a5fe82 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,32ec900ba39cb9b9b9afcd0f9a7ddeb4 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,950c14639cda71cde0ce16167e651375 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,3fb44d3955035fb3c7d7caaeb8e669ad trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d,ad976866b48beaa4f3a0d4f7812e37c3 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d,657af188ee0e7deb6fcc5c7f17fff737 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d,fd4ee0f1eee52f71f6827985ccdca38a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,7a3ae06303e65f59f15af5b906b7a471 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f @@ -292,12 +303,15 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,6c58ee trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d,3045ed5f70cc023771da5631dc0abbc1 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d,3a775b6ec87e8293ff7e730ab7ed17d8 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d,d54579853bc1e958ced6fa6e3d928d2b +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d,9a4225d5443f6caad4b35b68313325d8 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,e28ed051439e06abe8ffc14ebf9cf1d2 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef diff --git a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v index 8782227..3f918de 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v @@ -1,4 +1,4 @@ -trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,e8d23c8a62c8d943f788657b3a534a94 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c @@ -12,48 +12,44 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110 trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,cc945b5bffde4fec044e5660d2a5fe82 trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 -trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,55cfd5f40e2669326dd366522de31c59 +trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,a662261e3fd155f94337506d37a8b723 trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7 -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 -trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8 +trCRM/upgradeRes/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57 trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 -trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,6c58ee8fe4d6219d1b49869d4e25f129 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a +trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,5dd7ac6a2fe56c5335b9d8ca90861289 trCRM/upgradeRes/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971 trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099 trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0 trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d -trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,5663378b77289e7d351bdf90a6aabcc2 trCRM/upgradeRes/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPopTime.lua,04eda18a177de8ef755cbade62b61097 trCRM/upgradeRes/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password2.unity3d,5dc8eaeca2eeedb771451233e5d8bf98 trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 -trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 +trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1 -trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 -trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c +trCRM/upgradeRes/priority/ui/other/Android/InputTime.unity3d,a448a640c08bd93fff4605cb5f73dde9 trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d -trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 -trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,dabd3a6e76a5743b94d861be9a735795 +trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,6d7ee047a01c11be7f117b434a39db1a trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073 -trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,b9645fe9ff5972788d341acc70b7be30 +trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,712c17139d4e0769a2c1ebfb326d3d1a trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae trCRM/upgradeRes/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 -trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d trCRM/upgradeRes/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f @@ -63,20 +59,18 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a654 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd -trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6 trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524 -trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf -trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 +trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,cd2044775611a8ff79fafca8694d981c trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,756c08832a0f69ec66e386da4fd35ca7 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,950c14639cda71cde0ce16167e651375 +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,2168b9328b66f5be290967d626c367c3 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f @@ -88,8 +82,9 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6ee trCRM/upgradeRes/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680 trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836 -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a -trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,b02e9a081f66dc6b25ff39c64c896fe4 +trCRM/upgradeRes/priority/ui/panel/Android/PanelComFilter.unity3d,3d4cb175f54b68fde13d37ff20e2e722 +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101 trCRM/upgradeRes/priority/lua/db/DBTextures.lua,fd2b6a27eee4bcec69b1fd1b4bec92ba trCRM/upgradeRes/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2 trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,99670420a41bf33b055763d28c547a26 @@ -99,9 +94,11 @@ trCRM/upgradeRes/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971 trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e trCRM/upgradeRes/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,65a7251f84d25114372f7b50d5c9d84f trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 +trCRM/upgradeRes/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 @@ -132,21 +129,25 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab424 trCRM/upgradeRes/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,068f97e365e79ae11418ff16a1cf2f89 trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellFollowList.lua,c5fb5e1103ef14a9b27db0d69f574e0a +trCRM/upgradeRes/priority/lua/ui/cell/TRCellFollowList.lua,0939d88d43a38ddad4dfdfdad7fc2136 trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua,720f3ff97d9b71a9108fd949bf779b30 +trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowList.unity3d,fd4ee0f1eee52f71f6827985ccdca38a trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellOrderList.lua,035626bac75e16f15bc825f6e0ded212 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellOrderList.lua,4dc48eddbf96438192abc8f1e6dff153 trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e -trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,188a98cb52c9cb7c28d60f71dee9e68c +trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua,5eee71df7de0501de9f9c5ea030ea334 +trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,eab2f8ce29ba9910d376a04371876765 +trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,29858c124459a8e71aace8ebff600c04 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes/priority/lua/db/DBOrder.lua,36ed1c264dfd1ae3177ad79aedbbb8ee +trCRM/upgradeRes/priority/lua/db/DBOrder.lua,8e8be2e549257d747b99e5149681ab19 trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592 @@ -155,7 +156,7 @@ trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,a929e8a7fd7ba3 trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,0c9076d943ba5d1b3ac4da7726e7b73a trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf -trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,600ae2f4949e3ee829f17a2f6b4284e7 +trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,be7a258652e4f573ef52224b6fdfc105 trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 @@ -165,7 +166,7 @@ trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2a trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540 trCRM/upgradeRes/priority/lua/ui/panel/TRPProductList.lua,17c97e4927cb90121178558f48513b07 -trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,e28ed051439e06abe8ffc14ebf9cf1d2 +trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,8de8cb431ae2daf23d4d8ff940e5ef81 trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef @@ -173,13 +174,14 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3 trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,3fb44d3955035fb3c7d7caaeb8e669ad +trCRM/upgradeRes/priority/lua/ui/panel/TRPBindPhone.lua,61a254c78a3b19a2e73d4d8f4f082fb7 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772 -trCRM/upgradeRes/priority/lua/db/DBUser.lua,3d62c20b15c534581a2c389eb54f3b27 +trCRM/upgradeRes/priority/lua/db/DBUser.lua,9f02607d08c63b2818e5d5bd97545914 trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e @@ -190,19 +192,21 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd trCRM/upgradeRes/other/uiAtlas/mine/Android/me_about.unity3d,3da9c9416127c69bc20c281f44520f6e trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 trCRM/upgradeRes/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05 +trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc +trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 -trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b trCRM/upgradeRes/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d7642f690531d9410ff6a +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 trCRM/upgradeRes/priority/ui/panel/Android/PanelProductList.unity3d,3a775b6ec87e8293ff7e730ab7ed17d8 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d -trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,44306fc53f8711f95e0698e2613563cf +trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,79cec1c89fa7c63a5c598b97776345ff trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40 @@ -210,8 +214,9 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b33975 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,d49fda1549fd63822105fc7c0381a931 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a -trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 -trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e +trCRM/upgradeRes/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19 +trCRM/upgradeRes/priority/ui/panel/Android/PanelBindPhone.unity3d,b4aca0f337304fefc9997c00886e75c1 +trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowFilter.unity3d,04f6dc42d3bd121bb06cfbf3703fecff trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 @@ -219,7 +224,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b trCRM/upgradeRes/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8 trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,2f0072451a922be026f9192dee40c7a2 -trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,01edf3085f83b233b61ca948bc0e1b0b trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,07bca83a32baeab61818e02f878007e1 trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b @@ -237,7 +242,7 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3dd trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 -trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 +trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set2.unity3d,e528f24899ef583c113ca69bbb510ebd trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9 trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0 @@ -246,11 +251,12 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de2 trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7 trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a +trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,d461935432083ba62e8176bd4a212409 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b -trCRM/upgradeRes/priority/lua/net/NetProto.lua,485ffd7498e79efddaf28d71715e1c8f +trCRM/upgradeRes/priority/lua/net/NetProto.lua,ffbb542d7a01231611661e26dcc38931 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 @@ -261,12 +267,14 @@ trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49 trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233 trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,75c4f8568af9d7c5a72437d42097e64f trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,08da3fb9aee4ab666acb8b15eb1b01bf trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da +trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0 trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d @@ -276,8 +284,8 @@ trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14 trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,136f547ac123ba772549c7ea3636a66a -trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,56aa22c08fd4a18488f213a650f67ff1 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,8af659fb0156386d86542db4fd483a7c +trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,4424391a3b707f82c3cc0c5307adffe0 trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7 trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38 trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 @@ -292,13 +300,14 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761 trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopTime.lua,965d275ae8e835eb7fe5f780643ab7f2 trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,7a3ae06303e65f59f15af5b906b7a471 trCRM/upgradeRes/priority/ui/panel/Android/PanelProductDetail.unity3d,3045ed5f70cc023771da5631dc0abbc1 -trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa +trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2 trCRM/upgradeRes/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7 -trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 +trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 trCRM/upgradeRes/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 @@ -311,11 +320,14 @@ trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d3242473 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectProduct.unity3d,9a4225d5443f6caad4b35b68313325d8 -trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,3655882d094b886c89c7e48099136a46 +trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 +trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43 trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 -trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a +trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,56e4e5ba6ec4f9c368e5c1f2f724a994 +trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 +trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8 trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v index 01b30fb..de1e989 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":""}, {"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":""}, {"md5":"ad28312d5a1031d795e3c9654458ee03", "name":"2020_07_11_11_10_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"046046c4220dfee37405fba363ef4da9", "name":"2020_07_11_12_40_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77db9e1d39248c5e3ed87ff56cfdfd4f", "name":"2020_07_11_15_24_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8401e218df01ff6f8efac33e5d6e39a0", "name":"2020_07_11_15_28_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ef765772eff5ee3b08cb5422440719e2", "name":"2020_07_11_15_29_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"aa2f703664719834f26dcd21d2883e85", "name":"2020_07_11_16_44_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"68b800c76132086b6936702c22dda550", "name":"2020_07_11_18_36_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1c9460ffdd897dc6f03dcebb22e981dc", "name":"2020_07_11_18_44_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"670b46534aa13c4a24a8d67353af7946", "name":"2020_07_11_18_47_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92b2cf4bd87d5d2fb08ed54aa3336924", "name":"2020_07_11_18_49_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dfc491e8cf9e084c0deab072647a35a9", "name":"2020_07_11_20_48_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c793ce6d28a001e2d302998ef4c29515", "name":"2020_07_11_22_06_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"45aa16ae7ea8e23b77d51529c0fe18b0", "name":"2020_07_11_22_53_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b0efd17d53fcbe40d24b0bc7f305836f", "name":"2020_07_12_22_49_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7c46945478a830e39b984d91fab0f225", "name":"2020_07_12_23_16_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"615ade37c66732294ac2cecb29278c8f", "name":"2020_07_14_10_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"28895fabb70f998f86e2846baf92a465", "name":"2020_07_14_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7777caf9f2f719ff98d0d742d1837a2", "name":"2020_07_14_10_29_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65639996001bf1e68b9f6ec3f513798e", "name":"2020_07_14_12_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0017a9e89ecd0b3e08a523ddf6b72ba7", "name":"2020_07_14_14_15_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5c8af675013cc61e95427af31b777026", "name":"2020_07_14_14_31_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"59305f2e5d8e08a66da2128d80239354", "name":"2020_07_14_16_56_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"934af9763bccdaf254c054283f1aaaba", "name":"2020_07_14_17_40_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1cb7e22ce6b9edd721b6130ec62e3371", "name":"2020_07_14_17_57_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c7a73701efdd17079287252a525ba239", "name":"2020_07_14_18_15_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f718ecfce4b717fd57bdd72086518d41", "name":"2020_07_14_21_20_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1be9165a7b27a9f6dae87338944e63f3", "name":"2020_07_14_21_25_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8039b9bd5e69aa086a66737a192b250e", "name":"2020_07_14_21_27_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d42cc224bd9d955b2f9f9ab7b772ae01", "name":"2020_07_14_22_21_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d3b3eafe86fc020d290ff91f023e166d", "name":"2020_07_14_22_21_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cbb35899ffb39e5c7f2d22b476b52524", "name":"2020_07_15_21_20_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cb60a9a25fa44d0675187334c0077291", "name":"2020_07_15_21_22_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e6839dd2c69455fc4de0a1ef8ed1feb5", "name":"2020_07_15_21_26_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1d04fca58e24da050dd4940af0c2e029", "name":"2020_07_16_08_18_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"37ccd2b42009f0ea9370f041d78dddd0", "name":"2020_07_16_08_22_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e89f5d3dc3f315fbb51f13fa12da29b3", "name":"2020_07_16_08_26_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d2fcafd35f779e5a4c10be5aadb78792", "name":"2020_07_16_08_27_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"58435802f03161785dbe6bb06270081f", "name":"2020_07_16_08_44_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a2df25938ae3b4bd71dd019de6d45678", "name":"2020_07_16_23_17_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4cc49ae5a0c1d39a44822d7d044e20db", "name":"2020_07_16_23_19_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a3e1f999ae1954e71e729ed7899bf54e", "name":"2020_07_16_23_22_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1dfb90afcf900ab3f79b29c1a316730d", "name":"2020_07_16_23_23_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92f8331d68e51569638660bb20ab81a9", "name":"2020_07_16_23_41_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7fcf2020f2e3cfc6754edec369606935", "name":"2020_07_17_16_39_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d6594bf0fc23f0f4569414a38f954888", "name":"2020_07_17_16_45_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1fbde337eee663e800c6d79725685a21", "name":"2020_07_17_16_53_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b273d7416a75fe4b50c8d18966a4ef9f", "name":"2020_07_17_16_59_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ba8b387feddd0e1037284da0ffa08fb8", "name":"2020_07_17_17_22_38", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d0f3e0d18e42fa39a56b4b14975dcb6c", "name":"2020_07_17_17_32_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"75818552962263afb5701fef0ad50c7d", "name":"2020_07_17_22_27_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0b38957fcd9cee5c847e3cd85d20dc64", "name":"2020_07_17_22_30_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dc81751c36901303eab177f47779b29d", "name":"2020_07_17_22_52_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ada31c8671bb6d21f17be688b8230314", "name":"2020_07_17_22_54_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f147c624209e55e010742a6f7baa5550", "name":"2020_07_17_22_56_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0678dfa4525c42b91a9012a2d080b871", "name":"2020_07_17_22_59_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f5684c9c6b4d9295844cf82fae208a3c", "name":"2020_07_17_23_03_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d7976ebf674b8af12b6e2f7b6f14f920", "name":"2020_07_17_23_06_09", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1048d7961214f0ddc3ecbb2ce5ba18c4", "name":"2020_07_17_23_08_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2923dfc95530a24b93d6f39c1bb06adb", "name":"2020_07_18_09_20_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2b22f264f3fb7c8f33ef4cba3a1f0607", "name":"2020_07_18_09_35_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1fb0370bce73cf93e6f0a25c6bcc26b0", "name":"2020_07_18_09_41_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3c3457022aff04bebc70d4a265bd94bd", "name":"2020_07_18_09_55_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"36cb557aa9f52084c060467e6498f8be", "name":"2020_07_18_10_06_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"17213786aaf7b5f6848c4f851e161903", "name":"2020_07_18_12_28_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"979abb82fb4ff1492767d0d77a8d6bdf", "name":"2020_07_18_12_37_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7d67bd512b62c3332ac932c259afc5dc", "name":"2020_07_18_12_43_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"63c2f68ffc326d7373b31914163e918b", "name":"2020_07_18_16_04_38", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8e287656e0a7f11f09441e015e626d31", "name":"2020_07_18_20_41_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0db6350217c95cc761d8203c796666eb", "name":"2020_07_18_20_46_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"74531716270cdfa784be81b73e352188", "name":"2020_07_18_20_47_02", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"90aff843ab26f9038a44236c6e594d67", "name":"2020_07_18_21_08_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6d30d455768a406acffb2bfe39735cdd", "name":"2020_07_18_22_35_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"448bcbba8d272f42ba202f0caa334c77", "name":"2020_07_19_09_36_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"eaa141b4b52cc9a07a8e352bc2b858da", "name":"2020_07_19_10_29_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"631478c422d238bc23d0abaf8caed83b", "name":"2020_07_19_12_33_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c92204234e4a4ed3b5e6272e00fd0b97", "name":"2020_07_19_12_43_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40dd1be89eaaa85b25316e72943f752f", "name":"2020_07_20_14_42_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a5a4ea6ecbf7c70af35b2e3743a39c25", "name":"2020_07_20_14_45_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2a3df808ae2516146be8853e00ef31b5", "name":"2020_07_20_15_51_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"510eae4152c5a98dd742eaeb21680a42", "name":"2020_07_20_15_53_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2c5e459c65c45fb83ab26ef3d25d35de", "name":"2020_07_20_15_55_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5a984e015448d2769651642e37a4c5a2", "name":"2020_07_20_16_00_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2dc62024c6d620dc2ede734ff0166324", "name":"2020_07_20_16_19_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1405723aecdd85c9e4e238d07035a6f1", "name":"2020_07_20_16_23_08", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1802ca50e57ff6c83332f198f6482411", "name":"2020_07_20_17_45_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"87e34b1e499b2476ebb979b6e8497d79", "name":"2020_07_20_17_48_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"be2190184134005e3f1635d41d16ee83", "name":"2020_07_20_17_51_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5483f2ca5381acbeeebef045ec4b3b68", "name":"2020_07_21_16_43_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4894d8fb7d5ce3dce4d93f63735b5510", "name":"2020_07_21_18_21_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"787418ae05963af179d8476b2a3be750", "name":"2020_07_21_21_43_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"22e8cb56c03db9ec62e0bfc1859780ad", "name":"2020_07_21_21_44_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f157604638073d987b357d82f49106e", "name":"2020_07_21_22_36_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4b01497cdab38956f32f58e8519e984f", "name":"2020_07_21_22_47_20", "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":""}, {"md5":"ad28312d5a1031d795e3c9654458ee03", "name":"2020_07_11_11_10_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"046046c4220dfee37405fba363ef4da9", "name":"2020_07_11_12_40_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77db9e1d39248c5e3ed87ff56cfdfd4f", "name":"2020_07_11_15_24_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8401e218df01ff6f8efac33e5d6e39a0", "name":"2020_07_11_15_28_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ef765772eff5ee3b08cb5422440719e2", "name":"2020_07_11_15_29_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"aa2f703664719834f26dcd21d2883e85", "name":"2020_07_11_16_44_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"68b800c76132086b6936702c22dda550", "name":"2020_07_11_18_36_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1c9460ffdd897dc6f03dcebb22e981dc", "name":"2020_07_11_18_44_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"670b46534aa13c4a24a8d67353af7946", "name":"2020_07_11_18_47_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92b2cf4bd87d5d2fb08ed54aa3336924", "name":"2020_07_11_18_49_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dfc491e8cf9e084c0deab072647a35a9", "name":"2020_07_11_20_48_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c793ce6d28a001e2d302998ef4c29515", "name":"2020_07_11_22_06_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"45aa16ae7ea8e23b77d51529c0fe18b0", "name":"2020_07_11_22_53_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b0efd17d53fcbe40d24b0bc7f305836f", "name":"2020_07_12_22_49_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7c46945478a830e39b984d91fab0f225", "name":"2020_07_12_23_16_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"615ade37c66732294ac2cecb29278c8f", "name":"2020_07_14_10_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"28895fabb70f998f86e2846baf92a465", "name":"2020_07_14_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7777caf9f2f719ff98d0d742d1837a2", "name":"2020_07_14_10_29_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65639996001bf1e68b9f6ec3f513798e", "name":"2020_07_14_12_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0017a9e89ecd0b3e08a523ddf6b72ba7", "name":"2020_07_14_14_15_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5c8af675013cc61e95427af31b777026", "name":"2020_07_14_14_31_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"59305f2e5d8e08a66da2128d80239354", "name":"2020_07_14_16_56_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"934af9763bccdaf254c054283f1aaaba", "name":"2020_07_14_17_40_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1cb7e22ce6b9edd721b6130ec62e3371", "name":"2020_07_14_17_57_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c7a73701efdd17079287252a525ba239", "name":"2020_07_14_18_15_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f718ecfce4b717fd57bdd72086518d41", "name":"2020_07_14_21_20_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1be9165a7b27a9f6dae87338944e63f3", "name":"2020_07_14_21_25_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8039b9bd5e69aa086a66737a192b250e", "name":"2020_07_14_21_27_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d42cc224bd9d955b2f9f9ab7b772ae01", "name":"2020_07_14_22_21_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d3b3eafe86fc020d290ff91f023e166d", "name":"2020_07_14_22_21_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cbb35899ffb39e5c7f2d22b476b52524", "name":"2020_07_15_21_20_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cb60a9a25fa44d0675187334c0077291", "name":"2020_07_15_21_22_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e6839dd2c69455fc4de0a1ef8ed1feb5", "name":"2020_07_15_21_26_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1d04fca58e24da050dd4940af0c2e029", "name":"2020_07_16_08_18_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"37ccd2b42009f0ea9370f041d78dddd0", "name":"2020_07_16_08_22_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e89f5d3dc3f315fbb51f13fa12da29b3", "name":"2020_07_16_08_26_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d2fcafd35f779e5a4c10be5aadb78792", "name":"2020_07_16_08_27_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"58435802f03161785dbe6bb06270081f", "name":"2020_07_16_08_44_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a2df25938ae3b4bd71dd019de6d45678", "name":"2020_07_16_23_17_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4cc49ae5a0c1d39a44822d7d044e20db", "name":"2020_07_16_23_19_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a3e1f999ae1954e71e729ed7899bf54e", "name":"2020_07_16_23_22_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1dfb90afcf900ab3f79b29c1a316730d", "name":"2020_07_16_23_23_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92f8331d68e51569638660bb20ab81a9", "name":"2020_07_16_23_41_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7fcf2020f2e3cfc6754edec369606935", "name":"2020_07_17_16_39_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d6594bf0fc23f0f4569414a38f954888", "name":"2020_07_17_16_45_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1fbde337eee663e800c6d79725685a21", "name":"2020_07_17_16_53_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b273d7416a75fe4b50c8d18966a4ef9f", "name":"2020_07_17_16_59_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ba8b387feddd0e1037284da0ffa08fb8", "name":"2020_07_17_17_22_38", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d0f3e0d18e42fa39a56b4b14975dcb6c", "name":"2020_07_17_17_32_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"75818552962263afb5701fef0ad50c7d", "name":"2020_07_17_22_27_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0b38957fcd9cee5c847e3cd85d20dc64", "name":"2020_07_17_22_30_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dc81751c36901303eab177f47779b29d", "name":"2020_07_17_22_52_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ada31c8671bb6d21f17be688b8230314", "name":"2020_07_17_22_54_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f147c624209e55e010742a6f7baa5550", "name":"2020_07_17_22_56_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0678dfa4525c42b91a9012a2d080b871", "name":"2020_07_17_22_59_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f5684c9c6b4d9295844cf82fae208a3c", "name":"2020_07_17_23_03_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d7976ebf674b8af12b6e2f7b6f14f920", "name":"2020_07_17_23_06_09", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1048d7961214f0ddc3ecbb2ce5ba18c4", "name":"2020_07_17_23_08_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2923dfc95530a24b93d6f39c1bb06adb", "name":"2020_07_18_09_20_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2b22f264f3fb7c8f33ef4cba3a1f0607", "name":"2020_07_18_09_35_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1fb0370bce73cf93e6f0a25c6bcc26b0", "name":"2020_07_18_09_41_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3c3457022aff04bebc70d4a265bd94bd", "name":"2020_07_18_09_55_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"36cb557aa9f52084c060467e6498f8be", "name":"2020_07_18_10_06_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"17213786aaf7b5f6848c4f851e161903", "name":"2020_07_18_12_28_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"979abb82fb4ff1492767d0d77a8d6bdf", "name":"2020_07_18_12_37_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7d67bd512b62c3332ac932c259afc5dc", "name":"2020_07_18_12_43_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"63c2f68ffc326d7373b31914163e918b", "name":"2020_07_18_16_04_38", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8e287656e0a7f11f09441e015e626d31", "name":"2020_07_18_20_41_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0db6350217c95cc761d8203c796666eb", "name":"2020_07_18_20_46_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"74531716270cdfa784be81b73e352188", "name":"2020_07_18_20_47_02", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"90aff843ab26f9038a44236c6e594d67", "name":"2020_07_18_21_08_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6d30d455768a406acffb2bfe39735cdd", "name":"2020_07_18_22_35_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"448bcbba8d272f42ba202f0caa334c77", "name":"2020_07_19_09_36_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"eaa141b4b52cc9a07a8e352bc2b858da", "name":"2020_07_19_10_29_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"631478c422d238bc23d0abaf8caed83b", "name":"2020_07_19_12_33_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c92204234e4a4ed3b5e6272e00fd0b97", "name":"2020_07_19_12_43_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40dd1be89eaaa85b25316e72943f752f", "name":"2020_07_20_14_42_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a5a4ea6ecbf7c70af35b2e3743a39c25", "name":"2020_07_20_14_45_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2a3df808ae2516146be8853e00ef31b5", "name":"2020_07_20_15_51_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"510eae4152c5a98dd742eaeb21680a42", "name":"2020_07_20_15_53_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2c5e459c65c45fb83ab26ef3d25d35de", "name":"2020_07_20_15_55_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5a984e015448d2769651642e37a4c5a2", "name":"2020_07_20_16_00_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2dc62024c6d620dc2ede734ff0166324", "name":"2020_07_20_16_19_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1405723aecdd85c9e4e238d07035a6f1", "name":"2020_07_20_16_23_08", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1802ca50e57ff6c83332f198f6482411", "name":"2020_07_20_17_45_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"87e34b1e499b2476ebb979b6e8497d79", "name":"2020_07_20_17_48_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"be2190184134005e3f1635d41d16ee83", "name":"2020_07_20_17_51_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5483f2ca5381acbeeebef045ec4b3b68", "name":"2020_07_21_16_43_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4894d8fb7d5ce3dce4d93f63735b5510", "name":"2020_07_21_18_21_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"787418ae05963af179d8476b2a3be750", "name":"2020_07_21_21_43_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"22e8cb56c03db9ec62e0bfc1859780ad", "name":"2020_07_21_21_44_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f157604638073d987b357d82f49106e", "name":"2020_07_21_22_36_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4b01497cdab38956f32f58e8519e984f", "name":"2020_07_21_22_47_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"51ea5a31f29ccfb89b3fc1aff81fedca", "name":"2020_07_23_13_04_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ee7f1e29b20bde4e83319102658322b0", "name":"2020_07_23_14_16_11", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c3de7b242cc96ce52ab293b1da236461", "name":"2020_07_23_14_52_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8e4502b55f29bd1b80afaafce16577f2", "name":"2020_07_24_09_58_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e3dabb8eb94711f28d2a2483ded183e5", "name":"2020_07_24_10_17_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e785fee8f65f703539f3e370cd77955a", "name":"2020_07_24_16_27_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"913150c3fe20ebc3f3194afd7e58545f", "name":"2020_07_24_22_10_02", "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 00c9818..ee33679 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v @@ -1,4 +1,4 @@ -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,e8d23c8a62c8d943f788657b3a534a94 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c @@ -13,12 +13,12 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,cc945b5b trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 -trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,55cfd5f40e2669326dd366522de31c59 +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,a662261e3fd155f94337506d37a8b723 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57 trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,6c58ee8fe4d6219d1b49869d4e25f129 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,5dd7ac6a2fe56c5335b9d8ca90861289 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 @@ -26,7 +26,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,5663378b77289e7d351bdf90a6aabcc2 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e @@ -36,18 +36,21 @@ trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_password2.unity3d,5dc8 trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,cba4b2f5ee3df14ce326ed032d987e81 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d,3045ed5f70cc023771da5631dc0abbc1 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d,a448a640c08bd93fff4605cb5f73dde9 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,068f97e365e79ae11418ff16a1cf2f89 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,dabd3a6e76a5743b94d861be9a735795 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,6d7ee047a01c11be7f117b434a39db1a trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,b9645fe9ff5972788d341acc70b7be30 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,712c17139d4e0769a2c1ebfb326d3d1a trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2 @@ -63,24 +66,27 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,3655882d094b886c89c7e48099136a46 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,eab2f8ce29ba9910d376a04371876765 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,cd2044775611a8ff79fafca8694d981c trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,950c14639cda71cde0ce16167e651375 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,2168b9328b66f5be290967d626c367c3 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua,04eda18a177de8ef755cbade62b61097 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_password.unity3d,04bebaa914245dd4d2376f9ded0ad15f trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680 trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,b02e9a081f66dc6b25ff39c64c896fe4 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d,3d4cb175f54b68fde13d37ff20e2e722 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101 trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua,fd2b6a27eee4bcec69b1fd1b4bec92ba trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,99670420a41bf33b055763d28c547a26 @@ -90,10 +96,11 @@ trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,65a7251f84d25114372f7b50d5c9d84f trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 +trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,756c08832a0f69ec66e386da4fd35ca7 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 @@ -125,9 +132,10 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4a trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df96a841ce2f91 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua,c5fb5e1103ef14a9b27db0d69f574e0a +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua,0939d88d43a38ddad4dfdfdad7fc2136 trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,720f3ff97d9b71a9108fd949bf779b30 trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 @@ -137,11 +145,12 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f4 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d,fd4ee0f1eee52f71f6827985ccdca38a trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua,035626bac75e16f15bc825f6e0ded212 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua,4dc48eddbf96438192abc8f1e6dff153 trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,188a98cb52c9cb7c28d60f71dee9e68c +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua,5eee71df7de0501de9f9c5ea030ea334 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,29858c124459a8e71aace8ebff600c04 trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,36ed1c264dfd1ae3177ad79aedbbb8ee +trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,8e8be2e549257d747b99e5149681ab19 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 @@ -151,17 +160,17 @@ trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,a929e8 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,0c9076d943ba5d1b3ac4da7726e7b73a trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,600ae2f4949e3ee829f17a2f6b4284e7 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,be7a258652e4f573ef52224b6fdfc105 trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua,17c97e4927cb90121178558f48513b07 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,e28ed051439e06abe8ffc14ebf9cf1d2 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,8de8cb431ae2daf23d4d8ff940e5ef81 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee trCRM/upgradeRes4Publish/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef @@ -169,13 +178,13 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,3fb44d3955035fb3c7d7caaeb8e669ad +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua,61a254c78a3b19a2e73d4d8f4f082fb7 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772 -trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,3d62c20b15c534581a2c389eb54f3b27 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e @@ -190,7 +199,7 @@ trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc +trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,9f02607d08c63b2818e5d5bd97545914 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a @@ -199,7 +208,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d764 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d,3a775b6ec87e8293ff7e730ab7ed17d8 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d -trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,44306fc53f8711f95e0698e2613563cf +trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,79cec1c89fa7c63a5c598b97776345ff trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40 @@ -208,7 +217,8 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,a56567b7890 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,d49fda1549fd63822105fc7c0381a931 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a -trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 +trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d,b4aca0f337304fefc9997c00886e75c1 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e @@ -216,8 +226,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,2f0072451a922be026f9192dee40c7a2 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,01edf3085f83b233b61ca948bc0e1b0b trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,07bca83a32baeab61818e02f878007e1 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b @@ -247,7 +256,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f8 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,d461935432083ba62e8176bd4a212409 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b -trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,485ffd7498e79efddaf28d71715e1c8f +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,ffbb542d7a01231611661e26dcc38931 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 @@ -257,7 +266,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7c trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,75c4f8568af9d7c5a72437d42097e64f trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,08da3fb9aee4ab666acb8b15eb1b01bf trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 @@ -273,8 +282,8 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8d trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,136f547ac123ba772549c7ea3636a66a -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,56aa22c08fd4a18488f213a650f67ff1 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,8af659fb0156386d86542db4fd483a7c +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,4424391a3b707f82c3cc0c5307adffe0 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38 trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 @@ -284,15 +293,16 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,cba4b2f5ee3df14ce326ed032d987e81 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua,56e4e5ba6ec4f9c368e5c1f2f724a994 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua,965d275ae8e835eb7fe5f780643ab7f2 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,7a3ae06303e65f59f15af5b906b7a471 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d,3045ed5f70cc023771da5631dc0abbc1 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d,04f6dc42d3bd121bb06cfbf3703fecff trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 @@ -314,5 +324,6 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133f trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 +trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c diff --git a/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab b/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab index fd27db7..8d8a102 100644 --- a/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab +++ b/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab @@ -46,7 +46,7 @@ MonoBehaviour: material: {fileID: 0} mSprites: [] mPixelSize: 1 - mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mReplacement: {fileID: 0} mCoordinates: 0 sprites: [] _isBorrowSpriteMode: 1 diff --git a/Assets/trCRM/Scripts/ui/KKUIScrollView.cs b/Assets/trCRM/Scripts/ui/KKUIScrollView.cs new file mode 100644 index 0000000..2c86168 --- /dev/null +++ b/Assets/trCRM/Scripts/ui/KKUIScrollView.cs @@ -0,0 +1,76 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using XLua; +using Coolape; + +[RequireComponent (typeof(UIScrollView))] +public class KKUIScrollView : MonoBehaviour +{ + public CLBaseLua lua; + public UICenterOnChild centerOnChild; + UIScrollView _scrollView; + + public UIScrollView scrollView { + get { + if (_scrollView == null) + _scrollView = GetComponent (); + return _scrollView; + } + } + + public void onDragStarted () + { + Utl.doCallback (lua.getLuaFunction ("onDragStarted"), scrollView); + } + + public void onDragmMove () + { + Utl.doCallback (lua.getLuaFunction ("onDragmMove"), scrollView); + } + + public void onMomentumMove () + { + Utl.doCallback (lua.getLuaFunction ("onMomentumMove"), scrollView); + } + + public void onDragFinished () + { + Utl.doCallback (lua.getLuaFunction ("onDragFinished"), scrollView); + } + + public void onStoppedMoving () + { + Utl.doCallback (lua.getLuaFunction ("onStoppedMoving"), scrollView); + } + + public void onStartCenterOnChild () + { + Utl.doCallback (lua.getLuaFunction ("onStartCenterOnChild"), scrollView); + } + + public void onCenterChild (GameObject center) + { + Utl.doCallback (lua.getLuaFunction ("onCenterChild"), center, scrollView); + } + + public void onFinishCenterChild () + { + Utl.doCallback (lua.getLuaFunction ("onFinishCenterChild"), scrollView); + } + + public void Start () + { + scrollView.onDragStarted = (UIScrollView.OnDragNotification)onDragStarted; + scrollView.onMomentumMove = (UIScrollView.OnDragNotification)onMomentumMove; + scrollView.onDragFinished = (UIScrollView.OnDragNotification)onDragFinished; + scrollView.onStoppedMoving = (UIScrollView.OnDragNotification)onStoppedMoving; + scrollView.onDragmMove = (UIScrollView.OnDragNotification)onDragmMove; + scrollView.onStartCenterOnChild = (UIScrollView.OnDragNotification)onStartCenterOnChild; + if (centerOnChild != null) { + centerOnChild.onFinished = (SpringPanel.OnFinished)onFinishCenterChild; + centerOnChild.onCenter = (UICenterOnChild.OnCenterCallback)onCenterChild; + } + } + +} diff --git a/Assets/trCRM/Scripts/ui/KKUIScrollView.cs.meta b/Assets/trCRM/Scripts/ui/KKUIScrollView.cs.meta new file mode 100644 index 0000000..41970c9 --- /dev/null +++ b/Assets/trCRM/Scripts/ui/KKUIScrollView.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 548490e5985c145d7a7d533ceebb924d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png new file mode 100644 index 0000000..44e843e Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png.meta new file mode 100644 index 0000000..9bf9627 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 9a562495430e3457dbefdd238b8e78e7 +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/mine/sms.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png new file mode 100644 index 0000000..6ddf112 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png.meta new file mode 100644 index 0000000..a8605b8 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: abb8fd86713f4403eaa012a192193185 +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 273fc91..2523b8b 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab @@ -1865,6 +1865,34 @@ MonoBehaviour: paddingTop: 0 paddingBottom: 0 path: trCRM/upgradeRes4Dev/other/uiAtlas/order/xuanze_bg.png + - name: mine_phone + x: 0 + y: 0 + width: 64 + height: 64 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/mine/phone.png + - name: mine_sms + x: 0 + y: 0 + width: 64 + height: 64 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png mPixelSize: 1 mReplacement: {fileID: 0} mCoordinates: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua index 1831ae0..983ed5d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua @@ -3,7 +3,10 @@ local db = {} DBOrder.PopListGroup = { urgencyLevels = "urgencyLevels", -- 紧急程序 - templateList = "templateList" -- 订单模板 + templateList = "templateList", -- 订单模板 + orderType = "orderType", -- 订单类别 + orderStatus = "orderStatus", -- 订单状态 + payOrderStatus = "payOrderStatus" -- 回款订单状态 } DBOrder.onGetFilter = function(data) @@ -41,13 +44,69 @@ DBOrder.onGetFilter = function(data) end end end + + local filterInfor = {} + table.insert(filterInfor, {name = "我的订单", value = "0"}) + table.insert(filterInfor, {name = "我的草稿", value = "1"}) + db.filters[DBOrder.PopListGroup.orderType] = filterInfor + local options = ArrayList() + local values = ArrayList() + for i, v in ipairs(filterInfor) do + options:Add(v.name) + values:Add(v.value) + end + db.filtersPopup[DBOrder.PopListGroup.orderType] = { + options = options, + values = values + } + + filterInfor = {} + table.insert(filterInfor, {name = "草稿", value = "-1"}) + table.insert(filterInfor, {name = "正常工单", value = "0"}) + table.insert(filterInfor, {name = "回退工单", value = "1"}) + table.insert(filterInfor, {name = "回退到创建人", value = "2"}) + table.insert(filterInfor, {name = "正常关闭", value = "3"}) + table.insert(filterInfor, {name = "未正常关闭", value = "4"}) + db.filters[DBOrder.PopListGroup.orderStatus] = filterInfor + options = ArrayList() + values = ArrayList() + for i, v in ipairs(filterInfor) do + options:Add(v.name) + values:Add(v.value) + end + db.filtersPopup[DBOrder.PopListGroup.orderStatus] = { + options = options, + values = values + } + + filterInfor = {} + table.insert(filterInfor, {name = "暂无回款", value = "0"}) + table.insert(filterInfor, {name = "部分回款", value = "1"}) + table.insert(filterInfor, {name = "全部回款", value = "2"}) + db.filters[DBOrder.PopListGroup.payOrderStatus] = filterInfor + options = ArrayList() + values = ArrayList() + for i, v in ipairs(filterInfor) do + options:Add(v.name) + values:Add(v.value) + end + db.filtersPopup[DBOrder.PopListGroup.payOrderStatus] = { + options = options, + values = values + } end +DBOrder.getFilter = function(popGroup) + if popGroup then + return db.filters[popGroup] + end + return db.filters +end DBOrder.getPopupList = function(popGroup) if popGroup then return db.filtersPopup[popGroup] end - return db.filters + return db.filtersPopup end DBOrder.getFields = function(templateId) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua index 73f207c..9b6b69c 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua @@ -9,22 +9,54 @@ local db = {} local icons = {} local poplist = {} -function DBUser.onGetUsers(list) - poplist.options = ArrayList() - poplist.values = ArrayList() +DBUser.FilterGroup = { + user = "user", + group = "group" +} + +function DBUser.onGetUsers(list, groupList) + local options = ArrayList() + local values = ArrayList() + db.filters = {} + local name + db.filters[DBUser.FilterGroup.user] = {} for i, v in ipairs(list) do - db[v.loginNo] = v if v.loginName == "系统生成" then - poplist.options:Add(joinStr(v.loginNo, "_", v.loginName)) + name = joinStr(v.loginNo, "_", v.loginName) else - poplist.options:Add(joinStr(v.loginName)) + name = joinStr(v.loginName) end - poplist.values:Add(v.loginNo) + + table.insert(db.filters[DBUser.FilterGroup.user], {name = name, value = v.loginNo}) + db[v.loginNo] = v + options:Add(name) + values:Add(v.loginNo) end + poplist[DBUser.FilterGroup.user] = { + options = options, + values = values + } + -------------------------------------------- + local options = ArrayList() + local values = ArrayList() + db.filters[DBUser.FilterGroup.group] = {} + for i, v in ipairs(groupList) do + table.insert(db.filters[DBUser.FilterGroup.group], {name = v.name, value = v.id}) + options:Add(v.name) + values:Add(v.id) + end + poplist[DBUser.FilterGroup.group] = { + options = options, + values = values + } end -function DBUser.getPopList() - return poplist +function DBUser.getFilters(group) + return db.filters[group] +end + +function DBUser.getPopList(group) + return poplist[group] end ---@return _DBUser diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua index 61f392d..bc497aa 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua @@ -33,8 +33,8 @@ local wrapSendData = function(map) map.sign = NetProto.sign local dList = {} for k, v in pairs(map) do - if (type(v) == "number" or type(v) == "string" or type(v) == "boolean") then - table.insert(dList, joinStr(k, "=", Uri.EscapeDataString(v or ""))) + if v and (type(v) == "number" or type(v) == "string" or type(v) == "boolean") then + table.insert(dList, joinStr(k, "=", Uri.EscapeDataString(tostring(v)))) end end return table.concat(dList, "&") @@ -242,7 +242,8 @@ NetProto.cmds = { selectProductInfo = "selectProductInfo", -- 商品列表 createWfInfo = "createWfInfo", -- 创建订单 create_followUp_task = "create_followUp_task", -- 创建跟进预约 - list_followUp_records = "list_followUp_records" -- 跟进记录 + list_followUp_records = "list_followUp_records", -- 跟进记录 + workFlowQuery = "workFlowQuery" -- 工单列表 } --------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------- @@ -585,5 +586,15 @@ NetProto.send.list_followUp_records = function(filters, queryKey, page, callback content.current_page = page NetProto.sendSocket(content, callback, timeOutSec) end + +NetProto.send.workFlowQuery = function(filters, queryKey, page, callback, timeOutSec) + local content = {} + content.action = NetProto.cmds.workFlowQuery + content.groupId = NetProto.groupId + content.filters = filters + content.keywords = queryKey + content.current_page = page + NetProto.sendSocket(content, callback, timeOutSec) +end ------------------------------------------------------ return NetProto diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua index 37cbd83..f9d958c 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua @@ -115,6 +115,7 @@ function MyUtl.setIsHidePhone(val) end MyUtl.hidePhone = function(phone) + if not phone then return end if not MyUtl.isHidePhone then return phone end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua index 5346529..a9d8208 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua @@ -1,101 +1,122 @@ -- xx单元 do local _cell = {} - local csSelf = nil; - local transform = nil; - local grid; - local dayPrefab = nil; - local mData = nil; + local csSelf = nil + local transform = nil + local grid + local dayPrefab = nil + local mData = nil + + local dayList -- 初始化，只调用一次 function _cell.init(csObj) - csSelf = csObj; - transform = csSelf.transform; - grid = getChild(transform, "Grid"):GetComponent("UIGrid"); - dayPrefab = getChild(grid.transform, "00000").gameObject; - end - - -- 显示， - -- 注意，c#侧不会在调用show时，调用refresh - function _cell.show(go, data) + csSelf = csObj + transform = csSelf.transform + grid = getChild(transform, "Grid"):GetComponent("UIGrid") + dayPrefab = getChild(grid.transform, "00000").gameObject end -- 注意，c#侧不会在调用show时，调用refresh function _cell.refresh(data, pageIndex) - mData = data; + mData = data if (mData == nil) then mData = {} - local curYear, curMonth = PanelCalender.getData(); + local curYear, curMonth = PanelCalender.getData() if (pageIndex < 0) then - mData.year, mData.month = PanelCalender.getYYHH_ByaddMonth(curYear, curMonth, -6 + pageIndex); + mData.year, mData.month = PanelCalender.getYYHH_ByaddMonth(curYear, curMonth, -6 + pageIndex) else - mData.year, mData.month = PanelCalender.getYYHH_ByaddMonth(curYear, curMonth, -6 + pageIndex); + mData.year, mData.month = PanelCalender.getYYHH_ByaddMonth(curYear, curMonth, -6 + pageIndex) end end + dayList = _cell.resetCalender(mData.year, mData.month) + CLUIUtl.resetList4Lua(grid, dayPrefab, dayList, _cell.initCellDay) + end - CLUIUtl.resetList4Lua(grid, dayPrefab, - _cell.resetCalender(mData.year, mData.month), - _cell.initCellDay); + function _cell.doRefresh() + CLUIUtl.resetList4Lua(grid, dayPrefab, dayList, _cell.initCellDay) end -- 取得数据 function _cell.getData() - return mData; + return mData end function _cell.initCellDay(cell, day) - local data = {} - data.day = day; - -- print(mData.year); - -- print(mData.month); - -- print(day); - -- print("================="); - if (mData.year == DateTime.Now.Year and - mData.month == DateTime.Now.Month and - day == DateTime.Now.Day) then - data.isToday = true; - PanelCalender.setDefalutSelectDate(cell, mData.year, mData.month, day); + local data + if cell.luaTable then + data = cell.luaTable.getData() else - data.isToday = false; - data.isSelected = false; + data = {} end - local selectedYear, selectedMonth, selectedDay = PanelCalender.getSelectDate(); - if (mData.year == selectedYear and mData.month == selectedMonth and selectedDay == data.day) then - data.isSelected = true; + data.day = day + local selectedYear, selectedMonth, selectedDay = PanelCalender.getSelectDate() + if (mData.year == DateTime.Now.Year and mData.month == DateTime.Now.Month and day == DateTime.Now.Day) then + data.isToday = true + if selectedYear == nil then + PanelCalender.setDefalutSelectDate(cell, mData.year, mData.month, day) + end + else + data.isToday = false + data.isSelected = false end - cell:init(data, _cell.onClickDay); + data.isSelected = false + local isDateRange, startDate, endDate = PanelCalender.getDateRangeDate() + if isDateRange then + local tmpDate = + tonumber( + joinStr( + NumEx.nStrForLen(mData.year, 4), + NumEx.nStrForLen(mData.month, 2), + NumEx.nStrForLen(data.day, 2) + ) + ) + if tmpDate and (startDate and tmpDate >= startDate) and (endDate and tmpDate <= endDate) then + data.isSelected = true + elseif tmpDate and (startDate and tmpDate == startDate) and endDate == nil then + data.isSelected = true + else + data.isSelected = false + end + else + if (mData.year == selectedYear and mData.month == selectedMonth and selectedDay == data.day) then + data.isSelected = true + PanelCalender.setDefalutSelectDate(cell, mData.year, mData.month, day) + end + end + cell:init(data, _cell.onClickDay) end function _cell.onClickDay(cell) - local d = cell.luaTable.getData(); + local d = cell.luaTable.getData() if (d.day == -1) then - return; + return end - local selectedDay = cell.luaTable.getData().day; - local selectedMonth = mData.month; - local selectedYear = mData.year; + local selectedDay = cell.luaTable.getData().day + local selectedMonth = mData.month + local selectedYear = mData.year - PanelCalender.setSelectDate(cell, selectedYear, selectedMonth, selectedDay); + PanelCalender.setSelectDate(cell, selectedYear, selectedMonth, selectedDay) end function _cell.resetCalender(year, month) - local list = ArrayList(); - local dayCount = DateEx.getMothDays(year, month); - local week = DateEx.getWeek(year, month, 1); + local list = ArrayList() + local dayCount = DateEx.getMothDays(year, month) + local week = DateEx.getWeek(year, month, 1) for i = 0, week - 1 do - list:Add(-1); + list:Add(-1) end for i = week, dayCount - 1 + week do -- print(i .. "-" .. week .. "+1"); - list:Add(i - week + 1); + list:Add(i - week + 1) end for i = dayCount + week, 41 do - list:Add(-1); + list:Add(-1) end - return list; + return list end -------------------------------------------- - return _cell; + return _cell end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua new file mode 100644 index 0000000..6875924 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua @@ -0,0 +1,44 @@ +-- 单元 +local uiCell = {} + +local csSelf = nil +local transform = nil +local gameObject = nil +-- local Background = nil; +local Label = nil +local mData = nil + +local centerObj + +function uiCell.init(go) + gameObject = go + transform = go.transform + csSelf = gameObject:GetComponent("CLCellLua") + + -- Background = getChild(transform, "Background"):GetComponent("UISprite"); + Label = csSelf:GetComponent("UILabel") +end + +function uiCell.setCenterObj(val) + centerObj = val + uiCell.refresh() +end + +function uiCell.show(go, data) + mData = data + uiCell.refresh() +end + +function uiCell.refresh(flag) + Label.text = isNilOrEmpty(mData) and "请选择" or mData + if centerObj and centerObj.centeredObject and centerObj.centeredObject.name == gameObject.name then + Label.color = ColorEx.getColor(0xff2990dc) + else + Label.color = ColorEx.getColor(0xff363636) + end +end + +function uiCell.getData() + return mData +end +return uiCell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua.meta new file mode 100644 index 0000000..610c835 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPopTime.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 933ba76c855fc47f8a02fd380f0d7784 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua index bb06871..0b1fd94 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua @@ -12,6 +12,7 @@ ---@field popValues ---@field donotJoinKey boolean 是否要拼接key ---@field height numb 高度，只有在emptyspace有用 +---@field defaultText ---@class _ParamCellExtendFiled ---@field showMode _FieldMode @@ -152,7 +153,7 @@ function _cell.setElementMode(mode) uiobjs.Label.text = uiobjs.inputLabel end if uiobjs.input then - uiobjs.input.defaultText = uiobjs.inputLabel + uiobjs.input.defaultText = attr.defaultText or uiobjs.inputLabel end _cell.enabeldObj(uiobjs.Label4, true) -- multext if @@ -179,7 +180,7 @@ function _cell.setElementMode(mode) uiobjs.Label.text = "" end if uiobjs.input then - uiobjs.input.defaultText = "" + uiobjs.input.defaultText = attr.defaultText or "" end _cell.enabeldObj(uiobjs.Label4, false) _cell.enabeldObj(uiobjs.SpriteRight, false) @@ -196,7 +197,7 @@ function _cell.setElementMode(mode) uiobjs.Label.text = uiobjs.inputLabel end if uiobjs.input then - uiobjs.input.defaultText = uiobjs.inputLabel + uiobjs.input.defaultText = attr.defaultText or uiobjs.inputLabel end _cell.enabeldObj(uiobjs.Label4, true) _cell.enabeldObj(uiobjs.SpriteRight, true) @@ -213,7 +214,7 @@ function _cell.setElementMode(mode) uiobjs.Label.text = "" end if uiobjs.input then - uiobjs.input.defaultText = "" + uiobjs.input.defaultText = attr.defaultText or "" end _cell.enabeldObj(uiobjs.Label4, false) _cell.enabeldObj(uiobjs.SpriteRight, true) @@ -230,7 +231,7 @@ function _cell.setElementMode(mode) uiobjs.Label.text = "" end if uiobjs.input then - uiobjs.input.defaultText = "" + uiobjs.input.defaultText = attr.defaultText or "" end _cell.enabeldObj(uiobjs.Label4, false) _cell.enabeldObj(uiobjs.SpriteRight, true) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua index 71be57c..923b102 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua @@ -28,7 +28,7 @@ function _cell.show(go, data) mData = data local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList) uiobjs.LabelStatus:refreshItems(optionInfor.options, optionInfor.values) - local optionInfor = DBUser.getPopList() + local optionInfor = DBUser.getPopList(DBUser.FilterGroup.user) uiobjs.LabelServerNo:refreshItems(optionInfor.options, optionInfor.values) if tostring(mData.dealFlag) == "0" then diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua index fff1321..59ff098 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua @@ -11,13 +11,9 @@ local uiobjs = {} function _cell.init(csObj) csSelf = csObj transform = csSelf.transform - -- uiobjs.LabelCompanyName = getCC(transform, "LabelCompanyName", "UILabel") - -- uiobjs.LabelTime = getCC(transform, "LabelTime", "UILabel") ---@type UIPopupList 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", "UIPopupList") ---@type CLUIFormRoot uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot") uiobjs.SpriteStatus = getChild(transform, "SpriteStatus") @@ -28,12 +24,15 @@ end -- 注意，c#侧不会在调用show时，调用refresh function _cell.show(go, data) mData = data + mData.money = mData.prodNum * mData.salePrice mData._phoneNo = MyUtl.hidePhone(mData.phoneNo) - mData.lastFollowUpTime = isNilOrEmpty(mData.lastFollowUpTime) and "无" or mData.lastFollowUpTime - local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList) + local optionInfor = DBOrder.getPopupList(DBOrder.PopListGroup.orderStatus) uiobjs.LabelStatus:refreshItems(optionInfor.options, optionInfor.values) + optionInfor = DBUser.getPopList(DBUser.FilterGroup.user) + uiobjs.LabelServerNo:refreshItems(optionInfor.options, optionInfor.values) + uiobjs.formRoot:setValue(mData) - if tostring(mData.dealFlag) == "0" then + if tostring(mData.status) == "0" then SetActive(uiobjs.SpriteStatus.gameObject, true) else SetActive(uiobjs.SpriteStatus.gameObject, false) @@ -44,11 +43,10 @@ end function _cell.setHeadIcon() ---@type _DBUser - local user = DBUser.getUserById(mData.serviceNo) + local user = DBUser.getUserById(mData.upLoginNo) if user then - uiobjs.LabelServerNo.text = user.loginName DBUser.getIcon( - mData.serviceNo, + mData.upLoginNo, function(texture) if texture and texture.name == user.imageUrl then uiobjs.SpriteHeadIcon.mainTexture = texture @@ -63,16 +61,5 @@ function _cell.getData() return mData end -function _cell.uiEventDelegate(go) - local goName = go.name - if goName == "ButtonFollow" then - getPanelAsy("PanelNewFollow", onLoadedPanelTT, mData) - elseif goName == "ButtonTask" then - getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, mData) - elseif goName == "ButtonContact" then - MyUtl.callCust(mData) - end -end - -------------------------------------------- return _cell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua index b113197..40a10ef 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua @@ -13,6 +13,7 @@ local InputHH local InputMM local InputSS +local LabelTitle local LabelSelectDate local callback = nil @@ -23,7 +24,11 @@ local selectedDay local oldSelectedCell local isNeedTime = false +local isDateRange = false local curIndex = 0 +local InputTimeStart, InputTimeEnd, InputTime +local startDate, endDate, startDateStr, endDateStr +local defaultDateStr, defaultDate, defaultDate2 PanelCalender = {} function PanelCalender.init(_cs) @@ -34,45 +39,124 @@ function PanelCalender.init(_cs) local content = getChild(transform, "content") LabelYY = getChild(content, "Title", "LabelYY"):GetComponent("UILabel") LabelMM = getChild(content, "Title", "LabelMM"):GetComponent("UILabel") + LabelTitle = getChild(content, "Title", "LabelTitle"):GetComponent("UILabel") + ---@type Coolape.UIGridPage grid = getChild(content, "PanelDay/GridPage"):GetComponent("UIGridPage") LabelSelectDate = getChild(content, "LabelSelectDate"):GetComponent("UILabel") ButtonRoot = getChild(content, "ButtonRoot") TimeRoot = getChild(content, "TimeRoot") - InputHH = getChild(TimeRoot, "InputHH"):GetComponent("UIPopupList") - InputMM = getChild(TimeRoot, "InputMM"):GetComponent("UIPopupList") - InputSS = getChild(TimeRoot, "InputSS"):GetComponent("UIPopupList") + InputTimeStart = getCC(TimeRoot, "InputTimeStart", "CLUIElement") + InputTimeEnd = getCC(TimeRoot, "InputTimeEnd", "CLUIElement") + InputTime = getCC(TimeRoot, "InputTime", "CLUIElement") end function PanelCalender.setData(pars) - curYear = pars[0] - curMonth = pars[1] - callback = pars[2] - if (pars.Count > 3) then - isNeedTime = pars[3] + defaultDateStr = pars[0] + -- curMonth = pars[1] + callback = pars[1] + if (pars.Count > 2) then + isNeedTime = pars[2] else isNeedTime = false end + if (pars.Count > 3) then + isDateRange = pars[3] + else + isDateRange = false + end + + if isDateRange then + if isNilOrEmpty(defaultDateStr) then + startDate = nil + endDate = nil + curYear = DateTime.Now.Year + curMonth = DateTime.Now.Month + else + local strs = strSplit(defaultDateStr, "~") + defaultDate = DateTime.Parse(strs[1]) + local date = defaultDate + startDate = + tonumber( + joinStr(NumEx.nStrForLen(date.Year, 4), NumEx.nStrForLen(date.Month, 2), NumEx.nStrForLen(date.Day, 2)) + ) + startDateStr = joinStr(date.Year, "-", date.Month, "-", date.Day) + curYear = date.Year + curMonth = date.Month + + defaultDate2 = DateTime.Parse(strs[2]) + date = defaultDate2 + endDate = + tonumber( + joinStr(NumEx.nStrForLen(date.Year, 4), NumEx.nStrForLen(date.Month, 2), NumEx.nStrForLen(date.Day, 2)) + ) + endDateStr = joinStr(date.Year, "-", date.Month, "-", date.Day) + end + else + if isNilOrEmpty(defaultDateStr) then + curYear = DateTime.Now.Year + curMonth = DateTime.Now.Month + defaultDate = nil + selectedYear = nil + selectedMonth = nil + selectedDay = nil + else + defaultDate = DateTime.Parse(defaultDateStr) + curYear = defaultDate.Year + curMonth = defaultDate.Month + selectedYear = defaultDate.Year + selectedMonth = defaultDate.Month + selectedDay = defaultDate.Day + end + end end function PanelCalender.getData() return curYear, curMonth end +function PanelCalender.getDateRangeDate() + return isDateRange, startDate, endDate +end + function PanelCalender.show() csSelf.panel.depth = CLPanelManager.self.depth + 80 - oldSelectedCell = nil - selectedYear = nil - selectedMonth = nil - selectedDay = nil if (isNeedTime) then + if isDateRange then + LabelTitle.text = "选择时间范围" + SetActive(InputTimeStart.gameObject, true) + if defaultDate then + InputTimeStart.value = defaultDate:ToString(DateEx.fmt_HH_mm_ss) + else + InputTimeStart.value = DateEx.format(DateEx.fmt_HH_mm_ss) + end + SetActive(InputTimeEnd.gameObject, true) + if defaultDate2 then + InputTimeEnd.value = defaultDate2:ToString(DateEx.fmt_HH_mm_ss) + else + InputTimeEnd.value = DateEx.format(DateEx.fmt_HH_mm_ss) + end + SetActive(InputTime.gameObject, false) + else + LabelTitle.text = "选择时间" + SetActive(InputTimeStart.gameObject, false) + SetActive(InputTimeEnd.gameObject, false) + SetActive(InputTime.gameObject, true) + if defaultDate then + InputTime.value = defaultDate:ToString(DateEx.fmt_HH_mm_ss) + else + InputTime.value = DateEx.format(DateEx.fmt_HH_mm_ss) + end + end NGUITools.SetActive(TimeRoot.gameObject, true) - InputHH.value = NumEx.nStrForLen(DateTime.Now.Hour, 2) - InputMM.value = NumEx.nStrForLen(DateTime.Now.Minute, 2) - InputSS.value = NumEx.nStrForLen(DateTime.Now.Second, 2) - ButtonRoot.localPosition = Vector3(0, -627, 0) + ButtonRoot.localPosition = Vector3(0, -915, 0) else + if isDateRange then + LabelTitle.text = "选择日期范围" + else + LabelTitle.text = "选择日期" + end NGUITools.SetActive(TimeRoot.gameObject, false) ButtonRoot.localPosition = TimeRoot.localPosition end @@ -80,14 +164,31 @@ end function PanelCalender.refresh() PanelCalender.showCalender(curYear, curMonth) - if (selectedYear ~= nil) then - local dataStr = - PStr.b():a(tostring(selectedYear)):a("-"):a(NumEx.nStrForLen(selectedMonth, 2)):a("-"):a( - NumEx.nStrForLen(selectedDay, 2) - ):e() - LabelSelectDate.text = dataStr + if isDateRange then + if startDate and endDate then + LabelSelectDate.text = + joinStr( + "[999999]开始日期:[-][363636]", + startDateStr, + "[-] ", + "[999999]结束日期:[-][363636]", + endDateStr, + "[-]" + ) + else + LabelSelectDate.text = + joinStr("[999999]开始日期:[-][363636]", "请选择", "[-] ", "[999999]结束日期:[-][363636]", "请选择", "[-]") + end else - LabelSelectDate.text = "" + if (selectedYear ~= nil) then + local dataStr = + PStr.b():a(tostring(selectedYear)):a("-"):a(NumEx.nStrForLen(selectedMonth, 2)):a("-"):a( + NumEx.nStrForLen(selectedDay, 2) + ):e() + LabelSelectDate.text = joinStr("[999999]选择日期:[-][363636]", dataStr, "[-])") + else + LabelSelectDate.text = "" + end end end @@ -159,17 +260,69 @@ function PanelCalender.setSelectDate(cell, year, month, day) selectedDay = day selectedYear = year selectedMonth = month - local dataStr = - PStr.b():a(tostring(selectedYear)):a("-"):a(NumEx.nStrForLen(selectedMonth, 2)):a("-"):a( - NumEx.nStrForLen(selectedDay, 2) - ):e() - LabelSelectDate.text = dataStr + if isDateRange then + local dataStr = "" + local tmpDate = + tonumber(joinStr(NumEx.nStrForLen(year, 4), NumEx.nStrForLen(month, 2), NumEx.nStrForLen(day, 2))) + local tmpDateStr = joinStr(year, "-", month, "-", day) + -- 选择日期范围 + if startDate == nil then + startDate = tmpDate + startDateStr = tmpDateStr + dataStr = + joinStr("[999999]开始日期:[-][363636]", startDateStr, "[-] ", "[999999]结束日期:[-][363636]", "请选择", "[-]") + elseif startDate > tmpDate then + startDate = tmpDate + startDateStr = tmpDateStr + endDate = nil + dataStr = + joinStr("[999999]开始日期:[-][363636]", startDateStr, "[-] ", "[999999]结束日期:[-][363636]", "请选择", "[-]") + else + endDate = tmpDate + endDateStr = tmpDateStr + dataStr = + joinStr( + "[999999]开始日期:[-][363636]", + startDateStr, + "[-] ", + "[999999]结束日期:[-][363636]", + tmpDateStr, + "[-]" + ) + end + LabelSelectDate.text = dataStr - if (oldSelectedCell ~= nil) then - oldSelectedCell.luaTable.refreshState(false) + curYear = selectedYear + curMonth = selectedMonth + PanelCalender.refreshDays() + else + local dataStr = + PStr.b():a(tostring(selectedYear)):a("-"):a(NumEx.nStrForLen(selectedMonth, 2)):a("-"):a( + NumEx.nStrForLen(selectedDay, 2) + ):e() + LabelSelectDate.text = joinStr("[999999]选择日期:[-][363636]", dataStr, "[-]") + + if (oldSelectedCell ~= nil) then + oldSelectedCell.luaTable.refreshState(false) + end + oldSelectedCell = cell + oldSelectedCell.luaTable.refreshState(true) + end +end + +function PanelCalender.refreshDays() + local cell = grid.page1:GetComponent("CLCellLua") + if cell and cell.luaTable then + cell.luaTable.doRefresh() + end + cell = grid.page2:GetComponent("CLCellLua") + if cell and cell.luaTable then + cell.luaTable.doRefresh() + end + cell = grid.page3:GetComponent("CLCellLua") + if cell and cell.luaTable then + cell.luaTable.doRefresh() end - oldSelectedCell = cell - oldSelectedCell.luaTable.refreshState(true) end -- function PanelCalender.addMonth(m) @@ -192,6 +345,10 @@ end -- end function PanelCalender.hide() + if (oldSelectedCell ~= nil) then + oldSelectedCell.luaTable.refreshState(false) + end + oldSelectedCell = nil end function PanelCalender.procNetwork(cmd, succ, msg, paras) @@ -220,21 +377,38 @@ function PanelCalender.onClickBtn(btnName) oldSelectedCell = nil curYear = DateTime.Now.Year curMonth = DateTime.Now.Month + selectedYear = nil + selectedMonth = nil + selectedDay = nil + startDate = nil + endDate = nil + startDateStr = "" + endDateStr = "" PanelCalender.show() PanelCalender.refresh() elseif btnName == "ButtonOkay" then - CLPanelManager.hidePanel(csSelf) local dataStr = "" - if (selectedYear ~= nil) then - dataStr = - PStr.b():a(tostring(selectedYear)):a("-"):a(NumEx.nStrForLen(selectedMonth, 2)):a("-"):a( - NumEx.nStrForLen(selectedDay, 2) - ):e() - if (isNeedTime) then + if isDateRange then + if startDate == nil or endDate == nil then + MyUtl.toastW("请选择开始结束日期") + return + end + CLPanelManager.hidePanel(csSelf) + if isNeedTime then + dataStr = joinStr(startDateStr, " ", InputTimeStart.value, "~", endDateStr, " ", InputTimeEnd.value) + else + dataStr = joinStr(startDateStr, "~", endDateStr) + end + else + CLPanelManager.hidePanel(csSelf) + if (selectedYear ~= nil) then dataStr = - PStr.b():a(dataStr):a(" "):a(NumEx.nStrForLen(InputHH.value, 2)):a(":"):a( - NumEx.nStrForLen(InputMM.value, 2) - ):a(":"):a(NumEx.nStrForLen(InputSS.value, 2)):e() + PStr.b():a(tostring(selectedYear)):a("-"):a(NumEx.nStrForLen(selectedMonth, 2)):a("-"):a( + NumEx.nStrForLen(selectedDay, 2) + ):e() + if (isNeedTime) then + dataStr = joinStr(dataStr, " ", InputTime.value) + end end end Utl.doCallback(callback, dataStr) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua new file mode 100644 index 0000000..f6c4a24 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua @@ -0,0 +1,172 @@ +-- xx界面 +local CLLPPopTime = {} + +---@type Coolape.CLPanelLua +local csSelf = nil +---@type UnityEngine.Transform +local transform = nil +local uiobjs = {} +local defaultTime +local callback +local hours = {} +local minutes = {} +local seconds = {} +local hh, mm, ss +local firstCell + +-- 初始化，只会调用一次 +function CLLPPopTime.init(csObj) + csSelf = csObj + transform = csObj.transform + table.insert(hours, joinStr(NumEx.nStrForLen(23, 2), "点")) + for i = 0, 22 do + table.insert(hours, joinStr(NumEx.nStrForLen(i, 2), "点")) + end + + table.insert(minutes, joinStr(NumEx.nStrForLen(59, 2), "分")) + table.insert(seconds, joinStr(NumEx.nStrForLen(59, 2), "秒")) + for i = 0, 58 do + table.insert(minutes, joinStr(NumEx.nStrForLen(i, 2), "分")) + table.insert(seconds, joinStr(NumEx.nStrForLen(i, 2), "秒")) + end + ---@type UISprite + uiobjs.SpriteBg = getCC(transform, "Bottom/offset/SpriteBg", "UISprite") + local offset = getChild(transform, "Bottom/offset") + ---@type Coolape.CLUILoopGrid + uiobjs.listGridHH = getCC(offset, "ListHH/Content/Grid", "CLUILoopGrid") + uiobjs.centerOnChildHH = uiobjs.listGridHH:GetComponent("UICenterOnChild") + ---@type Coolape.CLUILoopGrid + uiobjs.listGridMM = getCC(offset, "ListMM/Content/Grid", "CLUILoopGrid") + uiobjs.centerOnChildMM = uiobjs.listGridMM:GetComponent("UICenterOnChild") + ---@type Coolape.CLUILoopGrid + uiobjs.listGridSS = getCC(offset, "ListSS/Content/Grid", "CLUILoopGrid") + uiobjs.centerOnChildSS = uiobjs.listGridSS:GetComponent("UICenterOnChild") +end + +-- 设置数据 +function CLLPPopTime.setData(paras) + callback = MapEx.getObject(paras, "callback") + defaultTime = MapEx.getString(paras, "time") + defaultTime = isNilOrEmpty(defaultTime) and DateEx.toHHMMSS(DateEx.nowMS) or defaultTime + local strs = strSplit(defaultTime, ":") + hh = strs[1] + mm = strs[2] + ss = strs[3] +end + +--当有通用背板显示时的回调 +function CLLPPopTime.onShowFrame() +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function CLLPPopTime.show() + firstCell = nil + uiobjs.listGridHH:setList(hours, CLLPPopTime.initCellHour, CLLPPopTime.onHeadHour, CLLPPopTime.onEndHour) + uiobjs.centerOnChildHH:Recenter() + -- uiobjs.centerOnChildHH:CenterOn(firstCell.transform) + firstCell = nil + uiobjs.listGridMM:setList(minutes, CLLPPopTime.initCellMinute, CLLPPopTime.onHeadMinute, CLLPPopTime.onEndMinute) + uiobjs.centerOnChildMM:Recenter() + -- uiobjs.centerOnChildMM:CenterOn(firstCell.transform) + firstCell = nil + uiobjs.listGridSS:setList(seconds, CLLPPopTime.initCellSec, CLLPPopTime.onHeadSec, CLLPPopTime.onEndSec) + uiobjs.centerOnChildSS:Recenter() + -- uiobjs.centerOnChildSS:CenterOn(firstCell.transform) +end +function CLLPPopTime.initCellHour(cell, data) + cell:init(data, nil) + cell.luaTable.setCenterObj(uiobjs.centerOnChildHH) + if firstCell == nil then + firstCell = cell + end +end +function CLLPPopTime.onHeadHour(head) + uiobjs.listGridHH:insertList(hours) +end +function CLLPPopTime.onEndHour(tail) + uiobjs.listGridHH:appendList(hours) +end + +function CLLPPopTime.initCellMinute(cell, data) + cell:init(data, nil) + cell.luaTable.setCenterObj(uiobjs.centerOnChildMM) + if firstCell == nil then + firstCell = cell + end +end +function CLLPPopTime.onHeadMinute(head) + uiobjs.listGridMM:insertList(minutes) +end +function CLLPPopTime.onEndMinute(tail) + uiobjs.listGridMM:appendList(minutes) +end + +function CLLPPopTime.initCellSec(cell, data) + cell:init(data, nil) + cell.luaTable.setCenterObj(uiobjs.centerOnChildSS) + if firstCell == nil then + firstCell = cell + end +end +function CLLPPopTime.onHeadSec(head) + uiobjs.listGridSS:insertList(seconds) +end +function CLLPPopTime.onEndSec(tail) + uiobjs.listGridSS:appendList(seconds) +end + +function CLLPPopTime.onStartCenterOnChild(scrollview) +end + +function CLLPPopTime.onCenterChild(center, scrollview) + ---@type Coolape.CLUILoopGrid + local grid = getCC(scrollview.transform, "Grid", "CLUILoopGrid") + grid:refreshContentOnly() +end + +function CLLPPopTime.onFinishCenterChild(scrollview) +end + +-- 刷新 +function CLLPPopTime.refresh() +end + +-- 关闭页面 +function CLLPPopTime.hide() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function CLLPPopTime.procNetwork(cmd, succ, msg, paras) +end + +-- 处理ui上的事件，例如点击等 +function CLLPPopTime.uiEventDelegate(go) + local goName = go.name + if goName == "ButtonClose" then + hideTopPanel(csSelf) + elseif goName == "ButtonOkay" then + local cell = uiobjs.centerOnChildHH.centeredObject:GetComponent("CLCellLua") + local hh = cell.luaTable.getData() + hh = string.gsub(hh, "点", "") + cell = uiobjs.centerOnChildMM.centeredObject:GetComponent("CLCellLua") + local mm = cell.luaTable.getData() + mm = string.gsub(mm, "分", "") + cell = uiobjs.centerOnChildSS.centeredObject:GetComponent("CLCellLua") + local ss = cell.luaTable.getData() + ss = string.gsub(ss, "秒", "") + hideTopPanel(csSelf) + Utl.doCallback(callback, joinStr(hh, ":", mm, ":", ss)) + end +end + +-- 当顶层页面发生变化时回调 +function CLLPPopTime.onTopPanelChange(topPanel) +end + +-- 当按了返回键时，关闭自己（返值为true时关闭） +function CLLPPopTime.hideSelfOnKeyBack() + return true +end + +-------------------------------------------- +return CLLPPopTime diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua.meta new file mode 100644 index 0000000..d1e4896 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2e30ca31b514448f4966eb300b3a5191 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua new file mode 100644 index 0000000..2cb21c5 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua @@ -0,0 +1,68 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPBindPhone:TRBasePanel +local TRPBindPhone = class("TRPBindPhone", TRBasePanel) + +local uiobjs = {} +-- 初始化，只会调用一次 +function TRPBindPhone:init(csObj) + TRPBindPhone.super.init(self, csObj) + uiobjs.content = getChild(self.transform, "PanelContent") + MyUtl.setContentView(uiobjs.content) + ---@type UIScrollView + uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView") + uiobjs.formRoot = getCC(uiobjs.scrollview.transform, "Table", "CLUIFormRoot") + self:setEventDelegate() +end + +-- 设置数据 +---@param paras _ParamTRPBindPhone +function TRPBindPhone:setData(paras) + self.mdata = paras +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPBindPhone:show() + uiobjs.formRoot:setValue(self.mdata) + uiobjs.scrollview:ResetPosition() +end + +-- 刷新 +function TRPBindPhone:refresh() +end + +-- 关闭页面 +function TRPBindPhone:hide() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPBindPhone:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + --[[ + if cmd == xx then + end + ]] + end +end + +function TRPBindPhone:setEventDelegate() + self.EventDelegate = { + ButtonModify = function() + getPanelAsy("PanelResetPasswordStep1", onLoadedPanelTT, {phone = self.mdata.phone, isBindPhone = true}) + end + } +end +-- 处理ui上的事件，例如点击等 +function TRPBindPhone:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPBindPhone:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPBindPhone diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua.meta new file mode 100644 index 0000000..5a31d0d --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPBindPhone.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59cc4c59a26144c999f66447094be492 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua new file mode 100644 index 0000000..dff7793 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua @@ -0,0 +1,140 @@ +---@class _ParamPCustFilter +---@field title +---@field callback +---@field defautFilter table +---@field queryKey + +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPComFilter:TRBasePanel 邮件列表 +local TRPComFilter = class("TRPComFilter", TRBasePanel) + +local uiobjs = {} +-- 初始化，只会调用一次 +function TRPComFilter:init(csObj) + TRPComFilter.super.init(self, csObj) + self:setEventDelegate() + + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 50, 190) + ---@type UIScrollView + uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView") + uiobjs.Table = getCC(self.transform, "PanelContent/Grid", "UITable") + uiobjs.prefab = getChild(uiobjs.Table.transform, "00000").gameObject + uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput") + uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite") + uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel") +end + +-- 设置数据 +---@param paras _ParamTRPComFilter +function TRPComFilter:setData(paras) + ---@type _ParamPCustFilter + self.mdata = paras + + if self.mdata.defautFilter then + self.list = self.mdata.defautFilter + end +end + +---public 当有通用背板显示时的回调 +---@param cs Coolape.CLPanelLua +function TRPComFilter:onShowFrame(cs) + if cs.frameObj then + ---@type _BGFrame1Param + local d = {} + -- d.title = LGet(cs.titleKeyName) + d.title = self.mdata.title + d.panel = cs + cs.frameObj:init(d) + end +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPComFilter:show() + uiobjs.InputSeachKey.value = self.mdata.queryKey + self:refreshFilterBtnStatus() + CLUIUtl.resetList4Lua(uiobjs.Table, uiobjs.prefab, self.list, self:wrapFunc(self.initCell)) +end + +function TRPComFilter:initCell(cell, data) + data.panel = self + cell:init(data, nil) +end + +function TRPComFilter: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 + +function TRPComFilter:hadFilterVal() + for i,v in ipairs(self.list) do + for j, f in ipairs(v.list) do + if f.selected then + return true + end + end + end + return false +end + +-- 刷新 +function TRPComFilter:refresh() +end + +-- 关闭页面 +function TRPComFilter:hide() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPComFilter:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + --[[ + if cmd == xx then + end + ]] + end +end + +function TRPComFilter:reset() + uiobjs.InputSeachKey.value = "" + for i,v in ipairs(self.list) do + for j, f in ipairs(v.list) do + f.selected = false + end + end + CLUIUtl.resetList4Lua(uiobjs.Table, uiobjs.prefab, self.list, self:wrapFunc(self.initCell)) + self:refreshFilterBtnStatus() +end + +function TRPComFilter:setEventDelegate() + self.EventDelegate = { + ButtonReset = function() + self:reset() + end, + ButtonOkay = function() + Utl.doCallback(self.mdata.callback, self.list, uiobjs.InputSeachKey.value) + hideTopPanel(self.csSelf) + end + } +end +-- 处理ui上的事件，例如点击等 +function TRPComFilter:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPComFilter:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPComFilter diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua.meta rename to Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua.meta diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua index 81ff3a7..1736897 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua @@ -30,7 +30,7 @@ function TRPConnect.show() local phone = Prefs.getUserName() local currGroup = Prefs.getCurrGroup(Prefs.getUserName()) companyInfro = json.decode(currGroup) - DBUser.onGetUsers(companyInfro.loginNoList) -- 缓存工号相关信息 + DBUser.onGetUsers(companyInfro.loginNoList, companyInfro.groupInfoList) -- 缓存工号相关信息 NetProto.socketInit(companyInfro.company_id, companyInfro.login_no, companyInfro.group_id) end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua index 09ed862..dbe75b6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua @@ -55,6 +55,7 @@ function TRPCustDetail:init(csObj) uiobjs.ButtonEndListOrder = getChild(uiobjs.OrderRoot.transform, "ButtonEndList") uiobjs.MoreRoot = getCC(uiobjs.Table.transform, "MoreRoot", "CLCellLua") + uiobjs.SysRoot = getCC(uiobjs.Table.transform, "SysRoot", "CLCellLua") end function TRPCustDetail:prepareMoreData() @@ -95,6 +96,69 @@ function TRPCustDetail:prepareMoreData() attr.height = 180 attr.donotJoinKey = true table.insert(self.moreProcList, attr) + -------------------------------------------- + + self.sysFields = {} + ---@type _ParamFieldAttr + local attr = {} + attr.id = "loginNo" + attr.attrName = "创建人员" + attr.attrType = DBCust.FieldType.popuplist + attr.ifMust = 0 + attr.height = 180 + attr.donotJoinKey = true + local popInfor = DBUser.getPopList(DBUser.FilterGroup.user) + attr.popOptions = popInfor.options + attr.popValues = popInfor.values + table.insert(self.sysFields, attr) + ---@type _ParamFieldAttr + attr = {} + attr.id = "groupId" + attr.attrName = "所属部门" + attr.attrType = DBCust.FieldType.popuplist + attr.ifMust = 0 + attr.height = 180 + attr.donotJoinKey = true + local popInfor = DBUser.getPopList(DBUser.FilterGroup.group) + attr.popOptions = popInfor.options + attr.popValues = popInfor.values + table.insert(self.sysFields, attr) + ---@type _ParamFieldAttr + attr = {} + attr.id = "createTime" + attr.attrName = "创建时间" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.height = 180 + attr.donotJoinKey = true + table.insert(self.sysFields, attr) + ---@type _ParamFieldAttr + attr = {} + attr.id = "updateTime" + attr.attrName = "更新时间" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.height = 180 + attr.donotJoinKey = true + table.insert(self.sysFields, attr) + ---@type _ParamFieldAttr + attr = {} + attr.id = "lastFollowUpTime" + attr.attrName = "最后跟进" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.height = 180 + attr.donotJoinKey = true + table.insert(self.sysFields, attr) + ---@type _ParamFieldAttr + attr = {} + attr.id = "followupTime" + attr.attrName = "下次跟进" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.height = 180 + attr.donotJoinKey = true + table.insert(self.sysFields, attr) end -- 设置数据 @@ -134,7 +198,7 @@ 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() + local poplist = DBUser.getPopList(DBUser.FilterGroup.user) uiobjs.InputLogin:refreshItems(poplist.options, poplist.values) uiobjs.LabelLoginNo:refreshItems(poplist.options, poplist.values) -- 设置星级 @@ -165,6 +229,7 @@ function TRPCustDetail:showDetail() self:release() SetActive(uiobjs.DetailRoot.gameObject, true) SetActive(uiobjs.ExtendRoot.gameObject, true) + SetActive(uiobjs.SysRoot.gameObject, true) SetActive(uiobjs.OrderRoot.gameObject, false) SetActive(uiobjs.Records.gameObject, false) SetActive(uiobjs.MoreRoot.gameObject, false) @@ -172,6 +237,7 @@ function TRPCustDetail:showDetail() -- uiobjs.ExtendRoot:init({data = self.mdata, isEditMode = false}, nil) self:showExtentFiles(self.mdata.taskId) + self:showSysFiles() -- 设置星级 local stars = {} @@ -186,6 +252,12 @@ function TRPCustDetail:showDetail() uiobjs.scrollView:ResetPosition() end +function TRPCustDetail:reposition() + uiobjs.Table:Reposition() + uiobjs.scrollView.disableDragIfFits = true + uiobjs.scrollView:ResetPosition() +end + ---public 显示扩展字段 function TRPCustDetail:showExtentFiles(taskId) ---@type _ParamCellExtendFiledRoot @@ -199,16 +271,36 @@ function TRPCustDetail:showExtentFiles(taskId) for i, v in ipairs(fields) do filedInfor = {} filedInfor.attr = v - filedInfor.isEditMode = false + filedInfor.showMode = _FieldMode.showOnly table.insert(param.fields, filedInfor) end uiobjs.ExtendRoot:init(param, nil) end +---public 显示扩展字段 +function TRPCustDetail:showSysFiles() + ---@type _ParamCellExtendFiledRoot + local param = {} + param.data = self.mdata + param.onFinish = self:wrapFunc(self.reposition) + param.fields = {} + local fields = self.sysFields + ---@type _ParamCellExtendFiled + local filedInfor + for i, v in ipairs(fields) do + filedInfor = {} + filedInfor.attr = v + filedInfor.showMode = _FieldMode.showOnly + table.insert(param.fields, filedInfor) + end + uiobjs.SysRoot:init(param, nil) +end + function TRPCustDetail:showRecords() self:release() SetActive(uiobjs.DetailRoot.gameObject, false) SetActive(uiobjs.ExtendRoot.gameObject, false) + SetActive(uiobjs.SysRoot.gameObject, false) SetActive(uiobjs.OrderRoot.gameObject, false) SetActive(uiobjs.Records.gameObject, true) SetActive(uiobjs.MoreRoot.gameObject, false) @@ -254,6 +346,7 @@ function TRPCustDetail:showOrders() self:release() SetActive(uiobjs.DetailRoot.gameObject, false) SetActive(uiobjs.ExtendRoot.gameObject, false) + SetActive(uiobjs.SysRoot.gameObject, false) SetActive(uiobjs.Records.gameObject, false) SetActive(uiobjs.OrderRoot.gameObject, true) SetActive(uiobjs.MoreRoot.gameObject, false) @@ -300,6 +393,7 @@ function TRPCustDetail:showMore() self:release() SetActive(uiobjs.DetailRoot.gameObject, false) SetActive(uiobjs.ExtendRoot.gameObject, false) + SetActive(uiobjs.SysRoot.gameObject, false) SetActive(uiobjs.Records.gameObject, false) SetActive(uiobjs.OrderRoot.gameObject, false) SetActive(uiobjs.MoreRoot.gameObject, true) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua index 071c018..97ed5a7 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua @@ -8,6 +8,7 @@ local uiobjs = {} function TRPCustList:init(csObj) TRPCustList.super.init(self, csObj) self:setEventDelegate() + self:initFilters() MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0) uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput") uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite") @@ -26,6 +27,59 @@ function TRPCustList:init(csObj) uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList") end +function TRPCustList:initFilters() + self.filters = {} + local d = {} + d.title = "归属工号" + d.key = DBCust.FilterGroup.loginNoList + d.key2 = "loginNos" + d.list = DBCust.getFilter(DBCust.FilterGroup.loginNoList) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "任务名称" + d.key = DBCust.FilterGroup.taskList + d.key2 = "taskId" + d.list = DBCust.getFilter(DBCust.FilterGroup.taskList) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "客户来源" + d.key = DBCust.FilterGroup.custFromList + d.key2 = "custFrom" + d.list = DBCust.getFilter(DBCust.FilterGroup.custFromList) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "客户状态" + d.key = DBCust.FilterGroup.dealFlagList + d.key2 = "dealFlag" + d.list = DBCust.getFilter(DBCust.FilterGroup.dealFlagList) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "客户类型" + d.key = DBCust.FilterGroup.custTypeList + d.key2 = "custType" + d.list = DBCust.getFilter(DBCust.FilterGroup.custTypeList) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end +end + -- 设置数据 ---@param paras _ParamTRPCustList function TRPCustList:setData(paras) @@ -35,6 +89,7 @@ end -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh function TRPCustList:show() uiobjs.InputSeachKey.value = "" + self:resetFilters() self:refreshFilterBtnStatus() self:showList({}) showHotWheel() @@ -158,9 +213,10 @@ function TRPCustList:setEventDelegate() end, ButtonFilter = function() getPanelAsy( - "PanelCustFilter", + "PanelComFilter", onLoadedPanelTT, { + title = "客户筛选", callback = self:wrapFunc(self.onSetFilter), queryKey = uiobjs.InputSeachKey.value, defautFilter = self.filters @@ -174,6 +230,12 @@ function TRPCustList:setEventDelegate() } end +function TRPCustList:resetFilters() + for i, v in ipairs(self.filters) do + v.selected = false + end +end + function TRPCustList:getFilterStr() if not self.filters then return "" diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua similarity index 59% rename from Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua rename to Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua index 41625ee..735e549 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua @@ -5,13 +5,13 @@ ---@type IDBasePanel local TRBasePanel = require("ui.panel.TRBasePanel") ----@class TRPCustFilter:TRBasePanel 邮件列表 -local TRPCustFilter = class("TRPCustFilter", TRBasePanel) +---@class TRPFollowFilter:TRBasePanel +local TRPFollowFilter = class("TRPFollowFilter", TRBasePanel) local uiobjs = {} -- 初始化，只会调用一次 -function TRPCustFilter:init(csObj) - TRPCustFilter.super.init(self, csObj) +function TRPFollowFilter:init(csObj) + TRPFollowFilter.super.init(self, csObj) self:setEventDelegate() MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 50, 190) @@ -20,13 +20,14 @@ function TRPCustFilter:init(csObj) uiobjs.Table = getCC(self.transform, "PanelContent/Grid", "UITable") uiobjs.prefab = getChild(uiobjs.Table.transform, "00000").gameObject uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput") + uiobjs.InputDate = getCC(uiobjs.Table.transform, "DateRang/InputDate", "CLUIElement") uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite") uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel") end -- 设置数据 ----@param paras _ParamTRPCustFilter -function TRPCustFilter:setData(paras) +---@param paras _ParamTRPFollowFilter +function TRPFollowFilter:setData(paras) ---@type _ParamPCustFilter self.mdata = paras @@ -35,51 +36,33 @@ function TRPCustFilter:setData(paras) else self.list = {} local d = {} - d.title = "归属工号" - d.key = DBCust.FilterGroup.loginNoList + + d = {} + d.title = "跟进类型" + d.key = DBCust.FilterGroup.followUpTypeList + d.key2 = "followTypeUp" + d.list = DBCust.getFilter(DBCust.FilterGroup.followUpTypeList) + if d.list and #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.list, d) + end + + d = {} + d.title = "商机" + d.key = DBCust.FilterGroup.opportunityList + d.key2 = "opportunity" + d.list = DBCust.getFilter(DBCust.FilterGroup.opportunityList) + if d.list and #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.list, d) + end + + d = {} + d.title = "跟进人员" + d.key = "loginNos" d.key2 = "loginNos" - d.list = DBCust.getFilter(DBCust.FilterGroup.loginNoList) - if #(d.list) > 0 then - -- table.insert(d.list, 1, {name = "全部", value = -1}) - table.insert(self.list, d) - end - - d = {} - d.title = "任务名称" - d.key = DBCust.FilterGroup.taskList - d.key2 = "taskId" - d.list = DBCust.getFilter(DBCust.FilterGroup.taskList) - if #(d.list) > 0 then - -- table.insert(d.list, 1, {name = "全部", value = -1}) - table.insert(self.list, d) - end - - d = {} - d.title = "客户来源" - d.key = DBCust.FilterGroup.custFromList - d.key2 = "custFrom" - d.list = DBCust.getFilter(DBCust.FilterGroup.custFromList) - if #(d.list) > 0 then - -- table.insert(d.list, 1, {name = "全部", value = -1}) - table.insert(self.list, d) - end - - d = {} - d.title = "客户状态" - d.key = DBCust.FilterGroup.dealFlagList - d.key2 = "dealFlag" - d.list = DBCust.getFilter(DBCust.FilterGroup.dealFlagList) - if #(d.list) > 0 then - -- table.insert(d.list, 1, {name = "全部", value = -1}) - table.insert(self.list, d) - end - - d = {} - d.title = "客户类型" - d.key = DBCust.FilterGroup.custTypeList - d.key2 = "custType" - d.list = DBCust.getFilter(DBCust.FilterGroup.custTypeList) - if #(d.list) > 0 then + d.list = DBUser.getFilters(DBUser.FilterGroup.user) + if d.list and #(d.list) > 0 then -- table.insert(d.list, 1, {name = "全部", value = -1}) table.insert(self.list, d) end @@ -87,18 +70,19 @@ function TRPCustFilter:setData(paras) end -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh -function TRPCustFilter:show() +function TRPFollowFilter:show() uiobjs.InputSeachKey.value = self.mdata.queryKey + uiobjs.InputDate.value = self.mdata.defaultTimeRange self:refreshFilterBtnStatus() CLUIUtl.resetList4Lua(uiobjs.Table, uiobjs.prefab, self.list, self:wrapFunc(self.initCell)) end -function TRPCustFilter:initCell(cell, data) +function TRPFollowFilter:initCell(cell, data) data.panel = self cell:init(data, nil) end -function TRPCustFilter:refreshFilterBtnStatus() +function TRPFollowFilter:refreshFilterBtnStatus() if self:hadFilterVal() then uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc) uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc) @@ -110,27 +94,30 @@ function TRPCustFilter:refreshFilterBtnStatus() end end -function TRPCustFilter:hadFilterVal() - for i,v in ipairs(self.list) do +function TRPFollowFilter:hadFilterVal() + for i, v in ipairs(self.list) do for j, f in ipairs(v.list) do if f.selected then return true end end end + if not isNilOrEmpty(uiobjs.InputDate.value) then + return true + end return false end -- 刷新 -function TRPCustFilter:refresh() +function TRPFollowFilter:refresh() end -- 关闭页面 -function TRPCustFilter:hide() +function TRPFollowFilter:hide() end -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 -function TRPCustFilter:procNetwork(cmd, succ, msg, paras) +function TRPFollowFilter:procNetwork(cmd, succ, msg, paras) if (succ == NetSuccess) then --[[ if cmd == xx then @@ -139,9 +126,10 @@ function TRPCustFilter:procNetwork(cmd, succ, msg, paras) end end -function TRPCustFilter:reset() +function TRPFollowFilter:reset() uiobjs.InputSeachKey.value = "" - for i,v in ipairs(self.list) do + uiobjs.InputDate.value = "" + for i, v in ipairs(self.list) do for j, f in ipairs(v.list) do f.selected = false end @@ -150,19 +138,31 @@ function TRPCustFilter:reset() self:refreshFilterBtnStatus() end -function TRPCustFilter:setEventDelegate() +function TRPFollowFilter:setEventDelegate() self.EventDelegate = { ButtonReset = function() self:reset() end, ButtonOkay = function() - Utl.doCallback(self.mdata.callback, self.list, uiobjs.InputSeachKey.value) + local startDate, endDate + if not isNilOrEmpty(uiobjs.InputDate) then + local strs = strSplit(uiobjs.InputDate.value, "~") + startDate = strs[1] + endDate = strs[2] + end + Utl.doCallback(self.mdata.callback, self.list, uiobjs.InputSeachKey.value, startDate, endDate) hideTopPanel(self.csSelf) + end, + ButtonResetDate = function() + uiobjs.InputDate.value = "" + end, + InputDate = function() + self:refreshFilterBtnStatus() end } end -- 处理ui上的事件，例如点击等 -function TRPCustFilter:uiEventDelegate(go) +function TRPFollowFilter:uiEventDelegate(go) local func = self.EventDelegate[go.name] if func then func() @@ -170,8 +170,8 @@ function TRPCustFilter:uiEventDelegate(go) end -- 当顶层页面发生变化时回调 -function TRPCustFilter:onTopPanelChange(topPanel) +function TRPFollowFilter:onTopPanelChange(topPanel) end -------------------------------------------- -return TRPCustFilter +return TRPFollowFilter diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua.meta new file mode 100644 index 0000000..79f5acc --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ab45f16b9152c4843b3b6b6ea7f1dd42 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua index c5a89a1..94578cd 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua @@ -120,6 +120,9 @@ function TRPFollowList:hadFilterVal() end end end + if self.startTime then + return true + end return false end -- 刷新 @@ -151,12 +154,13 @@ function TRPFollowList:setEventDelegate() self.EventDelegate = { ButtonFilter = function() getPanelAsy( - "PanelCustFilter", + "PanelFollowFilter", onLoadedPanelTT, { callback = self:wrapFunc(self.onSetFilter), queryKey = uiobjs.InputSeachKey.value, - defautFilter = self.filters + defautFilter = self.filters, + defaultTimeRange = self.startTime and joinStr(self.startTime, "~", self.endTime) or "" } ) end, @@ -176,18 +180,29 @@ function TRPFollowList:getFilterStr() local list = {} for j, f in ipairs(g.list) do if f.selected and f.value ~= -1 then - table.insert(list, f.value) + if g.key == DBCust.FilterGroup.opportunityList or g.key == DBCust.FilterGroup.followUpTypeList then + table.insert(list, f.name) + else + table.insert(list, f.value) + end end end ret[g.key2] = table.concat(list, ",") end + + if self.startTime then + ret.startTime = self.startTime + ret.endTime = self.endTime + end return ret end -function TRPFollowList:onSetFilter(filters, queryKey) +function TRPFollowList:onSetFilter(filters, queryKey, startTime, endTime) local oldqueryKey = uiobjs.InputSeachKey.value uiobjs.InputSeachKey.value = queryKey self.filters = filters + self.startTime = startTime + self.endTime = endTime self:refreshFilterBtnStatus() local queryKey = uiobjs.InputSeachKey.value queryKey = trim(queryKey) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua index 17c8e6f..84b57ee 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua @@ -81,11 +81,12 @@ function TRPMyInfor:initFiledsAttr() attr = {} attr.attrName = "手机" - attr.id = "" + attr.id = "phoneNo" attr.attrType = DBCust.FieldType.text attr.ifMust = 0 attr.cannotEdit = true attr.donotJoinKey = true + attr.defaultText = "未绑定" table.insert(self.baseFiledsAttr, attr) attr = {} @@ -108,6 +109,7 @@ function TRPMyInfor:setData(paras) local user = DBUser.getUserById(companyInfro.login_no) self.mdata.company_id = companyInfro.company_id self.mdata.company_name = companyInfro.company_name + self.mdata.phoneNo = Prefs.getUserName() if user then self.mdata.loginNo = user.loginNo self.mdata.loginName = user.loginName @@ -155,23 +157,31 @@ end function TRPMyInfor:onClickField(go) ---@type CLUIElement local el = go:GetComponent("CLUIElement") - getPanelAsy( - "PanelModifyFiled", - onLoadedPanelTT, - { - label = el.labeName.text, - key = el.jsonKey, - value = el.value, - canNull = el.canNull, - callback = self:wrapFunc(self.onFinishSetField) - } - ) + if el.jsonKey == "phoneNo" then + if isNilOrEmpty(self.mdata.phoneNo) then + getPanelAsy("PanelResetPasswordStep1", onLoadedPanelTT, {phone = self.mdata.phoneNo, isBindPhone = true}) + else + getPanelAsy("PanelBindPhone", onLoadedPanelTT, {phoneNo = self.mdata.phoneNo}) + end + else + getPanelAsy( + "PanelModifyFiled", + onLoadedPanelTT, + { + label = el.labeName.text, + key = el.jsonKey, + value = el.value, + canNull = el.canNull, + callback = self:wrapFunc(self.onFinishSetField) + } + ) + end end function TRPMyInfor:onFinishSetField(key, val) if tostring(val) ~= tostring(self.mdata[key]) then - -- self:sendModifymsg(key, val, true) - --//TODO: + -- self:sendModifymsg(key, val, true) + MyUtl.toastW("TODO:修改数据") end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua index e726c5a..4d6d7d1 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua @@ -8,6 +8,7 @@ local uiobjs = {} function TRPOrderList:init(csObj) TRPOrderList.super.init(self, csObj) self:setEventDelegate() + self:initFilters() MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0) uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput") uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite") @@ -26,6 +27,65 @@ function TRPOrderList:init(csObj) uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList") end +function TRPOrderList:initFilters() + self.filters = {} + local d = {} + d.title = "订单分类" + d.key = DBOrder.PopListGroup.orderType + d.key2 = "myWfType" + d.list = DBOrder.getFilter(DBOrder.PopListGroup.orderType) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "订单状态" + d.key = DBOrder.PopListGroup.orderStatus + d.key2 = "status" + d.list = DBOrder.getFilter(DBOrder.PopListGroup.orderStatus) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "回款订单" + d.key = DBOrder.PopListGroup.payOrderStatus + d.key2 = "payStatus" + d.list = DBOrder.getFilter(DBOrder.PopListGroup.payOrderStatus) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "跟进人员" + d.key = "loginNos" + d.key2 = "createLoginNo" + d.list = DBUser.getFilters(DBUser.FilterGroup.user) + if d.list and #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end + + d = {} + d.title = "所属部门" + d.key = DBUser.FilterGroup.group + d.key2 = "groupId" + d.list = DBUser.getFilters(DBUser.FilterGroup.group) + if #(d.list) > 0 then + -- table.insert(d.list, 1, {name = "全部", value = -1}) + table.insert(self.filters, d) + end +end + +function TRPOrderList:resetFilters() + for i, v in ipairs(self.filters) do + v.selected = false + end +end + -- 设置数据 ---@param paras _ParamTRPOrderList function TRPOrderList:setData(paras) @@ -35,10 +95,11 @@ end -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh function TRPOrderList:show() uiobjs.InputSeachKey.value = "" + self:resetFilters() self:refreshFilterBtnStatus() self:showList({}) showHotWheel() - NetProto.send.list_customers(self.filterValue, "", 1) + NetProto.send.workFlowQuery(self.filterValue, "", 1) end function TRPOrderList:showList(list) @@ -70,7 +131,7 @@ end function TRPOrderList:refreshList() local queryKey = uiobjs.InputSeachKey.value showHotWheel() - NetProto.send.list_customers(self.filterValue, queryKey, 1) + NetProto.send.workFlowQuery(self.filterValue, queryKey, 1) end function TRPOrderList:onHeadList(head) @@ -85,7 +146,7 @@ function TRPOrderList:onEndList(tail) local queryKey = uiobjs.InputSeachKey.value showHotWheel() -- 取得下一页 - NetProto.send.list_customers(self.filterValue, queryKey, self.pageInfo.current_page + 1) + NetProto.send.workFlowQuery(self.filterValue, queryKey, self.pageInfo.current_page + 1) else uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -235 SetActive(uiobjs.ButtonEndList.gameObject, true) @@ -97,7 +158,7 @@ function TRPOrderList:initCell(cell, data) end function TRPOrderList:onClickCell(cell, data) - getPanelAsy("PanelCustDetail", onLoadedPanelTT, data) + -- getPanelAsy("PanelCustDetail", onLoadedPanelTT, data) end function TRPOrderList:refreshFilterBtnStatus() @@ -134,7 +195,7 @@ end -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 function TRPOrderList:procNetwork(cmd, succ, msg, paras) if (succ == NetSuccess) then - if cmd == NetProto.cmds.list_customers then + if cmd == NetProto.cmds.workFlowQuery then local result = paras.result or {} self.pageInfo = result.meta if self.pageInfo and self.pageInfo.current_page > 1 then @@ -153,14 +214,12 @@ end function TRPOrderList:setEventDelegate() self.EventDelegate = { - ButtonAddCust = function() - getPanelAsy("PanelNewCust", onLoadedPanelTT) - end, ButtonFilter = function() getPanelAsy( - "PanelCustFilter", + "PanelComFilter", onLoadedPanelTT, { + title="订单筛选", callback = self:wrapFunc(self.onSetFilter), queryKey = uiobjs.InputSeachKey.value, defautFilter = self.filters @@ -169,7 +228,7 @@ function TRPOrderList:setEventDelegate() end, InputSeachKey = function() local queryKey = uiobjs.InputSeachKey.value - NetProto.send.list_customers(self.filterValue, queryKey, 1) + NetProto.send.workFlowQuery(self.filterValue, queryKey, 1) end } end @@ -201,7 +260,7 @@ function TRPOrderList:onSetFilter(filters, queryKey) showHotWheel() self.filterValue = self:getFilterStr() if oldqueryKey == queryKey then - NetProto.send.list_customers(self.filterValue, queryKey, 1) + NetProto.send.workFlowQuery(self.filterValue, queryKey, 1) else -- 会触发input的onChange事件 end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua index 044ba59..d2176d2 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua @@ -27,6 +27,8 @@ function TRPResetPasswordStep1:onShowFrame(cs) local d = {} if self.mData.isModify then d.title = "重置密码" + elseif self.mData.isBindPhone then + d.title = "绑定手机号" else d.title = "寻找密码" end @@ -62,11 +64,13 @@ function TRPResetPasswordStep1:setEventDelegate() hideTopPanel(self.csSelf) end, ButtonRight = function() - if not isNilOrEmpty(uiobjs.formRoot:checkValid()) then + local err = uiobjs.formRoot:checkValid() + if not isNilOrEmpty(err) then + MyUtl.toastW(err) return end - local d = uiobjs.formRoot:getValue(true) + local d = uiobjs.formRoot:getValue(self.mData, true) NetProto.sendVerMsg( d, function(data, orgs) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua index 6125ea7..044e677 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua @@ -28,6 +28,8 @@ function TRPResetPasswordStep2:onShowFrame(cs) local d = {} if self.mData.isModify then d.title = "重置密码" + elseif self.mData.isBindPhone then + d.title = "绑定手机号" else d.title = "寻找密码" end @@ -89,12 +91,19 @@ function TRPResetPasswordStep2:setEventDelegate() hideTopPanel(self.csSelf) end, ButtonRight = function() - if not isNilOrEmpty(uiobjs.formRoot:checkValid()) then + local err = uiobjs.formRoot:checkValid() + if not isNilOrEmpty(err) then + MyUtl.toastW(err) return end - local data = uiobjs.formRoot:getValue(self.mData, true) - data.isModify = self.mData.isModify - getPanelAsy("PanelResetPasswordStep3", onLoadedPanelTT, data) + if self.mData.isBindPhone then + -- 绑定号码 + MyUtl.toastW("TODO:绑定号码") + else + local data = uiobjs.formRoot:getValue(self.mData, true) + data.isModify = self.mData.isModify + getPanelAsy("PanelResetPasswordStep3", onLoadedPanelTT, data) + end end, ButtonReGetCode = function() if self.canReGetcode then diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua index d1fd7cd..113bb88 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua @@ -13,6 +13,7 @@ function TRPSetting:init(csObj) uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView") self:setEventDelegate() + uiobjs.LabelPhone = getCC(uiobjs.scrollview.transform, "Table/ButtonPhone/LabelPhone", "UILabel") end -- 设置数据 @@ -24,6 +25,7 @@ end -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh function TRPSetting:show() uiobjs.scrollview:ResetPosition() + uiobjs.LabelPhone.text = Prefs.getUserName() or "未绑定" end -- 刷新 @@ -46,22 +48,33 @@ end function TRPSetting:setEventDelegate() self.EventDelegate = { - ButtonPersonInfor=function() + ButtonPersonInfor = function() getPanelAsy("PanelMyInfor", onLoadedPanelTT) end, ButtonPassword = function() getPanelAsy("PanelResetPasswordStep1", onLoadedPanelTT, {phone = Prefs.getUserName(), isModify = true}) end, + ButtonPhone = function() + if isNilOrEmpty(Prefs.getUserName()) then + getPanelAsy( + "PanelResetPasswordStep1", + onLoadedPanelTT, + {phone = Prefs.getUserName(), isBindPhone = true} + ) + else + getPanelAsy("PanelBindPhone", onLoadedPanelTT, {phoneNo = Prefs.getUserName()}) + end + end, ButtonLogout = function() MyUtl.confirm( "确定要退出当前账号？", - function() - Prefs.setCurrGroup(Prefs.getUserName(), "") - Prefs.setUserPsd("") - hideTopPanel(self.csSelf) - hideTopPanel() - hideTopPanel() - getPanelAsy("PanelLogin", onLoadedPanel) + function() + Prefs.setCurrGroup(Prefs.getUserName(), "") + Prefs.setUserPsd("") + hideTopPanel(self.csSelf) + hideTopPanel() + hideTopPanel() + getPanelAsy("PanelLogin", onLoadedPanel) end, "退出账号" ) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab index 5d31157..db9f94a 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab @@ -372,6 +372,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isSetTime: 0 + isDateRange: 0 onChange: - mTarget: {fileID: 114290233639497436} mMethodName: onNotifyLua diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab new file mode 100644 index 0000000..98b16d6 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab @@ -0,0 +1,702 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1774473867402094133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9107563905011518963} + - component: {fileID: 7362944252603133247} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9107563905011518963 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774473867402094133} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -80, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7956408309511629590} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7362944252603133247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774473867402094133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7956408309511629590} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 7956408309511629590} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 7956408309511629590} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 7956408309511629590} + relative: 0 + absolute: 1 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 925 + mHeight: 2 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 512.5 + 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!1 &2023978223955727508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7956408309511629590} + - component: {fileID: 2482964966519133626} + - component: {fileID: 125986305053851445} + - component: {fileID: 2117344356947240197} + - component: {fileID: 6931577314366637404} + - component: {fileID: 4340295935269415930} + - component: {fileID: 5103833499522604987} + - component: {fileID: 2385076425003207683} + - component: {fileID: 2384795858359047695} + m_Layer: 5 + m_Name: InputTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7956408309511629590 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 30, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5282997740057569496} + - {fileID: 9055881335626284065} + - {fileID: 8197986261877729121} + - {fileID: 4184073273968408065} + - {fileID: 9107563905011518963} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2482964966519133626 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 160, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &125986305053851445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 4032659361466389177} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 1, g: 1, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &2117344356947240197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + 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: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 160 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.40625 + 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!114 &6931577314366637404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: taskId + formatValue: + labeName: {fileID: 4908998573392426763} + defaultName: + canNull: 0 + checkIDCard: 0 + minLen: 0 + maxLen: 0 + spriteBg: {fileID: 2117344356947240197} + valueIsNumber: 0 + isPhoneNum: 0 + inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1} +--- !u!114 &4340295935269415930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3cdf5f2b8d8745a69ee31dc45d16005, type: 3} + m_Name: + m_EditorClassIdentifier: + onChange: [] +--- !u!114 &5103833499522604987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &2385076425003207683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + 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/TRCellExtendField.lua + isNeedResetAtlase: 1 +--- !u!114 &2384795858359047695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2023978223955727508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 2117344356947240197} + offset: 50 + sizeAdjust: 1 +--- !u!1 &2503414206098340738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4184073273968408065} + - component: {fileID: 6836700471286366593} + - component: {fileID: 7251456197958770361} + m_Layer: 5 + m_Name: Label3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4184073273968408065 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2503414206098340738} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -277, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7956408309511629590} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6836700471286366593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2503414206098340738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 9055881335626284065} + relative: 1 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1} + mPivot: 3 + mWidth: 22 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.47826087 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: '*' + 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!114 &7251456197958770361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2503414206098340738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bd5e9ed3dcd9e4e4c81c8ceeeabc37bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _element: {fileID: 0} +--- !u!1 &6640440486422558380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5282997740057569496} + - component: {fileID: 4032659361466389177} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5282997740057569496 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6640440486422558380} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 442, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7956408309511629590} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4032659361466389177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6640440486422558380} + 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: 7956408309511629590} + relative: 1 + absolute: -70 + 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: 5 + mWidth: 92 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u9009\u62E9" + 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 &6980165291326088349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9055881335626284065} + - component: {fileID: 4908998573392426763} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9055881335626284065 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6980165291326088349} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -461, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7956408309511629590} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4908998573392426763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6980165291326088349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7956408309511629590} + relative: 0 + absolute: 51 + 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.6, g: 0.6, b: 0.6, 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: "\u9009\u62E9\u65F6\u95F4" + 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 &8766971756092726035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8197986261877729121} + - component: {fileID: 4853861744027745054} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8197986261877729121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766971756092726035} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 478, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7956408309511629590} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4853861744027745054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766971756092726035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7956408309511629590} + relative: 1 + absolute: -48 + rightAnchor: + target: {fileID: 7956408309511629590} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab.meta new file mode 100644 index 0000000..93c2f74 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 61734fc64b5914ba6ae9f007b6666b5e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab new file mode 100644 index 0000000..b5a943c --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab @@ -0,0 +1,1460 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &855376729560168419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1894962066803965122} + - component: {fileID: 299849199263245923} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1894962066803965122 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855376729560168419} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -80, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1015280428253676666} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &299849199263245923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855376729560168419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1015280428253676666} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 1015280428253676666} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 1015280428253676666} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 1015280428253676666} + relative: 0 + absolute: 1 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 2 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.283505 + 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!1 &1062776400911124416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3014698626100734380} + - component: {fileID: 3803308983338907432} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3014698626100734380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1062776400911124416} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 492, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1015280428253676666} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3803308983338907432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1062776400911124416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6542798875162878599} + relative: 1 + absolute: 50 + rightAnchor: + target: {fileID: 1015280428253676666} + relative: 1 + absolute: -70 + 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: 5 + mWidth: 815 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 16.717392 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u586B\u5199" + 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: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &1856021946756555215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6211563138953950025} + - component: {fileID: 89746668024248280} + - component: {fileID: 1757191906863240371} + m_Layer: 5 + m_Name: Empty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6211563138953950025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856021946756555215} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -250.90424, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9186483317114007049} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &89746668024248280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856021946756555215} + 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: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 120 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 9.375 +--- !u!114 &1757191906863240371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856021946756555215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 89746668024248280} + offset: 0 + sizeAdjust: 1 +--- !u!1 &2557425748939460182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 25182619514747478} + - component: {fileID: 7319243894787341350} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &25182619514747478 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2557425748939460182} + 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: 6940810193510325756} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7319243894787341350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2557425748939460182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 1 + absolute: 50 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 50 + 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: 240 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u66F4\u6362\u624B\u673A\u53F7" + 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 &3029469415635193764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3132999970221511505} + - component: {fileID: 7629996870108979488} + - component: {fileID: 3146146828021142752} + - component: {fileID: 4732895477870558640} + m_Layer: 5 + m_Name: DragContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3132999970221511505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3029469415635193764} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: 9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9186483318226848305} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7629996870108979488 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3029469415635193764} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2022, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3146146828021142752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3029469415635193764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 9186483318273454873} + draggablePanel: {fileID: 0} +--- !u!114 &4732895477870558640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3029469415635193764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 9186483318226848305} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 9186483318226848305} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 9186483318226848305} + relative: 0 + absolute: 150 + topAnchor: + target: {fileID: 9186483318226848305} + relative: 1 + absolute: -132 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1127 + mHeight: 2022 + mDepth: -1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.55736893 +--- !u!1 &4725287647856906054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3400899160147456236} + - component: {fileID: 213660698335421333} + - component: {fileID: 2296420080235116319} + m_Layer: 5 + m_Name: Empty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3400899160147456236 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4725287647856906054} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -14.904231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9186483317114007049} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &213660698335421333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4725287647856906054} + 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: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 30 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 37.5 +--- !u!114 &2296420080235116319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4725287647856906054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 213660698335421333} + offset: 0 + sizeAdjust: 1 +--- !u!1 &5739533003059974306 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6542798875162878599} + - component: {fileID: 5809400832199248222} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6542798875162878599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5739533003059974306} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -511, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1015280428253676666} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5809400832199248222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5739533003059974306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1015280428253676666} + relative: 0 + absolute: 51 + 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.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 138 + 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: "\u624B\u673A\u53F7" + 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 &6628384052566020757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6940810193510325756} + - component: {fileID: 4804660197840963059} + - component: {fileID: 4154952671317373235} + - component: {fileID: 6066563728127547150} + - component: {fileID: 5743332359183406338} + m_Layer: 5 + m_Name: ButtonModify + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6940810193510325756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628384052566020757} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -393.90424, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 25182619514747478} + m_Father: {fileID: 9186483317114007049} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4804660197840963059 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628384052566020757} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 166, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &4154952671317373235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628384052566020757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 6628384052566020757} + 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: 4949258247682498038} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &6066563728127547150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628384052566020757} + 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: 1025 + mHeight: 166 + mDepth: 1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.174699 + 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 &5743332359183406338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628384052566020757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 6066563728127547150} + offset: 50 + sizeAdjust: 1 +--- !u!1 &8112027019472108927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3445999009725872930} + - component: {fileID: 6062954344826217804} + - component: {fileID: 8718576262263871956} + m_Layer: 5 + m_Name: Label3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3445999009725872930 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8112027019472108927} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -373, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1015280428253676666} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6062954344826217804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8112027019472108927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6542798875162878599} + relative: 1 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1} + mPivot: 3 + mWidth: 22 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.5217391 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: '*' + 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!114 &8718576262263871956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8112027019472108927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bd5e9ed3dcd9e4e4c81c8ceeeabc37bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _element: {fileID: 0} +--- !u!1 &8749132400234014725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1015280428253676666} + - component: {fileID: 8579171031327733653} + - component: {fileID: 5026986549607123423} + - component: {fileID: 4086660778651153639} + - component: {fileID: 7884258597336760000} + - component: {fileID: 3473857724574877684} + - component: {fileID: 3324682892120388052} + - component: {fileID: 9216944652260170527} + - component: {fileID: 3324228327788456512} + m_Layer: 5 + m_Name: InputText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1015280428253676666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -109.904236, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3014698626100734380} + - {fileID: 6542798875162878599} + - {fileID: 3445999009725872930} + - {fileID: 1894962066803965122} + m_Father: {fileID: 9186483317114007049} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8579171031327733653 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 160, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5026986549607123423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 3803308983338907432} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 0, g: 0.23127818, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: + - mTarget: {fileID: 7884258597336760000} + mMethodName: OnValueChg + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + - mTarget: {fileID: 3324682892120388052} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + mValue: +--- !u!114 &4086660778651153639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + 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: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 160 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.03125 + 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!114 &7884258597336760000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: phoneNo + formatValue: + labeName: {fileID: 5809400832199248222} + defaultName: + canNull: 1 + checkIDCard: 0 + minLen: 0 + maxLen: 0 + spriteBg: {fileID: 4086660778651153639} + valueIsNumber: 0 + isPhoneNum: 0 + inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1} +--- !u!114 &3473857724574877684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &3324682892120388052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + 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/TRCellExtendField.lua + isNeedResetAtlase: 1 +--- !u!114 &9216944652260170527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + 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: 3324682892120388052} + mMethodName: onNotifyLua + mParameters: + - obj: {fileID: 0} + field: + name: gameObj + - obj: {fileID: 0} + field: + name: funcName + - obj: {fileID: 0} + field: + name: paras + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] +--- !u!114 &3324228327788456512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8749132400234014725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 4086660778651153639} + offset: 0 + sizeAdjust: 1 +--- !u!1 &9186483317114007054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9186483317114007049} + - component: {fileID: 9186483317114007048} + - component: {fileID: 7283729918675215446} + m_Layer: 5 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9186483317114007049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483317114007054} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 613, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3400899160147456236} + - {fileID: 1015280428253676666} + - {fileID: 6211563138953950025} + - {fileID: 6940810193510325756} + m_Father: {fileID: 9186483318273454878} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9186483317114007048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483317114007054} + m_Enabled: 1 + 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: 0} +--- !u!114 &7283729918675215446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483317114007054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!1 &9186483318226848310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9186483318226848305} + - component: {fileID: 9186483318226848307} + - component: {fileID: 4949258247682498038} + m_Layer: 5 + m_Name: PanelBindPhone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &9186483318226848305 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483318226848310} + 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: 9186483318273454878} + - {fileID: 3132999970221511505} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9186483318226848307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483318226848310} + 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 &4949258247682498038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483318226848310} + 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/TRPBindPhone.lua + isNeedBackplate: 1 + destroyWhenHide: 1 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 0 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: "\u624B\u673A\u53F7" +--- !u!1 &9186483318273454879 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9186483318273454878} + - component: {fileID: 9186483318273454872} + - component: {fileID: 9186483318273454873} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9186483318273454878 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483318273454879} + 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: 9186483317114007049} + m_Father: {fileID: 9186483318226848305} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9186483318273454872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483318273454879} + 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: 3 + mClipRange: {x: 0, y: 0, z: 1125, w: 1920} + mClipSoftness: {x: 4, y: 8} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &9186483318273454873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9186483318273454879} + 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} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab.meta new file mode 100644 index 0000000..fb4fb29 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b01fd3676a0242699db1883c3e59430 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab index 5d9dfc0..53c5182 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100000} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 200, y: 108, z: 0} + m_LocalPosition: {x: 387, y: 132.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5071924032703442501} @@ -124,7 +124,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100006} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -200, y: 107.625, z: 0} + m_LocalPosition: {x: -386.99997, y: 132.375, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1892811297692553155} @@ -919,7 +919,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100022} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 107.5, z: 0} + m_LocalPosition: {x: 0, y: 132.25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 400024} @@ -1028,6 +1028,7 @@ Transform: - {fileID: 400006} - {fileID: 400000} - {fileID: 4760587421058288492} + - {fileID: 5738290023824174323} m_Father: {fileID: 400030} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1091,7 +1092,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} mPivot: 4 mWidth: 975 mHeight: 2 @@ -1141,7 +1142,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -83, z: 0} + m_LocalPosition: {x: 0, y: -156, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 400030} @@ -1168,23 +1169,23 @@ MonoBehaviour: relative: 1 absolute: 0 bottomAnchor: - target: {fileID: 431130} + target: {fileID: 0} relative: 0 - absolute: -35 + absolute: -50 topAnchor: target: {fileID: 0} relative: 1 - absolute: 0 + absolute: 50 updateAnchors: 1 mColor: {r: 1, g: 1, b: 1, a: 1} mPivot: 4 - mWidth: 974 - mHeight: 1208 + mWidth: 1025 + mHeight: 1668 mDepth: -1 autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.8069594 + aspectRatio: 0.6145084 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -1211,7 +1212,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 974, y: 1208, z: 0} + m_Size: {x: 1025, y: 1668, z: 0} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &100030 GameObject: @@ -1240,7 +1241,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100030} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 100, z: 0} + m_LocalPosition: {x: 0, y: 200, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 400028} @@ -1253,6 +1254,7 @@ Transform: - {fileID: 441852} - {fileID: 493552} - {fileID: 429748} + - {fileID: 3602197919034512416} m_Father: {fileID: 400032} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1528,7 +1530,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100288} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalPosition: {x: -2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 400032} @@ -1565,7 +1567,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0, g: 0, b: 0, a: 0.6431373} mPivot: 4 - mWidth: 1129 + mWidth: 1441 mHeight: 2308 mDepth: -2 autoResizeBoxCollider: 1 @@ -1598,7 +1600,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1129, y: 2308, z: 0} + m_Size: {x: 1441, y: 2308, z: 0} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &11400458 MonoBehaviour: @@ -1758,13 +1760,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101512} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -516, z: 0} + m_LocalPosition: {x: 0, y: -617, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 411610} - - {fileID: 447436} - - {fileID: 410976} - - {fileID: 1908729368140089927} + - {fileID: 6849798103131519315} + - {fileID: 7989254895997902524} + - {fileID: 6352508919134169858} m_Father: {fileID: 400030} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1796,7 +1797,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 109530} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 438, y: 468, z: 0} + m_LocalPosition: {x: 459, y: 605, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 400030} @@ -1920,106 +1921,6 @@ MonoBehaviour: mSpriteName: cust_del mFillCenter: 1 isGrayMode: 0 ---- !u!1 &113082 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 486700} - - component: {fileID: 11413956} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &486700 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 113082} - 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: 410976} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11413956 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 113082} - 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: 54 - mHeight: 46 - mDepth: 2 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.173913 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: 07 - mFontSize: 46 - mFontStyle: 1 - 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 &115588 GameObject: m_ObjectHideFlags: 0 @@ -2109,7 +2010,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123386} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 419, z: 0} + m_LocalPosition: {x: 0, y: 445, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 400030} @@ -2144,7 +2045,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} mPivot: 4 mWidth: 975 mHeight: 2 @@ -2195,7 +2096,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 126816} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 200, y: 13.503111, z: 0} + m_LocalPosition: {x: 387, y: 27.003109, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4609361254695165463} @@ -2409,106 +2310,6 @@ MonoBehaviour: m_EditorClassIdentifier: _dragPage: {fileID: 0} _dragContent: {fileID: 0} ---- !u!1 &132680 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 433084} - - component: {fileID: 11483432} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &433084 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 132680} - 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: 447436} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11483432 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 132680} - 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: 54 - mHeight: 46 - mDepth: 2 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.173913 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: 07 - mFontSize: 46 - mFontStyle: 1 - 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 &134126 GameObject: m_ObjectHideFlags: 0 @@ -2534,7 +2335,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 134126} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 13.499998, z: 0} + m_LocalPosition: {x: 0, y: 27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 400024} @@ -2609,106 +2410,6 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont ---- !u!1 &135390 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 495100} - - component: {fileID: 11448434} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &495100 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 135390} - 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: 411610} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11448434 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 135390} - 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: 54 - mHeight: 46 - mDepth: 2 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.173913 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: 07 - mFontSize: 46 - mFontStyle: 1 - 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 &136168 GameObject: m_ObjectHideFlags: 0 @@ -2798,7 +2499,7 @@ MonoBehaviour: pivot: 4 maxPerLine: 0 cellWidth: 920 - cellHeight: 200 + cellHeight: 0 animateSmoothly: 0 hideInactive: 1 keepWithinPanel: 0 @@ -2812,106 +2513,6 @@ MonoBehaviour: page2: {fileID: 5447304680314763619} page3: {fileID: 4226014863429267943} currCell: 0 ---- !u!1 &139740 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 471868} - - component: {fileID: 11495618} - m_Layer: 5 - m_Name: LabelDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &471868 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 139740} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 88.56, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 411610} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11495618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 139740} - 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.21176471, g: 0.21176471, b: 0.21176471, a: 1} - mPivot: 5 - mWidth: 12 - mHeight: 46 - mDepth: 2 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.26086956 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: ':' - 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 &146448 GameObject: m_ObjectHideFlags: 0 @@ -3035,295 +2636,6 @@ MonoBehaviour: scrollView: {fileID: 0} draggablePanel: {fileID: 0} _gridPage: {fileID: 11418676} ---- !u!1 &149058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 447436} - - component: {fileID: 6571478} - - component: {fileID: 11457514} - - component: {fileID: 11471614} - - component: {fileID: 11474708} - m_Layer: 5 - m_Name: InputMM - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &447436 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 149058} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -23.58, y: -0.265625, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 433084} - - {fileID: 471626} - - {fileID: 494184} - m_Father: {fileID: 441852} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &6571478 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 149058} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 200, y: 100, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &11457514 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 149058} - 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: 120 - mHeight: 60 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2 - 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: icon3_no - mFillCenter: 1 - isGrayMode: 0 ---- !u!114 &11471614 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 149058} - 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: icon2_xl - highlightSprite: icon2_xl - position: 0 - alignment: 1 - items: - - "00\u5206" - - "01\u5206" - - "02\u5206" - - "03\u5206" - - "04\u5206" - - "05\u5206" - - "06\u5206" - - "07\u5206" - - "08\u5206" - - "09\u5206" - - "10\u5206" - - "11\u5206" - - "12\u5206" - - "13\u5206" - - "14\u5206" - - "15\u5206" - - "16\u5206" - - "17\u5206" - - "18\u5206" - - "19\u5206" - - "20\u5206" - - "21\u5206" - - "22\u5206" - - "23\u5206" - - "24\u5206" - - "25\u5206" - - "26\u5206" - - "27\u5206" - - "28\u5206" - - "29\u5206" - - "30\u5206" - - "31\u5206" - - "32\u5206" - - "33\u5206" - - "34\u5206" - - "35\u5206" - - "36\u5206" - - "37\u5206" - - "38\u5206" - - "39\u5206" - - "40\u5206" - - "41\u5206" - - "42\u5206" - - "43\u5206" - - "44\u5206" - - "45\u5206" - - "46\u5206" - - "47\u5206" - - "48\u5206" - - "49\u5206" - - "50\u5206" - - "51\u5206" - - "52\u5206" - - "53\u5206" - - "54\u5206" - - "55\u5206" - - "56\u5206" - - "57\u5206" - - "58\u5206" - - "59\u5206" - valueItems: - - 00 - - 01 - - 02 - - 03 - - 04 - - 05 - - 06 - - 07 - - 08 - - 09 - - 10 - - 11 - - 12 - - 13 - - 14 - - 15 - - 16 - - 17 - - 18 - - 19 - - 20 - - 21 - - 22 - - 23 - - 24 - - 25 - - 26 - - 27 - - 28 - - 29 - - 30 - - 31 - - 32 - - 33 - - 34 - - 35 - - 36 - - 37 - - 38 - - 39 - - 40 - - 41 - - 42 - - 43 - - 44 - - 45 - - 46 - - 47 - - 48 - - 49 - - 50 - - 51 - - 52 - - 53 - - 54 - - 55 - - 56 - - 57 - - 58 - - 59 - 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: 11483432} - mMethodName: SetCurrentSelection - mParameters: - - obj: {fileID: 0} - field: - name: go - oneShot: 0 - mSelectedItem: "00\u5206" - 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 &11474708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 149058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} - m_Name: - m_EditorClassIdentifier: - onSelect: [] --- !u!1 &149142 GameObject: m_ObjectHideFlags: 0 @@ -3395,7 +2707,7 @@ MonoBehaviour: anchorOffset: 0 softBorderPadding: 1 renderQueue: 0 - startingRenderQueue: 3008 + startingRenderQueue: 3011 mClipTexture: {fileID: 0} mAlpha: 1 mClipping: 3 @@ -3572,7 +2884,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153818} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -443, z: 0} + m_LocalPosition: {x: 0, y: -477, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 400030} @@ -3607,7 +2919,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mColor: {r: 1, g: 1, b: 1, a: 1} mPivot: 4 mWidth: 256 mHeight: 46 @@ -3615,11 +2927,11 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 5.5652175 + aspectRatio: 6.347826 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: 2017-01-02 + mText: '[363636]2017-01-02[-]' mFontSize: 46 mFontStyle: 0 mAlignment: 0 @@ -3707,7 +3019,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.4044118, g: 0.4073854, b: 0.4073854, a: 1} + mColor: {r: 1, g: 0.5575234, b: 0.5518868, a: 1} mPivot: 4 mWidth: 100 mHeight: 50 @@ -3719,7 +3031,7 @@ MonoBehaviour: keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: "\u4ECA\u5929" + mText: "\u91CD\u7F6E" mFontSize: 50 mFontStyle: 0 mAlignment: 0 @@ -3747,512 +3059,6 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont ---- !u!1 &160142 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 410976} - - component: {fileID: 6598082} - - component: {fileID: 11431156} - - component: {fileID: 11483474} - - component: {fileID: 11467742} - m_Layer: 5 - m_Name: InputSS - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &410976 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160142} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 170, y: -0.265625, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 486700} - - {fileID: 445528} - - {fileID: 462044} - m_Father: {fileID: 441852} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &6598082 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160142} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 200, y: 100, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &11431156 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160142} - 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: 120 - mHeight: 60 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2 - 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: icon3_no - mFillCenter: 1 - isGrayMode: 0 ---- !u!114 &11483474 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160142} - 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: icon2_xl - highlightSprite: icon2_xl - position: 0 - alignment: 1 - items: - - "00\u79D2" - - "01\u79D2" - - "02\u79D2" - - "03\u79D2" - - "04\u79D2" - - "05\u79D2" - - "06\u79D2" - - "07\u79D2" - - "08\u79D2" - - "09\u79D2" - - "10\u79D2" - - "11\u79D2" - - "12\u79D2" - - "13\u79D2" - - "14\u79D2" - - "15\u79D2" - - "16\u79D2" - - "17\u79D2" - - "18\u79D2" - - "19\u79D2" - - "20\u79D2" - - "21\u79D2" - - "22\u79D2" - - "23\u79D2" - - "24\u79D2" - - "25\u79D2" - - "26\u79D2" - - "27\u79D2" - - "28\u79D2" - - "29\u79D2" - - "30\u79D2" - - "31\u79D2" - - "32\u79D2" - - "33\u79D2" - - "34\u79D2" - - "35\u79D2" - - "36\u79D2" - - "37\u79D2" - - "38\u79D2" - - "39\u79D2" - - "40\u79D2" - - "41\u79D2" - - "42\u79D2" - - "43\u79D2" - - "44\u79D2" - - "45\u79D2" - - "46\u79D2" - - "47\u79D2" - - "48\u79D2" - - "49\u79D2" - - "50\u79D2" - - "51\u79D2" - - "52\u79D2" - - "53\u79D2" - - "54\u79D2" - - "55\u79D2" - - "56\u79D2" - - "57\u79D2" - - "58\u79D2" - - "59\u79D2" - valueItems: - - 00 - - 01 - - 02 - - 03 - - 04 - - 05 - - 06 - - 07 - - 08 - - 09 - - 10 - - 11 - - 12 - - 13 - - 14 - - 15 - - 16 - - 17 - - 18 - - 19 - - 20 - - 21 - - 22 - - 23 - - 24 - - 25 - - 26 - - 27 - - 28 - - 29 - - 30 - - 31 - - 32 - - 33 - - 34 - - 35 - - 36 - - 37 - - 38 - - 39 - - 40 - - 41 - - 42 - - 43 - - 44 - - 45 - - 46 - - 47 - - 48 - - 49 - - 50 - - 51 - - 52 - - 53 - - 54 - - 55 - - 56 - - 57 - - 58 - - 59 - 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: 11413956} - mMethodName: SetCurrentSelection - mParameters: - - obj: {fileID: 0} - field: - name: go - oneShot: 0 - mSelectedItem: "00\u79D2" - 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 &11467742 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160142} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} - m_Name: - m_EditorClassIdentifier: - onSelect: [] ---- !u!1 &161162 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 411610} - - component: {fileID: 6556062} - - component: {fileID: 11415032} - - component: {fileID: 11496064} - - component: {fileID: 5585855615298158665} - m_Layer: 5 - m_Name: InputHH - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &411610 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 161162} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -201.7, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 495100} - - {fileID: 471868} - - {fileID: 433208} - m_Father: {fileID: 441852} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &6556062 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 161162} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 200, y: 100, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &11415032 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 161162} - 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: 120 - mHeight: 60 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 2 - 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: icon3_no - mFillCenter: 1 - isGrayMode: 0 ---- !u!114 &11496064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 161162} - 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: icon2_xl - highlightSprite: icon2_xl - position: 0 - alignment: 1 - items: - - "00\u70B9" - - "01\u70B9" - - "02\u70B9" - - "03\u70B9" - - "04\u70B9" - - "05\u70B9" - - "06\u70B9" - - "07\u70B9" - - "08\u70B9" - - "09\u70B9" - - "10\u70B9" - - "11\u70B9" - - "12\u70B9" - - "13\u70B9" - - "14\u70B9" - - "15\u70B9" - - "16\u70B9" - - "17\u70B9" - - "18\u70B9" - - "19\u70B9" - - "20\u70B9" - - "21\u70B9" - - "22\u70B9" - - "23\u70B9" - valueItems: - - 00 - - 01 - - 02 - - 03 - - 04 - - 05 - - 06 - - 07 - - 08 - - 09 - - 10 - - 11 - - 12 - - 13 - - 14 - - 15 - - 16 - - 17 - - 18 - - 19 - - 20 - - 21 - - 22 - - 23 - 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: 11448434} - mMethodName: SetCurrentSelection - mParameters: - - obj: {fileID: 0} - field: - name: go - oneShot: 0 - mSelectedItem: "00\u70B9" - 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 &5585855615298158665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 161162} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} - m_Name: - m_EditorClassIdentifier: - onSelect: [] --- !u!1 &163254 GameObject: m_ObjectHideFlags: 0 @@ -4367,7 +3173,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 163404} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -627, z: 0} + m_LocalPosition: {x: 0, y: -915, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 438004} @@ -4376,174 +3182,6 @@ Transform: m_Father: {fileID: 400030} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &165128 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 462044} - - component: {fileID: 11400616} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &462044 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 165128} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 40.79, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 410976} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11400616 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 165128} - 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: 26 - mHeight: 16 - mDepth: 3 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.625 - 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: icon2_xl - mFillCenter: 1 - isGrayMode: 0 ---- !u!1 &173120 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 433208} - - component: {fileID: 11417850} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &433208 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173120} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 40.79, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 411610} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11417850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173120} - 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: 26 - mHeight: 16 - mDepth: 3 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.625 - 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: icon2_xl - mFillCenter: 1 - isGrayMode: 0 --- !u!1 &175564 GameObject: m_ObjectHideFlags: 0 @@ -4589,7 +3227,7 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 300, y: 100, z: 0} + m_Size: {x: 300, y: 140, z: 0} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &11431866 MonoBehaviour: @@ -4623,7 +3261,7 @@ MonoBehaviour: mParameters: - obj: {fileID: 0} field: - name: + name: go oneShot: 0 --- !u!114 &11402104 MonoBehaviour: @@ -4727,106 +3365,6 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 ---- !u!1 &183448 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 471626} - - component: {fileID: 11493864} - m_Layer: 5 - m_Name: LabelDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &471626 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 183448} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 88.56, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 447436} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11493864 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 183448} - 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.21176471, g: 0.21176471, b: 0.21176471, a: 1} - mPivot: 5 - mWidth: 12 - mHeight: 46 - mDepth: 2 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.26086956 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: ':' - 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 &186332 GameObject: m_ObjectHideFlags: 0 @@ -4854,7 +3392,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186332} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -200, y: 13, z: 0} + m_LocalPosition: {x: -387, y: 26.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6435624578293171811} @@ -4924,190 +3462,6 @@ MonoBehaviour: trigger: 0 volume: 1 pitch: 1 ---- !u!1 &186776 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 494184} - - component: {fileID: 11495624} - m_Layer: 5 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &494184 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 186776} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 40.79, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 447436} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11495624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 186776} - 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: 26 - mHeight: 16 - mDepth: 3 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1.625 - 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: icon2_xl - mFillCenter: 1 - isGrayMode: 0 ---- !u!1 &189590 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 445528} - - component: {fileID: 11461976} - m_Layer: 5 - m_Name: LabelDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &445528 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 189590} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 88.56, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 410976} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11461976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 189590} - 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.21176471, g: 0.21176471, b: 0.21176471, a: 1} - mPivot: 5 - mWidth: 14 - mHeight: 46 - mDepth: 2 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 0.3043478 - keepCrispWhenShrunk: 1 - mTrueTypeFont: {fileID: 0} - mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: - 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 &194328 GameObject: m_ObjectHideFlags: 0 @@ -5153,7 +3507,7 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 300, y: 100, z: 0} + m_Size: {x: 300, y: 140, z: 0} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &11492402 MonoBehaviour: @@ -7056,6 +5410,106 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!1 &633767958754868090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5207405045895213408} + - component: {fileID: 5688747733241585443} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5207405045895213408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633767958754868090} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -461, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6352508919134169858} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5688747733241585443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633767958754868090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6352508919134169858} + relative: 0 + absolute: 51 + 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.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 92 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 3 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u65F6\u95F4" + 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 &643534707929451747 GameObject: m_ObjectHideFlags: 0 @@ -8498,6 +6952,207 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!1 &1177069587725215297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6352508919134169858} + - component: {fileID: 5458792117331428693} + - component: {fileID: 6710936719190925310} + - component: {fileID: 2211944555913600500} + - component: {fileID: 7147969365677456435} + - component: {fileID: 4005107498099184247} + - component: {fileID: 6463412365497757164} + - component: {fileID: 6761751093542802988} + m_Layer: 5 + m_Name: InputTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6352508919134169858 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 30, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4329492068059951571} + - {fileID: 5207405045895213408} + - {fileID: 3848547703882505590} + - {fileID: 200037014591356480} + m_Father: {fileID: 441852} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5458792117331428693 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 160, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6710936719190925310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 1869650086831172808} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 1, g: 1, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &2211944555913600500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + 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: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 160 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.40625 + 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!114 &7147969365677456435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: taskId + formatValue: + labeName: {fileID: 5688747733241585443} + defaultName: + canNull: 0 + checkIDCard: 0 + minLen: 0 + maxLen: 0 + spriteBg: {fileID: 2211944555913600500} + valueIsNumber: 0 + isPhoneNum: 0 + inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1} +--- !u!114 &4005107498099184247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3cdf5f2b8d8745a69ee31dc45d16005, type: 3} + m_Name: + m_EditorClassIdentifier: + onChange: [] +--- !u!114 &6463412365497757164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &6761751093542802988 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177069587725215297} + 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/TRCellExtendField.lua + isNeedResetAtlase: 1 --- !u!1 &1178014727236013616 GameObject: m_ObjectHideFlags: 0 @@ -9596,6 +8251,106 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &1434334564849980049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7346947560759673838} + - component: {fileID: 6626950295408070619} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7346947560759673838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434334564849980049} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 442, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7989254895997902524} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6626950295408070619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434334564849980049} + 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: 7989254895997902524} + relative: 1 + absolute: -70 + 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: 5 + mWidth: 92 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u9009\u62E9" + 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 &1473573222326367244 GameObject: m_ObjectHideFlags: 0 @@ -11269,90 +10024,6 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont ---- !u!1 &2010627617964071767 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1908729368140089927} - - component: {fileID: 8855308431006679089} - m_Layer: 5 - m_Name: SpriteLine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1908729368140089927 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2010627617964071767} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -53.4, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 441852} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8855308431006679089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2010627617964071767} - 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: 975 - mHeight: 2 - mDepth: 1 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 487.5 - mType: 1 - mFillDirection: 4 - mFillAmount: 1 - mInvert: 0 - mFlip: 0 - centerType: 1 - leftType: 1 - rightType: 1 - bottomType: 1 - topType: 1 - atlasName: EmptyAtlas - mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} - mSpriteName: public__empty - mFillCenter: 1 - isGrayMode: 0 --- !u!1 &2027110020569586682 GameObject: m_ObjectHideFlags: 0 @@ -12336,6 +11007,106 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &2256983772409415444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5738290023824174323} + - component: {fileID: 3764188054235452643} + m_Layer: 5 + m_Name: LabelTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5738290023824174323 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2256983772409415444} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 240, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 400024} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3764188054235452643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2256983772409415444} + 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.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 4 + mWidth: 306 + mHeight: 50 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.12 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u9009\u62E9\u65F6\u95F4\u8303\u56F4" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 1 + 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 &2298258371082920509 GameObject: m_ObjectHideFlags: 0 @@ -12866,6 +11637,207 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &2392524164375683565 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7989254895997902524} + - component: {fileID: 9127751006381586140} + - component: {fileID: 9195299175877707280} + - component: {fileID: 3016238195380823833} + - component: {fileID: 7835526160376817798} + - component: {fileID: 4468568687937611837} + - component: {fileID: 6143642981708994251} + - component: {fileID: 7884540025758530417} + m_Layer: 5 + m_Name: InputTimeEnd + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7989254895997902524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -130, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7346947560759673838} + - {fileID: 7114350009452182840} + - {fileID: 6530635348855629321} + - {fileID: 7216664239957944663} + m_Father: {fileID: 441852} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9127751006381586140 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 160, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &9195299175877707280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 6626950295408070619} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 1, g: 1, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &3016238195380823833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + 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: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 160 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.40625 + 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!114 &7835526160376817798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: taskId + formatValue: + labeName: {fileID: 3961591869661611094} + defaultName: + canNull: 0 + checkIDCard: 0 + minLen: 0 + maxLen: 0 + spriteBg: {fileID: 3016238195380823833} + valueIsNumber: 0 + isPhoneNum: 0 + inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1} +--- !u!114 &4468568687937611837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3cdf5f2b8d8745a69ee31dc45d16005, type: 3} + m_Name: + m_EditorClassIdentifier: + onChange: [] +--- !u!114 &6143642981708994251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &7884540025758530417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2392524164375683565} + 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/TRCellExtendField.lua + isNeedResetAtlase: 1 --- !u!1 &2400840765369224328 GameObject: m_ObjectHideFlags: 0 @@ -13825,6 +12797,90 @@ MonoBehaviour: scrollView: {fileID: 0} draggablePanel: {fileID: 0} _gridPage: {fileID: 11418676} +--- !u!1 &2775130328725603043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7216664239957944663} + - component: {fileID: 4232194129574860493} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7216664239957944663 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2775130328725603043} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -80, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7989254895997902524} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4232194129574860493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2775130328725603043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7989254895997902524} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 7989254895997902524} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 7989254895997902524} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 7989254895997902524} + relative: 0 + absolute: 1 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 925 + mHeight: 2 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 462.5 + 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!1 &2781767514847795196 GameObject: m_ObjectHideFlags: 0 @@ -14018,7 +13074,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2831968163769875995} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 463106} @@ -14053,7 +13109,7 @@ MonoBehaviour: relative: 1 absolute: 0 updateAnchors: 1 - mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} mPivot: 4 mWidth: 2 mHeight: 80 @@ -14685,6 +13741,90 @@ MonoBehaviour: sorted: 0 oldParentPos: {x: 0, y: 0, z: 0} oldParentClipOffset: {x: 0, y: 0} +--- !u!1 &3010017199928865904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5692859135490908086} + - component: {fileID: 6290375219350454138} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5692859135490908086 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3010017199928865904} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -80, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6849798103131519315} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6290375219350454138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3010017199928865904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6849798103131519315} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 6849798103131519315} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 6849798103131519315} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 6849798103131519315} + relative: 0 + absolute: 1 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 925 + mHeight: 2 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 462.5 + 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!1 &3010132312854616972 GameObject: m_ObjectHideFlags: 0 @@ -14908,6 +14048,90 @@ MonoBehaviour: scrollView: {fileID: 0} draggablePanel: {fileID: 0} _gridPage: {fileID: 11418676} +--- !u!1 &3158932242677056578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 200037014591356480} + - component: {fileID: 4733250391759574788} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &200037014591356480 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3158932242677056578} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -80, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6352508919134169858} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4733250391759574788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3158932242677056578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6352508919134169858} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 6352508919134169858} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 6352508919134169858} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 6352508919134169858} + relative: 0 + absolute: 1 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 925 + mHeight: 2 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 462.5 + 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!1 &3232254219464460721 GameObject: m_ObjectHideFlags: 0 @@ -15354,6 +14578,207 @@ MonoBehaviour: scrollView: {fileID: 0} draggablePanel: {fileID: 0} _gridPage: {fileID: 11418676} +--- !u!1 &3274984847502051025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6849798103131519315} + - component: {fileID: 1373821490720966655} + - component: {fileID: 3520160997755596144} + - component: {fileID: 3172743468160186176} + - component: {fileID: 5860415603384162073} + - component: {fileID: 963308589293402559} + - component: {fileID: 8624953626838486526} + - component: {fileID: 1188095403726069318} + m_Layer: 5 + m_Name: InputTimeStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6849798103131519315 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 30, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8661955157471722141} + - {fileID: 5533090225518833252} + - {fileID: 4656881669991920932} + - {fileID: 5692859135490908086} + m_Father: {fileID: 441852} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1373821490720966655 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 160, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3520160997755596144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 473839433938878716} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 1, g: 1, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &3172743468160186176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + 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: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 160 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.40625 + 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!114 &5860415603384162073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: taskId + formatValue: + labeName: {fileID: 8450384675688424782} + defaultName: + canNull: 0 + checkIDCard: 0 + minLen: 0 + maxLen: 0 + spriteBg: {fileID: 3172743468160186176} + valueIsNumber: 0 + isPhoneNum: 0 + inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1} +--- !u!114 &963308589293402559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3cdf5f2b8d8745a69ee31dc45d16005, type: 3} + m_Name: + m_EditorClassIdentifier: + onChange: [] +--- !u!114 &8624953626838486526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &1188095403726069318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274984847502051025} + 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/TRCellExtendField.lua + isNeedResetAtlase: 1 --- !u!1 &3282162442191954876 GameObject: m_ObjectHideFlags: 0 @@ -19552,6 +18977,90 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!1 &4312548976162821211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3848547703882505590} + - component: {fileID: 8513156993597364157} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3848547703882505590 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4312548976162821211} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 478, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6352508919134169858} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8513156993597364157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4312548976162821211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6352508919134169858} + relative: 1 + absolute: -48 + rightAnchor: + target: {fileID: 6352508919134169858} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &4314242944153735775 GameObject: m_ObjectHideFlags: 0 @@ -22908,6 +22417,90 @@ MonoBehaviour: scrollView: {fileID: 0} draggablePanel: {fileID: 0} _gridPage: {fileID: 11418676} +--- !u!1 &5246414816031951190 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4656881669991920932} + - component: {fileID: 8230866721918282075} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4656881669991920932 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246414816031951190} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 478, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6849798103131519315} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8230866721918282075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246414816031951190} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6849798103131519315} + relative: 1 + absolute: -48 + rightAnchor: + target: {fileID: 6849798103131519315} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &5284831215843144503 GameObject: m_ObjectHideFlags: 0 @@ -25348,6 +24941,106 @@ MonoBehaviour: scrollView: {fileID: 0} draggablePanel: {fileID: 0} _gridPage: {fileID: 11418676} +--- !u!1 &5889317976777488088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5533090225518833252} + - component: {fileID: 8450384675688424782} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5533090225518833252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5889317976777488088} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -461, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6849798103131519315} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8450384675688424782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5889317976777488088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6849798103131519315} + relative: 0 + absolute: 51 + 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.6, g: 0.6, b: 0.6, 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: "\u5F00\u59CB\u65F6\u95F4" + 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 &5906822267192158904 GameObject: m_ObjectHideFlags: 0 @@ -25719,6 +25412,106 @@ MonoBehaviour: mSpriteName: cust_right mFillCenter: 1 isGrayMode: 0 +--- !u!1 &5968863496788123385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4329492068059951571} + - component: {fileID: 1869650086831172808} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4329492068059951571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5968863496788123385} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 442, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6352508919134169858} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1869650086831172808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5968863496788123385} + 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: 6352508919134169858} + relative: 1 + absolute: -70 + 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: 5 + mWidth: 92 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u9009\u62E9" + 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 &5971718700922684815 GameObject: m_ObjectHideFlags: 0 @@ -25842,6 +25635,90 @@ MonoBehaviour: scrollView: {fileID: 0} draggablePanel: {fileID: 0} _gridPage: {fileID: 11418676} +--- !u!1 &5997942422150596600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6530635348855629321} + - component: {fileID: 786127996705751581} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6530635348855629321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997942422150596600} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 478, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7989254895997902524} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &786127996705751581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997942422150596600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7989254895997902524} + relative: 1 + absolute: -48 + rightAnchor: + target: {fileID: 7989254895997902524} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &6010026993312520132 GameObject: m_ObjectHideFlags: 0 @@ -33601,6 +33478,106 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &7872887354765272297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8661955157471722141} + - component: {fileID: 473839433938878716} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8661955157471722141 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7872887354765272297} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 442, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6849798103131519315} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &473839433938878716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7872887354765272297} + 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: 6849798103131519315} + relative: 1 + absolute: -70 + 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: 5 + mWidth: 92 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u9009\u62E9" + 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 &7942811449484778440 GameObject: m_ObjectHideFlags: 0 @@ -35382,6 +35359,106 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &8395962141578576344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7114350009452182840} + - component: {fileID: 3961591869661611094} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7114350009452182840 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395962141578576344} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -461, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7989254895997902524} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3961591869661611094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395962141578576344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7989254895997902524} + relative: 0 + absolute: 51 + 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.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 184 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 3 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u7ED3\u675F\u65F6\u95F4" + 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 &8493990679121270425 GameObject: m_ObjectHideFlags: 0 @@ -37763,6 +37840,90 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &9140900809536304894 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3602197919034512416} + - component: {fileID: 2904558932492409092} + m_Layer: 5 + m_Name: SpriteLine (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3602197919034512416 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9140900809536304894} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 550, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 400030} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2904558932492409092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9140900809536304894} + 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.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 975 + mHeight: 2 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 487.5 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: public__empty + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &9148288670693579313 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab similarity index 99% rename from Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab rename to Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab index 5595365..fcff9c6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab @@ -1199,7 +1199,7 @@ GameObject: - component: {fileID: 5320277713193979054} - component: {fileID: 4128751237254219587} m_Layer: 5 - m_Name: PanelCustFilter + m_Name: PanelComFilter m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1282,7 +1282,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isPause: 0 - luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua + luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua isNeedBackplate: 1 destroyWhenHide: 0 isNeedResetAtlase: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta rename to Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab.meta diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab index 12776ec..a754c54 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab @@ -32,7 +32,7 @@ Transform: - {fileID: 1558906886} - {fileID: 6259538829113905718} m_Father: {fileID: 8246500317629248720} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1177340838 MonoBehaviour: @@ -627,7 +627,7 @@ MonoBehaviour: mLabelList: [] mBgBorder: 0 eventReceiver: {fileID: 0} - functionName: OnSelectionChange + functionName: textScale: 0 font: {fileID: 0} textLabel: {fileID: 0} @@ -1934,6 +1934,88 @@ MonoBehaviour: widget: {fileID: 4693393415201863677} offset: 0 sizeAdjust: 1 +--- !u!1 &1073031199327224890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4886666851593583502} + - component: {fileID: 5747540970113465753} + - component: {fileID: 4279901766477904402} + - component: {fileID: 5016285631500529963} + m_Layer: 5 + m_Name: SysRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4886666851593583502 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073031199327224890} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8838.999, y: -1777.6542, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2426801971675280382} + m_Father: {fileID: 8246500317629248720} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5747540970113465753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073031199327224890} + m_Enabled: 1 + 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 &4279901766477904402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073031199327224890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!114 &5016285631500529963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073031199327224890} + 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 &1134059653406025018 GameObject: m_ObjectHideFlags: 0 @@ -4980,7 +5062,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8246500317629248720} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4905231102126225637 MonoBehaviour: @@ -6963,6 +7045,90 @@ MonoBehaviour: widget: {fileID: 2403509267388899063} offset: 0 sizeAdjust: 1 +--- !u!1 &4280625964581610458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1960737176562699803} + - component: {fileID: 6862079706378699948} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1960737176562699803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4280625964581610458} + 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: 2426801971675280382} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6862079706378699948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4280625964581610458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 2426801971675280382} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 2426801971675280382} + 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 &4339859189069139256 GameObject: m_ObjectHideFlags: 0 @@ -7728,6 +7894,93 @@ MonoBehaviour: mSpriteName: cust_cus_tel mFillCenter: 1 isGrayMode: 0 +--- !u!1 &4906630994237821854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2426801971675280382} + - component: {fileID: 8058641080977890906} + - component: {fileID: 1203313915198748042} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2426801971675280382 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4906630994237821854} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.000061035156, y: -51.029392, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1960737176562699803} + - {fileID: 6776850397468619022} + m_Father: {fileID: 4886666851593583502} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8058641080977890906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4906630994237821854} + 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: -1 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: -1 + 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 &1203313915198748042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4906630994237821854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 8058641080977890906} + offset: 0 + sizeAdjust: 1 --- !u!1 &5078642348540468931 GameObject: m_ObjectHideFlags: 0 @@ -10327,7 +10580,7 @@ Transform: - {fileID: 9155012502424189886} - {fileID: 7066844989434100784} m_Father: {fileID: 8246500317629248720} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8997606126826942676 MonoBehaviour: @@ -11307,6 +11560,106 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &7142510263042379155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6776850397468619022} + - component: {fileID: 7262911135413684141} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6776850397468619022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7142510263042379155} + 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: 2426801971675280382} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7262911135413684141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7142510263042379155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1960737176562699803} + 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: "\u7CFB\u7EDF\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 &7246578445747532193 GameObject: m_ObjectHideFlags: 0 @@ -11920,6 +12273,7 @@ Transform: m_Children: - {fileID: 8366587093192941028} - {fileID: 5046301095161937844} + - {fileID: 4886666851593583502} - {fileID: 1177340836} - {fileID: 5659840120862483878} - {fileID: 4720872816294074782} @@ -14054,7 +14408,7 @@ MonoBehaviour: anchorOffset: 0 softBorderPadding: 1 renderQueue: 0 - startingRenderQueue: 3010 + startingRenderQueue: 3011 mClipTexture: {fileID: 0} mAlpha: 1 mClipping: 3 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab new file mode 100644 index 0000000..6830ebc --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab @@ -0,0 +1,3314 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &205197199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 205197200} + - component: {fileID: 205197202} + - component: {fileID: 205197201} + m_Layer: 5 + m_Name: DateRang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &205197200 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205197199} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.000061035156, y: -129.7792, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 828879642} + - {fileID: 627589226} + - {fileID: 5685129533102851219} + m_Father: {fileID: 4227704355533648770} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &205197202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205197199} + 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: 1 + 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 &205197201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 205197199} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 205197202} + offset: 0 + sizeAdjust: 1 +--- !u!1 &627589225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 627589226} + - component: {fileID: 627589230} + - component: {fileID: 627589229} + - component: {fileID: 627589228} + - component: {fileID: 627589227} + m_Layer: 5 + m_Name: ButtonResetDate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &627589226 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627589225} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 457, y: -25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1339950592} + m_Father: {fileID: 205197200} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &627589230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627589225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 205197200} + relative: 1 + absolute: -105 + rightAnchor: + target: {fileID: 205197200} + relative: 1 + absolute: -65 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 40 + mHeight: 40 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + 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_limt + mFillCenter: 1 + isGrayMode: 0 +--- !u!65 &627589229 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627589225} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 150, y: 70, z: 0} + m_Center: {x: -30, y: 0, z: 0} +--- !u!114 &627589228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627589225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &627589227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627589225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 627589225} + 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: 462953310162120705} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!1 &828879641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 828879642} + - component: {fileID: 828879643} + m_Layer: 5 + m_Name: LabelTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &828879642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828879641} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -492, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 205197200} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &828879643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828879641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 205197200} + relative: 0 + absolute: 70 + 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.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 0 + mWidth: 192 + mHeight: 48 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u8DDF\u8FDB\u65F6\u95F4" + 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 &1339950591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1339950592} + - component: {fileID: 1339950593} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1339950592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339950591} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -20, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 627589226} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1339950593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339950591} + 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: 5 + mWidth: 283 + mHeight: 38 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.4473686 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u4E0D\u9650" + mFontSize: 38 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &183276892259396841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6115538761302875609} + - component: {fileID: 9211806195800712830} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6115538761302875609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183276892259396841} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 47, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1731516933773288530} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9211806195800712830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183276892259396841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1731516933773288530} + relative: 0 + absolute: 25 + rightAnchor: + target: {fileID: 1731516933773288530} + relative: 0 + absolute: 69 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 44 + mHeight: 44 + mDepth: 8 + 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: cust_search + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &462953310162120704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5189506512011070934} + - component: {fileID: 8571920817349802988} + - component: {fileID: 462953310162120705} + m_Layer: 5 + m_Name: PanelFollowFilter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5189506512011070934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462953310162120704} + 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: 1565651194772470820} + - {fileID: 775722184887486306} + - {fileID: 4457465785659032471} + - {fileID: 3207195570272401198} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8571920817349802988 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462953310162120704} + 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 &462953310162120705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462953310162120704} + 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/TRPFollowFilter.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 0 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: "\u5BA2\u6237\u7B5B\u9009" +--- !u!1 &653921910427044159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4474744197425117927} + - component: {fileID: 1916491522500160201} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4474744197425117927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653921910427044159} + 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: 8347946362543549489} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1916491522500160201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653921910427044159} + 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: 100 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u786E\u5B9A" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &1297020980621624960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 861654188008410821} + - component: {fileID: 8874518310761540151} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &861654188008410821 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297020980621624960} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -340, y: -170, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2839950600726126008} + m_Father: {fileID: 5448276560023846600} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8874518310761540151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297020980621624960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 0 + sorting: 1 + pivot: 0 + maxPerLine: 3 + cellWidth: 342 + cellHeight: 135 + animateSmoothly: 0 + hideInactive: 1 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} +--- !u!1 &1522803416410355591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4235246831414552961} + - component: {fileID: 7626298795741640157} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4235246831414552961 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522803416410355591} + 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: 5825540033057450410} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7626298795741640157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522803416410355591} + 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.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 4 + mWidth: 100 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u91CD\u7F6E" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &1870399532478961555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3207195570272401198} + - component: {fileID: 7727917832211639263} + m_Layer: 5 + m_Name: Bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3207195570272401198 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870399532478961555} + 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: 5825540033057450410} + - {fileID: 8347946362543549489} + m_Father: {fileID: 5189506512011070934} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7727917832211639263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870399532478961555} + 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: 7 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!1 &2583870049327647825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1731516933773288530} + - component: {fileID: 8979120355881279297} + - component: {fileID: 8276241300119133701} + - component: {fileID: 6732176087957994148} + m_Layer: 5 + m_Name: InputSeachKey + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1731516933773288530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583870049327647825} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -473, y: -203, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3561966273508826051} + - {fileID: 6115538761302875609} + - {fileID: 3961247746322268070} + m_Father: {fileID: 4457465785659032471} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8979120355881279297 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583870049327647825} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 685, y: 88, z: 0} + m_Center: {x: 342.5, y: 0, z: 0} +--- !u!114 &8276241300119133701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583870049327647825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 1159671129322936516} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 0.60296786, g: 1, b: 0, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &6732176087957994148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2583870049327647825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4457465784278989913} + relative: 0 + absolute: 90 + rightAnchor: + target: {fileID: 4457465784278989913} + relative: 1 + absolute: -350 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 3 + mWidth: 685 + mHeight: 88 + mDepth: 6 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1.8181819 + 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_on_off_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &3297863474616581184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5523787868453199633} + - component: {fileID: 8660090940110546140} + - component: {fileID: 489578169873718953} + - component: {fileID: 4747248344984932325} + - component: {fileID: 4980662028086762451} + m_Layer: 5 + m_Name: ButtonReset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5523787868453199633 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3297863474616581184} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 457, y: -23, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2989009057541167663} + m_Father: {fileID: 5448276560023846600} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8660090940110546140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3297863474616581184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5448276560023846600} + relative: 1 + absolute: -105 + rightAnchor: + target: {fileID: 5448276560023846600} + relative: 1 + absolute: -65 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 40 + mHeight: 40 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + 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_limt + mFillCenter: 1 + isGrayMode: 0 +--- !u!65 &489578169873718953 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3297863474616581184} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 150, y: 70, z: 0} + m_Center: {x: -30, y: 0, z: 0} +--- !u!114 &4747248344984932325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3297863474616581184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &4980662028086762451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3297863474616581184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 3297863474616581184} + 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: 4606284776302702209} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!1 &3592140148355828143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 775722184887486306} + - component: {fileID: 578918168223662566} + - component: {fileID: 7212903280988360158} + - component: {fileID: 2829562210694936720} + m_Layer: 5 + m_Name: dragscroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &775722184887486306 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3592140148355828143} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -38, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5189506512011070934} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &578918168223662566 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3592140148355828143} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2041, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7212903280988360158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3592140148355828143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 223468403593481820} + draggablePanel: {fileID: 0} +--- !u!114 &2829562210694936720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3592140148355828143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5189506512011070934} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 5189506512011070934} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 5189506512011070934} + relative: 0 + absolute: 193 + topAnchor: + target: {fileID: 5189506512011070934} + relative: 1 + absolute: -268 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1127 + mHeight: 1843 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.611503 + 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: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &4137348635131599600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2989009057541167663} + - component: {fileID: 605251600346535119} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2989009057541167663 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4137348635131599600} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -20, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5523787868453199633} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &605251600346535119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4137348635131599600} + 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: 5 + mWidth: 283 + mHeight: 38 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.4473686 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u4E0D\u9650" + mFontSize: 38 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &4366778029054393105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5685129533102851219} + - component: {fileID: 214544924041378367} + - component: {fileID: 2391661970216046768} + - component: {fileID: 4462264015564900992} + - component: {fileID: 4665338699175652057} + - component: {fileID: 1723439637380795515} + - component: {fileID: 7375490486985633854} + - component: {fileID: 114572621635778954} + m_Layer: 5 + m_Name: InputDate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5685129533102851219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -142.89, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7628972938487072605} + - {fileID: 5857614187647502564} + m_Father: {fileID: 205197200} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &214544924041378367 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1005, y: 140, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2391661970216046768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 1691548411144060220} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 1, g: 1, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &4462264015564900992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + 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: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1005 + mHeight: 140 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.178571 + 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_input + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &4665338699175652057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: taskId + formatValue: + labeName: {fileID: 0} + defaultName: + canNull: 0 + checkIDCard: 0 + minLen: 0 + maxLen: 0 + spriteBg: {fileID: 4462264015564900992} + valueIsNumber: 0 + isPhoneNum: 0 + inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1} +--- !u!114 &1723439637380795515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4fc1983a05daa4f0fb11c911430b5e5d, type: 3} + m_Name: + m_EditorClassIdentifier: + isSetTime: 1 + isDateRange: 1 + onChange: + - mTarget: {fileID: 462953310162120705} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: + oneShot: 0 +--- !u!114 &7375490486985633854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &114572621635778954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029054393105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 4462264015564900992} + offset: 60 + sizeAdjust: 1 +--- !u!1 &4457465784278989912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4457465784278989913} + - component: {fileID: 4457465784278989914} + - component: {fileID: 8614066648768252696} + m_Layer: 5 + m_Name: SpriteBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4457465784278989913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465784278989912} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -132, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4457465785659032471} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4457465784278989914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465784278989912} + 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: -1 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: -264 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -132 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 1 + mWidth: 1125 + mHeight: 132 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 8.522727 + 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_border + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &8614066648768252696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465784278989912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 4457465784278989914} + offset: 0 + sizeAdjust: 1 +--- !u!1 &4457465784968197195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4457465784968197188} + - component: {fileID: 4457465784968197189} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4457465784968197188 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465784968197195} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -45, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4457465785179217067} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4457465784968197189 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465784968197195} + 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: -30 + rightAnchor: + target: {fileID: 4457465785179217067} + relative: 0 + absolute: -20 + 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: 5 + mWidth: 100 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u7B5B\u9009" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &4457465785179217066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4457465785179217067} + - component: {fileID: 4457465785179217063} + - component: {fileID: 4076984728414941589} + - component: {fileID: 6585311524014384707} + m_Layer: 5 + m_Name: ButtonFilter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4457465785179217067 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465785179217066} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 446, y: -203, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4457465784968197188} + m_Father: {fileID: 4457465785659032471} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4457465785179217063 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465785179217066} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 200, y: 100, z: 0} + m_Center: {x: -61.2, y: 0, z: 0} +--- !u!114 &4076984728414941589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465785179217066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4457465784278989913} + relative: 1 + absolute: -140 + rightAnchor: + target: {fileID: 4457465784278989913} + relative: 1 + absolute: -90 + bottomAnchor: + target: {fileID: 0} + relative: 1 + absolute: -241 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -165 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 50 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + 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_screen + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &6585311524014384707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465785179217066} + 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: 462953310162120705} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] +--- !u!1 &4457465785659032470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4457465785659032471} + - component: {fileID: 4457465785659032464} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4457465785659032471 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465785659032470} + 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: 4457465784278989913} + - {fileID: 4457465785179217067} + - {fileID: 1731516933773288530} + m_Father: {fileID: 5189506512011070934} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4457465785659032464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457465785659032470} + 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 &5793648698618097448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3961247746322268070} + - component: {fileID: 4467069892460889704} + - component: {fileID: 1683776542133188012} + - component: {fileID: 8666753869649038121} + - component: {fileID: 147288831479276519} + m_Layer: 5 + m_Name: ButtonReset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3961247746322268070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5793648698618097448} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 643, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1731516933773288530} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4467069892460889704 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5793648698618097448} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 90, y: 90, z: 0} + m_Center: {x: 0, y: -0.22070312, z: 0} +--- !u!114 &1683776542133188012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5793648698618097448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 5793648698618097448} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 1 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: [] +--- !u!114 &8666753869649038121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5793648698618097448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1731516933773288530} + relative: 1 + absolute: -64 + rightAnchor: + target: {fileID: 1731516933773288530} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 44 + mHeight: 44 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + 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: login_log_no + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &147288831479276519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5793648698618097448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce7ce3a27703447e98bd5b91307e34c8, type: 3} + m_Name: + m_EditorClassIdentifier: + input: {fileID: 0} +--- !u!1 &6111155827175331193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1565651194772470820} + - component: {fileID: 4458966573099965234} + - component: {fileID: 223468403593481820} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1565651194772470820 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6111155827175331193} + 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: 4227704355533648770} + m_Father: {fileID: 5189506512011070934} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4458966573099965234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6111155827175331193} + 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: 3008 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: 0, y: 0, z: 1125, w: 2000} + mClipSoftness: {x: 4, y: 10} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &223468403593481820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6111155827175331193} + 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 &6423820128815658134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5857614187647502564} + - component: {fileID: 7193116710199891099} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5857614187647502564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6423820128815658134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 468, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5685129533102851219} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7193116710199891099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6423820128815658134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5685129533102851219} + relative: 1 + absolute: -48 + rightAnchor: + target: {fileID: 5685129533102851219} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &6564875918938815593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3561966273508826051} + - component: {fileID: 1159671129322936516} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3561966273508826051 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6564875918938815593} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 80, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1731516933773288530} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1159671129322936516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6564875918938815593} + 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: 3 + mWidth: 548 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 11.416667 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5BA2\u6237\u540D\u79F0/\u7535\u8BDD/\u516C\u53F8\u540D\u79F0" + mFontSize: 48 + 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: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &6728636558377549920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3695258758641459131} + - component: {fileID: 4743862603042501963} + m_Layer: 5 + m_Name: LabelTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3695258758641459131 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6728636558377549920} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -492, y: -23, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5448276560023846600} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4743862603042501963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6728636558377549920} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5448276560023846600} + relative: 0 + absolute: 70 + 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.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 3 + mWidth: 242 + mHeight: 48 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.041666668 + 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 &6951234077664588031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3329625299256352101} + - component: {fileID: 8558542733589672924} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3329625299256352101 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6951234077664588031} + 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: 2839950600726126008} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8558542733589672924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6951234077664588031} + 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: 283 + mHeight: 38 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.4473686 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5168\u90E8\u6765\u6E90" + mFontSize: 38 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &7019228256416743578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5825540033057450410} + - component: {fileID: 778372381558488235} + - component: {fileID: 3210262091989522217} + - component: {fileID: 7691561266837767382} + m_Layer: 5 + m_Name: ButtonReset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5825540033057450410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7019228256416743578} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -283, y: 90, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4235246831414552961} + m_Father: {fileID: 3207195570272401198} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &778372381558488235 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7019228256416743578} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 563, y: 190, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3210262091989522217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7019228256416743578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 7019228256416743578} + 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: 462953310162120705} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &7691561266837767382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7019228256416743578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5189506512011070934} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 5189506512011070934} + relative: 0.5 + 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: 563 + mHeight: 190 + mDepth: 4 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.963158 + 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!1 &7447551251579409370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8347946362543549489} + - component: {fileID: 6838659560483951760} + - component: {fileID: 3005638436170856046} + - component: {fileID: 7608701667941333914} + m_Layer: 5 + m_Name: ButtonOkay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8347946362543549489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447551251579409370} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 281, y: 90, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4474744197425117927} + m_Father: {fileID: 3207195570272401198} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6838659560483951760 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447551251579409370} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 563, y: 190, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3005638436170856046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447551251579409370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 7447551251579409370} + 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: 462953310162120705} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &7608701667941333914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7447551251579409370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5189506512011070934} + relative: 0.5 + absolute: 0 + rightAnchor: + target: {fileID: 5189506512011070934} + relative: 1 + absolute: 1 + 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: 563 + mHeight: 190 + mDepth: 4 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.963158 + 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!1 &7858971160452103958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2839950600726126008} + - component: {fileID: 117508549990506876} + - component: {fileID: 1859782613518611396} + - component: {fileID: 6491369320749517896} + - component: {fileID: 872876398909207184} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2839950600726126008 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858971160452103958} + 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: 3329625299256352101} + m_Father: {fileID: 861654188008410821} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &117508549990506876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858971160452103958} + 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.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 305 + mHeight: 100 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 3.05 + 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: news_news_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!65 &1859782613518611396 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858971160452103958} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 305, y: 100, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6491369320749517896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858971160452103958} + 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/TRCellCustFilter.lua + isNeedResetAtlase: 1 +--- !u!114 &872876398909207184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858971160452103958} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!1 &8285423118169524760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4227704355533648770} + - component: {fileID: 532923665115465751} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4227704355533648770 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8285423118169524760} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 917, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 205197200} + - {fileID: 5448276560023846600} + m_Father: {fileID: 1565651194772470820} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &532923665115465751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8285423118169524760} + m_Enabled: 1 + 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: 80} +--- !u!1 &8364720013596285210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5448276560023846600} + - component: {fileID: 4606284776302702209} + - component: {fileID: 4920019863745010887} + - component: {fileID: 5655804029163233582} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5448276560023846600 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8364720013596285210} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.000061035156, y: -551.90424, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3695258758641459131} + - {fileID: 861654188008410821} + - {fileID: 5523787868453199633} + m_Father: {fileID: 4227704355533648770} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4606284776302702209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8364720013596285210} + 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/TRCellCustFilterGroup.lua + isNeedResetAtlase: 1 +--- !u!114 &4920019863745010887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8364720013596285210} + 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: 1 + 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 &5655804029163233582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8364720013596285210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 4920019863745010887} + offset: 0 + sizeAdjust: 1 +--- !u!1 &8982677341022132521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7628972938487072605} + - component: {fileID: 1691548411144060220} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7628972938487072605 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8982677341022132521} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -472, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5685129533102851219} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1691548411144060220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8982677341022132521} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5685129533102851219} + relative: 0 + absolute: 30 + rightAnchor: + target: {fileID: 5685129533102851219} + relative: 1 + absolute: -70 + 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: 276 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 8.26087 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u9009\u62E9\u65F6\u95F4\u8303\u56F4" + 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 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab.meta new file mode 100644 index 0000000..5488b8e --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowFilter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 91be5b30899084c2b9e9f7343d64cf6f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab index 547ba8a..380690a 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab @@ -168,7 +168,6 @@ Transform: - {fileID: 1695612816179622048} - {fileID: 1695612815265812562} - {fileID: 3626394024244750507} - - {fileID: 3592938584915241295} m_Father: {fileID: 7084386452241072431} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -886,7 +885,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: lastFollowUpTime + jsonKey: companyName formatValue: "\u5173\u8054\u5BA2\u6237\uFF1A{0}" labeName: {fileID: 0} defaultName: @@ -1325,139 +1324,6 @@ MonoBehaviour: frameName: Frame1 frameObj: {fileID: 0} titleKeyName: "\u8BA2\u5355\u7BA1\u7406" ---- !u!1 &3548334101062895408 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3592938584915241295} - - component: {fileID: 8796507067764736209} - - component: {fileID: 5032767334997936555} - - component: {fileID: 8751693546856402152} - m_Layer: 5 - m_Name: ButtonAddCust - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3592938584915241295 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548334101062895408} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 486, y: -66, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1695612814791429998} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &8796507067764736209 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548334101062895408} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 150, y: 100, z: 0} - m_Center: {x: 0, y: -0.22070312, z: 0} ---- !u!114 &5032767334997936555 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548334101062895408} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenTarget: {fileID: 3548334101062895408} - 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: 3186475724049071352} - mMethodName: uiEventDelegate - mParameters: - - obj: {fileID: 0} - field: - name: go - oneShot: 0 ---- !u!114 &8751693546856402152 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548334101062895408} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} - m_Name: - m_EditorClassIdentifier: - leftAnchor: - target: {fileID: 7084386452241072431} - relative: 1 - absolute: -100 - rightAnchor: - target: {fileID: 7084386452241072431} - relative: 1 - absolute: -50 - bottomAnchor: - target: {fileID: 0} - relative: 0 - absolute: 0 - topAnchor: - target: {fileID: 0} - relative: 1 - absolute: 0 - updateAnchors: 1 - mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} - mPivot: 4 - mWidth: 50 - mHeight: 50 - mDepth: 10 - autoResizeBoxCollider: 0 - hideIfOffScreen: 0 - keepAspectRatio: 0 - aspectRatio: 1 - 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_add - mFillCenter: 1 - isGrayMode: 0 --- !u!1 &3549210079222449859 GameObject: m_ObjectHideFlags: 0 @@ -1945,7 +1811,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: custName + jsonKey: money formatValue: "\u8BA2\u5355\u91D1\u989D\uFF1A{0}" labeName: {fileID: 0} defaultName: @@ -2070,7 +1936,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: _phoneNo + jsonKey: title formatValue: labeName: {fileID: 0} defaultName: @@ -2197,7 +2063,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: dealFlag + jsonKey: status formatValue: labeName: {fileID: 0} defaultName: @@ -2463,6 +2329,9 @@ GameObject: m_Component: - component: {fileID: 4586775333025383884} - component: {fileID: 4206424963445455942} + - component: {fileID: 5867811423619707448} + - component: {fileID: 6679270411634261236} + - component: {fileID: 3516603784228117905} m_Layer: 5 m_Name: LabelServerNo m_TagString: Untagged @@ -2553,6 +2422,96 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!114 &5867811423619707448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873896675524645784} + 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: cust_kuang + highlightSprite: cust_kuang + 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: 4206424963445455942} + 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: OnSelectionChange + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &6679270411634261236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873896675524645784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: + onSelect: [] +--- !u!114 &3516603784228117905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873896675524645784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: upLoginNo + 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 &8007719617964266529 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab new file mode 100644 index 0000000..2f2b71f --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab @@ -0,0 +1,2234 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &544416178748965893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2198796937342118843} + - component: {fileID: 6466028710283934468} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2198796937342118843 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544416178748965893} + 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: 6662251014114980171} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6466028710283934468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544416178748965893} + 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: 100 + mHeight: 50 + mDepth: 6 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u786E\u5B9A" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &631848331702737398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6662251014114980171} + - component: {fileID: 7102377862267161988} + - component: {fileID: 5874481942874192929} + - component: {fileID: 268447247375187655} + m_Layer: 5 + m_Name: ButtonOkay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6662251014114980171 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631848331702737398} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 256, y: 130, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2198796937342118843} + m_Father: {fileID: 5582903260374513313} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7102377862267161988 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631848331702737398} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 511, y: 170, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5874481942874192929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631848331702737398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 631848331702737398} + 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: 3447656779159380079} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &268447247375187655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631848331702737398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6465621104633644601} + relative: 0.5 + absolute: 1 + rightAnchor: + target: {fileID: 6465621104633644601} + relative: 1 + absolute: -50 + 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: 511 + mHeight: 170 + mDepth: 4 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 8.735294 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: news_news_bg3 + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &1084493579020767485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 481303131407904040} + - component: {fileID: 582197646671488555} + - component: {fileID: 2872489061304645867} + - component: {fileID: 2589606404839085669} + - component: {fileID: 4800221381155435057} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &481303131407904040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084493579020767485} + 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: 6723428472793730579} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &582197646671488555 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084493579020767485} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 350, y: 170, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2872489061304645867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084493579020767485} + 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/CLLUICellPopTime.lua + isNeedResetAtlase: 1 +--- !u!114 &2589606404839085669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084493579020767485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &4800221381155435057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084493579020767485} + 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: 100 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: -100 + 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: 350 + mHeight: 170 + mDepth: 4 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.0588236 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: Button + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &3063119004022759453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8491980237244919721} + - component: {fileID: 3544616932018690786} + - component: {fileID: 8086091085415963400} + - component: {fileID: 6175954657764051609} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8491980237244919721 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063119004022759453} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 409.625, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5434535687595079828} + m_Father: {fileID: 5566004928670619858} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3544616932018690786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063119004022759453} + 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: 3 + mClipRange: {x: -3, y: 510, z: 350, w: 508} + mClipSoftness: {x: 4, y: 20} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: -415.34564} +--- !u!114 &8086091085415963400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063119004022759453} + 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!114 &6175954657764051609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3063119004022759453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 548490e5985c145d7a7d533ceebb924d, type: 3} + m_Name: + m_EditorClassIdentifier: + lua: {fileID: 3447656779159380079} + centerOnChild: {fileID: 1925290727} +--- !u!1 &3311481915715404129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5582903260374513313} + - component: {fileID: 8539336253784618419} + m_Layer: 5 + m_Name: offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5582903260374513313 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3311481915715404129} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -12, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4861078229998994018} + - {fileID: 6465621104633582373} + - {fileID: 2014136152764395693} + - {fileID: 3001521619261156381} + - {fileID: 5566004928670619858} + - {fileID: 6662251014114980171} + - {fileID: 2753388622739236036} + m_Father: {fileID: 4656741697118012276} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8539336253784618419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3311481915715404129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d166255cacf07b4292b8402b3ddefc5, type: 3} + m_Name: + m_EditorClassIdentifier: + exeOrder: 0 + method: 3 + style: 0 + animationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + ignoreTimeScale: 1 + delay: 0 + duration: 0.5 + steeperCurves: 0 + tweenGroup: 0 + onFinished: [] + eventReceiver: {fileID: 0} + callWhenFinished: + from: {x: 0, y: -808, z: 0} + to: {x: 0, y: 0, z: 0} + worldSpace: 0 +--- !u!1 &3593969635608471362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4861078229998994018} + m_Layer: 5 + m_Name: ListHH + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4861078229998994018 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3593969635608471362} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -323, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6465621104633583299} + m_Father: {fileID: 5582903260374513313} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3779854653034273962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6729888722248275479} + - component: {fileID: 8795270748742423938} + - component: {fileID: 9029399132010269627} + - component: {fileID: 541587764301946308} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6729888722248275479 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3779854653034273962} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 409.625, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6723428472793730579} + m_Father: {fileID: 3001521619261156381} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8795270748742423938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3779854653034273962} + 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: 3005 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: -3, y: 510, z: 350, w: 508} + mClipSoftness: {x: 4, y: 20} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: -415.34564} +--- !u!114 &9029399132010269627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3779854653034273962} + 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!114 &541587764301946308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3779854653034273962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 548490e5985c145d7a7d533ceebb924d, type: 3} + m_Name: + m_EditorClassIdentifier: + lua: {fileID: 3447656779159380079} + centerOnChild: {fileID: 1194634937} +--- !u!1 &3791414562045971808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6723428472793730579} + - component: {fileID: 4297167672691606626} + - component: {fileID: 3578013046533572953} + - component: {fileID: 1194634937} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6723428472793730579 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791414562045971808} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 243.8, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 481303131407904040} + m_Father: {fileID: 6729888722248275479} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4297167672691606626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791414562045971808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 1 + sorting: 1 + pivot: 1 + maxPerLine: 0 + cellWidth: 0 + cellHeight: 170 + animateSmoothly: 0 + hideInactive: 1 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} +--- !u!114 &3578013046533572953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791414562045971808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} + m_Name: + m_EditorClassIdentifier: + cellCount: 8 + isPlayTween: 0 + twType: 0 + tweenSpeed: 0.01 + twDuration: 0.5 + twMethod: 2 + itemList: [] + grid: {fileID: 0} + panel: {fileID: 0} + OnShowHeadListCallbacks: [] + OnHideHeadListCallbacks: [] + OnEndListCallbacks: [] +--- !u!114 &1194634937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3791414562045971808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d35d721694fa0ee48a2d14bddfcbf4a4, type: 3} + m_Name: + m_EditorClassIdentifier: + springStrength: 8 + nextPageThreshold: 0 +--- !u!1 &3941057758238369560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5434535687595079828} + - component: {fileID: 2872400154868597756} + - component: {fileID: 8217370474189126949} + - component: {fileID: 1925290727} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5434535687595079828 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3941057758238369560} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 243.8, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8668910340148971647} + m_Father: {fileID: 8491980237244919721} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2872400154868597756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3941057758238369560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 1 + sorting: 1 + pivot: 1 + maxPerLine: 0 + cellWidth: 0 + cellHeight: 170 + animateSmoothly: 0 + hideInactive: 1 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} +--- !u!114 &8217370474189126949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3941057758238369560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} + m_Name: + m_EditorClassIdentifier: + cellCount: 8 + isPlayTween: 0 + twType: 0 + tweenSpeed: 0.01 + twDuration: 0.5 + twMethod: 2 + itemList: [] + grid: {fileID: 0} + panel: {fileID: 0} + OnShowHeadListCallbacks: [] + OnHideHeadListCallbacks: [] + OnEndListCallbacks: [] +--- !u!114 &1925290727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3941057758238369560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d35d721694fa0ee48a2d14bddfcbf4a4, type: 3} + m_Name: + m_EditorClassIdentifier: + springStrength: 8 + nextPageThreshold: 0 +--- !u!1 &4374580416922284712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4656741697118012276} + - component: {fileID: 7661381189971257344} + m_Layer: 5 + m_Name: Bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4656741697118012276 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4374580416922284712} + 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: 5582903260374513313} + m_Father: {fileID: 6465621104633644601} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7661381189971257344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4374580416922284712} + 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: 7 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!1 &4913477101506348625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2014136152764395693} + - component: {fileID: 5752912808634769556} + - component: {fileID: 5205960718542109963} + - component: {fileID: 4855468429700172222} + m_Layer: 5 + m_Name: ButtonClose + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2014136152764395693 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4913477101506348625} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -258, y: 130, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2838006935581547687} + m_Father: {fileID: 5582903260374513313} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5752912808634769556 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4913477101506348625} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 511, y: 170, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5205960718542109963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4913477101506348625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 4913477101506348625} + 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: 3447656779159380079} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &4855468429700172222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4913477101506348625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6465621104633644601} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 6465621104633644601} + relative: 0.5 + absolute: -1 + 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: 511 + mHeight: 170 + mDepth: 4 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 8.735294 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: news_news_bg2 + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &6351390138922569805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2838006935581547687} + - component: {fileID: 3236224299291198011} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2838006935581547687 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6351390138922569805} + 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: 2014136152764395693} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3236224299291198011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6351390138922569805} + 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.94509804, g: 0.3529412, b: 0.2901961, a: 1} + mPivot: 4 + mWidth: 100 + mHeight: 50 + mDepth: 6 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u53D6\u6D88" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &6465621104633356583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465621104633582373} + - component: {fileID: 6465621104623617469} + - component: {fileID: 3051096308451344762} + m_Layer: 5 + m_Name: SpriteBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6465621104633582373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633356583} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1, y: 248, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5582903260374513313} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6465621104623617469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633356583} + 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: 50 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: -50 + 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: 7 + mWidth: 1025 + mHeight: 510 + mDepth: -1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.009804 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: news_news_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &3051096308451344762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633356583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 6465621104623617469} + offset: 50 + sizeAdjust: 1 +--- !u!1 &6465621104633367627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465621104633578147} + - component: {fileID: 6465621104623631715} + - component: {fileID: 6465621104623640119} + - component: {fileID: 7582042948107752781} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6465621104633578147 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633367627} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 243.8, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6465621104633630651} + m_Father: {fileID: 6465621104633583299} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6465621104623631715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633367627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 1 + sorting: 1 + pivot: 1 + maxPerLine: 0 + cellWidth: 0 + cellHeight: 170 + animateSmoothly: 0 + hideInactive: 1 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} +--- !u!114 &6465621104623640119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633367627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} + m_Name: + m_EditorClassIdentifier: + cellCount: 8 + isPlayTween: 0 + twType: 0 + tweenSpeed: 0.01 + twDuration: 0.5 + twMethod: 2 + itemList: [] + grid: {fileID: 0} + panel: {fileID: 0} + OnShowHeadListCallbacks: [] + OnHideHeadListCallbacks: [] + OnEndListCallbacks: [] +--- !u!114 &7582042948107752781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633367627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d35d721694fa0ee48a2d14bddfcbf4a4, type: 3} + m_Name: + m_EditorClassIdentifier: + springStrength: 8 + nextPageThreshold: 0 +--- !u!1 &6465621104633368553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465621104633630651} + - component: {fileID: 6465621104627098741} + - component: {fileID: 6465621104623722307} + - component: {fileID: 6465621104623621429} + - component: {fileID: 3498325704309931877} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6465621104633630651 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633368553} + 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: 6465621104633578147} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6465621104627098741 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633368553} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 350, y: 170, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6465621104623722307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633368553} + 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/CLLUICellPopTime.lua + isNeedResetAtlase: 1 +--- !u!114 &6465621104623621429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633368553} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &3498325704309931877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633368553} + 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: 100 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: -100 + 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: 350 + mHeight: 170 + mDepth: 4 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.0588236 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: Button + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &6465621104633515841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465621104633583299} + - component: {fileID: 6465621104623644313} + - component: {fileID: 6465621104623735543} + - component: {fileID: 5569598260436662389} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6465621104633583299 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633515841} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 409.625, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6465621104633578147} + m_Father: {fileID: 4861078229998994018} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6465621104623644313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633515841} + 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: 3006 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: -3, y: 510, z: 350, w: 508} + mClipSoftness: {x: 4, y: 20} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: -415.34564} +--- !u!114 &6465621104623735543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633515841} + 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!114 &5569598260436662389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633515841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 548490e5985c145d7a7d533ceebb924d, type: 3} + m_Name: + m_EditorClassIdentifier: + lua: {fileID: 3447656779159380079} + centerOnChild: {fileID: 7582042948107752781} +--- !u!1 &6465621104633517023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465621104633693761} + - component: {fileID: 6465621104623634043} + - component: {fileID: 6465621104627462449} + - component: {fileID: 6465621104623667663} + m_Layer: 5 + m_Name: SpriteBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6465621104633693761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633517023} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6465621104633644601} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6465621104623634043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633517023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6465621104633644601} + relative: 0 + absolute: -5 + rightAnchor: + target: {fileID: 6465621104633644601} + relative: 1 + absolute: 5 + bottomAnchor: + target: {fileID: 6465621104633644601} + relative: 0 + absolute: -5 + topAnchor: + target: {fileID: 6465621104633644601} + relative: 1 + absolute: 5 + updateAnchors: 1 + mColor: {r: 0, g: 0, b: 0, a: 0.3137255} + mPivot: 4 + mWidth: 1135 + mHeight: 2314 + mDepth: -2 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.49049264 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!65 &6465621104627462449 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633517023} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1135, y: 2314, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6465621104623667663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633517023} + 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: 0} + mMethodName: OnClickClose + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] +--- !u!1 &6465621104633537711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465621104633644601} + - component: {fileID: 6465621104623729509} + - component: {fileID: 3447656779159380079} + m_Layer: 5 + m_Name: PanelPopTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6465621104633644601 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633537711} + 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: 6465621104633693761} + - {fileID: 4656741697118012276} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6465621104623729509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633537711} + 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 &3447656779159380079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6465621104633537711} + 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/CLLPPopTime.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: + frameObj: {fileID: 0} + titleKeyName: +--- !u!1 &7262934247970519281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8668910340148971647} + - component: {fileID: 8880273940289369919} + - component: {fileID: 6781343252378393038} + - component: {fileID: 6467141911442588042} + - component: {fileID: 7525201071848278443} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8668910340148971647 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262934247970519281} + 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: 5434535687595079828} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8880273940289369919 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262934247970519281} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 350, y: 170, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6781343252378393038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262934247970519281} + 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/CLLUICellPopTime.lua + isNeedResetAtlase: 1 +--- !u!114 &6467141911442588042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262934247970519281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 0} + draggablePanel: {fileID: 0} +--- !u!114 &7525201071848278443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7262934247970519281} + 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: 100 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: -100 + 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: 350 + mHeight: 170 + mDepth: 4 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.0588236 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: Button + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &8780192223845159598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5566004928670619858} + m_Layer: 5 + m_Name: ListSS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5566004928670619858 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8780192223845159598} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 323, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8491980237244919721} + m_Father: {fileID: 5582903260374513313} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8962871559251102646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2753388622739236036} + - component: {fileID: 3049565582268192250} + - component: {fileID: 8392604162078937099} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2753388622739236036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8962871559251102646} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 500, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5582903260374513313} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3049565582268192250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8962871559251102646} + 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.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 4 + mWidth: 1017 + mHeight: 170 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5.9823527 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: cust_kuang + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &8392604162078937099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8962871559251102646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 3049565582268192250} + offset: 54 + sizeAdjust: 1 +--- !u!1 &9054639155991564523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3001521619261156381} + m_Layer: 5 + m_Name: ListMM + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3001521619261156381 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9054639155991564523} + 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: 6729888722248275479} + m_Father: {fileID: 5582903260374513313} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab.meta new file mode 100644 index 0000000..eed1457 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27591aeb2aa724e72a9b04b3298a4218 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab index 949b2f2..b9c3abb 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab @@ -245,6 +245,7 @@ GameObject: - component: {fileID: 3340297541839146388} - component: {fileID: 9064726627313867737} - component: {fileID: 6434443883825252431} + - component: {fileID: 4760727973710844651} m_Layer: 5 m_Name: ButtonDelPhoneNum m_TagString: Untagged @@ -366,6 +367,19 @@ MonoBehaviour: mSpriteName: login_log_no mFillCenter: 1 isGrayMode: 0 +--- !u!114 &4760727973710844651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2691153983406664913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce7ce3a27703447e98bd5b91307e34c8, type: 3} + m_Name: + m_EditorClassIdentifier: + input: {fileID: 4632458405731700042} --- !u!1 &3735941456448390010 GameObject: m_ObjectHideFlags: 0 @@ -437,7 +451,7 @@ MonoBehaviour: anchorOffset: 0 softBorderPadding: 1 renderQueue: 0 - startingRenderQueue: 3004 + startingRenderQueue: 3000 mClipTexture: {fileID: 0} mAlpha: 1 mClipping: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab index b074a29..f658e0d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab @@ -1,5 +1,511 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &91496935302607083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1309268115925574498} + - component: {fileID: 931896475262976886} + - component: {fileID: 7943412783261344577} + - component: {fileID: 6383180090762351278} + - component: {fileID: 2041574897859970477} + m_Layer: 5 + m_Name: ButtonPhone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1309268115925574498 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91496935302607083} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -448.9042, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4467275381001726069} + - {fileID: 3285693818782913895} + - {fileID: 4066338927282729114} + - {fileID: 6814024543032914404} + - {fileID: 4617049223909871368} + m_Father: {fileID: 5142353427110750969} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &931896475262976886 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91496935302607083} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 166, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7943412783261344577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91496935302607083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 91496935302607083} + 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: 8975378231227750662} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &6383180090762351278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91496935302607083} + 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: 1125 + mHeight: 166 + mDepth: 1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.7771087 + 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!114 &2041574897859970477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 91496935302607083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 6383180090762351278} + offset: 0 + sizeAdjust: 1 +--- !u!1 &622456254911425566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3694358332591433340} + - component: {fileID: 7235092231504044354} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3694358332591433340 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 622456254911425566} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 50, y: -84, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1345443715194949896} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7235092231504044354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 622456254911425566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1345443715194949896} + relative: 0 + absolute: 100 + rightAnchor: + target: {fileID: 1345443715194949896} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 1345443715194949896} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 1345443715194949896} + relative: 0 + absolute: -2 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 2 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 250 + 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: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &660764522144996438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6145429347260269230} + - component: {fileID: 2757760074912591903} + m_Layer: 5 + m_Name: SpriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6145429347260269230 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 660764522144996438} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -480, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1345443715194949896} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2757760074912591903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 660764522144996438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1345443715194949896} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 1345443715194949896} + relative: 0 + absolute: 114 + 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: 64 + mHeight: 64 + 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: mine_sms + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &825413746011190462 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2703578331337026897} + - component: {fileID: 2683774396407346117} + m_Layer: 5 + m_Name: SpriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2703578331337026897 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 825413746011190462} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -480, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5708718997705413206} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2683774396407346117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 825413746011190462} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5708718997705413206} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 5708718997705413206} + relative: 0 + absolute: 114 + 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: 64 + mHeight: 64 + 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: mine_myset_remind + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &988037886180983291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3285693818782913895} + - component: {fileID: 1293509461526240796} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3285693818782913895 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988037886180983291} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -398, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1309268115925574498} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1293509461526240796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988037886180983291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4467275381001726069} + relative: 1 + absolute: 50 + rightAnchor: + target: {fileID: 0} + 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: 3 + mWidth: 192 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u624B\u673A\u7ED1\u5B9A" + 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 &1309255239237077844 GameObject: m_ObjectHideFlags: 0 @@ -124,11 +630,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1574758529604312775} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -380.9042, z: 0} + m_LocalPosition: {x: 0, y: -1081.9042, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5142353427110750969} - m_RootOrder: 3 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3997408473138381567 MonoBehaviour: @@ -283,6 +789,243 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &1987654442456433815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4066338927282729114} + - component: {fileID: 8515283784660405330} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4066338927282729114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987654442456433815} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 498, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1309268115925574498} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8515283784660405330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987654442456433815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1309268115925574498} + relative: 1 + absolute: -78 + rightAnchor: + target: {fileID: 1309268115925574498} + 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.8, g: 0.8, b: 0.8, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &2085915762645019667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4675397354910025470} + - component: {fileID: 8216589700792656427} + - component: {fileID: 9122529267884217426} + - component: {fileID: 8799193526337836790} + - component: {fileID: 7782801672714628212} + m_Layer: 5 + m_Name: ButtonCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4675397354910025470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085915762645019667} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -814.9042, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1618426770527669028} + - {fileID: 2080811446361962741} + - {fileID: 4050996073446475473} + - {fileID: 5834038867545177077} + m_Father: {fileID: 5142353427110750969} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8216589700792656427 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085915762645019667} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 166, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &9122529267884217426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085915762645019667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 2085915762645019667} + 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: 8975378231227750662} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &8799193526337836790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085915762645019667} + 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: 1125 + mHeight: 166 + mDepth: 1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.7771087 + 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!114 &7782801672714628212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085915762645019667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 8799193526337836790} + offset: 0 + sizeAdjust: 1 --- !u!1 &2441044411561534783 GameObject: m_ObjectHideFlags: 0 @@ -309,11 +1052,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2441044411561534783} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -578.90424, z: 0} + m_LocalPosition: {x: 0, y: -1278.9043, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5142353427110750969} - m_RootOrder: 5 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4116121608862511912 MonoBehaviour: @@ -368,6 +1111,159 @@ MonoBehaviour: widget: {fileID: 4116121608862511912} offset: 0 sizeAdjust: 1 +--- !u!1 &2484531034894060934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5708718997705413206} + - component: {fileID: 6364131964272030140} + - component: {fileID: 1014459282304902433} + - component: {fileID: 9180020390664281321} + - component: {fileID: 9111632103331495773} + m_Layer: 5 + m_Name: ButtonNotice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5708718997705413206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484531034894060934} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -646.90424, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2703578331337026897} + - {fileID: 4036099679400000600} + - {fileID: 5726404839654719828} + - {fileID: 857750938435011093} + m_Father: {fileID: 5142353427110750969} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6364131964272030140 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484531034894060934} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 166, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1014459282304902433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484531034894060934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 2484531034894060934} + 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: 8975378231227750662} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &9180020390664281321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484531034894060934} + 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: 1125 + mHeight: 166 + mDepth: 1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.7771087 + 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!114 &9111632103331495773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2484531034894060934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 9180020390664281321} + offset: 0 + sizeAdjust: 1 --- !u!1 &2576829712871826367 GameObject: m_ObjectHideFlags: 0 @@ -705,6 +1601,106 @@ MonoBehaviour: widget: {fileID: 2139285653528136009} offset: 0 sizeAdjust: 1 +--- !u!1 &3349677399286031011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4036099679400000600} + - component: {fileID: 8722128494242725919} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4036099679400000600 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3349677399286031011} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -398, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5708718997705413206} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8722128494242725919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3349677399286031011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 2703578331337026897} + relative: 1 + absolute: 50 + rightAnchor: + target: {fileID: 0} + 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: 3 + mWidth: 192 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.041666668 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u63D0\u9192\u8BBE\u7F6E" + 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 &3553264241392456263 GameObject: m_ObjectHideFlags: 0 @@ -805,6 +1801,90 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &3601364525823079470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4050996073446475473} + - component: {fileID: 6753052053740173132} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4050996073446475473 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3601364525823079470} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 498, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4675397354910025470} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6753052053740173132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3601364525823079470} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4675397354910025470} + relative: 1 + absolute: -78 + rightAnchor: + target: {fileID: 4675397354910025470} + 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.8, g: 0.8, b: 0.8, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &3606338658805797644 GameObject: m_ObjectHideFlags: 0 @@ -889,6 +1969,90 @@ MonoBehaviour: mSpriteName: mine_myset_data mFillCenter: 1 isGrayMode: 0 +--- !u!1 &3754878494382320452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5834038867545177077} + - component: {fileID: 8467577725665314731} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5834038867545177077 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3754878494382320452} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 50, y: -84, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4675397354910025470} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8467577725665314731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3754878494382320452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4675397354910025470} + relative: 0 + absolute: 100 + rightAnchor: + target: {fileID: 4675397354910025470} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 4675397354910025470} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 4675397354910025470} + relative: 0 + absolute: -2 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 2 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 250 + 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: public__empty + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &3859172374880658481 GameObject: m_ObjectHideFlags: 0 @@ -973,6 +2137,527 @@ MonoBehaviour: mSpriteName: cust_right mFillCenter: 1 isGrayMode: 0 +--- !u!1 &3861668615236389720 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2080811446361962741} + - component: {fileID: 7951199153214011736} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2080811446361962741 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3861668615236389720} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -398, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4675397354910025470} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7951199153214011736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3861668615236389720} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1618426770527669028} + relative: 1 + absolute: 50 + rightAnchor: + target: {fileID: 0} + 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: 3 + mWidth: 192 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u8003\u52E4\u8BBE\u7F6E" + 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 &3929123794220258019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 857750938435011093} + - component: {fileID: 1859582624370296539} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &857750938435011093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929123794220258019} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 50, y: -84, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5708718997705413206} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1859582624370296539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929123794220258019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5708718997705413206} + relative: 0 + absolute: 100 + rightAnchor: + target: {fileID: 5708718997705413206} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 5708718997705413206} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 5708718997705413206} + relative: 0 + absolute: -2 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 2 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 250 + 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: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &3944240181963601057 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6814024543032914404} + - component: {fileID: 7684591775147651144} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6814024543032914404 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944240181963601057} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 50, y: -84, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1309268115925574498} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7684591775147651144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944240181963601057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1309268115925574498} + relative: 0 + absolute: 100 + rightAnchor: + target: {fileID: 1309268115925574498} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 1309268115925574498} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 1309268115925574498} + relative: 0 + absolute: -2 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 2 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 512.5 + 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: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &4079953227522190995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1345443715194949896} + - component: {fileID: 8833124952478185007} + - component: {fileID: 7255332444631966116} + - component: {fileID: 6297974670258395861} + - component: {fileID: 6129357162857232473} + m_Layer: 5 + m_Name: ButtonSMS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1345443715194949896 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4079953227522190995} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -982.9042, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6145429347260269230} + - {fileID: 1106623894374282989} + - {fileID: 1491823544797670291} + - {fileID: 3694358332591433340} + m_Father: {fileID: 5142353427110750969} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8833124952478185007 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4079953227522190995} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 166, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7255332444631966116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4079953227522190995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 4079953227522190995} + 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: 8975378231227750662} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &6297974670258395861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4079953227522190995} + 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: 1125 + mHeight: 166 + mDepth: 1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6.7771087 + 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!114 &6129357162857232473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4079953227522190995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 6297974670258395861} + offset: 0 + sizeAdjust: 1 +--- !u!1 &4210596104621349995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4617049223909871368} + - component: {fileID: 6296004411870908963} + m_Layer: 5 + m_Name: LabelPhone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4617049223909871368 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4210596104621349995} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 462, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1309268115925574498} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6296004411870908963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4210596104621349995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + rightAnchor: + target: {fileID: 1309268115925574498} + relative: 1 + absolute: -100 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 5 + mWidth: 144 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.041666668 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u672A\u7ED1\u5B9A" + 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 &4595629667651144948 GameObject: m_ObjectHideFlags: 0 @@ -1041,7 +2726,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 512.5 + aspectRatio: 250 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -1125,7 +2810,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 512.5 + aspectRatio: 250 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -1387,6 +3072,11 @@ Transform: - {fileID: 1662906958607315996} - {fileID: 1213015998593156943} - {fileID: 6340201778145445016} + - {fileID: 1309268115925574498} + - {fileID: 1021337332250322503} + - {fileID: 5708718997705413206} + - {fileID: 4675397354910025470} + - {fileID: 1345443715194949896} - {fileID: 5009003466440160881} - {fileID: 578342960997457729} - {fileID: 7931499846028081081} @@ -1498,6 +3188,106 @@ MonoBehaviour: mSpriteName: cust_right mFillCenter: 1 isGrayMode: 0 +--- !u!1 &6533080316026118374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1106623894374282989} + - component: {fileID: 1679228960534253960} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1106623894374282989 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6533080316026118374} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -398, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1345443715194949896} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1679228960534253960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6533080316026118374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6145429347260269230} + relative: 1 + absolute: 50 + rightAnchor: + target: {fileID: 0} + 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: 3 + mWidth: 192 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.041666668 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u77ED\u4FE1\u8BBE\u7F6E" + 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 &7015135009873643801 GameObject: m_ObjectHideFlags: 0 @@ -1650,7 +3440,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 512.5 + aspectRatio: 250 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -1694,12 +3484,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7196047386175395429} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -676.90424, z: 0} + m_LocalPosition: {x: 0, y: -1376.9043, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4069223954330664614} m_Father: {fileID: 5142353427110750969} - m_RootOrder: 6 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &8830479335972913411 BoxCollider: @@ -1816,6 +3606,91 @@ MonoBehaviour: widget: {fileID: 7787142963349214206} offset: 0 sizeAdjust: 1 +--- !u!1 &7408183809033857691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1021337332250322503} + - component: {fileID: 7768603221598349096} + - component: {fileID: 770824046959204717} + m_Layer: 5 + m_Name: Empty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1021337332250322503 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7408183809033857691} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -548.90424, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5142353427110750969} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7768603221598349096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7408183809033857691} + 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: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 30 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 37.5 +--- !u!114 &770824046959204717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7408183809033857691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 7768603221598349096} + offset: 0 + sizeAdjust: 1 --- !u!1 &7584087027213890075 GameObject: m_ObjectHideFlags: 0 @@ -1900,6 +3775,90 @@ MonoBehaviour: mSpriteName: mine_myset_clean_up mFillCenter: 1 isGrayMode: 0 +--- !u!1 &7646326237334250115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1491823544797670291} + - component: {fileID: 2633962474236219970} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1491823544797670291 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646326237334250115} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 498, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1345443715194949896} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2633962474236219970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646326237334250115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1345443715194949896} + relative: 1 + absolute: -78 + rightAnchor: + target: {fileID: 1345443715194949896} + 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.8, g: 0.8, b: 0.8, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &8011761447186278239 GameObject: m_ObjectHideFlags: 0 @@ -2053,6 +4012,90 @@ MonoBehaviour: widget: {fileID: 6353449347681945482} offset: 0 sizeAdjust: 1 +--- !u!1 &8171941901877663265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1618426770527669028} + - component: {fileID: 367969710554098012} + m_Layer: 5 + m_Name: SpriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1618426770527669028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8171941901877663265} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -480, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4675397354910025470} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &367969710554098012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8171941901877663265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4675397354910025470} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 4675397354910025470} + relative: 0 + absolute: 114 + 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: 64 + mHeight: 64 + 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: mine_myset_check + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &8399778681914775680 GameObject: m_ObjectHideFlags: 0 @@ -2081,7 +4124,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8399778681914775680} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -478.9042, z: 0} + m_LocalPosition: {x: 0, y: -1179.9042, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6489565779607049762} @@ -2089,7 +4132,7 @@ Transform: - {fileID: 7304423403426497656} - {fileID: 2149480541021084929} m_Father: {fileID: 5142353427110750969} - m_RootOrder: 4 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &7535804637381760972 BoxCollider: @@ -2206,6 +4249,90 @@ MonoBehaviour: widget: {fileID: 7692996692035420986} offset: 0 sizeAdjust: 1 +--- !u!1 &8673784890352639113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5726404839654719828} + - component: {fileID: 2352365602045485636} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5726404839654719828 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673784890352639113} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 498, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5708718997705413206} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2352365602045485636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8673784890352639113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5708718997705413206} + relative: 1 + absolute: -78 + rightAnchor: + target: {fileID: 5708718997705413206} + 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.8, g: 0.8, b: 0.8, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + 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: cust_right + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &8743468429456156437 GameObject: m_ObjectHideFlags: 0 @@ -2274,7 +4401,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 4 + aspectRatio: 0.041666668 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -2391,3 +4518,87 @@ MonoBehaviour: widget: {fileID: 4239766933696522085} offset: 0 sizeAdjust: 1 +--- !u!1 &9029284771281429132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4467275381001726069} + - component: {fileID: 6341463190191798306} + m_Layer: 5 + m_Name: SpriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4467275381001726069 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9029284771281429132} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -480, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1309268115925574498} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6341463190191798306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9029284771281429132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1309268115925574498} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 1309268115925574498} + relative: 0 + absolute: 114 + 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: 64 + mHeight: 64 + 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: mine_phone + mFillCenter: 1 + isGrayMode: 0 diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d new file mode 100644 index 0000000..904d00d Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d.meta new file mode 100644 index 0000000..59ad404 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b92bc7491106a49bc9eea0ee714cf04b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d new file mode 100644 index 0000000..acd35a4 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d.meta new file mode 100644 index 0000000..09972b8 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5a19bff549519400db8a128e2291431f +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 e9a62ad..48e991a 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/DBOrder.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua index ccec399..b7f2b82 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua index f0433f0..b00ff72 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/net/NetProto.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua index f021ebb..26a8cdb 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua index 5c9d345..9a7b627 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua index 7ea071e..6dc858f 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua new file mode 100644 index 0000000..add3bfb Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua.meta new file mode 100644 index 0000000..4476425 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPopTime.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4409644c1f7b04e7189abd4a91958f7c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua index 0086031..f3317a1 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/TRCellFollowList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua index 003a13e..682024e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua index f1d67e2..12dee18 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.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 674710a..16eecba 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/CLLPPopTime.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua new file mode 100644 index 0000000..75134b3 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua.meta new file mode 100644 index 0000000..54663b0 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopTime.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d1cfaa34a02642f186f7804a2bf2392 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua new file mode 100644 index 0000000..92f3d66 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua.meta new file mode 100644 index 0000000..b3aaa08 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPBindPhone.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 576ae3e785a0f4133ab8e9ceb6ceb533 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua new file mode 100644 index 0000000..4e85389 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua.meta new file mode 100644 index 0000000..46694b4 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d4ed49ac7d1504f78be1386c81a033a4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua index 084774d..e4f3cde 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.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 10fceea..517313e 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/TRPCustList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua index b128cfe..b973ec8 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/TRPFollowFilter.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua new file mode 100644 index 0000000..7226355 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua.meta new file mode 100644 index 0000000..725d647 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f3a05e1002bc546feaa5a707d4282dcc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua index 6c38212..a5cc51f 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua index 2210f38..83cabb3 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua index 73dc503..a99d44f 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua index cd02e64..2035569 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua index 1eba3c5..26e636d 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua index 7bb2025..550e3b1 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d index ffa3090..76cb23a 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d new file mode 100644 index 0000000..5734cb3 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d.meta new file mode 100644 index 0000000..35eba77 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7645db5cf79aa40aca8a90de98884204 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d new file mode 100644 index 0000000..a7b0f34 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d.meta new file mode 100644 index 0000000..1e77f2a --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c1bba39a04ef445689a7ac52b955d323 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d index 543fd22..be39dc3 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d similarity index 94% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d index cd5dfba..cd3b1f0 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d.meta rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d.meta diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d index 168c29e..4f69037 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/PanelFollowFilter.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d new file mode 100644 index 0000000..a9c8864 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d.meta new file mode 100644 index 0000000..8bffd15 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowFilter.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9c4de348dfd474c5fa522995446a7d51 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d index 60ac527..606246b 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d new file mode 100644 index 0000000..2dee545 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d.meta new file mode 100644 index 0000000..fc63f4c --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 915de7b6adc8d4df5aeb7f9731890ef3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d index 74540ad..2626e0a 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d index 966461f..1d21670 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelComFilter.unity3d similarity index 100% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelComFilter.unity3d diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelComFilter.unity3d.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelCustFilter.unity3d.meta rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelComFilter.unity3d.meta diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver index e44496a..f39ba80 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,f8fe6a54b41b24c21a17c44adcf3c7368 %trCRM/resVer/Android/VerCtl/other.ver8,822497381e060296014eff513bee3aeb \ No newline at end of file +r8 (trCRM/resVer/Android/VerCtl/priority.ver8,1fec9577a10403ccd67a0c48fe1932ca8 %trCRM/resVer/Android/VerCtl/other.ver8,7d87c2e39edae94777427df11652a703 \ 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 d8aec86..a5a9919 100644 Binary files a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver and b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver differ diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver index c9c87f7..1838376 100644 Binary files a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver and b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver differ