diff --git a/Assets/3rd/unity-webview/Plugins/Android/WebViewPlugin.jar b/Assets/3rd/unity-webview/Plugins/Android/WebViewPlugin.jar index a282fa4..442ed4f 100644 Binary files a/Assets/3rd/unity-webview/Plugins/Android/WebViewPlugin.jar and b/Assets/3rd/unity-webview/Plugins/Android/WebViewPlugin.jar differ diff --git a/Assets/3rd/unity-webview/Plugins/Editor/UnityWebViewPostprocessBuild.cs b/Assets/3rd/unity-webview/Plugins/Editor/UnityWebViewPostprocessBuild.cs index aed9469..c2a4b47 100644 --- a/Assets/3rd/unity-webview/Plugins/Editor/UnityWebViewPostprocessBuild.cs +++ b/Assets/3rd/unity-webview/Plugins/Editor/UnityWebViewPostprocessBuild.cs @@ -4,9 +4,7 @@ using System.Text; using System.Xml; using UnityEditor.Android; using UnityEditor.Callbacks; -#if UNITY_IOS using UnityEditor.iOS.Xcode; -#endif using UnityEditor; using UnityEngine; @@ -25,6 +23,9 @@ public class UnityWebViewPostprocessBuild var changed = false; var androidManifest = new AndroidManifest(GetManifestPath(basePath)); changed = (androidManifest.SetHardwareAccelerated(true) || changed); +#if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC + changed = (androidManifest.SetUsesCleartextTraffic(true) || changed); +#endif #if UNITYWEBVIEW_ANDROID_ENABLE_CAMERA changed = (androidManifest.AddCamera() || changed); #endif @@ -71,6 +72,9 @@ public class UnityWebViewPostprocessBuild var changed = false; var androidManifest = new AndroidManifest(manifest); changed = (androidManifest.SetHardwareAccelerated(true) || changed); +#if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC + changed = (androidManifest.SetUsesCleartextTraffic(true) || changed); +#endif #if UNITYWEBVIEW_ANDROID_ENABLE_CAMERA changed = (androidManifest.AddCamera() || changed); #endif @@ -86,8 +90,6 @@ public class UnityWebViewPostprocessBuild } } #endif - -#if UNITY_IOS if (buildTarget == BuildTarget.iOS) { string projPath = path + "/Unity-iPhone.xcodeproj/project.pbxproj"; PBXProject proj = new PBXProject(); @@ -99,7 +101,6 @@ public class UnityWebViewPostprocessBuild #endif File.WriteAllText(projPath, proj.WriteToString()); } -#endif } } @@ -154,6 +155,16 @@ internal class AndroidManifest : AndroidXmlDocument { nsMgr); } + internal bool SetUsesCleartextTraffic(bool enabled) { + // android:usesCleartextTraffic + bool changed = false; + if (ApplicationElement.GetAttribute("usesCleartextTraffic", AndroidXmlNamespace) != ((enabled) ? "true" : "false")) { + ApplicationElement.SetAttribute("usesCleartextTraffic", AndroidXmlNamespace, (enabled) ? "true" : "false"); + changed = true; + } + return changed; + } + internal bool SetHardwareAccelerated(bool enabled) { bool changed = false; var activity = GetActivityWithLaunchIntent() as XmlElement; diff --git a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist index 884e1b2..7c2bada 100644 --- a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist +++ b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 19E287 + 19F101 CFBundleDevelopmentRegion English CFBundleExecutable diff --git a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist.meta b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist.meta index 7721cc5..5d0f55a 100644 --- a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist.meta +++ b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Info.plist.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d8bb24d011b447b58e9ba755365cb0e +guid: 63292b274abcf4fbd8bbb8dd511636c9 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView index 59c35a4..c6b7da0 100755 Binary files a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView and b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView differ diff --git a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView.meta b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView.meta index 7716ac8..62d3a2c 100644 --- a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView.meta +++ b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/MacOS/WebView.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee5ba59c0146b49a88f62aa0e9c1ab88 +guid: 0886bac7b42ce4b238001e3ba567f243 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta index 2f1294e..86b8fb1 100644 --- a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta +++ b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d405197ed59f4015860b82a0f9f5717 +guid: 5786bd43e3702474283e603cbec15704 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta index 5dc0a9e..cf1c1e3 100644 --- a/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta +++ b/Assets/3rd/unity-webview/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f9afbbf70a5bb4304a15cf99106eac7f +guid: ddcf9ff29e8ef4ef3a1b09503d23af6e DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/WebViewObject.cs b/Assets/3rd/unity-webview/Plugins/WebViewObject.cs index f23a419..ff0dbbc 100644 --- a/Assets/3rd/unity-webview/Plugins/WebViewObject.cs +++ b/Assets/3rd/unity-webview/Plugins/WebViewObject.cs @@ -344,6 +344,8 @@ public class WebViewObject : MonoBehaviour private static extern void _CWebViewPlugin_SaveCookies(); [DllImport("__Internal")] private static extern string _CWebViewPlugin_GetCookies(string url); + [DllImport("__Internal")] + private static extern void _CWebViewPlugin_SetBasicAuthInfo(IntPtr instance, string userName, string password); #elif UNITY_WEBGL [DllImport("__Internal")] private static extern void _gree_unity_webview_init(string name); @@ -978,6 +980,25 @@ public class WebViewObject : MonoBehaviour #endif } + public void SetBasicAuthInfo(string userName, string password) + { +#if UNITY_WEBPLAYER || UNITY_WEBGL + //TODO: UNSUPPORTED +#elif UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_LINUX + //TODO: UNSUPPORTED +#elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX + //TODO: UNSUPPORTED +#elif UNITY_IPHONE + if (webView == IntPtr.Zero) + return; + _CWebViewPlugin_SetBasicAuthInfo(webView, userName, password); +#elif UNITY_ANDROID + if (webView == null) + return; + webView.Call("SetBasicAuthInfo", userName, password); +#endif + } + #if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX void OnApplicationFocus(bool focus) diff --git a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist index ee6e167..5b4b348 100644 --- a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist +++ b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 19E287 + 19F101 CFBundleDevelopmentRegion English CFBundleExecutable diff --git a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist.meta b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist.meta index 54d489a..0da56f7 100644 --- a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist.meta +++ b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Info.plist.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 339b5b600628440f79bc7f2cac88de47 +guid: 388bc77ba5dbc4227b1522015cd14117 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated index a9e8823..abdc101 100755 Binary files a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated and b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated differ diff --git a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated.meta b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated.meta index cb81a91..25dc4d1 100644 --- a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated.meta +++ b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/MacOS/WebViewSeparated.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bb549cd3a3d142d49618c2fb5ebb251 +guid: 9ed83015d29134314a9d5bd678459f92 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Resources/InfoPlist.strings.meta b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Resources/InfoPlist.strings.meta index bbf3827..b1581a0 100644 --- a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Resources/InfoPlist.strings.meta +++ b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/Resources/InfoPlist.strings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 60b1c105abb004192bf943c9edf22ddb +guid: 2ff99eeeec8e740a895caf2c893f00dc DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/_CodeSignature/CodeResources.meta b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/_CodeSignature/CodeResources.meta index c100a2e..a64c3f8 100644 --- a/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/_CodeSignature/CodeResources.meta +++ b/Assets/3rd/unity-webview/Plugins/WebViewSeparated.bundle/Contents/_CodeSignature/CodeResources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 83e294a735af0441b997ce35b3c269c1 +guid: ccc550b454f8b419293dc16c5e0c5999 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/3rd/unity-webview/Plugins/iOS/WebView.mm b/Assets/3rd/unity-webview/Plugins/iOS/WebView.mm index 0b4453b..e01751d 100644 --- a/Assets/3rd/unity-webview/Plugins/iOS/WebView.mm +++ b/Assets/3rd/unity-webview/Plugins/iOS/WebView.mm @@ -97,6 +97,8 @@ @interface CWebViewPlugin : NSObject("currentActivity")) + { + using (var window = activity.Call("getWindow")) + { + window.Call("setSoftInputMode", mode); // (int)0x7FFFFFFF + } + } + } +#endif + } } \ No newline at end of file diff --git a/Assets/CoolapeFrameData/cfg/projcet.cfg b/Assets/CoolapeFrameData/cfg/projcet.cfg index f103160..4ad20cd 100644 --- a/Assets/CoolapeFrameData/cfg/projcet.cfg +++ b/Assets/CoolapeFrameData/cfg/projcet.cfg @@ -1,2 +1,2 @@ w:idIhotUpgradeServersXpHgetServerListUrl78(upgradeControledbyEachServer?useSFTPBport4Entry P>ossCmd7Qhost4UploadUpgradePackageE192.168.1.205Qport4UploadUpgradePackage"ERemoteBaseDirP/usr/local/var/www/trCrmIhotUpgradeBaseUrl8+http://192.168.1.205:8080/trCrm?ftpUser?chenbinJsetServerPkgMd5Url7CftpPassword<123.;key8,5310a90c21d9b86e0cbee2faa79045c9GisUploadOSSTempossCmd7Qhost4UploadUpgradePackageBttfcrm.topQport4UploadUpgradePackage -ERemoteBaseDirR/usr/share/nginx/app/trCRMIhotUpgradeBaseUrl8)http://ttfcrm.top:29300/trCRM?ftpUser?appuserJsetServerPkgMd5Url7CftpPassword?cb2020@;key8,d265697d3e1ff6fe9435580ea91c4482GisUploadOSSTemp外网Bhost4Entry7HcompanyPanelNameBPanelFirst外网Bhost4Entry7HcompanyPanelNameBPanelFirst通用A通用iOS \ No newline at end of file +tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion;0.9ImKeystoreNamePath8 +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添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7CmSubChannel<2000FmBundleVersion;0.1ImKeystoreNamePath8 +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 diff --git a/Assets/CoolapeFrameData/verControl/.resModifyDate.v b/Assets/CoolapeFrameData/verControl/.resModifyDate.v index fcb3678..bdddfac 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -289,12 +289,12 @@ /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,132389528130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132392064300000000 /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 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/.DS_Store,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua,132389158870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua,132392072580000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/battle.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio.meta,132289129800000000 @@ -321,17 +321,17 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfgTool.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/city/CLLCity.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/city/CLLCity.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua,132388175550000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua,132391295790000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua.meta,132370178140000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,132381612130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,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,132389392200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua,132391910420000000 /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,132389394030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua,132390880240000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua.meta,132358701520000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua,132378178470000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua.meta,132378001360000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132389171610000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132391928410000000 /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 @@ -344,7 +344,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,132389394900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132391928970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua.meta,132355452450000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua,132386912690000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua.meta,132289129810000000 @@ -369,7 +369,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLUpdateUpgrader.lua.meta,132289129810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLVerManager.lua,132355853980000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLVerManager.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua,132300176910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua,132391892790000000 /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,132389158870000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000 @@ -397,7 +397,7 @@ /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/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,132387317090000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua,132391267030000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua.meta,132387249510000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua,132363130990000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua.meta,132289223570000000 @@ -413,9 +413,9 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustProc.lua.meta,132369989000000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua,132381516850000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua.meta,132376505230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132388248030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132390389050000000 /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,132389452900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132390405460000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua.meta,132378223060000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua,132387683750000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta,132387614100000000 @@ -423,6 +423,10 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua.meta,132368777750000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua,132379832580000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua.meta,132378928680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua,132391737460000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua.meta,132390392540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua,132391745710000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua.meta,132390980070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua,132387571400000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua.meta,132373690990000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua,132381618580000000 @@ -448,7 +452,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSceneManager.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua,132387276090000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua,132389334400000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua,132391891930000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWWWProgress.lua,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWWWProgress.lua.meta,132289129800000000 @@ -460,15 +464,15 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua.meta,132290982930000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua,132369424200000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua.meta,132300378700000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua,132389255080000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua,132391940690000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua.meta,132289134270000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua,132370001540000000 /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/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,132389430450000000 +/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.meta,132367521030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132388215100000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132391941560000000 /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,132387560070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua.meta,132370233760000000 @@ -476,19 +480,21 @@ /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/TRPGuid.lua,132387685130000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua.meta,132387611790000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua,132387297530000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua,132391667360000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua.meta,132355735820000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua,132387297660000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua.meta,132375465560000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua,132380867870000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua.meta,132373063880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132388172570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132391674280000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua.meta,132370897440000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua,132388573800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua.meta,132388537450000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132389526870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132391953690000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta,132388185120000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua,132381390070000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua.meta,132373879180000000 @@ -502,6 +508,8 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua.meta,132357325780000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua,132387319020000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua.meta,132358703190000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua,132391944670000000 +/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,132389316790000000 /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 @@ -516,15 +524,15 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab.meta,132357347880000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame2.prefab,132378244010000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame2.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab,132388125050000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab,132390388660000000 /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,132388125050000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132390388660000000 /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,132388572030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab,132390390010000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab.meta,132378243900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132385741920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132390388670000000 /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,132389375500000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132390388660000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab.meta,132378243880000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab,132384959410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab.meta,132362722920000000 @@ -536,25 +544,27 @@ /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,132389159950000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab.meta,132372971640000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132384738550000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132391690000000000 /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,132389300840000000 /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,132387563840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132391859630000000 /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,132389159920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132391812540000000 /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,132389167200000000 /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,132389167200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132391815980000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab.meta,132370116810000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab,132372845470000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab.meta,132369515950000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab,132391739200000000 +/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/PanelGuid.prefab,132387684730000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta,132387602700000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab,132385938020000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab,132389373270000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab,132391663380000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab.meta,132355322410000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab,132389159970000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab.meta,132289211980000000 @@ -572,7 +582,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab.meta,132374439140000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab,132388572030000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta,132388537780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132389528130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132391751720000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388185850000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132381390160000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000 @@ -590,7 +600,7 @@ /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSceneManager.prefab.meta,132289129800000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectCompany.prefab,132378181660000000 /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,132389528130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab,132391663390000000 /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,132389277030000000 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab.meta,132389267620000000 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v index df0b3a1..20db1c2 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 003875d..62621cc 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Publish.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Publish.v @@ -128,9 +128,9 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d8148 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa -trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,5f53512926d5d4748adf663c09dff5e7 +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,6b50b4e4afbdc66704ed49d4b15135f9 trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f -trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,09859475ed7cb2fbcee9098c758656a4 +trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,873a46e4570a7aabdd3594f6ec7822f3 trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes4Publish/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f @@ -138,18 +138,18 @@ trCRM/upgradeRes4Publish/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e -trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,8e970152224262213e454e36f3dd19a8 -trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 -trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,4a9820d704d06a365367a4ccdc266938 -trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,275a8d9af018da4d047dc3a5ad9efe1f +trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,f5d617f7342053a0236bb93b9d1a1e46 +trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 +trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,f8698b64c77257cf874459dae1999a58 +trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,c89d42f4c6ebe72da436e07ee70f69ad trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 -trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,45a81065a8bb595907dbf9794a04f147 +trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,7f89ba27b59c6a86ce68c9144737f247 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,df3108c65b288722530f80bb73893062 trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 -trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,14fa2058adb8fb53d67dc85de14fd9ab +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,67fd6d20a587a9020ece0b87702be2c2 trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e8749743983d92 trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b @@ -162,7 +162,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea6 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 -trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 +trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,dd68aa9278468a37c6462d7d0fd342ae trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,96b4f88eea21e061eff2e3f76fbb623b trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,a8351f9de5c665db23014cf331f2edb0 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 @@ -175,7 +175,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,e1fb7ee5d50bd0ffc6561f5a4ec8426f +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 @@ -183,11 +183,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,86d3ed6429ba39f0a99f2307b5c43854 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,3178958635719c8c324791371ebf968a -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,95a4f6696cc482a85d3979024f807c19 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,1b18f9bdb869156c26bc4f1131a2dd6c +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,1c1a6485c860cfe9ba1552b022347883 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua,b2827429c70df8b7aa8e87451a96bf67 +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 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 @@ -202,60 +204,63 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,cffd5d749401579ae6c7035baabf2875 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,2649c8d1307ea0f0a5404a8ac962f9aa trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,8ef3b142a4375bdb311d15f962a3a9f2 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8d6ee6caffff19fef0e0836a83a814ad +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,1cd7b0d9c92e9fce1eb3b99195fea068 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,8c0ad5a5bb2bc51f9dd0951db8569bcb +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,62aff784a70e4a1bd0faa472176a0978 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,bf6d5e77f027d5b9f15d28aaae42dce4 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0aecd09184717a8e03 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,70894ccf80d88d4261b1b072f1a55f3e trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,cb4111b5926ebb6a2a36a249c491a693 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,066c0b5bb6ccd06dad11356747664599 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,ef981e78f783343271b8c655f358084c -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,66699c2865c091bd7e4cd93678ee7bc1 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,269b8f710565b968f8170deac352ec8e trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,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,a4ebb94a988f9c6c534703f89efeb7a8 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,59750609585193c66d08adfa8544d946 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,f56e483096cf8b078f5d55416cf2932d -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,be94a5ea478478b84db4dbd942015247 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,eecf93435d855908ef5d364f5dcbaffd +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,126902c484a19b9f09e7bae17655611a +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,cd2ced3b17c33b4750ddcade27f6b98f +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,7af548695c754297fbf27cfedeb54a14 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,d27c231bd910b5d72c90a86efda2a660 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,acf45d3619beb2deb72cce95732c68c4 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,4526242a599f63c0bac766360a515e23 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,bfec75cacbedc1126c89c90cdff3f887 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,a100acfd581e89b0800fafb7ad87d006 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,27a4aa8842e58ce4ced2acf4f7256864 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,f4542609056769c35fcd7be55645c3b4 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,8a18b35ad6a9166cea0ae7ed71bdb788 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,1b3684b2a66d46d9c410bde8798e38aa trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,c5e276ac96627a8d412ff0299addd2a0 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,01e2d641bf61652b730108d269a56d6b trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d @@ -265,7 +270,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,0a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,f6367c75d38ecbf5607ed563867db24d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,b7eeb3b3776c4d5d11c74f589784e053 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,c4a2f36dec38a689f49f356f05a62d88 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd @@ -274,6 +279,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity 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/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 f345ac5..538c2ad 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v @@ -5,28 +5,26 @@ trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690 trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 -trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,bfec75cacbedc1126c89c90cdff3f887 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49 trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,e28ed051439e06abe8ffc14ebf9cf1d2 -trCRM/upgradeRes/priority/lua/db/DBCust.lua,8e970152224262213e454e36f3dd19a8 -trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 -trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa +trCRM/upgradeRes/priority/lua/db/DBCust.lua,f5d617f7342053a0236bb93b9d1a1e46 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc trCRM/upgradeRes/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 -trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1 +trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 trCRM/upgradeRes/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,cffd5d749401579ae6c7035baabf2875 trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 -trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,f56e483096cf8b078f5d55416cf2932d +trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 +trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,cd2ced3b17c33b4750ddcade27f6b98f trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae +trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e -trCRM/upgradeRes/priority/lua/CLLMainLua.lua,09859475ed7cb2fbcee9098c758656a4 +trCRM/upgradeRes/priority/lua/CLLMainLua.lua,21d11b26b8c2388ec8fec87bc018be0c +trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a -trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 -trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 @@ -37,66 +35,66 @@ trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 -trCRM/upgradeRes/priority/lua/db/DBRoot.lua,275a8d9af018da4d047dc3a5ad9efe1f -trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 +trCRM/upgradeRes/priority/lua/db/DBRoot.lua,c89d42f4c6ebe72da436e07ee70f69ad trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f -trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 -trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 +trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d -trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 -trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 +trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,59750609585193c66d08adfa8544d946 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a trCRM/upgradeRes/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9 trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,1ec2853e1a8660c4cadcace8f333f5af trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8 -trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,acf45d3619beb2deb72cce95732c68c4 +trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0 trCRM/upgradeRes/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd trCRM/upgradeRes/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3ddd6f65cf62f4a19 +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 -trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,95a4f6696cc482a85d3979024f807c19 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,1c1a6485c860cfe9ba1552b022347883 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,8ef3b142a4375bdb311d15f962a3a9f2 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 +trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_about.unity3d,3da9c9416127c69bc20c281f44520f6e trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,a8351f9de5c665db23014cf331f2edb0 trCRM/upgradeRes/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab -trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b -trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,5f53512926d5d4748adf663c09dff5e7 -trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc -trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,cb4111b5926ebb6a2a36a249c491a693 -trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 -trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 -trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1 -trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,8c0ad5a5bb2bc51f9dd0951db8569bcb +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,066c0b5bb6ccd06dad11356747664599 +trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd +trCRM/upgradeRes/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a +trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 +trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 +trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 -trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414 +trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,d27c231bd910b5d72c90a86efda2a660 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524 trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7 +trCRM/upgradeRes/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f @@ -107,128 +105,135 @@ trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389b trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,86d3ed6429ba39f0a99f2307b5c43854 -trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,c5e276ac96627a8d412ff0299addd2a0 +trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,01e2d641bf61652b730108d269a56d6b trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 -trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 -trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 -trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f +trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 -trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 +trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 -trCRM/upgradeRes/priority/lua/db/DBUser.lua,45a81065a8bb595907dbf9794a04f147 -trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 +trCRM/upgradeRes/priority/lua/db/DBUser.lua,7f89ba27b59c6a86ce68c9144737f247 +trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,eecf93435d855908ef5d364f5dcbaffd trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 -trCRM/upgradeRes/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 -trCRM/upgradeRes/priority/lua/db/DBOrder.lua,4a9820d704d06a365367a4ccdc266938 +trCRM/upgradeRes/priority/lua/db/DBOrder.lua,f8698b64c77257cf874459dae1999a58 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6 trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 -trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f -trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,98e4a2114213bf46c7f4a71d2079ca25 -trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,269b8f710565b968f8170deac352ec8e +trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_enterprise.unity3d,59d7dae785dea4fa88b52f40a8d167cf trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d -trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23 +trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,4526242a599f63c0bac766360a515e23 trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 +trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214 trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 -trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2 +trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1 trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d -trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f trCRM/upgradeRes/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2 -trCRM/upgradeRes/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0aecd09184717a8e03 trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e -trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,3178958635719c8c324791371ebf968a +trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,1b18f9bdb869156c26bc4f1131a2dd6c trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd trCRM/upgradeRes/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 -trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 -trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa +trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,126902c484a19b9f09e7bae17655611a +trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 -trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectProduct.unity3d,d4ffb59af82153fd7d7e283bb35c5597 +trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 +trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 +trCRM/upgradeRes/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd1e08640243d -trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 +trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43 trCRM/upgradeRes/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb -trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75 -trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b +trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021 trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0aecd09184717a8e03 -trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,4a7a74aeaf091ac9187f90429dec5ed0 -trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e +trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,1cd7b0d9c92e9fce1eb3b99195fea068 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductList.lua,b2827429c70df8b7aa8e87451a96bf67 +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,c4a2f36dec38a689f49f356f05a62d88 +trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75 +trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e trCRM/upgradeRes/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990 -trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43 -trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5 +trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f +trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,7af548695c754297fbf27cfedeb54a14 trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be trCRM/upgradeRes/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8 +trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d trCRM/upgradeRes/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d -trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 +trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 +trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf +trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58 trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5 trCRM/upgradeRes/other/uiAtlas/order/Android/add.unity3d,bf6728a3e41783ee7d63c130107a16e1 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a +trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 +trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2 trCRM/upgradeRes/other/uiAtlas/order/Android/upload.unity3d,a7cb722ecba5f405105f0cfda4695e74 -trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,e1fb7ee5d50bd0ffc6561f5a4ec8426f -trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1 +trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectProduct.unity3d,d54579853bc1e958ced6fa6e3d928d2b trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 +trCRM/upgradeRes/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d +trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,1b3684b2a66d46d9c410bde8798e38aa trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 -trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 +trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7 -trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d +trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073 -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,f4542609056769c35fcd7be55645c3b4 -trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd -trCRM/upgradeRes/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,8a18b35ad6a9166cea0ae7ed71bdb788 +trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 +trCRM/upgradeRes/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb -trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a -trCRM/upgradeRes/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d -trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 +trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 +trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,dd68aa9278468a37c6462d7d0fd342ae +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef -trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 -trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe +trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 +trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,ef981e78f783343271b8c655f358084c -trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password.unity3d,04bebaa914245dd4d2376f9ded0ad15f trCRM/upgradeRes/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 trCRM/upgradeRes/priority/lua/net/CLLNet.lua,df3108c65b288722530f80bb73893062 -trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe +trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f trCRM/upgradeRes/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b -trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc +trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef trCRM/upgradeRes/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966 @@ -239,52 +244,52 @@ trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 trCRM/upgradeRes/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d7642f690531d9410ff6a -trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,be94a5ea478478b84db4dbd942015247 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a -trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e -trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 +trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099 trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e8749743983d92 trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af -trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f +trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 -trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a -trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,8d6ee6caffff19fef0e0836a83a814ad -trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 -trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb +trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,2649c8d1307ea0f0a5404a8ac962f9aa +trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,70894ccf80d88d4261b1b072f1a55f3e trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 +trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,6b50b4e4afbdc66704ed49d4b15135f9 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,f6367c75d38ecbf5607ed563867db24d trCRM/upgradeRes/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e -trCRM/upgradeRes/priority/lua/net/NetProto.lua,14fa2058adb8fb53d67dc85de14fd9ab +trCRM/upgradeRes/priority/lua/net/NetProto.lua,67fd6d20a587a9020ece0b87702be2c2 +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set2.unity3d,e528f24899ef583c113ca69bbb510ebd trCRM/upgradeRes/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c7400323115d8be90421d trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,62aff784a70e4a1bd0faa472176a0978 -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,a100acfd581e89b0800fafb7ad87d006 -trCRM/upgradeRes/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,bf6d5e77f027d5b9f15d28aaae42dce4 +trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239 trCRM/upgradeRes/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,0a1669987fdd4ce81f5b7cba8ce77876 trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf -trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695 -trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa -trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e -trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 +trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab +trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b +trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 +trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa +trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea -trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac -trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 -trCRM/upgradeRes/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e +trCRM/upgradeRes/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081 +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414 +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password.unity3d,04bebaa914245dd4d2376f9ded0ad15f trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6 trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da -trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,27a4aa8842e58ce4ced2acf4f7256864 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e -trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v index 15ce310..a782d8b 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":""}] \ 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":""}] \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v index 8a60479..f2818f5 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v @@ -20,15 +20,15 @@ trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666c trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,cffd5d749401579ae6c7035baabf2875 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,2649c8d1307ea0f0a5404a8ac962f9aa trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,f56e483096cf8b078f5d55416cf2932d +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,cd2ced3b17c33b4750ddcade27f6b98f trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e -trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,09859475ed7cb2fbcee9098c758656a4 +trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,21d11b26b8c2388ec8fec87bc018be0c trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a @@ -38,7 +38,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/company_bg.unity3d,2153c72 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,a4ebb94a988f9c6c534703f89efeb7a8 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,4a7a74aeaf091ac9187f90429dec5ed0 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,c4a2f36dec38a689f49f356f05a62d88 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_password2.unity3d,5dc8eaeca2eeedb771451233e5d8bf98 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 @@ -52,6 +52,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua,59750609585193c66d08adfa8544d946 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set2.unity3d,e528f24899ef583c113ca69bbb510ebd @@ -66,7 +67,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79db trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,6011b5732b185053dc107332593e5d2b trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,95a4f6696cc482a85d3979024f807c19 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,1c1a6485c860cfe9ba1552b022347883 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,8ef3b142a4375bdb311d15f962a3a9f2 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 @@ -82,19 +83,20 @@ trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_about.unity3d,3da9c941612 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,a8351f9de5c665db23014cf331f2edb0 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519 -trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,275a8d9af018da4d047dc3a5ad9efe1f +trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,c89d42f4c6ebe72da436e07ee70f69ad trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,8c0ad5a5bb2bc51f9dd0951db8569bcb -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua,b2827429c70df8b7aa8e87451a96bf67 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,eecf93435d855908ef5d364f5dcbaffd trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,be94a5ea478478b84db4dbd942015247 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,d27c231bd910b5d72c90a86efda2a660 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 @@ -116,8 +118,8 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,bfec75cacbedc1126c89c90cdff3f887 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,c5e276ac96627a8d412ff0299addd2a0 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,01e2d641bf61652b730108d269a56d6b trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 @@ -125,16 +127,16 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab890 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,1ec2853e1a8660c4cadcace8f333f5af trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc -trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,8e970152224262213e454e36f3dd19a8 +trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,f5d617f7342053a0236bb93b9d1a1e46 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 -trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,45a81065a8bb595907dbf9794a04f147 +trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,7f89ba27b59c6a86ce68c9144737f247 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 -trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,4a9820d704d06a365367a4ccdc266938 +trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,f8698b64c77257cf874459dae1999a58 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 @@ -143,14 +145,14 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,98e4a2114213bf46c7f4a71d2079ca25 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,269b8f710565b968f8170deac352ec8e trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_enterprise.unity3d,59d7dae785dea4fa88b52f40a8d167cf trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,4526242a599f63c0bac766360a515e23 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 @@ -167,18 +169,19 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,51bec42b663bfa0ae trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,3178958635719c8c324791371ebf968a +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,1b18f9bdb869156c26bc4f1131a2dd6c trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,0a1669987fdd4ce81f5b7cba8ce77876 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,126902c484a19b9f09e7bae17655611a trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d,d4ffb59af82153fd7d7e283bb35c5597 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d,d54579853bc1e958ced6fa6e3d928d2b trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 @@ -188,22 +191,23 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,2f4c84546ec70a42deaf05cc0fd105bb trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8d6ee6caffff19fef0e0836a83a814ad +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,1cd7b0d9c92e9fce1eb3b99195fea068 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,7af548695c754297fbf27cfedeb54a14 trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 -trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,e1fb7ee5d50bd0ffc6561f5a4ec8426f +trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/add.unity3d,bf6728a3e41783ee7d63c130107a16e1 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a @@ -213,19 +217,19 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68 trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,1b3684b2a66d46d9c410bde8798e38aa trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,f4542609056769c35fcd7be55645c3b4 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,8a18b35ad6a9166cea0ae7ed71bdb788 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 -trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0 +trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 -trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15 +trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,dd68aa9278468a37c6462d7d0fd342ae trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 @@ -233,7 +237,8 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee8 trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,df3108c65b288722530f80bb73893062 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,cb4111b5926ebb6a2a36a249c491a693 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,066c0b5bb6ccd06dad11356747664599 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7 @@ -257,15 +262,15 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,0992523f277369f5b08a6f756722daeb +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,70894ccf80d88d4261b1b072f1a55f3e trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa -trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,5f53512926d5d4748adf663c09dff5e7 +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,6b50b4e4afbdc66704ed49d4b15135f9 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f -trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,14fa2058adb8fb53d67dc85de14fd9ab +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,67fd6d20a587a9020ece0b87702be2c2 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c7400323115d8be90421d -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,62aff784a70e4a1bd0faa472176a0978 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,a100acfd581e89b0800fafb7ad87d006 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,bf6d5e77f027d5b9f15d28aaae42dce4 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,27a4aa8842e58ce4ced2acf4f7256864 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee diff --git a/Assets/WebGLTemplates/unity-webview/index.html.meta b/Assets/WebGLTemplates/unity-webview/index.html.meta index 767fc89..56afb06 100644 --- a/Assets/WebGLTemplates/unity-webview/index.html.meta +++ b/Assets/WebGLTemplates/unity-webview/index.html.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94ef8924433cd442c9e14cd3b152a9e9 +guid: 38881f7e0f0da4db28e4b34c7b3e1b3c DefaultImporter: externalObjects: {} userData: diff --git a/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta b/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta index b8eec68..ba05c9f 100644 --- a/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta +++ b/Assets/WebGLTemplates/unity-webview/unity-webview.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c760bad0efd5e4d2093996b01d1755a6 +guid: 833e7cec47f61466aa39e54e3d5dbcec DefaultImporter: externalObjects: {} userData: diff --git a/Assets/WebPlayerTemplates/unity-webview/index.html.meta b/Assets/WebPlayerTemplates/unity-webview/index.html.meta index e1af1c5..f719ea5 100644 --- a/Assets/WebPlayerTemplates/unity-webview/index.html.meta +++ b/Assets/WebPlayerTemplates/unity-webview/index.html.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f9ad43fd49f0415bb3ddcb12d5740df +guid: 1f6c336b87ad54cdebdc24dcd1c74c7e DefaultImporter: externalObjects: {} userData: diff --git a/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta b/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta index cdbc348..84a1c88 100644 --- a/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta +++ b/Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b58b041ce3d8f4e07a745943093e4196 +guid: 36a2d466738134e3a8ac552c6c893b88 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta b/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta index 9645471..e264c33 100644 --- a/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta +++ b/Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 701078ef438644ddabb677ed392d7719 +guid: 0e1e8ff7e0103422b9da5bfb716689ca DefaultImporter: externalObjects: {} userData: diff --git a/Assets/trCRM/DistSpringWebsocketClient/Client4Stomp.cs b/Assets/trCRM/DistSpringWebsocketClient/Client4Stomp.cs index 9e4be39..9453f4c 100644 --- a/Assets/trCRM/DistSpringWebsocketClient/Client4Stomp.cs +++ b/Assets/trCRM/DistSpringWebsocketClient/Client4Stomp.cs @@ -127,7 +127,10 @@ public class Client4Stomp : MonoBehaviour /// void OnMessageReceived(WebSocket ws, string message) { - Debug.Log(message); + if (isDebug) + { + Debug.Log(message); + } socket_MessageReceived(ws, message); } diff --git a/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab b/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab index 8d8a102..fd27db7 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: 0} + mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} mCoordinates: 0 sprites: [] _isBorrowSpriteMode: 1 diff --git a/Assets/trCRM/_scene/Main.unity b/Assets/trCRM/_scene/Main.unity index f25bdf6..8f6ea44 100644 --- a/Assets/trCRM/_scene/Main.unity +++ b/Assets/trCRM/_scene/Main.unity @@ -539,7 +539,7 @@ MonoBehaviour: autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.48828125 + aspectRatio: 1.3333334 --- !u!65 &447471687 BoxCollider: m_ObjectHideFlags: 0 @@ -1137,17 +1137,17 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1} mPivot: 4 - mWidth: 482 + mWidth: 488 mHeight: 40 mDepth: 1 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 12.05 + aspectRatio: 12 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: Daily Work + mText: DAILYWORK mFontSize: 40 mFontStyle: 0 mAlignment: 0 @@ -1162,7 +1162,7 @@ MonoBehaviour: mApplyGradient: 0 mGradientTop: {r: 1, g: 1, b: 1, a: 1} mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} - mSpacingX: 26 + mSpacingX: 31 mSpacingY: 0 mUseFloatSpacing: 0 mFloatSpacingX: 0 @@ -1630,7 +1630,7 @@ MonoBehaviour: luaPath: isPrintDownload: 0 downLoadTimes4Failed: 3 - baseUrl: http://ttfcrm.top:29300/trCRM + baseUrl: http://app.ttf-cti.com:29300/trCRM platform: haveUpgrade: 0 is2GNetUpgrade: 1 @@ -1868,7 +1868,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: url: - isDebug: 1 + isDebug: 0 --- !u!4 &2029199943 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab index 1838c20..9d0ea0b 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab @@ -1758,8 +1758,8 @@ MonoBehaviour: y: 0 width: 192 height: 100 - borderLeft: 0 - borderRight: 0 + borderLeft: 49 + borderRight: 49 borderTop: 0 borderBottom: 0 paddingLeft: 0 @@ -1772,8 +1772,8 @@ MonoBehaviour: y: 0 width: 209 height: 120 - borderLeft: 0 - borderRight: 0 + borderLeft: 49 + borderRight: 49 borderTop: 0 borderBottom: 0 paddingLeft: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua index 04931d6..261b3a9 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua @@ -31,8 +31,8 @@ CLLMainLua.init = function() MyCfg.mode = GameMode.none -- 日志logveiw if ReporterMessageReceiver.self ~= nil then - ReporterMessageReceiver.self.gameObject:SetActive(false) - ReporterMessageReceiver.self.luaPath = "KOK/upgradeRes/priority/lua/toolkit/KKLogListener.lua" + ReporterMessageReceiver.self.gameObject:SetActive(true) + ReporterMessageReceiver.self.luaPath = "trCrm/upgradeRes/priority/lua/toolkit/KKLogListener.lua" ReporterMessageReceiver.self:setLua() end -- 设置显示状态栏 @@ -43,6 +43,7 @@ CLLMainLua.init = function() -- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN) -- CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible -- CS.ApplicationChrome.dimmed = false + CS.ApplicationChrome.setSoftInputMode(CS.ApplicationChrome.ADJUST_PAN); --设置帧率 Application.targetFrameRate = 10 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua index ab3f2f9..f3d644e 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua @@ -1,7 +1,7 @@ ---@class _DBCust ---@field custName ---@field custType ----@field phone +---@field phoneNo ---@field address ---@field companyName ---@field taskId @@ -80,10 +80,10 @@ DBCust.onGetFilter = function(data) end DBCust.getFieldsByTask = function(taskValue) - taskValue = tostring(taskValue) if not taskValue then return {} end + taskValue = tostring(taskValue) return db.taskFields[taskValue] or {} end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua index a4b9237..e9075fa 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua @@ -85,7 +85,9 @@ DBMessage.onGetMessage = function(type, list) db.list = db.list or {} db.list[type] = db.list[type] or {} db.lastGetTime = db.lastGetTime or {} - db.lastGetTime[type] = list[1].CREATETIME -- 更新最后取得的时间 + if list and #list > 0 then + db.lastGetTime[type] = list[1].CREATETIME -- 更新最后取得的时间 + end ---@param v _DBMessage for i, v in ipairs(list) do table.insert(db.list[type], v) -- 倒序 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua index 517d478..c06d400 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua @@ -3,7 +3,7 @@ local db = {} DBOrder.PopListGroup = { urgencyLevels = "urgencyLevels", -- 紧急程序 - templateList = "templateList", -- 订单模板 + templateList = "templateList" -- 订单模板 } DBOrder.onGetFilter = function(data) @@ -11,26 +11,76 @@ DBOrder.onGetFilter = function(data) -- 转换成poplist db.filtersPopup = {} + db.templateFields = {} + db.templateInfor = {} + db.nextHandlerList = {} for k, cells in pairs(data) do db.filtersPopup[k] = {} ---@type System.Collections.ArrayList db.filtersPopup[k].options = ArrayList() db.filtersPopup[k].values = ArrayList() - -- db.filtersPopup[k].options:Add("") -- db.filtersPopup[k].values:Add("") for i, s in ipairs(cells) do + local key = tostring(s.value) db.filtersPopup[k].options:Add(s.name) - db.filtersPopup[k].values:Add(tostring(s.value)) + db.filtersPopup[k].values:Add(key) + if k == DBOrder.PopListGroup.templateList then + db.templateInfor[key] = s + db.templateFields[key] = s.fieldAttr -- 设置任务的扩展字段 + -- db.templateFields[key] + if s.nextHandlerList then + db.nextHandlerList[key] = {} -- 下一步处理人 + db.nextHandlerList[key].options = ArrayList() + db.nextHandlerList[key].values = ArrayList() + for l, u in ipairs(s.nextHandlerList) do + db.nextHandlerList[key].options:Add(u.loginName) + db.nextHandlerList[key].values:Add(tostring(u.loginNo)) + end + end + end end end end -DBCust.getPopupList = function(popGroup) +DBOrder.getPopupList = function(popGroup) if popGroup then return db.filtersPopup[popGroup] end return db.filters end +DBOrder.getFields = function(templateId) + if not templateId then + return {} + end + templateId = tostring(templateId) + return db.templateFields[templateId] or {} +end + +DBOrder.getTemplateInfor = function(templateId) + if not templateId then + return {} + end + templateId = tostring(templateId) + return db.templateInfor[templateId] or {} +end + +DBOrder.getNextHandler = function(templateId) + if not templateId then + return nil + end + templateId = tostring(templateId) + return db.nextHandlerList[templateId] +end + +--============================================================================== +DBOrder.onGetProducts = function(content) + db.products = content.productList +end + +DBOrder.getProducts = function() + return db.products +end +--============================================================================== return DBOrder diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua index f0b98c2..096969a 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua @@ -39,7 +39,9 @@ DBRoot.funcs = { [NetProto.cmds.load_wfTicket_Settings] = function(data) DBOrder.onGetFilter(data.result) end, - + [NetProto.cmds.selectProductInfo] = function(data) + DBOrder.onGetProducts(data.result) + end, } DBRoot.onReceiveData = function(cmd, data) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua index 29db185..9c94701 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua @@ -24,6 +24,7 @@ function DBUser.getPopList() return poplist end +---@return _DBUser function DBUser.getUserById(loginNo) local user = db[loginNo] if user == nil then diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua index e4b61ec..235e886 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua @@ -8,15 +8,12 @@ NetProto.send = {} --------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------- -local host = "47.111.20.34" +local host = "app.ttf-cti.com" -- "47.111.20.34" local port = 29004 -- local host = "192.168.1.126" -- local port = 29000 --- local baseUrl = "http://app.ttf-cti.com:29000/open_api/" local baseUrl = joinStr("http://", host, ":", port, "/open_api/") --- local baseUrl2 = "http://47.111.20.34:29004/open_api/" --- local socketUrl = "ws://app.ttf-cti.com:29000/tr_socket/websocket/" --- local socketUrl = "ws://47.111.20.34:29004/tr_socket/websocket/" +-- local baseUrl = "http://47.111.20.34/home/open_api/" local socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/") ---@type Dist.SpringWebsocket.Client @@ -241,8 +238,9 @@ NetProto.cmds = { update_customer = "update_customer", -- 更新客户信息 save_customer = "save_customer", -- 新建客户 create_followUp_record = "create_followUp_record", -- 新建跟进 - load_wfTicket_Settings = "load_wfTicket_Settings", -- 工单配置信息 + load_wfTicket_Settings = "load_WfTicket_Settings", -- 工单配置信息 selectProductInfo = "selectProductInfo", -- 商品列表 + createWfInfo = "createWfInfo", -- 创建订单 } --------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------- @@ -296,9 +294,9 @@ end ---@param frame Dist.SpringWebsocket.StompFrame NetProto.OnReceiveStompMsg = function(frame) - if isDebug then - print(frame.Code, frame.Content) - end + -- if isDebug then + -- print(frame.Code, frame.Content) + -- end if frame.Code == StompStatus.OPENSERVER then socket:Connect(nil, NetProto.OnReceiveStompMsg) elseif frame.Code == StompStatus.CONNECTED then @@ -336,6 +334,10 @@ NetProto.OnReceiveStompMsg = function(frame) end end end + + if isDebug then + printw(cmd, frame.Content) + end if cmd then doCallbackSocket(content) dispatch(content, {cmd = cmd}) @@ -362,6 +364,7 @@ NetProto.doReconnectSocket = function() NetProto.reconnectTimes = NetProto.reconnectTimes or 0 NetProto.isReconnect = true if NetProto.reconnectTimes > 1 then + NetProto.reconnectTimes = 0 -- 重连失败提示 CLUIUtl.showConfirm("服务器连接失败,请重试", NetProto.doReconnectSocket) else @@ -541,12 +544,27 @@ NetProto.send.load_wfTicket_Settings = function(callback, timeOutSec) NetProto.sendSocket(content, callback, timeOutSec) end -NetProto.send.selectProductInfo = function(callback, timeOutSec) +NetProto.send.selectProductInfo = function(searchKey, page, callback, timeOutSec) local content = {} content.action = NetProto.cmds.selectProductInfo content.loginNo = NetProto.loginNo content.groupId = NetProto.groupId + content.current_page = page + content.search = searchKey NetProto.sendSocket(content, callback, timeOutSec) end + +NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec) + local content = {} + content.action = NetProto.cmds.createWfInfo + local user = DBUser.getUserById(NetProto.loginNo) + content.wfStatus = "正常工单" + content.loginName = user.loginName + content.loginNo = NetProto.loginNo + content.groupId = NetProto.groupId + content.workFlowInfo = workFlowInfo + NetProto.sendSocket(content, callback, timeOutSec) +end + ------------------------------------------------------ return NetProto diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua index d876247..856aabc 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua @@ -1,36 +1,14 @@ -- 日志监听 -do - KKLogListener = {} +KKLogListener = {} - function KKLogListener.OnLogError(log) - -- 当有异常日志时 - if KKWhiteList and KKWhiteList.isWhiteName() then - if CLAlert.self ~= nil then - alertInfo("有异常日志，请在屏幕画圈查看详细！", Color.red, 3, 4) - end - end - - -- 记录到服务器 - if __recodeErrorLog__ then - if - (not startswith(log.condition, "get attr is nil")) and - (not startswith(log.condition, "Releasing render texture that is set as Camera")) and - (not startswith(log.condition, "Billing disabled")) and - (not startswith(log.condition, "propNames is null")) and - (not string.find(log.condition, "/KokManagement/ErrorServlet")) - then - local url = joinStr(__httpBaseUrl3, "/KokManagement/ErrorServlet") - local formData = Hashtable() - formData:Add("errorKey", joinStr(log.condition, "\n", log.stacktrace)) - WWWEx.post(url, formData, CLAssetType.text, nil, nil, nil, true) - end - end - end - - function KKLogListener.OnLogWarning(log) - -- 当有警告日志时 - end - - -------------------------------------------- - return KKLogListener +function KKLogListener.OnLogError(log) + -- 当有异常日志时 + MyUtl.toastE("有异常日志，请在屏幕画圈查看详细！") end + +function KKLogListener.OnLogWarning(log) + -- 当有警告日志时 +end + +-------------------------------------------- +return KKLogListener diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua index 3ebf0c5..2504599 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua @@ -40,7 +40,7 @@ function CLToastRoot.borrow() else cell = queue:deQueue() end - cell.name = string.format("%11d",index) + cell.name = string.format("%11d", index) index = index + 1 return cell end @@ -51,6 +51,9 @@ function CLToastRoot.returnToast(cell) end function CLToastRoot.toast(msg, type, staySec) + if isNilOrEmpty(msg) then + return + end local cell = CLToastRoot.borrow() SetActive(cell.gameObject, true) cell:init({msg = msg, type = type, staySec = staySec}, nil) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua index f1db44d..2420491 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua @@ -39,9 +39,9 @@ function _cell.init(csObj) uiobjs.spriteBg = getCC(transform, "Background", "UISprite") end - if uiobjs.spriteBg then - uiobjs.spriteBg.width = NumEx.getIntPart(CSPMain.contentRect.z) - end + -- if uiobjs.spriteBg then + -- uiobjs.spriteBg.width = NumEx.getIntPart(CSPMain.contentRect.z) + -- end uiobjs.boxCollider = csSelf:GetComponent("BoxCollider") ---@type UIInput diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua index 7905ecd..b5378df 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua @@ -88,16 +88,6 @@ function _cell.onLoadField(name, go, orgs) local param = mData.fields[index] local cell = go:GetComponent("CLCellLua") SetActive(go, true) - --[[ - ---@type _ParamCellExtendFiled - local param = { - attr = fileAttr, - onMultTextInputChg = _cell.onMultTextInputChg, - isEditMode = isEditMode, - onClick = mData.onClick, - onSelect = mData.onSelect - } - ]] if param.attr.attrType == DBCust.FieldType.multext then -- 要设置一次 param.orgOnMultTextInputChg = param.onMultTextInputChg diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua new file mode 100644 index 0000000..f1d9c95 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua @@ -0,0 +1,44 @@ +-- xx单元 +local _cell = {} +---@type Coolape.CLCellLua +local csSelf = nil +local transform = nil +local mData = nil +local uiobjs = {} + +-- 初始化，只调用一次 +function _cell.init(csObj) + csSelf = csObj + transform = csSelf.transform + ---@type CLUIFormRoot + uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot") + ---@type UIToggle + uiobjs.Toggle = getCC(transform, "Toggle", "UIToggle") +end + +-- 显示， +-- 注意，c#侧不会在调用show时，调用refresh +function _cell.show(go, data) + mData = data + uiobjs.formRoot:setValue(mData.data, true) + _cell.selected(mData.isSelected) +end + +-- 取得数据 +function _cell.getData() + return mData +end + +function _cell.selected(val) + mData.isSelected = val + uiobjs.Toggle.value = val +end + +function _cell.uiEventDelegate(go) + if go.name == "Toggle" then + _cell.selected(uiobjs.Toggle.value) + end +end + +-------------------------------------------- +return _cell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua.meta new file mode 100644 index 0000000..b496d77 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 156c8a77e4fb8424da798e7fd2682597 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua new file mode 100644 index 0000000..6238f0e --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua @@ -0,0 +1,44 @@ +-- xx单元 +local _cell = {} +---@type Coolape.CLCellLua +local csSelf = nil +local transform = nil +local mData = nil +local uiobjs = {} +_cell.onDeleteProduct = nil + +-- 初始化，只调用一次 +function _cell.init(csObj) + csSelf = csObj + transform = csSelf.transform + ---@type CLUIFormRoot + uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot") +end + +-- 显示， +-- 注意，c#侧不会在调用show时，调用refresh +function _cell.show(go, data) + mData = data + uiobjs.formRoot:setValue(mData) +end + +-- 取得数据 +function _cell.getData() + return mData +end + +function _cell.uiEventDelegate(go) + if go.name == "ButtonEdit" then + getPanelAsy("PanelEditPrice", onLoadedPanelTT, {data = mData, callback = _cell.onFinishEditPrice}) + elseif go.name == "ButtonDel" then + Utl.doCallback(_cell.onDeleteProduct, mData) + end +end + +function _cell.onFinishEditPrice(d) + mData = d + uiobjs.formRoot:setValue(mData) +end + +-------------------------------------------- +return _cell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua.meta new file mode 100644 index 0000000..8c1fa2c --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4500701b5daa743d7bcb2147cedf4101 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua index dc87824..079fe02 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua @@ -43,7 +43,7 @@ function CLLPStart.setLuasAtBegainning() -- 日志监听 if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then -- if KKWhiteList.isWhiteName() then - ReporterMessageReceiver.self.gameObject:SetActive(false) + ReporterMessageReceiver.self.gameObject:SetActive(true) -- else -- ReporterMessageReceiver.self.gameObject:SetActive(false) -- end @@ -193,11 +193,16 @@ function CLLPStart.doEnterGame() if content.success then local currGroup = Prefs.getCurrGroup(Prefs.getUserName()) if isNilOrEmpty(currGroup) then - ---@type _ParamTRPSelectGroup - local d = {} - d.isHideCloseBtn = true - d.companyList = content.result - getPanelAsy("PanelSelectCompany", onLoadedPanel, d) + if #(content.result) == 1 then + Prefs.setCurrGroup(Prefs.getUserName(), json.encode(content.result[1])) + getPanelAsy("PanelConnect", onLoadedPanel) + else + ---@type _ParamTRPSelectGroup + local d = {} + d.isHideCloseBtn = true + d.companyList = content.result + getPanelAsy("PanelSelectCompany", onLoadedPanel, d) + end CLLPStart.hideSplash() else local useOldCurrGroup = false @@ -213,11 +218,16 @@ function CLLPStart.doEnterGame() if useOldCurrGroup then getPanelAsy("PanelConnect", onLoadedPanel) else - ---@type _ParamTRPSelectGroup - local d = {} - d.isHideCloseBtn = true - d.companyList = content.result - getPanelAsy("PanelSelectCompany", onLoadedPanel, d) + if #(content.result) == 1 then + Prefs.setCurrGroup(Prefs.getUserName(), json.encode(content.result[1])) + getPanelAsy("PanelConnect", onLoadedPanel) + else + ---@type _ParamTRPSelectGroup + local d = {} + d.isHideCloseBtn = true + d.companyList = content.result + getPanelAsy("PanelSelectCompany", onLoadedPanel, d) + end end CLLPStart.hideSplash() end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua index a7d6e81..f0b05a1 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua @@ -21,6 +21,8 @@ function CSPTasks.init(csObj) uiobjs.Content.baseClipRegion = CSPTasks.contentRect uiobjs.TableContent = getCC(uiobjs.Content.transform, "Table", "UITable") + ---@type UIToggle + uiobjs.ToggleCust = getCC(uiobjs.TableContent.transform, "Statistics/grid/ToggleCust", "UIToggle") uiobjs.Statistics = getChild(uiobjs.TableContent.transform, "Statistics") ---@type UIScrollView @@ -61,6 +63,7 @@ function CSPTasks.show() end -- uiobjs.TableTask:setList(list, nil) + uiobjs.ToggleCust:Set(true) CSPTasks.showReportform("reportform1") uiobjs.scrollView:ResetPosition() end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua index 6b4353d..81ff3a7 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua @@ -88,7 +88,6 @@ function TRPConnect.getDataFromServer() NetProto.send.booking_query() NetProto.send.replenish_query() NetProto.send.load_wfTicket_Settings() - NetProto.send.selectProductInfo() end -- 处理ui上的事件，例如点击等 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua index a634cfc..b7f4c88 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua @@ -226,6 +226,7 @@ function TRPCustDetail:procNetwork(cmd, succ, msg, paras) elseif cmd == NetProto.cmds.update_customer then if self.currToggle == 1 then self:showDetail() + uiobjs.Head:setValue(self.mdata) end end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua new file mode 100644 index 0000000..f1d69fd --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua @@ -0,0 +1,77 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPEditPrice:TRBasePanel 邮件列表 +local TRPEditPrice = class("TRPEditPrice", TRBasePanel) + +local uiobjs = {} +local callback +-- 初始化，只会调用一次 +function TRPEditPrice:init(csObj) + TRPEditPrice.super.init(self, csObj) + + self:setEventDelegate() + ---@type CLUIFormRoot + uiobjs.formRoot = self.csSelf:GetComponent("CLUIFormRoot") + +end + +-- 设置数据 +---@param paras _ParamTRPEditPrice +function TRPEditPrice:setData(paras) + self.mdata = paras.data + callback = paras.callback +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPEditPrice:show() + uiobjs.formRoot:setValue(self.mdata) +end + +-- 刷新 +function TRPEditPrice:refresh() +end + +-- 关闭页面 +function TRPEditPrice:hide() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPEditPrice:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + --[[ + if cmd == xx then + end + ]] + end +end + +function TRPEditPrice:setEventDelegate() + self.EventDelegate = { + ButtonCancel = function() + hideTopPanel(self.csSelf) + end, + ButtonOkay = function() + hideTopPanel(self.csSelf) + self.mdata = uiobjs.formRoot:getValue(self.mdata, true) + if tonumber(self.mdata.productNum) <= 0 then + MyUtl.toastW("数量不能低于1") + return + end + Utl.doCallback(callback, self.mdata) + end + } +end +-- 处理ui上的事件，例如点击等 +function TRPEditPrice:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPEditPrice:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPEditPrice diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua.meta new file mode 100644 index 0000000..3b62007 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dff0f4357a1c44e81914c15a6a5d71a9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua index 6f20d6c..7d743cd 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua @@ -102,11 +102,16 @@ function TRPLogin:setEventDelegate() local currGroup = Prefs.getCurrGroup(Prefs.getUserName()) if isNilOrEmpty(currGroup) then - ---@type _ParamTRPSelectGroup - local d = {} - d.isHideCloseBtn = true - d.companyList = content.result - getPanelAsy("PanelSelectCompany", onLoadedPanel, d) + if #(content.result) == 1 then + Prefs.setCurrGroup(Prefs.getUserName(), json.encode(content.result[1])) + getPanelAsy("PanelConnect", onLoadedPanel) + else + ---@type _ParamTRPSelectGroup + local d = {} + d.isHideCloseBtn = true + d.companyList = content.result + getPanelAsy("PanelSelectCompany", onLoadedPanel, d) + end else getPanelAsy("PanelConnect", onLoadedPanel) end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua index ec04e78..4cf3770 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua @@ -83,9 +83,8 @@ function TRPNewCust:show() optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.taskList) uiobjs.InputTask:refreshItems(optionInfor.options, optionInfor.values) - -- optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList) - local poplist = DBUser.getPopList() - uiobjs.InputLogin:refreshItems(poplist.options, poplist.values) + optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList) + uiobjs.InputLogin:refreshItems(optionInfor.options, optionInfor.values) self:refreshContent() diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua index febe906..4aa7287 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua @@ -24,6 +24,15 @@ function TRPNewOrder:init(csObj) uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua") ---@type CLUIFormRoot uiobjs.ExtendFormRoot = uiobjs.ExtendRoot:GetComponent("CLUIFormRoot") + + ---@type UITable + uiobjs.StepRoot = getCC(uiobjs.Table.transform, "StepRoot", "UITable") + ---@type CLUIFormRoot + uiobjs.StepFormRoot = uiobjs.StepRoot:GetComponent("CLUIFormRoot") + ---@type UIPopupList + uiobjs.InputNextLogino = getCC(uiobjs.StepRoot.transform, "InputNextLogino", "UIPopupList") + uiobjs.gridProjects = getCC(uiobjs.Table.transform, "InputSelectProduct/Products", "UIGrid") + uiobjs.gridProjectsPrefab = getChild(uiobjs.gridProjects.transform, "00000").gameObject -- uiobjs.elements = uiobjs.DetailRoot.gameObject:GetComponentsInChildren(typeof(CLUIElement), true) uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave") end @@ -34,15 +43,18 @@ function TRPNewOrder:initFiledsAttr() self.baseFiledsAttr = {} attr = {} attr.attrName = "工单模板" - attr.id = "" + attr.id = "templetId" attr.attrType = DBCust.FieldType.popuplist attr.ifMust = 1 attr.donotJoinKey = true + local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.templateList) + attr.popOptions = popInfor.options + attr.popValues = popInfor.values table.insert(self.baseFiledsAttr, attr) attr = {} attr.attrName = "工单名称" - attr.id = "" + attr.id = "title" attr.attrType = DBCust.FieldType.text attr.ifMust = 1 attr.donotJoinKey = true @@ -50,10 +62,13 @@ function TRPNewOrder:initFiledsAttr() attr = {} attr.attrName = "紧急程序" - attr.id = "" + attr.id = "urgency" attr.attrType = DBCust.FieldType.popuplist attr.ifMust = 0 attr.donotJoinKey = true + local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.urgencyLevels) or {} + attr.popOptions = popInfor.options + attr.popValues = popInfor.values table.insert(self.baseFiledsAttr, attr) attr = {} @@ -101,7 +116,7 @@ function TRPNewOrder:initFiledsAttr() attr = {} attr.attrName = "订单内容" - attr.id = "" + attr.id = "content" attr.attrType = DBCust.FieldType.multext attr.ifMust = 0 attr.donotJoinKey = true @@ -115,16 +130,25 @@ function TRPNewOrder:setData(paras) self.isNewOrder = false self.mdata = paras - if type(self.mdata.jsonStr) == "string" then - self.mdata.jsonStr = json.decode(self.mdata.jsonStr) + if type(self.mdata.attrJson) == "string" then + self.mdata.attrJson = json.decode(self.mdata.attrJson) end - self.mdata.jsonStr = self.mdata.jsonStr or {} + self.mdata.attrJson = self.mdata.attrJson or {} + ---@type _DBCust self.cust = nil else --//TODO:初始值 self.isNewOrder = true + ---@type _DBCust self.cust = paras self.mdata = {} + local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.templateList) + self.mdata.templetId = popInfor.values[0] + popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.urgencyLevels) + self.mdata.urgency = popInfor.values[0] + local templateInfor = DBOrder.getTemplateInfor(self.mdata.templetId) + self.mdata.content = templateInfor.content + self.selectedProducts = {} end end @@ -154,12 +178,39 @@ end function TRPNewOrder:refreshContent() self:showBaseFields() - local taskId = self.mdata and self.mdata.taskId or nil - self:showExtentFiles(taskId) + self:showProducts() + local templetId = self.mdata and self.mdata.templetId or nil + self:showExtentFiles(templetId) self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1) end +function TRPNewOrder:showProducts() + local products + if self.isNewOrder then + products = self.selectedProducts + else + products = json.decode(self.mdata.prodJson) + end + CLUIUtl.resetList4Lua(uiobjs.gridProjects, uiobjs.gridProjectsPrefab, products, self:wrapFunc(self.initProductCell)) + self:reposition() +end + +function TRPNewOrder:initProductCell(cell, data) + cell:init(data, nil) + cell.luaTable.onDeleteProduct = self:wrapFunc(self.onDeleteProduct) +end + +function TRPNewOrder:onDeleteProduct(data) + for i, v in ipairs(self.selectedProducts) do + if v.id == data.id then + table.remove(self.selectedProducts, i) + break + end + end + self:showProducts() +end + function TRPNewOrder:showBaseFields() ---@type _ParamCellExtendFiledRoot local param = {} @@ -182,9 +233,9 @@ function TRPNewOrder:showBaseFields() if filedInfor.attr.attrType == DBCust.FieldType.multext then filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) end + filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg) if not self.isNewOrder then filedInfor.onClick = self:wrapFunc(self.onClickInputField) - filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg) end table.insert(param.fields, filedInfor) end @@ -193,30 +244,62 @@ function TRPNewOrder:showBaseFields() end ---public 显示扩展字段 -function TRPNewOrder:showExtentFiles(taskId) - ---@type _ParamCellExtendFiledRoot - local param = {} - param.data = self.mdata and self.mdata.jsonStr or {} - -- param.isEditMode = true - param.onFinish = self:wrapFunc(self.setExtendFieldsMode) - param.fields = {} - local fields = DBCust.getFieldsByTask(taskId) or {} - ---@type _ParamCellExtendFiled - local filedInfor - for i, v in ipairs(fields) do - filedInfor = {} - filedInfor.attr = v - filedInfor.isEditMode = true - if filedInfor.attr.attrType == DBCust.FieldType.multext then - filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) +function TRPNewOrder:showExtentFiles(templetId) + local cfgInfor = DBOrder.getTemplateInfor(templetId) + local fields = DBOrder.getFields(templetId) or {} + if #fields > 0 then + ---@type _ParamCellExtendFiledRoot + local param = {} + param.data = self.mdata and self.mdata.attrJson or {} + -- param.isEditMode = true + param.onFinish = self:wrapFunc(self.setExtendFieldsMode) + param.fields = {} + ---@type _ParamCellExtendFiled + local filedInfor + for i, v in ipairs(fields) do + filedInfor = {} + filedInfor.attr = v + filedInfor.isEditMode = true + if filedInfor.attr.attrType == DBCust.FieldType.multext then + filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) + end + if not self.isNewOrder then + filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend) + filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) + end + table.insert(param.fields, filedInfor) end - if not self.isNewOrder then - filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend) - filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) - end - table.insert(param.fields, filedInfor) + SetActive(uiobjs.ExtendRoot.gameObject, true) + uiobjs.ExtendRoot:init(param, nil) + else + SetActive(uiobjs.ExtendRoot.gameObject, false) end - uiobjs.ExtendRoot:init(param, nil) + + -- next Step + local nextStep = DBOrder.getNextHandler(templetId) + if nextStep and tonumber(cfgInfor.ifToLoginNo) == 1 then + SetActive(uiobjs.StepFormRoot.gameObject, true) + uiobjs.InputNextLogino:refreshItems(nextStep.options, nextStep.values) + uiobjs.StepFormRoot:setValue(self.mdata) + else + SetActive(uiobjs.StepFormRoot.gameObject, false) + end + + -- product + if tonumber(cfgInfor.ifProduct) == 1 then + SetActive(uiobjs.gridProjects.transform.parent.gameObject, true) + self.selectedProducts = {} + self:showProducts() + else + SetActive(uiobjs.gridProjects.transform.parent.gameObject, false) + end + + -- refresh content + local d = uiobjs.DetailFromRoot:getValue(true) + d.content = cfgInfor.content + uiobjs.DetailFromRoot:setValue(d) + ------- + uiobjs.StepRoot:Reposition() end function TRPNewOrder:reposition() @@ -241,7 +324,7 @@ function TRPNewOrder:setElementMode(el) local boxcollider = el:GetComponent("BoxCollider") local ButtonReset = getCC(el.transform, "ButtonReset", "MyInputReset") - if (not self.isNewOrder) and (el.jsonKey == "taskId" or el.jsonKey == "phoneNo") then + if el.jsonKey == "taskId" or el.jsonKey == "phoneNo" then boxcollider.enabled = false else boxcollider.enabled = true @@ -296,18 +379,21 @@ function TRPNewOrder:procNetwork(cmd, succ, msg, paras) end function TRPNewOrder:onPopupFieldValChg(go) - if self.isNewOrder then - return - end ---@type CLUIElement local el = go:GetComponent("CLUIElement") - if el then - local err = el:checkValid() - if tostring(el.value) ~= tostring(self.mdata[el.jsonKey]) then - if isNilOrEmpty(err) then - self:sendModifymsg(el.jsonKey, el.value, false) - else - MyUtl.toastW(err) + if self.isNewOrder then + if el and el.jsonKey == "templetId" then + self:showExtentFiles(el.value) + end + else + if el then + local err = el:checkValid() + if tostring(el.value) ~= tostring(self.mdata[el.jsonKey]) then + if isNilOrEmpty(err) then + self:sendModifymsg(el.jsonKey, el.value, false) + else + MyUtl.toastW(err) + end end end end @@ -416,33 +502,71 @@ end function TRPNewOrder:setEventDelegate() self.EventDelegate = { ButtonSave = function() - local err = uiobjs.DetailRoot:checkValid() + local err = uiobjs.DetailFromRoot:checkValid() err = joinStr(err, uiobjs.ExtendFormRoot:checkValid()) if not isNilOrEmpty(err) then MyUtl.toastW(err) return end - - local cust = uiobjs.DetailRoot:getValue(true) - cust.customerLabel = self.mdata.customerLabel - local jsonStr = uiobjs.ExtendFormRoot:getValue(true) - cust.jsonStr = jsonStr + local order = uiobjs.DetailFromRoot:getValue(true) + order.custId = self.cust.custId + local attrJson = uiobjs.ExtendFormRoot:getValue(true) + order.attrJson = attrJson + if uiobjs.StepFormRoot.gameObject.activeInHierarchy then + order = uiobjs.StepFormRoot:getValue(order, true) + end + local templateInfor = DBOrder.getTemplateInfor(order.templetId) + order.ifToLoginNo = templateInfor.ifToLoginNo + order.ifMail = templateInfor.ifMail + order.ifProduct = templateInfor.ifProduct + if uiobjs.gridProjects.gameObject.activeInHierarchy then + if self.selectedProducts == nil or #(self.selectedProducts) <= 0 then + MyUtl.toastW("请添加产品") + return + end + order.prodJson = self.selectedProducts + -- 计算价格 + for i, v in ipairs(order.prodJson) do + v.totalPrice = tonumber(v.productNum) * tonumber(v.price) + v.salePrice = tonumber(v.productNum) * tonumber(v.productPrice) + end + end + order.wfType = "0" -- 0：正常工单，1：退货工单 showHotWheel() - NetProto.send.save_customer( - cust, + NetProto.send.createWfInfo( + order, function(content) if content.success then - getPanelAsy("PanelCustDetail", onLoadedPanel, cust) + MyUtl.toastS("订单创建成功") + hideTopPanel(self.csSelf) end hideHotWheel() end ) end, + InputSeachKey = function() + local queryKey = uiobjs.InputSeachKey.value + NetProto.send.selectProductInfo(queryKey, 1) + end, InputSelectProduct = function() - getPanelAsy("PanelSelectProduct", onLoadedPanelTT) + -- 选择商品 + getPanelAsy( + "PanelSelectProduct", + onLoadedPanelTT, + {selectedProducts = self.selectedProducts, callback = self:wrapFunc(self.onGetSelectedProducts)} + ) + end, + InputAttachment = function() + -- 添加附件 end } end + +function TRPNewOrder:onGetSelectedProducts(list) + self.selectedProducts = list + self:showProducts() +end + -- 处理ui上的事件，例如点击等 function TRPNewOrder:uiEventDelegate(go) local func = self.EventDelegate[go.name] diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua new file mode 100644 index 0000000..eeb9e34 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua @@ -0,0 +1,137 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPSelectProduct:TRBasePanel 邮件列表 +local TRPSelectProduct = class("TRPSelectProduct", TRBasePanel) + +local uiobjs = {} +local selectedMap = {} +-- 初始化，只会调用一次 +function TRPSelectProduct:init(csObj) + TRPSelectProduct.super.init(self, csObj) + + self:setEventDelegate() + + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 298, 200) + uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput") + ---@type UIScrollView + uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView") + ---@type Coolape.CLUILoopGrid + uiobjs.Grid = getCC(uiobjs.scrollView.transform, "Grid", "CLUILoopGrid") + + uiobjs.ButtonEndList = getChild(uiobjs.Grid.transform, "ButtonEndList") + uiobjs.ButtonEndListLb = getCC(uiobjs.ButtonEndList, "Label", "UILabel") +end + +-- 设置数据 +---@param paras _ParamTRPSelectProduct +function TRPSelectProduct:setData(paras) + selectedMap = {} + self.callback = paras.callback + for i, v in ipairs(paras.selectedProducts or {}) do + selectedMap[v.id] = v + end +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPSelectProduct:show() + uiobjs.InputSeachKey.value = "" + showHotWheel() + NetProto.send.selectProductInfo(uiobjs.InputSeachKey.value, 1) + self:showList({}) +end + +function TRPSelectProduct:showList(products) + SetActive(uiobjs.ButtonEndList.gameObject, false) + local list = {} + for i, v in ipairs(products or {}) do + table.insert(list, {data = v, isSelected = selectedMap[v.id] and true or false}) + end + uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList)) + uiobjs.scrollView:ResetPosition() +end +function TRPSelectProduct:appList(list) + SetActive(uiobjs.ButtonEndList.gameObject, false) + uiobjs.Grid:appendList(list) +end + +function TRPSelectProduct:initCell(cell, data) + cell:init(data, nil) +end + +function TRPSelectProduct:onEndList(tail) + printw("到最后了==" .. tail.name) + if self.pageInfo and self.pageInfo.current_page < self.pageInfo.total_pages then + local queryKey = uiobjs.InputSeachKey.value + showHotWheel() + -- 取得下一页 + NetProto.send.selectProductInfo(queryKey, self.pageInfo.current_page + 1) + else + uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -210 + SetActive(uiobjs.ButtonEndList.gameObject, true) + end +end + +function TRPSelectProduct:getSelected() + local list = {} + if uiobjs.Grid.list ~= nil then + for i = 0, uiobjs.Grid.list.Count - 1 do + local d = uiobjs.Grid.list[i] + if d.isSelected then + d.data.productNum = d.data.productNum or 1 + d.data.productPrice = d.data.price + table.insert(list, d.data) + end + end + end + return list +end + +-- 刷新 +function TRPSelectProduct:refresh() +end + +-- 关闭页面 +function TRPSelectProduct:hide() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPSelectProduct:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + if cmd == NetProto.cmds.selectProductInfo then + local result = paras.result or {} + self.pageInfo = result.meta + if self.pageInfo and self.pageInfo.current_page > 1 then + self:appList(result.data) + else + self:showList(result.data) + end + hideHotWheel() + end + end +end + +function TRPSelectProduct:setEventDelegate() + self.EventDelegate = { + ButtonCancel = function() + hideTopPanel(self.csSelf) + end, + ButtonOkay = function() + hideTopPanel(self.csSelf) + Utl.doCallback(self.callback, self:getSelected()) + end + } +end +-- 处理ui上的事件，例如点击等 +function TRPSelectProduct:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPSelectProduct:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPSelectProduct diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua.meta new file mode 100644 index 0000000..228d4f8 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 86e6d69b882e04ce9889f5823ad95f66 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab index 8ddfbfd..a1758b6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab @@ -129,6 +129,7 @@ GameObject: - component: {fileID: 8085093767652781930} - component: {fileID: 2439694156049545749} - component: {fileID: 1506532759999847837} + - component: {fileID: 114031756461323902} m_Layer: 5 m_Name: InputCheckboxs m_TagString: Untagged @@ -324,6 +325,21 @@ MonoBehaviour: field: name: oneShot: 0 +--- !u!114 &114031756461323902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3095922444815459397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 0} + offset: 0 + sizeAdjust: 1 --- !u!1 &5713654144068856770 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab index b02b259..e7fa6ae 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab @@ -214,6 +214,7 @@ GameObject: - component: {fileID: 1723439637486485793} - component: {fileID: 7375490486847536484} - component: {fileID: 114290233639497436} + - component: {fileID: 114572621479752912} m_Layer: 5 m_Name: InputDate m_TagString: Untagged @@ -414,6 +415,21 @@ MonoBehaviour: isPause: 0 luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua isNeedResetAtlase: 1 +--- !u!114 &114572621479752912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366778029194131019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 0} + offset: 0 + sizeAdjust: 1 --- !u!1 &4634753059616572994 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab index ce2ed27..e147fe4 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab @@ -250,6 +250,7 @@ GameObject: m_Component: - component: {fileID: 6707647812568961046} - component: {fileID: 2839739815580303652} + - component: {fileID: 5711713659476070239} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -324,6 +325,21 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!114 &5711713659476070239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3436914829287944890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 0} + offset: 0 + sizeAdjust: 1 --- !u!1 &3697089830196127904 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab index 1179e45..30fdf46 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab @@ -17,6 +17,7 @@ GameObject: - component: {fileID: 6356504636838832541} - component: {fileID: 9053534331056369762} - component: {fileID: 114097241059719580} + - component: {fileID: 114583540844523490} m_Layer: 5 m_Name: InputPoplist m_TagString: Untagged @@ -268,6 +269,21 @@ MonoBehaviour: isPause: 0 luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua isNeedResetAtlase: 1 +--- !u!114 &114583540844523490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772436816849070028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 0} + offset: 0 + sizeAdjust: 1 --- !u!1 &3752426191522449626 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab index d7afa4d..48d9fc6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab @@ -340,6 +340,7 @@ GameObject: - component: {fileID: 2270108241694216974} - component: {fileID: 114614343490987310} - component: {fileID: 5790993641769127909} + - component: {fileID: 114450741716434618} m_Layer: 5 m_Name: InputText m_TagString: Untagged @@ -567,6 +568,21 @@ MonoBehaviour: onDrag: [] onBecameVisible: [] onBecameInvisible: [] +--- !u!114 &114450741716434618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6259930685614177535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 0} + offset: 0 + sizeAdjust: 1 --- !u!1 &6856486077525911941 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab index 65afee6..1dcb47c 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab @@ -873,7 +873,7 @@ MonoBehaviour: relative: 0 absolute: -100 updateAnchors: 1 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} mPivot: 4 mWidth: 825 mHeight: 2 @@ -1381,7 +1381,7 @@ MonoBehaviour: relative: 0 absolute: -20 updateAnchors: 1 - mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} mPivot: 1 mWidth: 2 mHeight: 110 @@ -1389,7 +1389,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.015625 + aspectRatio: 0.018181818 mType: 1 mFillDirection: 4 mFillAmount: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab index ce2a5ea..fa978c0 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab @@ -76,7 +76,7 @@ MonoBehaviour: mClipping: 0 mClipRange: {x: 0, y: 0, z: 300, w: 200} mClipSoftness: {x: 4, y: 4} - mDepth: 10001 + mDepth: 10 mSortingOrder: 0 mClipOffset: {x: 0, y: 0} --- !u!114 &5447032094512914035 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab index 5021b8d..0ad113e 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab @@ -8136,7 +8136,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: dealflag + jsonKey: dealFlag formatValue: labeName: {fileID: 0} defaultName: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab index ef5de77..68ad9c4 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab @@ -3209,7 +3209,7 @@ GameObject: - component: {fileID: 7170620776478054822} - component: {fileID: 1182383136} m_Layer: 5 - m_Name: LabelCompanyName + m_Name: LabelPhoneNo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3310,7 +3310,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: companyName + jsonKey: phoneNo formatValue: labeName: {fileID: 0} defaultName: @@ -3585,7 +3585,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} m_Name: m_EditorClassIdentifier: - cellCount: 9 + cellCount: 10 isPlayTween: 0 twType: 0 tweenSpeed: 0.01 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab new file mode 100644 index 0000000..c3abbf5 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab @@ -0,0 +1,1501 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &903940474807098790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 823191984279681123} + - component: {fileID: 6567527048949938529} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &823191984279681123 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 903940474807098790} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -150, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6567527048949938529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 903940474807098790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8723537600914609370} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 8723537600914609370} + 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.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 925 + mHeight: 2 + mDepth: 10 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 256.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 &1721730874532777168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4768666378060549449} + - component: {fileID: 2159667127516814700} + - component: {fileID: 5737056449441516878} + - component: {fileID: 1521398631628699916} + - component: {fileID: 1777960969033646450} + m_Layer: 5 + m_Name: InputPrice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4768666378060549449 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721730874532777168} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -162, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1882454239596058888} + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2159667127516814700 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721730874532777168} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 209.99998, y: 119.249985, z: 0} + m_Center: {x: 104.99999, y: -0.22070312, z: 0} +--- !u!114 &5737056449441516878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721730874532777168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 2134748000593916866} + inputType: 0 + onReturnKey: 0 + keyboardType: 4 + 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.5132427, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &1521398631628699916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721730874532777168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8723537600914609370} + relative: 0 + absolute: 300 + rightAnchor: + target: {fileID: 8723537600914609370} + 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.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 3 + mWidth: 575 + mHeight: 120 + mDepth: 6 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4.7916665 + 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: order_ipt_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &1777960969033646450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721730874532777168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: productPrice + 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.9882353, b: 0.827451, a: 1} +--- !u!1 &3189014855169151903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 209978061535193685} + - component: {fileID: 1823513668536423768} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &209978061535193685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3189014855169151903} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -412, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1823513668536423768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3189014855169151903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8723537600914609370} + relative: 0 + absolute: 50 + 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: 144 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 3 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u6210\u4EA4\u4EF7" + 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 &3647314898397951189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1882454239596058888} + - component: {fileID: 2134748000593916866} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1882454239596058888 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3647314898397951189} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 30, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4768666378060549449} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2134748000593916866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3647314898397951189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4768666378060549449} + relative: 0 + absolute: 30 + rightAnchor: + target: {fileID: 4768666378060549449} + relative: 1 + absolute: -30 + 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: 515 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 11.291667 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u586B\u5199" + 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 &4393382088720327568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6620479294449856333} + - component: {fileID: 1398652266460283533} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6620479294449856333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393382088720327568} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -412, y: 190, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1398652266460283533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393382088720327568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8723537600914609370} + relative: 0 + absolute: 50 + 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: 96 + mHeight: 48 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u6570\u91CF" + 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 &5162327584935852353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3946239867233247010} + - component: {fileID: 2990790222774913180} + - component: {fileID: 3655839080119614012} + m_Layer: 5 + m_Name: SpriteBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3946239867233247010 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162327584935852353} + 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: 6698264939275120446} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2990790222774913180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162327584935852353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 6698264939275120446} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 6698264939275120446} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 6698264939275120446} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 6698264939275120446} + relative: 1 + absolute: 1 + updateAnchors: 0 + mColor: {r: 0, g: 0, b: 0, a: 0.19607843} + mPivot: 4 + mWidth: 1127 + mHeight: 2306 + mDepth: -1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.48872507 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!65 &3655839080119614012 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162327584935852353} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2306, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6694721509567594081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4665392054299412596} + - component: {fileID: 8748326499767433123} + - component: {fileID: 7180114790124171700} + - component: {fileID: 3230975759791811139} + m_Layer: 5 + m_Name: ButtonOkay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4665392054299412596 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694721509567594081} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 231, y: -260, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8748326499767433123 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694721509567594081} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 460, y: 150, z: 0} + m_Center: {x: 0, y: -0.22070312, z: 0} +--- !u!114 &7180114790124171700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694721509567594081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 6694721509567594081} + 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: 8765983973354708079} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &3230975759791811139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694721509567594081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8723537600914609370} + relative: 0.5 + absolute: 0 + rightAnchor: + target: {fileID: 8723537600914609370} + 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.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 4 + mWidth: 462 + mHeight: 50 + mDepth: 9 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 18.5 + 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: 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 &6956425300677148596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6158079556513047541} + - component: {fileID: 7010490122779876125} + - component: {fileID: 7460120588157692584} + - component: {fileID: 8453906698608056286} + m_Layer: 5 + m_Name: ButtonCancel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6158079556513047541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6956425300677148596} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -231, y: -260, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7010490122779876125 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6956425300677148596} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 460, y: 150, z: 0} + m_Center: {x: 0, y: -0.22070312, z: 0} +--- !u!114 &7460120588157692584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6956425300677148596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 6956425300677148596} + 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: 8765983973354708079} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &8453906698608056286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6956425300677148596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8723537600914609370} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 8723537600914609370} + 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: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1} + mPivot: 4 + mWidth: 462 + mHeight: 50 + mDepth: 9 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + 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: 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 &7063893143499562293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6466094854413232821} + - component: {fileID: 4393612293168443333} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6466094854413232821 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7063893143499562293} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 30, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5067832225942083336} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4393612293168443333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7063893143499562293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5067832225942083336} + relative: 0 + absolute: 30 + rightAnchor: + target: {fileID: 5067832225942083336} + relative: 1 + absolute: -30 + 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: 515 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u586B\u5199" + 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 &7306337466906108236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5067832225942083336} + - component: {fileID: 6286184803759592175} + - component: {fileID: 2183782956924942737} + - component: {fileID: 5299680943849592713} + - component: {fileID: 4464519465649717842} + m_Layer: 5 + m_Name: InputNum + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5067832225942083336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7306337466906108236} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -162, y: 190, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6466094854413232821} + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6286184803759592175 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7306337466906108236} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 209.99998, y: 119.249985, z: 0} + m_Center: {x: 104.99999, y: -0.22070312, z: 0} +--- !u!114 &2183782956924942737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7306337466906108236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 4393612293168443333} + inputType: 0 + onReturnKey: 0 + keyboardType: 4 + 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.5132427, b: 1, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: [] + mValue: +--- !u!114 &5299680943849592713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7306337466906108236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8723537600914609370} + relative: 0 + absolute: 300 + rightAnchor: + target: {fileID: 8723537600914609370} + 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.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 3 + mWidth: 575 + mHeight: 120 + mDepth: 6 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.0416665 + 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: order_ipt_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &4464519465649717842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7306337466906108236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: productNum + 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.98609334, b: 0.8254717, a: 1} +--- !u!1 &7703609590429312581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1934134456541968896} + - component: {fileID: 4684235899522096912} + 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 &1934134456541968896 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7703609590429312581} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -260, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6698264939275120446} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4684235899522096912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7703609590429312581} + 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: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 3 + mHeight: 140 + mDepth: 10 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.021428572 + 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 &8258648700415457035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8723537600914609370} + - component: {fileID: 1811658107251951667} + - component: {fileID: 5261520224574820538} + m_Layer: 5 + m_Name: SpriteFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8723537600914609370 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8258648700415457035} + 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: 6698264939275120446} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1811658107251951667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8258648700415457035} + 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: 925 + mHeight: 700 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1.3214285 + 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!114 &5261520224574820538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8258648700415457035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 1811658107251951667} + offset: 100 + sizeAdjust: 1 +--- !u!1 &8654553078135463802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6698264939275120446} + - component: {fileID: 970876416881401071} + - component: {fileID: 8765983973354708079} + - component: {fileID: 8408473136201929229} + m_Layer: 5 + m_Name: PanelEditPrice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6698264939275120446 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8654553078135463802} + 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: 8723537600914609370} + - {fileID: 3946239867233247010} + - {fileID: 6620479294449856333} + - {fileID: 209978061535193685} + - {fileID: 5067832225942083336} + - {fileID: 4768666378060549449} + - {fileID: 6158079556513047541} + - {fileID: 4665392054299412596} + - {fileID: 823191984279681123} + - {fileID: 1934134456541968896} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &970876416881401071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8654553078135463802} + 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: 10001 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &8765983973354708079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8654553078135463802} + 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/TRPEditPrice.lua + isNeedBackplate: 1 + destroyWhenHide: 1 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 0 + EffectList: [] + frameName: + frameObj: {fileID: 0} + titleKeyName: +--- !u!114 &8408473136201929229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8654553078135463802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta new file mode 100644 index 0000000..19d51f5 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6d833b598325d4890a2b96ba1fbc1182 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab index 2bbbba6..3b4a540 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab @@ -175,7 +175,7 @@ MonoBehaviour: spriteBg: {fileID: 0} valueIsNumber: 0 isPhoneNum: 0 - inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + inValidColor: {r: 1, g: 0.98458993, b: 0.8066038, a: 1} --- !u!1 &169019246291288862 GameObject: m_ObjectHideFlags: 0 @@ -352,7 +352,7 @@ MonoBehaviour: anchorOffset: 0 softBorderPadding: 1 renderQueue: 0 - startingRenderQueue: 3004 + startingRenderQueue: 3000 mClipTexture: {fileID: 0} mAlpha: 1 mClipping: 0 @@ -1820,4 +1820,4 @@ MonoBehaviour: spriteBg: {fileID: 0} valueIsNumber: 0 isPhoneNum: 0 - inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + inValidColor: {r: 1, g: 0.9882353, b: 0.80784315, a: 1} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab index b86c527..f49f453 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 6550131546567880329} - component: {fileID: 1400738340445852906} + - component: {fileID: 2450137576761800781} m_Layer: 5 m_Name: LabelTitle m_TagString: Untagged @@ -100,6 +101,30 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!114 &2450137576761800781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230301894280886138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: name + 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 &420220745163305833 GameObject: m_ObjectHideFlags: 0 @@ -187,6 +212,190 @@ MonoBehaviour: widget: {fileID: 6492461016575558900} offset: 0 sizeAdjust: 1 +--- !u!1 &570599612739694576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1916666550900471628} + - component: {fileID: 2528188703087000678} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1916666550900471628 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570599612739694576} + 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: 675396154728095867} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2528188703087000678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570599612739694576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 675396154728095867} + 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: "\u4EA7\u54C1\u5217\u8868" + 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 &585498974579909820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 22394276322990286} + - component: {fileID: 3663387896147821745} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &22394276322990286 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585498974579909820} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 527, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2296907656735151289} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3663387896147821745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585498974579909820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 2296907656735151289} + relative: 1 + absolute: -56 + rightAnchor: + target: {fileID: 2296907656735151289} + relative: 1 + absolute: -15 + 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: 41 + mHeight: 42 + mDepth: 2 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.97619045 + 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: order_upload + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &610027238503312487 GameObject: m_ObjectHideFlags: 0 @@ -617,6 +826,106 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &1248641904593754930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 875495427856843662} + - component: {fileID: 3867134515248793764} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &875495427856843662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248641904593754930} + 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: 2296907656735151289} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3867134515248793764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248641904593754930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 2296907656735151289} + 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: "\u4E0A\u4F20\u9644\u4EF6" + 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 &1727863174527336050 GameObject: m_ObjectHideFlags: 0 @@ -686,7 +995,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.024390243 + aspectRatio: 0.73170733 mType: 0 mFillDirection: 4 mFillAmount: 1 @@ -733,6 +1042,290 @@ Transform: m_Father: {fileID: 1249610349479200778} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1747138548909843324 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7657068295081712894} + - component: {fileID: 2764307760294437458} + - component: {fileID: 402544230249269469} + - component: {fileID: 1822789348239397613} + - component: {fileID: 7212621386719867572} + - component: {fileID: 4827293370493757523} + - component: {fileID: 5382361447205940525} + - component: {fileID: 8008446805945251026} + - component: {fileID: 1374284702246386988} + - component: {fileID: 1373667629297150802} + m_Layer: 5 + m_Name: InputNextLogino + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7657068295081712894 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -177.40427, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5582618885866839856} + - {fileID: 8756541529506466761} + - {fileID: 8497326207621746825} + - {fileID: 4483711941230969321} + - {fileID: 3365078923715238671} + m_Father: {fileID: 4781790433082627634} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2764307760294437458 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + 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 &402544230249269469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 3737823221411734865} + 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 &1822789348239397613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + 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 &7212621386719867572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: upLoginNo + formatValue: + labeName: {fileID: 4614443635681525987} + defaultName: + canNull: 0 + checkIDCard: 0 + minLen: 0 + maxLen: 0 + spriteBg: {fileID: 1822789348239397613} + valueIsNumber: 0 + isPhoneNum: 0 + inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1} +--- !u!114 &4827293370493757523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + 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 &5382361447205940525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + 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: work_work_color + highlightSprite: work_work_color + 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: 402544230249269469} + mMethodName: SetCurrentSelection + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + - mTarget: {fileID: 1374284702246386988} + mMethodName: onNotifyLua + mParameters: + - obj: {fileID: 0} + field: + name: gameObj + - obj: {fileID: 0} + field: + name: funcName + - obj: {fileID: 0} + field: + name: paras + oneShot: 0 + mSelectedItem: + mPanel: {fileID: 0} + mChild: {fileID: 0} + mBackground: {fileID: 0} + mHighlight: {fileID: 0} + mHighlightedLabel: {fileID: 0} + mLabelList: [] + mBgBorder: 0 + eventReceiver: {fileID: 0} + functionName: + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &8008446805945251026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1374284702246386988 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + 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 &1373667629297150802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747138548909843324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 1822789348239397613} + offset: 0 + sizeAdjust: 1 --- !u!1 &1756049166721528722 GameObject: m_ObjectHideFlags: 0 @@ -743,6 +1336,7 @@ GameObject: m_Component: - component: {fileID: 1502935258626211947} - component: {fileID: 5731697688251608301} + - component: {fileID: 2081556300610010648} m_Layer: 5 m_Name: LabelPrice m_TagString: Untagged @@ -833,6 +1427,30 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!114 &2081556300610010648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1756049166721528722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: productPrice + 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 &2148602215420597074 GameObject: m_ObjectHideFlags: 0 @@ -917,6 +1535,90 @@ MonoBehaviour: mSpriteName: news_new2_bg_20 mFillCenter: 1 isGrayMode: 0 +--- !u!1 &2206517897526349950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1653017981213649932} + - component: {fileID: 2623852011169394803} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1653017981213649932 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2206517897526349950} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 525, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 675396154728095867} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2623852011169394803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2206517897526349950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 675396154728095867} + relative: 1 + absolute: -59 + rightAnchor: + target: {fileID: 675396154728095867} + relative: 1 + absolute: -15 + 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: 44 + mHeight: 44 + mDepth: 2 + 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: order_add + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &2312657503403256251 GameObject: m_ObjectHideFlags: 0 @@ -1031,6 +1733,7 @@ GameObject: - component: {fileID: 2561601009419381926} - component: {fileID: 2877679468211997251} - component: {fileID: 1614666034406617091} + - component: {fileID: 8997402939825653335} m_Layer: 5 m_Name: 00000 m_TagString: Untagged @@ -1128,7 +1831,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isPause: 0 - luaPath: + luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua isNeedResetAtlase: 1 --- !u!65 &2877679468211997251 BoxCollider: @@ -1157,6 +1860,19 @@ MonoBehaviour: m_EditorClassIdentifier: scrollView: {fileID: 6096547598309516579} draggablePanel: {fileID: 0} +--- !u!114 &8997402939825653335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2353031233360675871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: --- !u!1 &2425227412765712263 GameObject: m_ObjectHideFlags: 0 @@ -1189,7 +1905,7 @@ Transform: m_Children: - {fileID: 5247068646262692398} m_Father: {fileID: 9092197074366352143} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &571659679455997282 MonoBehaviour: @@ -1239,6 +1955,204 @@ MonoBehaviour: isPause: 0 luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua isNeedResetAtlase: 1 +--- !u!1 &2779954401832340586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4483711941230969321} + - component: {fileID: 6541864264794994281} + - component: {fileID: 6956883597060696401} + m_Layer: 5 + m_Name: Label3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4483711941230969321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2779954401832340586} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -235, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7657068295081712894} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6541864264794994281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2779954401832340586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8756541529506466761} + 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 &6956883597060696401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2779954401832340586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bd5e9ed3dcd9e4e4c81c8ceeeabc37bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _element: {fileID: 0} +--- !u!1 &2951365181638761030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3365078923715238671} + - component: {fileID: 2376431918120099947} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3365078923715238671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951365181638761030} + 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: 7657068295081712894} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2376431918120099947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951365181638761030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7657068295081712894} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 7657068295081712894} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 7657068295081712894} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 7657068295081712894} + 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: 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 &3280314110464383070 GameObject: m_ObjectHideFlags: 0 @@ -1337,6 +2251,106 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1125, y: 2172, z: 0} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3291290318664386819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4096705695685564279} + - component: {fileID: 5079062268023500054} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4096705695685564279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3291290318664386819} + 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: 2296907656735151289} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5079062268023500054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3291290318664386819} + 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: 2296907656735151289} + 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: "\u4E0A\u4F20" + 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 &3329392447864977988 GameObject: m_ObjectHideFlags: 0 @@ -1489,7 +2503,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1 + aspectRatio: 2 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -1521,40 +2535,6 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont ---- !u!114 &7444113832486605406 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3483699863772794590} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenTarget: {fileID: 3483699863772794590} - hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} - pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} - disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - duration: 0.2 - skipColorEffect: 1 - dragHighlight: 0 - hoverSprite: - pressedSprite: - disabledSprite: - hoverSprite2D: {fileID: 0} - pressedSprite2D: {fileID: 0} - disabledSprite2D: {fileID: 0} - pixelSnap: 0 - onClick: - - mTarget: {fileID: 6896994100725352575} - mMethodName: uiEventDelegate - mParameters: - - obj: {fileID: 0} - field: - name: go - oneShot: 0 --- !u!1 &3527172386429605029 GameObject: m_ObjectHideFlags: 0 @@ -1765,6 +2745,7 @@ GameObject: m_Component: - component: {fileID: 2058935815621498124} - component: {fileID: 1732784937487359550} + - component: {fileID: 8480082912746378192} m_Layer: 5 m_Name: LabelNum m_TagString: Untagged @@ -1855,6 +2836,30 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!114 &8480082912746378192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3693886865786244243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: productNum + 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 &3724171473237482120 GameObject: m_ObjectHideFlags: 0 @@ -2029,6 +3034,106 @@ MonoBehaviour: widget: {fileID: 3244412214061244712} offset: 0 sizeAdjust: 1 +--- !u!1 &4256534391372987841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3343166803441427381} + - component: {fileID: 5819574687512402388} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3343166803441427381 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4256534391372987841} + 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: 675396154728095867} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5819574687512402388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4256534391372987841} + 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: 675396154728095867} + 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: "\u6DFB\u52A0" + 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 &4943220243769778600 GameObject: m_ObjectHideFlags: 0 @@ -2053,13 +3158,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4943220243769778600} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -599.65424, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -263.37488, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1249610349479200778} - m_Father: {fileID: 4781790433082627634} - m_RootOrder: 3 + m_Father: {fileID: 675396154728095867} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8191825125617429936 MonoBehaviour: @@ -2085,6 +3190,120 @@ MonoBehaviour: sorted: 0 oldParentPos: {x: 0, y: 0, z: 0} oldParentClipOffset: {x: 0, y: 0} +--- !u!1 &5010329345755705583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6711905458103532908} + - component: {fileID: 4167374270505585388} + - component: {fileID: 258942648196306388} + m_Layer: 5 + m_Name: Label3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6711905458103532908 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010329345755705583} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -327, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 675396154728095867} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4167374270505585388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010329345755705583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1916666550900471628} + 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 &258942648196306388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5010329345755705583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bd5e9ed3dcd9e4e4c81c8ceeeabc37bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _element: {fileID: 0} --- !u!1 &5041018495098694811 GameObject: m_ObjectHideFlags: 0 @@ -2334,6 +3553,90 @@ MonoBehaviour: widget: {fileID: 1088630238510636419} offset: 50 sizeAdjust: 1 +--- !u!1 &5470036040766138051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5597705235801352074} + - component: {fileID: 4892855398820289774} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5597705235801352074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5470036040766138051} + 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: 675396154728095867} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4892855398820289774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5470036040766138051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 675396154728095867} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 675396154728095867} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 675396154728095867} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 675396154728095867} + 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: 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 &5483648808180388224 GameObject: m_ObjectHideFlags: 0 @@ -2542,6 +3845,120 @@ MonoBehaviour: frameName: Frame1 frameObj: {fileID: 0} titleKeyName: +--- !u!1 &5996401750579512365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5447743745483950510} + - component: {fileID: 3416614396053421614} + - component: {fileID: 1524695618551406870} + m_Layer: 5 + m_Name: Label3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5447743745483950510 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5996401750579512365} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -327, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2296907656735151289} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3416614396053421614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5996401750579512365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 875495427856843662} + 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 &1524695618551406870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5996401750579512365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bd5e9ed3dcd9e4e4c81c8ceeeabc37bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _element: {fileID: 0} --- !u!1 &6286203512651980998 GameObject: m_ObjectHideFlags: 0 @@ -2610,7 +4027,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 3 + aspectRatio: 4 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -2642,6 +4059,190 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &6345041123785752900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5582618885866839856} + - component: {fileID: 3737823221411734865} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5582618885866839856 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6345041123785752900} + 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: 7657068295081712894} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3737823221411734865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6345041123785752900} + 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: 7657068295081712894} + 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 &6725638605002920449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6561805268829721416} + - component: {fileID: 6150182536713627692} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6561805268829721416 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6725638605002920449} + 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: 2296907656735151289} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6150182536713627692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6725638605002920449} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 2296907656735151289} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 2296907656735151289} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 2296907656735151289} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 2296907656735151289} + 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: 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 &6759362610761014225 GameObject: m_ObjectHideFlags: 0 @@ -2753,7 +4354,6 @@ GameObject: - component: {fileID: 4781790433082627634} - component: {fileID: 7899363832441793291} - component: {fileID: 3465195309980707120} - - component: {fileID: 297076975900738772} m_Layer: 5 m_Name: StepRoot m_TagString: Untagged @@ -2773,12 +4373,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7870608547099953618} - - {fileID: 3249582732546049925} - - {fileID: 4766177138085261660} - - {fileID: 6735670843721406284} - - {fileID: 7153976123925079848} + - {fileID: 7657068295081712894} + - {fileID: 2296907656735151289} m_Father: {fileID: 9092197074366352143} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7899363832441793291 MonoBehaviour: @@ -2813,21 +4411,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: jsonKey: ---- !u!114 &297076975900738772 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6840166634573325542} - 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 &6940455585639554457 GameObject: m_ObjectHideFlags: 0 @@ -2857,6 +4440,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8665097120123855419} + - {fileID: 675396154728095867} - {fileID: 695648132874815624} - {fileID: 4781790433082627634} m_Father: {fileID: 4808583122758801922} @@ -2882,6 +4466,106 @@ MonoBehaviour: hideInactive: 1 keepWithinPanel: 0 padding: {x: 0, y: 30} +--- !u!1 &7275300635852460917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8756541529506466761} + - component: {fileID: 4614443635681525987} + m_Layer: 5 + m_Name: Label2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8756541529506466761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275300635852460917} + 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: 7657068295081712894} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4614443635681525987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275300635852460917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7657068295081712894} + 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: 276 + mHeight: 46 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 6 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u4E0B\u4E00\u6B65\u5904\u7406\u4EBA" + 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 &7788637167834274862 GameObject: m_ObjectHideFlags: 0 @@ -2966,6 +4650,175 @@ MonoBehaviour: mSpriteName: work_work_color mFillCenter: 1 isGrayMode: 0 +--- !u!1 &7898200024377142075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2296907656735151289} + - component: {fileID: 6052790691369986581} + - component: {fileID: 7847741233886550698} + - component: {fileID: 3989876927114666004} + - component: {fileID: 6582611865144033048} + - component: {fileID: 5684835301358909987} + m_Layer: 5 + m_Name: InputAttachment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2296907656735151289 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7898200024377142075} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -863.0292, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4096705695685564279} + - {fileID: 875495427856843662} + - {fileID: 22394276322990286} + - {fileID: 5447743745483950510} + - {fileID: 6561805268829721416} + m_Father: {fileID: 4781790433082627634} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6052790691369986581 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7898200024377142075} + 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 &7847741233886550698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7898200024377142075} + 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 &3989876927114666004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7898200024377142075} + 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 &6582611865144033048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7898200024377142075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 7847741233886550698} + offset: 0 + sizeAdjust: 1 +--- !u!114 &5684835301358909987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7898200024377142075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 8872996654376181753} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 1 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 6896994100725352575} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 --- !u!1 &8174250477570590167 GameObject: m_ObjectHideFlags: 0 @@ -3158,608 +5011,257 @@ MonoBehaviour: mSpriteName: work_work_color mFillCenter: 1 isGrayMode: 0 ---- !u!1001 &1985086999844831078 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4781790433082627634} - m_Modifications: - - target: {fileID: 772436816849070028, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_Name - value: InputAttachment - objectReference: {fileID: 0} - - target: {fileID: 772436816849070028, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 850321821054899805, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 92 - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mText - value: "\u4E0A\u4F20" - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 3224139937598047577, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: -327 - objectReference: {fileID: 0} - - target: {fileID: 3638312893300319451, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 4338095648653057983, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.y - value: -80 - objectReference: {fileID: 0} - - target: {fileID: 5210229992238887641, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 0.47826087 - objectReference: {fileID: 0} - - target: {fileID: 5210229992238887641, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 184 - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mText - value: "\u4E0A\u4F20\u9644\u4EF6" - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 0.04761905 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mSpriteName - value: order_upload - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: leftAnchor.absolute - value: -56 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: rightAnchor.absolute - value: -15 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 41 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mHeight - value: 42 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 6356504636838832541, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: atlas - value: - objectReference: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, - type: 3} - - target: {fileID: 6356504636838832541, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: trueTypeFont - value: - objectReference: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, - type: 3} - - target: {fileID: 7452256010539373625, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: 527 - objectReference: {fileID: 0} - - target: {fileID: 7999562909891110987, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.y - value: -862.5291 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 337f1c0d233644dc591990603c463db8, type: 3} ---- !u!4 &7153976123925079848 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - m_PrefabInstance: {fileID: 1985086999844831078} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4242577356528150802 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4781790433082627634} - m_Modifications: - - target: {fileID: 772436816849070028, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_Name - value: InputSelectProduct - objectReference: {fileID: 0} - - target: {fileID: 772436816849070028, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 850321821054899805, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 92 - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mText - value: "\u6DFB\u52A0" - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 3224139937598047577, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: -327 - objectReference: {fileID: 0} - - target: {fileID: 3638312893300319451, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 4338095648653057983, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.y - value: -80 - objectReference: {fileID: 0} - - target: {fileID: 5210229992238887641, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 0.47826087 - objectReference: {fileID: 0} - - target: {fileID: 5210229992238887641, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 184 - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mText - value: "\u4EA7\u54C1\u5217\u8868" - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 0.045454547 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mSpriteName - value: order_add - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: leftAnchor.absolute - value: -59 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: rightAnchor.absolute - value: -15 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mHeight - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 6356504636838832541, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: atlas - value: - objectReference: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, - type: 3} - - target: {fileID: 6356504636838832541, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: trueTypeFont - value: - objectReference: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, - type: 3} - - target: {fileID: 7452256010539373625, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: 525 - objectReference: {fileID: 0} - - target: {fileID: 7999562909891110987, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.y - value: -335.52924 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8547632661248865796, guid: 337f1c0d233644dc591990603c463db8, type: 3} - - {fileID: 9053534331056369762, guid: 337f1c0d233644dc591990603c463db8, type: 3} - - {fileID: 6356504636838832541, guid: 337f1c0d233644dc591990603c463db8, type: 3} - - {fileID: 1662168741216341101, guid: 337f1c0d233644dc591990603c463db8, type: 3} - - {fileID: 114097241059719580, guid: 337f1c0d233644dc591990603c463db8, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 337f1c0d233644dc591990603c463db8, type: 3} ---- !u!1 &3483699863772794590 stripped +--- !u!1 &8872996654376181753 GameObject: - m_CorrespondingSourceObject: {fileID: 772436816849070028, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - m_PrefabInstance: {fileID: 4242577356528150802} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4766177138085261660 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - m_PrefabInstance: {fileID: 4242577356528150802} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6186999471670796235 -PrefabInstance: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4781790433082627634} - m_Modifications: - - target: {fileID: 772436816849070028, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_Name - value: InputNextLogino - objectReference: {fileID: 0} - - target: {fileID: 772436816849070028, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 850321821054899805, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 92 - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mText - value: "\u9009\u62E9" - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2402740887452033505, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 3224139937598047577, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: -235 - objectReference: {fileID: 0} - - target: {fileID: 3638312893300319451, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 4338095648653057983, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.y - value: -80 - objectReference: {fileID: 0} - - target: {fileID: 5210229992238887641, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mWidth - value: 276 - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: aspectRatio - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mText - value: "\u4E0B\u4E00\u6B65\u5904\u7406\u4EBA" - objectReference: {fileID: 0} - - target: {fileID: 5948945561247630419, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mFont - value: - objectReference: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, - type: 3} - - target: {fileID: 6193227682257864774, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: mAtlas - value: - objectReference: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, - type: 3} - - target: {fileID: 6356504636838832541, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: atlas - value: - objectReference: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, - type: 3} - - target: {fileID: 6356504636838832541, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: trueTypeFont - value: - objectReference: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, - type: 3} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.y - value: -177.27924 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 337f1c0d233644dc591990603c463db8, type: 3} ---- !u!4 &3249582732546049925 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8702209548977510478, guid: 337f1c0d233644dc591990603c463db8, - type: 3} - m_PrefabInstance: {fileID: 6186999471670796235} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 675396154728095867} + - component: {fileID: 4990245062396829399} + - component: {fileID: 8815791271140863592} + - component: {fileID: 2441478266584503510} + - component: {fileID: 4901143979543252347} + - component: {fileID: 6765947744325158601} + m_Layer: 5 + m_Name: InputSelectProduct + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &675396154728095867 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872996654376181753} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -685.9043, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3343166803441427381} + - {fileID: 1916666550900471628} + - {fileID: 1653017981213649932} + - {fileID: 6711905458103532908} + - {fileID: 5597705235801352074} + - {fileID: 6735670843721406284} + m_Father: {fileID: 9092197074366352143} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4990245062396829399 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872996654376181753} + 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 &8815791271140863592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872996654376181753} + 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 &2441478266584503510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872996654376181753} + 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 &4901143979543252347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872996654376181753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 8815791271140863592} + offset: 0 + sizeAdjust: 1 +--- !u!114 &6765947744325158601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8872996654376181753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 8872996654376181753} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 1 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 6896994100725352575} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!1 &9044075107775048955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8497326207621746825} + - component: {fileID: 5149278701099797750} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8497326207621746825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9044075107775048955} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 528, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7657068295081712894} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5149278701099797750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9044075107775048955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7657068295081712894} + relative: 1 + absolute: -48 + rightAnchor: + target: {fileID: 7657068295081712894} + 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/panel/PanelSelectProduct.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab index 29f5198..d940457 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab @@ -280,6 +280,7 @@ GameObject: - component: {fileID: 6443676307379350713} - component: {fileID: 5129961851071160420} - component: {fileID: 2953575355203642134} + - component: {fileID: 5748525195033831039} m_Layer: 5 m_Name: 00000 m_TagString: Untagged @@ -321,7 +322,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isPause: 0 - luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua + luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductList.lua isNeedResetAtlase: 1 --- !u!114 &5129961851071160420 MonoBehaviour: @@ -391,6 +392,19 @@ MonoBehaviour: widget: {fileID: 5129961851071160420} offset: 0 sizeAdjust: 1 +--- !u!114 &5748525195033831039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339031885216242466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: --- !u!1 &1476048743331547168 GameObject: m_ObjectHideFlags: 0 @@ -421,6 +435,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3250592075526405360} + - {fileID: 312477580778927759} m_Father: {fileID: 8302959411981827612} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -460,7 +475,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} m_Name: m_EditorClassIdentifier: - cellCount: 10 + cellCount: 14 isPlayTween: 0 twType: 0 tweenSpeed: 0.01 @@ -556,6 +571,106 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!1 &3516691852276209336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3318967223522064214} + - component: {fileID: 3838711473590820217} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3318967223522064214 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3516691852276209336} + 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: 312477580778927759} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3838711473590820217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3516691852276209336} + 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: 1125 + mHeight: 50 + mDepth: 11 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 22.5 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u65E0\u66F4\u591A\u4FE1\u606F" + mFontSize: 46 + 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 &3625231913236928321 GameObject: m_ObjectHideFlags: 0 @@ -966,7 +1081,7 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} mPivot: 3 - mWidth: 84 + mWidth: 284 mHeight: 42 mDepth: 5 autoResizeBoxCollider: 0 @@ -1083,7 +1198,7 @@ MonoBehaviour: checkSprite: {fileID: 0} checkAnimation: {fileID: 0} eventReceiver: {fileID: 0} - functionName: OnActivate + functionName: startsChecked: 0 --- !u!114 &2409523827425164381 MonoBehaviour: @@ -1254,7 +1369,14 @@ MonoBehaviour: 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: [] + onChange: + - mTarget: {fileID: 6984233625075085881} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 mValue: --- !u!114 &4318169829063325852 MonoBehaviour: @@ -1422,7 +1544,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} m_Name: m_EditorClassIdentifier: - jsonKey: + jsonKey: num formatValue: "\u5E93\u5B58\uFF1A{0}" labeName: {fileID: 0} defaultName: @@ -1528,6 +1650,7 @@ GameObject: m_Component: - component: {fileID: 7271328320495617231} - component: {fileID: 6073061147799334719} + - component: {fileID: 1872187556} m_Layer: 5 m_Name: LabelTitle m_TagString: Untagged @@ -1618,6 +1741,30 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!114 &1872187556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6062575811671155989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: name + 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 &6109131649511301274 GameObject: m_ObjectHideFlags: 0 @@ -1800,6 +1947,94 @@ MonoBehaviour: hideIfOffScreen: 0 keepAspectRatio: 0 aspectRatio: 0.5405276 +--- !u!1 &6575156775745750833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 312477580778927759} + - component: {fileID: 7219926862309829378} + - component: {fileID: 5260718638861744539} + - component: {fileID: 3624412198162812352} + m_Layer: 5 + m_Name: ButtonEndList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &312477580778927759 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6575156775745750833} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -592.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3318967223522064214} + m_Father: {fileID: 6641565186329801146} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7219926862309829378 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6575156775745750833} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 87.74999, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5260718638861744539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6575156775745750833} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 3516691852276209336} + 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 &3624412198162812352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6575156775745750833} + 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 &6583241675011228078 GameObject: m_ObjectHideFlags: 0 @@ -1962,6 +2197,7 @@ GameObject: m_Component: - component: {fileID: 2927355420003232706} - component: {fileID: 8281559266079674693} + - component: {fileID: 2023641540} m_Layer: 5 m_Name: LabelPrice m_TagString: Untagged @@ -1977,7 +2213,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6814252217244726824} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -137.00002, y: -42, z: 0} + m_LocalPosition: {x: -137, y: -42, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3250592075526405360} @@ -2014,7 +2250,7 @@ MonoBehaviour: updateAnchors: 0 mColor: {r: 0.94509804, g: 0.76862746, b: 0.05882353, a: 1} mPivot: 3 - mWidth: 200 + mWidth: 284 mHeight: 42 mDepth: 5 autoResizeBoxCollider: 0 @@ -2052,6 +2288,30 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!114 &2023641540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6814252217244726824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: price + 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 &6984233625075085880 GameObject: m_ObjectHideFlags: 0 @@ -2147,7 +2407,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isPause: 0 - luaPath: + luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua isNeedBackplate: 1 destroyWhenHide: 0 isNeedResetAtlase: 1 diff --git a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d index ea5a037..42cedbc 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/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua index dc4949e..95cc9fa 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua index 87fa428..3588bf7 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua index 95556f6..335db56 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua index d3985d2..caf2c6d 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/DBRoot.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua index ca7013a..a6ead5e 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua index e4506a6..994b84b 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 1d28cac..1c14a59 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/KKLogListener.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua index 03884bf..d26db16 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua index ed2f83e..674a611 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua index 1169c2f..b94ce71 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua index 6a89feb..b585938 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua new file mode 100644 index 0000000..e1a1192 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua.meta new file mode 100644 index 0000000..627e7af --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4217e7cc0173d41cfba3ab8d03d42260 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua new file mode 100644 index 0000000..e301365 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua.meta new file mode 100644 index 0000000..979152e --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductSelected.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2bd85c33f7a8a41ec9c474e622fc55f5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua index 8466bab..77490ad 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua index 646816e..99fd5ee 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua index 21a6572..084774d 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 90448c0..fdb99a6 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/TRPEditPrice.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua new file mode 100644 index 0000000..fd8c032 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua.meta new file mode 100644 index 0000000..a87ff4f --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9dbcf0d323c8f40dc8d566e67d1c3dd7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua index dd02eaa..dfaf511 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua index 08d668b..5e15092 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua index 09f2383..a17df50 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua new file mode 100644 index 0000000..5470d65 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua.meta new file mode 100644 index 0000000..90ffb27 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eeda25c7541e64df6b1920374596b21d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d index c20ae0f..a0b0be1 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d index 8478c7f..62926a6 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/InputMultText.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d index 5bb8287..4a61d9a 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d index 76b94f3..31888d2 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d index dac4a6e..d07b8ab 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d index bdfbffa..708f9c6 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d index f325915..4fe8a96 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d index 00f59c8..b3aacd9 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/PanelCustList.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d index 28f1501..30ea86a 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d new file mode 100644 index 0000000..27db286 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d.meta new file mode 100644 index 0000000..d7ac89b --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b2fbbe53fe16f4f3487d65e8f5ac99b9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d index 5d1da38..78db32f 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d index 5c30784..d79c93c 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d index 6234df9..299aeb9 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver index e039bca..c85562a 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,3e915803cfd2bb3ae01e78d9ae0198668 %trCRM/resVer/Android/VerCtl/other.ver8,dc65aaee0c1df6fcd7279730917b98fe \ No newline at end of file +r8 (trCRM/resVer/Android/VerCtl/priority.ver8,390cfadd31a54f6247c2183af9cce0f08 %trCRM/resVer/Android/VerCtl/other.ver8,dc65aaee0c1df6fcd7279730917b98fe \ 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 e37fba8..3aedddb 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 7321538..fb6aaf8 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