diff --git a/Assets/3rd/NativeCamera.meta b/Assets/3rd/NativeCamera.meta new file mode 100644 index 0000000..81da828 --- /dev/null +++ b/Assets/3rd/NativeCamera.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c7a308d4b0404c13b070242a6b57fa6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins.meta b/Assets/3rd/NativeCamera/Plugins.meta new file mode 100644 index 0000000..46cbd0d --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1bb6a665b7d9041bab99a6efdbc705ca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Android.meta b/Assets/3rd/NativeCamera/Plugins/Android.meta similarity index 57% rename from Assets/3rd/NativeGallery/Android.meta rename to Assets/3rd/NativeCamera/Plugins/Android.meta index ae029ba..356b865 100644 --- a/Assets/3rd/NativeGallery/Android.meta +++ b/Assets/3rd/NativeCamera/Plugins/Android.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 0a607dcda26e7614f86300c6ca717295 +guid: 5fc918beb0f7cfe49a7f596d5b6b8768 folderAsset: yes -timeCreated: 1498722617 -licenseType: Store +timeCreated: 1525098661 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NCCallbackHelper.cs b/Assets/3rd/NativeCamera/Plugins/Android/NCCallbackHelper.cs new file mode 100644 index 0000000..f6f6635 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Android/NCCallbackHelper.cs @@ -0,0 +1,31 @@ +#if !UNITY_EDITOR && UNITY_ANDROID +using UnityEngine; + +namespace NativeCameraNamespace +{ + public class NCCallbackHelper : MonoBehaviour + { + private System.Action mainThreadAction = null; + + private void Awake() + { + DontDestroyOnLoad( gameObject ); + } + + private void Update() + { + if( mainThreadAction != null ) + { + System.Action temp = mainThreadAction; + mainThreadAction = null; + temp(); + } + } + + public void CallOnMainThread( System.Action function ) + { + mainThreadAction = function; + } + } +} +#endif \ No newline at end of file diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NCCallbackHelper.cs.meta b/Assets/3rd/NativeCamera/Plugins/Android/NCCallbackHelper.cs.meta new file mode 100644 index 0000000..75af0cb --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Android/NCCallbackHelper.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b2bbe0051e738ea4585119c46d863f19 +timeCreated: 1545147258 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NCCameraCallbackAndroid.cs b/Assets/3rd/NativeCamera/Plugins/Android/NCCameraCallbackAndroid.cs new file mode 100644 index 0000000..d90136b --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Android/NCCameraCallbackAndroid.cs @@ -0,0 +1,39 @@ +#if !UNITY_EDITOR && UNITY_ANDROID +using UnityEngine; + +namespace NativeCameraNamespace +{ + public class NCCameraCallbackAndroid : AndroidJavaProxy + { + private readonly NativeCamera.CameraCallback callback; + private readonly NCCallbackHelper callbackHelper; + + public NCCameraCallbackAndroid( NativeCamera.CameraCallback callback ) : base( "com.yasirkula.unity.NativeCameraMediaReceiver" ) + { + this.callback = callback; + callbackHelper = new GameObject( "NCCallbackHelper" ).AddComponent(); + } + + public void OnMediaReceived( string path ) + { + callbackHelper.CallOnMainThread( () => MediaReceiveCallback( path ) ); + } + + private void MediaReceiveCallback( string path ) + { + if( string.IsNullOrEmpty( path ) ) + path = null; + + try + { + if( callback != null ) + callback( path ); + } + finally + { + Object.Destroy( callbackHelper ); + } + } + } +} +#endif \ No newline at end of file diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NCCameraCallbackAndroid.cs.meta b/Assets/3rd/NativeCamera/Plugins/Android/NCCameraCallbackAndroid.cs.meta new file mode 100644 index 0000000..317390d --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Android/NCCameraCallbackAndroid.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3cc8df584d2a4344b929a4f13a53723a +timeCreated: 1519060539 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NCPermissionCallbackAndroid.cs b/Assets/3rd/NativeCamera/Plugins/Android/NCPermissionCallbackAndroid.cs new file mode 100644 index 0000000..13c2342 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Android/NCPermissionCallbackAndroid.cs @@ -0,0 +1,29 @@ +#if !UNITY_EDITOR && UNITY_ANDROID +using System.Threading; +using UnityEngine; + +namespace NativeCameraNamespace +{ + public class NCPermissionCallbackAndroid : AndroidJavaProxy + { + private object threadLock; + public int Result { get; private set; } + + public NCPermissionCallbackAndroid( object threadLock ) : base( "com.yasirkula.unity.NativeCameraPermissionReceiver" ) + { + Result = -1; + this.threadLock = threadLock; + } + + public void OnPermissionResult( int result ) + { + Result = result; + + lock( threadLock ) + { + Monitor.Pulse( threadLock ); + } + } + } +} +#endif \ No newline at end of file diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NCPermissionCallbackAndroid.cs.meta b/Assets/3rd/NativeCamera/Plugins/Android/NCPermissionCallbackAndroid.cs.meta new file mode 100644 index 0000000..449eca7 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Android/NCPermissionCallbackAndroid.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: bafa24bbc8c455f44a2b98dcbe6451bd +timeCreated: 1519060539 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NativeCamera.aar b/Assets/3rd/NativeCamera/Plugins/Android/NativeCamera.aar new file mode 100644 index 0000000..1027c5a Binary files /dev/null and b/Assets/3rd/NativeCamera/Plugins/Android/NativeCamera.aar differ diff --git a/Assets/3rd/NativeCamera/Plugins/Android/NativeCamera.aar.meta b/Assets/3rd/NativeCamera/Plugins/Android/NativeCamera.aar.meta new file mode 100644 index 0000000..0efd215 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Android/NativeCamera.aar.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 284037eba2526f54d9cf51b5d9bffcfa +timeCreated: 1569764737 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Android: Android + second: + enabled: 1 + settings: {} + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Editor.meta b/Assets/3rd/NativeCamera/Plugins/Editor.meta similarity index 69% rename from Assets/3rd/NativeGallery/Editor.meta rename to Assets/3rd/NativeCamera/Plugins/Editor.meta index 0f26bfe..610638e 100644 --- a/Assets/3rd/NativeGallery/Editor.meta +++ b/Assets/3rd/NativeCamera/Plugins/Editor.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 19fc6b8ce781591438a952d8aa9104f8 +guid: 16fe39fd709533a4eba946790a8e3123 folderAsset: yes timeCreated: 1521452097 -licenseType: Store +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/Assets/3rd/NativeCamera/Plugins/Editor/NCPostProcessBuild.cs b/Assets/3rd/NativeCamera/Plugins/Editor/NCPostProcessBuild.cs new file mode 100644 index 0000000..4efa3d5 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Editor/NCPostProcessBuild.cs @@ -0,0 +1,66 @@ +using System.IO; +using UnityEditor; +using UnityEngine; +#if UNITY_IOS +using UnityEditor.Callbacks; +using UnityEditor.iOS.Xcode; +#endif + +public class NCPostProcessBuild +{ + private const bool ENABLED = true; + + private const string CAMERA_USAGE_DESCRIPTION = "Capture media with camera"; + private const string MICROPHONE_USAGE_DESCRIPTION = "Capture microphone input in videos"; + + [InitializeOnLoadMethod] + public static void ValidatePlugin() + { + string jarPath = "Assets/Plugins/NativeCamera/Android/NativeCamera.jar"; + if( File.Exists( jarPath ) ) + { + Debug.Log( "Deleting obsolete " + jarPath ); + AssetDatabase.DeleteAsset( jarPath ); + } + } + +#if UNITY_IOS +#pragma warning disable 0162 + [PostProcessBuild] + public static void OnPostprocessBuild( BuildTarget target, string buildPath ) + { + if( !ENABLED ) + return; + + if( target == BuildTarget.iOS ) + { + string pbxProjectPath = PBXProject.GetPBXProjectPath( buildPath ); + string plistPath = Path.Combine( buildPath, "Info.plist" ); + + PBXProject pbxProject = new PBXProject(); + pbxProject.ReadFromFile( pbxProjectPath ); + +#if UNITY_2019_3_OR_NEWER + string targetGUID = pbxProject.GetUnityFrameworkTargetGuid(); +#else + string targetGUID = pbxProject.TargetGuidByName( PBXProject.GetUnityTargetName() ); +#endif + + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework MobileCoreServices" ); + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework ImageIO" ); + + File.WriteAllText( pbxProjectPath, pbxProject.WriteToString() ); + + PlistDocument plist = new PlistDocument(); + plist.ReadFromString( File.ReadAllText( plistPath ) ); + + PlistElementDict rootDict = plist.root; + rootDict.SetString( "NSCameraUsageDescription", CAMERA_USAGE_DESCRIPTION ); + rootDict.SetString( "NSMicrophoneUsageDescription", MICROPHONE_USAGE_DESCRIPTION ); + + File.WriteAllText( plistPath, plist.WriteToString() ); + } + } +#pragma warning restore 0162 +#endif +} \ No newline at end of file diff --git a/Assets/3rd/NativeCamera/Plugins/Editor/NCPostProcessBuild.cs.meta b/Assets/3rd/NativeCamera/Plugins/Editor/NCPostProcessBuild.cs.meta new file mode 100644 index 0000000..6dea393 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Editor/NCPostProcessBuild.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: fa3b57e342928704cb910789ae4dde20 +timeCreated: 1521452119 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/Editor/NativeCamera.Editor.asmdef b/Assets/3rd/NativeCamera/Plugins/Editor/NativeCamera.Editor.asmdef new file mode 100644 index 0000000..deca259 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Editor/NativeCamera.Editor.asmdef @@ -0,0 +1,15 @@ +{ + "name": "NativeCamera.Editor", + "references": [], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/3rd/NativeCamera/Plugins/Editor/NativeCamera.Editor.asmdef.meta b/Assets/3rd/NativeCamera/Plugins/Editor/NativeCamera.Editor.asmdef.meta new file mode 100644 index 0000000..03078af --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/Editor/NativeCamera.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 31117d0234af0084b91a7e53b3d9e0a3 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/NativeCamera.Runtime.asmdef b/Assets/3rd/NativeCamera/Plugins/NativeCamera.Runtime.asmdef new file mode 100644 index 0000000..bbba069 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/NativeCamera.Runtime.asmdef @@ -0,0 +1,3 @@ +{ + "name": "NativeCamera.Runtime" +} diff --git a/Assets/3rd/NativeCamera/Plugins/NativeCamera.Runtime.asmdef.meta b/Assets/3rd/NativeCamera/Plugins/NativeCamera.Runtime.asmdef.meta new file mode 100644 index 0000000..9d08631 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/NativeCamera.Runtime.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b107fd1956cb3e04985108f5ee29e115 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/NativeCamera.cs b/Assets/3rd/NativeCamera/Plugins/NativeCamera.cs new file mode 100644 index 0000000..1ac23eb --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/NativeCamera.cs @@ -0,0 +1,442 @@ +using System; +using System.IO; +using UnityEngine; +using Object = UnityEngine.Object; +#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS ) +using NativeCameraNamespace; +#endif + +public static class NativeCamera +{ + public struct ImageProperties + { + public readonly int width; + public readonly int height; + public readonly string mimeType; + public readonly ImageOrientation orientation; + + public ImageProperties( int width, int height, string mimeType, ImageOrientation orientation ) + { + this.width = width; + this.height = height; + this.mimeType = mimeType; + this.orientation = orientation; + } + } + + public struct VideoProperties + { + public readonly int width; + public readonly int height; + public readonly long duration; + public readonly float rotation; + + public VideoProperties( int width, int height, long duration, float rotation ) + { + this.width = width; + this.height = height; + this.duration = duration; + this.rotation = rotation; + } + } + + public enum Permission { Denied = 0, Granted = 1, ShouldAsk = 2 }; + public enum Quality { Default = -1, Low = 0, Medium = 1, High = 2 }; + public enum PreferredCamera { Default = -1, Rear = 0, Front = 1 } + + // EXIF orientation: http://sylvana.net/jpegcrop/exif_orientation.html (indices are reordered) + public enum ImageOrientation { Unknown = -1, Normal = 0, Rotate90 = 1, Rotate180 = 2, Rotate270 = 3, FlipHorizontal = 4, Transpose = 5, FlipVertical = 6, Transverse = 7 }; + + public delegate void CameraCallback( string path ); + + #region Platform Specific Elements +#if !UNITY_EDITOR && UNITY_ANDROID + private static AndroidJavaClass m_ajc = null; + private static AndroidJavaClass AJC + { + get + { + if( m_ajc == null ) + m_ajc = new AndroidJavaClass( "com.yasirkula.unity.NativeCamera" ); + + return m_ajc; + } + } + + private static AndroidJavaObject m_context = null; + private static AndroidJavaObject Context + { + get + { + if( m_context == null ) + { + using( AndroidJavaObject unityClass = new AndroidJavaClass( "com.unity3d.player.UnityPlayer" ) ) + { + m_context = unityClass.GetStatic( "currentActivity" ); + } + } + + return m_context; + } + } +#elif !UNITY_EDITOR && UNITY_IOS + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeCamera_CheckPermission(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeCamera_RequestPermission(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeCamera_CanOpenSettings(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeCamera_OpenSettings(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeCamera_HasCamera(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeCamera_TakePicture( string imageSavePath, int maxSize, int preferredCamera ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeCamera_RecordVideo( int quality, int maxDuration, int preferredCamera ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeCamera_GetImageProperties( string path ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeCamera_GetVideoProperties( string path ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeCamera_GetVideoThumbnail( string path, string thumbnailSavePath, int maxSize, double captureTimeInSeconds ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeCamera_LoadImageAtPath( string path, string temporaryFilePath, int maxSize ); +#endif + +#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS ) + private static string m_temporaryImagePath = null; + private static string TemporaryImagePath + { + get + { + if( m_temporaryImagePath == null ) + { + m_temporaryImagePath = Path.Combine( Application.temporaryCachePath, "tmpImg" ); + Directory.CreateDirectory( Application.temporaryCachePath ); + } + + return m_temporaryImagePath; + } + } +#endif + +#if !UNITY_EDITOR && UNITY_IOS + private static string m_iOSSelectedImagePath = null; + private static string IOSSelectedImagePath + { + get + { + if( m_iOSSelectedImagePath == null ) + { + m_iOSSelectedImagePath = Path.Combine( Application.temporaryCachePath, "CameraImg" ); + Directory.CreateDirectory( Application.temporaryCachePath ); + } + + return m_iOSSelectedImagePath; + } + } +#endif + #endregion + + #region Runtime Permissions + public static Permission CheckPermission() + { +#if !UNITY_EDITOR && UNITY_ANDROID + Permission result = (Permission) AJC.CallStatic( "CheckPermission", Context ); + if( result == Permission.Denied && (Permission) PlayerPrefs.GetInt( "NativeCameraPermission", (int) Permission.ShouldAsk ) == Permission.ShouldAsk ) + result = Permission.ShouldAsk; + + return result; +#elif !UNITY_EDITOR && UNITY_IOS + return (Permission) _NativeCamera_CheckPermission(); +#else + return Permission.Granted; +#endif + } + + public static Permission RequestPermission() + { +#if !UNITY_EDITOR && UNITY_ANDROID + object threadLock = new object(); + lock( threadLock ) + { + NCPermissionCallbackAndroid nativeCallback = new NCPermissionCallbackAndroid( threadLock ); + + AJC.CallStatic( "RequestPermission", Context, nativeCallback, PlayerPrefs.GetInt( "NativeCameraPermission", (int) Permission.ShouldAsk ) ); + + if( nativeCallback.Result == -1 ) + System.Threading.Monitor.Wait( threadLock ); + + if( (Permission) nativeCallback.Result != Permission.ShouldAsk && PlayerPrefs.GetInt( "NativeCameraPermission", -1 ) != nativeCallback.Result ) + { + PlayerPrefs.SetInt( "NativeCameraPermission", nativeCallback.Result ); + PlayerPrefs.Save(); + } + + return (Permission) nativeCallback.Result; + } +#elif !UNITY_EDITOR && UNITY_IOS + return (Permission) _NativeCamera_RequestPermission(); +#else + return Permission.Granted; +#endif + } + + public static bool CanOpenSettings() + { +#if !UNITY_EDITOR && UNITY_IOS + return _NativeCamera_CanOpenSettings() == 1; +#else + return true; +#endif + } + + public static void OpenSettings() + { +#if !UNITY_EDITOR && UNITY_ANDROID + AJC.CallStatic( "OpenSettings", Context ); +#elif !UNITY_EDITOR && UNITY_IOS + _NativeCamera_OpenSettings(); +#endif + } + #endregion + + #region Camera Functions + public static Permission TakePicture( CameraCallback callback, int maxSize = -1, bool saveAsJPEG = true, PreferredCamera preferredCamera = PreferredCamera.Default ) + { + Permission result = RequestPermission(); + if( result == Permission.Granted && !IsCameraBusy() ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + AJC.CallStatic( "TakePicture", Context, new NCCameraCallbackAndroid( callback ), (int) preferredCamera ); +#elif !UNITY_EDITOR && UNITY_IOS + if( maxSize <= 0 ) + maxSize = SystemInfo.maxTextureSize; + + NCCameraCallbackiOS.Initialize( callback ); + _NativeCamera_TakePicture( IOSSelectedImagePath + ( saveAsJPEG ? ".jpeg" : ".png" ), maxSize, (int) preferredCamera ); +#else + if( callback != null ) + callback( null ); +#endif + } + + return result; + } + + public static Permission RecordVideo( CameraCallback callback, Quality quality = Quality.Default, int maxDuration = 0, long maxSizeBytes = 0L, PreferredCamera preferredCamera = PreferredCamera.Default ) + { + Permission result = RequestPermission(); + if( result == Permission.Granted && !IsCameraBusy() ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + AJC.CallStatic( "RecordVideo", Context, new NCCameraCallbackAndroid( callback ), (int) preferredCamera, (int) quality, maxDuration, maxSizeBytes ); +#elif !UNITY_EDITOR && UNITY_IOS + NCCameraCallbackiOS.Initialize( callback ); + _NativeCamera_RecordVideo( (int) quality, maxDuration, (int) preferredCamera ); +#else + if( callback != null ) + callback( null ); +#endif + } + + return result; + } + + public static bool DeviceHasCamera() + { +#if !UNITY_EDITOR && UNITY_ANDROID + return AJC.CallStatic( "HasCamera", Context ); +#elif !UNITY_EDITOR && UNITY_IOS + return _NativeCamera_HasCamera() == 1; +#else + return true; +#endif + } + + public static bool IsCameraBusy() + { +#if !UNITY_EDITOR && UNITY_IOS + return NCCameraCallbackiOS.IsBusy; +#else + return false; +#endif + } + #endregion + + #region Utility Functions + public static Texture2D LoadImageAtPath( string imagePath, int maxSize = -1, bool markTextureNonReadable = true, + bool generateMipmaps = true, bool linearColorSpace = false ) + { + if( string.IsNullOrEmpty( imagePath ) ) + throw new ArgumentException( "Parameter 'imagePath' is null or empty!" ); + + if( !File.Exists( imagePath ) ) + throw new FileNotFoundException( "File not found at " + imagePath ); + + if( maxSize <= 0 ) + maxSize = SystemInfo.maxTextureSize; + +#if !UNITY_EDITOR && UNITY_ANDROID + string loadPath = AJC.CallStatic( "LoadImageAtPath", Context, imagePath, TemporaryImagePath, maxSize ); +#elif !UNITY_EDITOR && UNITY_IOS + string loadPath = _NativeCamera_LoadImageAtPath( imagePath, TemporaryImagePath, maxSize ); +#else + string loadPath = imagePath; +#endif + + String extension = Path.GetExtension( imagePath ).ToLowerInvariant(); + TextureFormat format = ( extension == ".jpg" || extension == ".jpeg" ) ? TextureFormat.RGB24 : TextureFormat.RGBA32; + + Texture2D result = new Texture2D( 2, 2, format, generateMipmaps, linearColorSpace ); + + try + { + if( !result.LoadImage( File.ReadAllBytes( loadPath ), markTextureNonReadable ) ) + { + Object.DestroyImmediate( result ); + return null; + } + } + catch( Exception e ) + { + Debug.LogException( e ); + + Object.DestroyImmediate( result ); + return null; + } + finally + { + if( loadPath != imagePath ) + { + try + { + File.Delete( loadPath ); + } + catch { } + } + } + + return result; + } + + public static Texture2D GetVideoThumbnail( string videoPath, int maxSize = -1, double captureTimeInSeconds = -1.0 ) + { + if( maxSize <= 0 ) + maxSize = SystemInfo.maxTextureSize; + +#if !UNITY_EDITOR && UNITY_ANDROID + string thumbnailPath = AJC.CallStatic( "GetVideoThumbnail", Context, videoPath, TemporaryImagePath + ".png", false, maxSize, captureTimeInSeconds ); +#elif !UNITY_EDITOR && UNITY_IOS + string thumbnailPath = _NativeCamera_GetVideoThumbnail( videoPath, TemporaryImagePath + ".png", maxSize, captureTimeInSeconds ); +#else + string thumbnailPath = null; +#endif + + if( !string.IsNullOrEmpty( thumbnailPath ) ) + return LoadImageAtPath( thumbnailPath, maxSize ); + else + return null; + } + + public static ImageProperties GetImageProperties( string imagePath ) + { + if( !File.Exists( imagePath ) ) + throw new FileNotFoundException( "File not found at " + imagePath ); + +#if !UNITY_EDITOR && UNITY_ANDROID + string value = AJC.CallStatic( "GetImageProperties", Context, imagePath ); +#elif !UNITY_EDITOR && UNITY_IOS + string value = _NativeCamera_GetImageProperties( imagePath ); +#else + string value = null; +#endif + + int width = 0, height = 0; + string mimeType = null; + ImageOrientation orientation = ImageOrientation.Unknown; + if( !string.IsNullOrEmpty( value ) ) + { + string[] properties = value.Split( '>' ); + if( properties != null && properties.Length >= 4 ) + { + if( !int.TryParse( properties[0].Trim(), out width ) ) + width = 0; + if( !int.TryParse( properties[1].Trim(), out height ) ) + height = 0; + + mimeType = properties[2].Trim(); + if( mimeType.Length == 0 ) + { + String extension = Path.GetExtension( imagePath ).ToLowerInvariant(); + if( extension == ".png" ) + mimeType = "image/png"; + else if( extension == ".jpg" || extension == ".jpeg" ) + mimeType = "image/jpeg"; + else if( extension == ".gif" ) + mimeType = "image/gif"; + else if( extension == ".bmp" ) + mimeType = "image/bmp"; + else + mimeType = null; + } + + int orientationInt; + if( int.TryParse( properties[3].Trim(), out orientationInt ) ) + orientation = (ImageOrientation) orientationInt; + } + } + + return new ImageProperties( width, height, mimeType, orientation ); + } + + public static VideoProperties GetVideoProperties( string videoPath ) + { + if( !File.Exists( videoPath ) ) + throw new FileNotFoundException( "File not found at " + videoPath ); + +#if !UNITY_EDITOR && UNITY_ANDROID + string value = AJC.CallStatic( "GetVideoProperties", Context, videoPath ); +#elif !UNITY_EDITOR && UNITY_IOS + string value = _NativeCamera_GetVideoProperties( videoPath ); +#else + string value = null; +#endif + + int width = 0, height = 0; + long duration = 0L; + float rotation = 0f; + if( !string.IsNullOrEmpty( value ) ) + { + string[] properties = value.Split( '>' ); + if( properties != null && properties.Length >= 4 ) + { + if( !int.TryParse( properties[0].Trim(), out width ) ) + width = 0; + if( !int.TryParse( properties[1].Trim(), out height ) ) + height = 0; + if( !long.TryParse( properties[2].Trim(), out duration ) ) + duration = 0L; + if( !float.TryParse( properties[3].Trim(), out rotation ) ) + rotation = 0f; + } + } + + if( rotation == -90f ) + rotation = 270f; + + return new VideoProperties( width, height, duration, rotation ); + } + #endregion +} \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/NativeGallery.cs.meta b/Assets/3rd/NativeCamera/Plugins/NativeCamera.cs.meta similarity index 74% rename from Assets/3rd/NativeGallery/NativeGallery.cs.meta rename to Assets/3rd/NativeCamera/Plugins/NativeCamera.cs.meta index 2ceb99b..0fa49e2 100644 --- a/Assets/3rd/NativeGallery/NativeGallery.cs.meta +++ b/Assets/3rd/NativeCamera/Plugins/NativeCamera.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: ce1403606c3629046a0147d3e705f7cc -timeCreated: 1498722610 -licenseType: Store -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: ff758a73b21d4a04aa6f95679b3da605 +timeCreated: 1498722610 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/README.txt b/Assets/3rd/NativeCamera/Plugins/README.txt new file mode 100644 index 0000000..8bbe5dc --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/README.txt @@ -0,0 +1,90 @@ += Native Camera for Android & iOS = + +Online documentation & example code available at: https://github.com/yasirkula/UnityNativeCamera +E-mail: yasirkula@gmail.com + +1. ABOUT +This plugin helps you take pictures/record videos natively with your device's camera on Android & iOS. + +2. HOW TO +NativeCamera no longer requires any manual setup on Android. If you were using an older version of the plugin, you need to remove NativeCamera's "" from your AndroidManifest.xml. + +For reference, the legacy documentation is available at: https://github.com/yasirkula/UnityNativeCamera/wiki/Manual-Setup-for-Android + +2.2. iOS Setup +There are two ways to set up the plugin on iOS: + +2.2.a. Automated Setup for iOS +- (optional) change the value of CAMERA_USAGE_DESCRIPTION in Plugins/NativeCamera/Editor/NCPostProcessBuild.cs + +2.2.b. Manual Setup for iOS +- set the value of ENABLED to false in NCPostProcessBuild.cs +- build your project +- enter a Camera Usage Description to Info.plist in Xcode +- insert "-framework MobileCoreServices -framework ImageIO" to the "Other Linker Flags" of Unity-iPhone Target + +3. FAQ +- Can't use the camera, it says "Can't find ContentProvider, camera is inaccessible!" in Logcat +After building your project, verify that NativeCamera's "" tag is inserted in-between the "..." tags of PROJECT_PATH/Temp/StagingArea/AndroidManifest.xml. If not, please contact me. + +- Can't use the camera, it says "java.lang.ClassNotFoundException: com.yasirkula.unity.NativeCamera" in Logcat +If your project uses ProGuard, try adding the following line to ProGuard filters: -keep class com.yasirkula.unity.* { *; } + +4. SCRIPTING API +Please see the online documentation for a more in-depth documentation of the Scripting API: https://github.com/yasirkula/UnityNativeCamera + +enum NativeCamera.Permission { Denied = 0, Granted = 1, ShouldAsk = 2 }; +enum NativeCamera.Quality { Default = -1, Low = 0, Medium = 1, High = 2 }; +enum NativeCamera.ImageOrientation { Unknown = -1, Normal = 0, Rotate90 = 1, Rotate180 = 2, Rotate270 = 3, FlipHorizontal = 4, Transpose = 5, FlipVertical = 6, Transverse = 7 }; // EXIF orientation: http://sylvana.net/jpegcrop/exif_orientation.html (indices are reordered) + +delegate void CameraCallback( string path ); + +//// Accessing Camera //// + +// This operation is asynchronous! After user takes a picture or cancels the operation, the callback is called (on main thread) +// CameraCallback takes a string parameter which stores the path of the captured image, or null if the operation is canceled +// maxSize: determines the maximum size of the returned image in pixels on iOS. A larger image will be down-scaled for better performance. If untouched, its value will be set to SystemInfo.maxTextureSize. Has no effect on Android +// saveAsJPEG: determines whether the image is saved as JPEG or PNG. Has no effect on Android +// preferredCamera: determines whether the rear camera or the front camera should be opened by default +NativeCamera.Permission NativeCamera.TakePicture( CameraCallback callback, int maxSize = -1, bool saveAsJPEG = true, PreferredCamera preferredCamera = PreferredCamera.Default ); + +// quality: determines the quality of the recorded video +// maxDuration: determines the maximum duration, in seconds, for the recorded video. If untouched, there will be no limit. Please note that the functionality of this parameter depends on whether the device vendor has added this capability to the camera or not. So, this parameter may not have any effect on some devices +// maxSizeBytes: determines the maximum size, in bytes, for the recorded video. If untouched, there will be no limit. This parameter has no effect on iOS. Please note that the functionality of this parameter depends on whether the device vendor has added this capability to the camera or not. So, this parameter may not have any effect on some devices +NativeCamera.Permission NativeCamera.RecordVideo( CameraCallback callback, Quality quality = Quality.Default, int maxDuration = 0, long maxSizeBytes = 0L, PreferredCamera preferredCamera = PreferredCamera.Default ); + +bool NativeCamera.DeviceHasCamera(); // returns false if the device doesn't have a camera. In this case, TakePicture and RecordVideo functions will not execute + +bool NativeCamera.IsCameraBusy(); // returns true if the camera is currently open. In that case, another TakePicture or RecordVideo request will simply be ignored + + +//// Runtime Permissions //// + +// Accessing camera is only possible when permission state is Permission.Granted. TakePicture and RecordVideo functions request permission internally (and return the result) but you can also check/request the permissions manually +NativeCamera.Permission NativeCamera.CheckPermission(); +NativeCamera.Permission NativeCamera.RequestPermission(); + +// If permission state is Permission.Denied, user must grant the necessary permission(s) manually from the Settings (Android requires Storage and, if declared in AndroidManifest, Camera permissions; iOS requires Camera permission). These functions help you open the Settings directly from within the app +void NativeCamera.OpenSettings(); +bool NativeCamera.CanOpenSettings(); + + +//// Utility Functions //// + +// Creates a Texture2D from the specified image file in correct orientation and returns it. Returns null, if something goes wrong +// maxSize: determines the maximum size of the returned Texture2D in pixels. Larger textures will be down-scaled. If untouched, its value will be set to SystemInfo.maxTextureSize. It is recommended to set a proper maxSize for better performance +// markTextureNonReadable: marks the generated texture as non-readable for better memory usage. If you plan to modify the texture later (e.g. GetPixels/SetPixels), set its value to false +// generateMipmaps: determines whether texture should have mipmaps or not +// linearColorSpace: determines whether texture should be in linear color space or sRGB color space +Texture2D NativeCamera.LoadImageAtPath( string imagePath, int maxSize = -1, bool markTextureNonReadable = true, bool generateMipmaps = true, bool linearColorSpace = false ); + +// Creates a Texture2D thumbnail from a video file and returns it. Returns null, if something goes wrong +// maxSize: determines the maximum size of the returned Texture2D in pixels. Larger thumbnails will be down-scaled. If untouched, its value will be set to SystemInfo.maxTextureSize. It is recommended to set a proper maxSize for better performance +// captureTimeInSeconds: determines the frame of the video that the thumbnail is captured from. If untouched, OS will decide this value +Texture2D NativeCamera.GetVideoThumbnail( string videoPath, int maxSize = -1, double captureTimeInSeconds = -1.0 ); + +// Returns an ImageProperties instance that holds the width, height and mime type information of an image file without creating a Texture2D object. Mime type will be null, if it can't be determined +NativeCamera.ImageProperties NativeCamera.GetImageProperties( string imagePath ); + +// Returns a VideoProperties instance that holds the width, height, duration (in milliseconds) and rotation information of a video file. To play a video in correct orientation, you should rotate it by rotation degrees clockwise. For a 90-degree or 270-degree rotated video, values of width and height should be swapped to get the display size of the video +NativeCamera.VideoProperties NativeCamera.GetVideoProperties( string videoPath ); \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/README.txt.meta b/Assets/3rd/NativeCamera/Plugins/README.txt.meta similarity index 54% rename from Assets/3rd/NativeGallery/README.txt.meta rename to Assets/3rd/NativeCamera/Plugins/README.txt.meta index 55f4090..783148f 100644 --- a/Assets/3rd/NativeGallery/README.txt.meta +++ b/Assets/3rd/NativeCamera/Plugins/README.txt.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e5d70289d6cc2ac4294d703db236f8d0 -timeCreated: 1520539180 -licenseType: Store +guid: 5a88d1b1b9d7b904b862304c20ed4db4 +timeCreated: 1563308465 +licenseType: Free TextScriptImporter: userData: assetBundleName: diff --git a/Assets/3rd/NativeGallery/iOS.meta b/Assets/3rd/NativeCamera/Plugins/iOS.meta similarity index 69% rename from Assets/3rd/NativeGallery/iOS.meta rename to Assets/3rd/NativeCamera/Plugins/iOS.meta index 0474d23..2e481b3 100644 --- a/Assets/3rd/NativeGallery/iOS.meta +++ b/Assets/3rd/NativeCamera/Plugins/iOS.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9c623599351a41a4c84c20f73c9d8976 +guid: 5576acd2a06eb72409e6ec4b7f204a4e folderAsset: yes timeCreated: 1498722622 -licenseType: Store +licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/Assets/3rd/NativeCamera/Plugins/iOS/NCCameraCallbackiOS.cs b/Assets/3rd/NativeCamera/Plugins/iOS/NCCameraCallbackiOS.cs new file mode 100644 index 0000000..950341a --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/iOS/NCCameraCallbackiOS.cs @@ -0,0 +1,72 @@ +#if !UNITY_EDITOR && UNITY_IOS +using UnityEngine; + +namespace NativeCameraNamespace +{ + public class NCCameraCallbackiOS : MonoBehaviour + { + private static NCCameraCallbackiOS instance; + private NativeCamera.CameraCallback callback; + + private float nextBusyCheckTime; + + public static bool IsBusy { get; private set; } + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeCamera_IsCameraBusy(); + + public static void Initialize( NativeCamera.CameraCallback callback ) + { + if( IsBusy ) + return; + + if( instance == null ) + { + instance = new GameObject( "NCCameraCallbackiOS" ).AddComponent(); + DontDestroyOnLoad( instance.gameObject ); + } + + instance.callback = callback; + + instance.nextBusyCheckTime = Time.realtimeSinceStartup + 1f; + IsBusy = true; + } + + private void Update() + { + if( IsBusy ) + { + if( Time.realtimeSinceStartup >= nextBusyCheckTime ) + { + nextBusyCheckTime = Time.realtimeSinceStartup + 1f; + + if( _NativeCamera_IsCameraBusy() == 0 ) + { + IsBusy = false; + + if( callback != null ) + { + callback( null ); + callback = null; + } + } + } + } + } + + public void OnMediaReceived( string path ) + { + IsBusy = false; + + if( string.IsNullOrEmpty( path ) ) + path = null; + + if( callback != null ) + { + callback( path ); + callback = null; + } + } + } +} +#endif \ No newline at end of file diff --git a/Assets/3rd/NativeCamera/Plugins/iOS/NCCameraCallbackiOS.cs.meta b/Assets/3rd/NativeCamera/Plugins/iOS/NCCameraCallbackiOS.cs.meta new file mode 100644 index 0000000..78f7c6a --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/iOS/NCCameraCallbackiOS.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d8f19d5713752dc41bd377562677d8ee +timeCreated: 1519060539 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeCamera/Plugins/iOS/NativeCamera.mm b/Assets/3rd/NativeCamera/Plugins/iOS/NativeCamera.mm new file mode 100644 index 0000000..2f4a4e3 --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/iOS/NativeCamera.mm @@ -0,0 +1,507 @@ +#import +#import +#import +#import +#import + +#ifdef UNITY_4_0 || UNITY_5_0 +#import "iPhone_View.h" +#else +extern UIViewController* UnityGetGLViewController(); +#endif + +@interface UNativeCamera:NSObject ++ (int)checkPermission; ++ (int)requestPermission; ++ (int)canOpenSettings; ++ (void)openSettings; ++ (int)hasCamera; ++ (void)openCamera:(BOOL)imageMode defaultCamera:(int)defaultCamera savePath:(NSString *)imageSavePath maxImageSize:(int)maxImageSize videoQuality:(int)videoQuality maxVideoDuration:(int)maxVideoDuration; ++ (int)isCameraBusy; ++ (char *)getImageProperties:(NSString *)path; ++ (char *)getVideoProperties:(NSString *)path; ++ (char *)getVideoThumbnail:(NSString *)path savePath:(NSString *)savePath maximumSize:(int)maximumSize captureTime:(double)captureTime; ++ (char *)loadImageAtPath:(NSString *)path tempFilePath:(NSString *)tempFilePath maximumSize:(int)maximumSize; +@end + +@implementation UNativeCamera + +static NSString *pickedMediaSavePath; +static UIImagePickerController *imagePicker; +static int cameraMaxImageSize = -1; +static int imagePickerState = 0; // 0 -> none, 1 -> showing, 2 -> finished + +// Credit: https://stackoverflow.com/a/20464727/2373034 ++ (int)checkPermission { + if ([[[UIDevice currentDevice] systemVersion] compare:@"7.0" options:NSNumericSearch] != NSOrderedAscending) + { + AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]; + if (status == AVAuthorizationStatusAuthorized) + return 1; + else if (status == AVAuthorizationStatusNotDetermined ) + return 2; + else + return 0; + } + + return 1; +} + +// Credit: https://stackoverflow.com/a/20464727/2373034 ++ (int)requestPermission { + if ([[[UIDevice currentDevice] systemVersion] compare:@"7.0" options:NSNumericSearch] != NSOrderedAscending) + { + AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]; + if (status == AVAuthorizationStatusAuthorized) + return 1; + + if (status == AVAuthorizationStatusNotDetermined) { + __block BOOL authorized = NO; + + dispatch_semaphore_t sema = dispatch_semaphore_create(0); + [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) { + authorized = granted; + dispatch_semaphore_signal(sema); + }]; + dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER); + + if (authorized) + return 1; + else + return 0; + } + + return 0; + } + + return 1; +} + +// Credit: https://stackoverflow.com/a/25453667/2373034 ++ (int)canOpenSettings { + if (&UIApplicationOpenSettingsURLString != NULL) + return 1; + else + return 0; +} + +// Credit: https://stackoverflow.com/a/25453667/2373034 ++ (void)openSettings { + if (&UIApplicationOpenSettingsURLString != NULL) + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]; +} + ++ (int)hasCamera { + if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) + return 1; + + return 0; +} + +// Credit: https://stackoverflow.com/a/10531752/2373034 ++ (void)openCamera:(BOOL)imageMode defaultCamera:(int)defaultCamera savePath:(NSString *)imageSavePath maxImageSize:(int)maxImageSize videoQuality:(int)videoQuality maxVideoDuration:(int)maxVideoDuration { + if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) + { + NSLog(@"Device has no registered cameras!"); + + UnitySendMessage("NCCameraCallbackiOS", "OnMediaReceived", ""); + return; + } + + if ((imageMode && ![[UIImagePickerController availableMediaTypesForSourceType:UIImagePickerControllerSourceTypeCamera] containsObject:(NSString*)kUTTypeImage]) || + (!imageMode && ![[UIImagePickerController availableMediaTypesForSourceType:UIImagePickerControllerSourceTypeCamera] containsObject:(NSString*)kUTTypeMovie])) + { + NSLog(@"Camera does not support this operation!"); + + UnitySendMessage("NCCameraCallbackiOS", "OnMediaReceived", ""); + return; + } + + imagePicker = [[UIImagePickerController alloc] init]; + imagePicker.delegate = self; + imagePicker.allowsEditing = NO; + imagePicker.sourceType = UIImagePickerControllerSourceTypeCamera; + + if (imageMode) + imagePicker.mediaTypes = [NSArray arrayWithObject:(NSString *)kUTTypeImage]; + else + { + imagePicker.mediaTypes = [NSArray arrayWithObject:(NSString *)kUTTypeMovie]; + + if (maxVideoDuration > 0) + imagePicker.videoMaximumDuration = maxVideoDuration; + + if (videoQuality == 0) + imagePicker.videoQuality = UIImagePickerControllerQualityTypeLow; + else if (videoQuality == 1) + imagePicker.videoQuality = UIImagePickerControllerQualityTypeMedium; + else if (videoQuality == 2) + imagePicker.videoQuality = UIImagePickerControllerQualityTypeHigh; + } + + if (defaultCamera == 0 && [UIImagePickerController isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceRear]) + imagePicker.cameraDevice = UIImagePickerControllerCameraDeviceRear; + else if (defaultCamera == 1 && [UIImagePickerController isCameraDeviceAvailable:UIImagePickerControllerCameraDeviceFront]) + imagePicker.cameraDevice = UIImagePickerControllerCameraDeviceFront; + + pickedMediaSavePath = imageSavePath; + cameraMaxImageSize = maxImageSize; + + imagePickerState = 1; + [UnityGetGLViewController() presentViewController:imagePicker animated:YES completion:^{ imagePickerState = 0; }]; +} + ++ (int)isCameraBusy { + if (imagePickerState == 2) + return 1; + + if (imagePicker != nil) { + if (imagePickerState == 1 || [imagePicker presentingViewController] == UnityGetGLViewController()) + return 1; + + imagePicker = nil; + return 0; + } + + return 0; +} + +// Credit: https://stackoverflow.com/a/4170099/2373034 ++ (NSArray *)getImageMetadata:(NSString *)path { + int width = 0; + int height = 0; + int orientation = -1; + + CGImageSourceRef imageSource = CGImageSourceCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:path], nil); + if (imageSource != nil) { + NSDictionary *options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:(__bridge NSString *)kCGImageSourceShouldCache]; + CFDictionaryRef imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, (__bridge CFDictionaryRef)options); + CFRelease(imageSource); + + CGFloat widthF = 0.0f, heightF = 0.0f; + if (imageProperties != nil) { + if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyPixelWidth)) + CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth), kCFNumberCGFloatType, &widthF); + + if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyPixelHeight)) + CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight), kCFNumberCGFloatType, &heightF); + + if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyOrientation)) { + CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyOrientation), kCFNumberIntType, &orientation); + + if (orientation > 4) { // landscape image + CGFloat temp = widthF; + widthF = heightF; + heightF = temp; + } + } + + CFRelease(imageProperties); + } + + width = (int)roundf(widthF); + height = (int)roundf(heightF); + } + + return [[NSArray alloc] initWithObjects:[NSNumber numberWithInt:width], [NSNumber numberWithInt:height], [NSNumber numberWithInt:orientation], nil]; +} + ++ (char *)getImageProperties:(NSString *)path { + NSArray *metadata = [self getImageMetadata:path]; + + int orientationUnity; + int orientation = [metadata[2] intValue]; + + // To understand the magic numbers, see ImageOrientation enum in NativeCamera.cs + // and http://sylvana.net/jpegcrop/exif_orientation.html + if (orientation == 1) + orientationUnity = 0; + else if (orientation == 2) + orientationUnity = 4; + else if (orientation == 3) + orientationUnity = 2; + else if (orientation == 4) + orientationUnity = 6; + else if (orientation == 5) + orientationUnity = 5; + else if (orientation == 6) + orientationUnity = 1; + else if (orientation == 7) + orientationUnity = 7; + else if (orientation == 8) + orientationUnity = 3; + else + orientationUnity = -1; + + return [self getCString:[NSString stringWithFormat:@"%d>%d> >%d", [metadata[0] intValue], [metadata[1] intValue], orientationUnity]]; +} + ++ (char *)getVideoProperties:(NSString *)path { + CGSize size = CGSizeZero; + float rotation = 0; + long long duration = 0; + + AVURLAsset *asset = [AVURLAsset URLAssetWithURL:[NSURL fileURLWithPath:path] options:nil]; + if (asset != nil) { + duration = (long long) round(CMTimeGetSeconds([asset duration]) * 1000); + CGAffineTransform transform = [asset preferredTransform]; + NSArray* videoTracks = [asset tracksWithMediaType:AVMediaTypeVideo]; + if (videoTracks != nil && [videoTracks count] > 0) { + size = [[videoTracks objectAtIndex:0] naturalSize]; + transform = [[videoTracks objectAtIndex:0] preferredTransform]; + } + + rotation = atan2(transform.b, transform.a) * (180.0 / M_PI); + } + + return [self getCString:[NSString stringWithFormat:@"%d>%d>%lld>%f", (int)roundf(size.width), (int)roundf(size.height), duration, rotation]]; +} + ++ (char *)getVideoThumbnail:(NSString *)path savePath:(NSString *)savePath maximumSize:(int)maximumSize captureTime:(double)captureTime { + AVAssetImageGenerator *thumbnailGenerator = [[AVAssetImageGenerator alloc] initWithAsset:[[AVURLAsset alloc] initWithURL:[NSURL fileURLWithPath:path] options:nil]]; + thumbnailGenerator.appliesPreferredTrackTransform = YES; + thumbnailGenerator.maximumSize = CGSizeMake((CGFloat) maximumSize, (CGFloat) maximumSize); + thumbnailGenerator.requestedTimeToleranceBefore = kCMTimeZero; + thumbnailGenerator.requestedTimeToleranceAfter = kCMTimeZero; + + if (captureTime < 0.0) + captureTime = 0.0; + else { + AVURLAsset *asset = [AVURLAsset URLAssetWithURL:[NSURL fileURLWithPath:path] options:nil]; + if (asset != nil) { + double videoDuration = CMTimeGetSeconds([asset duration]); + if (videoDuration > 0.0 && captureTime >= videoDuration - 0.1) { + if (captureTime > videoDuration) + captureTime = videoDuration; + + thumbnailGenerator.requestedTimeToleranceBefore = CMTimeMakeWithSeconds(1.0, 600); + } + } + } + + NSError *error = nil; + CGImageRef image = [thumbnailGenerator copyCGImageAtTime:CMTimeMakeWithSeconds(captureTime, 600) actualTime:nil error:&error]; + if (image == nil) { + if (error != nil) + NSLog(@"Error generating video thumbnail: %@", error); + else + NSLog(@"Error generating video thumbnail..."); + + return ""; + } + + UIImage *thumbnail = [[UIImage alloc] initWithCGImage:image]; + CGImageRelease(image); + + if (![UIImagePNGRepresentation(thumbnail) writeToFile:savePath atomically:YES]) { + NSLog(@"Error saving thumbnail image"); + return ""; + } + + return [self getCString:savePath]; +} + ++ (UIImage *)scaleImage:(UIImage *)image maxSize:(int)maxSize { + CGFloat width = image.size.width; + CGFloat height = image.size.height; + + UIImageOrientation orientation = image.imageOrientation; + if (width <= maxSize && height <= maxSize && orientation != UIImageOrientationDown && + orientation != UIImageOrientationLeft && orientation != UIImageOrientationRight && + orientation != UIImageOrientationLeftMirrored && orientation != UIImageOrientationRightMirrored && + orientation != UIImageOrientationUpMirrored && orientation != UIImageOrientationDownMirrored) + return image; + + CGFloat scaleX = 1.0f; + CGFloat scaleY = 1.0f; + if (width > maxSize) + scaleX = maxSize / width; + if (height > maxSize) + scaleY = maxSize / height; + + // Credit: https://github.com/mbcharbonneau/UIImage-Categories/blob/master/UIImage%2BAlpha.m + CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image.CGImage); + BOOL hasAlpha = alpha == kCGImageAlphaFirst || alpha == kCGImageAlphaLast || alpha == kCGImageAlphaPremultipliedFirst || alpha == kCGImageAlphaPremultipliedLast; + + CGFloat scaleRatio = scaleX < scaleY ? scaleX : scaleY; + CGRect imageRect = CGRectMake(0, 0, width * scaleRatio, height * scaleRatio); + UIGraphicsBeginImageContextWithOptions(imageRect.size, !hasAlpha, image.scale); + [image drawInRect:imageRect]; + image = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + + return image; +} + ++ (char *)loadImageAtPath:(NSString *)path tempFilePath:(NSString *)tempFilePath maximumSize:(int)maximumSize { + // Check if the image can be loaded by Unity without requiring a conversion to PNG + // Credit: https://stackoverflow.com/a/12048937/2373034 + NSString *extension = [path pathExtension]; + BOOL conversionNeeded = [extension caseInsensitiveCompare:@"jpg"] != NSOrderedSame && [extension caseInsensitiveCompare:@"jpeg"] != NSOrderedSame && [extension caseInsensitiveCompare:@"png"] != NSOrderedSame; + + if (!conversionNeeded) { + // Check if the image needs to be processed at all + NSArray *metadata = [self getImageMetadata:path]; + int orientationInt = [metadata[2] intValue]; // 1: correct orientation, [1,8]: valid orientation range + if (orientationInt == 1 && [metadata[0] intValue] <= maximumSize && [metadata[1] intValue] <= maximumSize) + return [self getCString:path]; + } + + UIImage *image = [UIImage imageWithContentsOfFile:path]; + if (image == nil) + return [self getCString:path]; + + UIImage *scaledImage = [self scaleImage:image maxSize:maximumSize]; + if (conversionNeeded || scaledImage != image) { + if (![UIImagePNGRepresentation(scaledImage) writeToFile:tempFilePath atomically:YES]) { + NSLog(@"Error creating scaled image"); + return [self getCString:path]; + } + + return [self getCString:tempFilePath]; + } + else + return [self getCString:path]; +} + ++ (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { + NSString *path = nil; + if ([info[UIImagePickerControllerMediaType] isEqualToString:(NSString *)kUTTypeImage]) { // took picture + // Temporarily save image as PNG + UIImage *image = info[UIImagePickerControllerEditedImage] ?: info[UIImagePickerControllerOriginalImage]; + if (image == nil) + path = nil; + else { + NSString *extension = [pickedMediaSavePath pathExtension]; + BOOL saveAsJPEG = [extension caseInsensitiveCompare:@"jpg"] == NSOrderedSame || [extension caseInsensitiveCompare:@"jpeg"] == NSOrderedSame; + + // Try to save the image with metadata + // CANCELED: a number of users reported that this method results in 90-degree rotated images, uncomment at your own risk + // Credit: https://stackoverflow.com/a/15858955 + /*NSDictionary *metadata = [info objectForKey:UIImagePickerControllerMediaMetadata]; + NSMutableDictionary *mutableMetadata = nil; + CFDictionaryRef metadataRef; + CFStringRef imageType; + + if (saveAsJPEG) { + mutableMetadata = [metadata mutableCopy]; + [mutableMetadata setObject:@(1.0) forKey:(__bridge NSString *)kCGImageDestinationLossyCompressionQuality]; + + metadataRef = (__bridge CFDictionaryRef)mutableMetadata; + imageType = kUTTypeJPEG; + } + else { + metadataRef = (__bridge CFDictionaryRef)metadata; + imageType = kUTTypePNG; + } + + CGImageDestinationRef imageDestination = CGImageDestinationCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:pickedMediaSavePath], imageType , 1, NULL); + if (imageDestination == NULL ) + NSLog(@"Failed to create image destination"); + else { + CGImageDestinationAddImage(imageDestination, image.CGImage, metadataRef); + if (CGImageDestinationFinalize(imageDestination)) + path = pickedMediaSavePath; + else + NSLog(@"Failed to finalize the image"); + + CFRelease(imageDestination); + }*/ + + if (path == nil) { + //NSLog(@"Attempting to save the image without metadata as fallback"); + + if ((saveAsJPEG && [UIImageJPEGRepresentation([self scaleImage:image maxSize:cameraMaxImageSize], 1.0) writeToFile:pickedMediaSavePath atomically:YES]) || + (!saveAsJPEG && [UIImagePNGRepresentation([self scaleImage:image maxSize:cameraMaxImageSize]) writeToFile:pickedMediaSavePath atomically:YES]) ) + path = pickedMediaSavePath; + else { + NSLog(@"Error saving image without metadata"); + path = nil; + } + } + } + } + else { // recorded video + NSURL *mediaUrl = info[UIImagePickerControllerMediaURL] ?: info[UIImagePickerControllerReferenceURL]; + if (mediaUrl == nil) + path = nil; + else + path = [mediaUrl path]; + } + + imagePicker = nil; + imagePickerState = 2; + UnitySendMessage("NCCameraCallbackiOS", "OnMediaReceived", [self getCString:path]); + + [picker dismissViewControllerAnimated:NO completion:nil]; +} + ++ (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker +{ + imagePicker = nil; + UnitySendMessage("NCCameraCallbackiOS", "OnMediaReceived", ""); + + [picker dismissViewControllerAnimated:YES completion:nil]; +} + +// Credit: https://stackoverflow.com/a/37052118/2373034 ++ (char *)getCString:(NSString *)source { + if (source == nil) + source = @""; + + const char *sourceUTF8 = [source UTF8String]; + char *result = (char*) malloc(strlen(sourceUTF8) + 1); + strcpy(result, sourceUTF8); + + return result; +} + +@end + +extern "C" int _NativeCamera_CheckPermission() { + return [UNativeCamera checkPermission]; +} + +extern "C" int _NativeCamera_RequestPermission() { + return [UNativeCamera requestPermission]; +} + +extern "C" int _NativeCamera_CanOpenSettings() { + return [UNativeCamera canOpenSettings]; +} + +extern "C" void _NativeCamera_OpenSettings() { + [UNativeCamera openSettings]; +} + +extern "C" int _NativeCamera_HasCamera() { + return [UNativeCamera hasCamera]; +} + +extern "C" void _NativeCamera_TakePicture(const char* imageSavePath, int maxSize, int preferredCamera) { + [UNativeCamera openCamera:YES defaultCamera:preferredCamera savePath:[NSString stringWithUTF8String:imageSavePath] maxImageSize:maxSize videoQuality:-1 maxVideoDuration:-1]; +} + +extern "C" void _NativeCamera_RecordVideo(int quality, int maxDuration, int preferredCamera) { + [UNativeCamera openCamera:NO defaultCamera:preferredCamera savePath:nil maxImageSize:4096 videoQuality:quality maxVideoDuration:maxDuration]; +} + +extern "C" int _NativeCamera_IsCameraBusy() { + return [UNativeCamera isCameraBusy]; +} + +extern "C" char* _NativeCamera_GetImageProperties(const char* path) { + return [UNativeCamera getImageProperties:[NSString stringWithUTF8String:path]]; +} + +extern "C" char* _NativeCamera_GetVideoProperties(const char* path) { + return [UNativeCamera getVideoProperties:[NSString stringWithUTF8String:path]]; +} + +extern "C" char* _NativeCamera_GetVideoThumbnail(const char* path, const char* thumbnailSavePath, int maxSize, double captureTimeInSeconds) { + return [UNativeCamera getVideoThumbnail:[NSString stringWithUTF8String:path] savePath:[NSString stringWithUTF8String:thumbnailSavePath] maximumSize:maxSize captureTime:captureTimeInSeconds]; +} + +extern "C" char* _NativeCamera_LoadImageAtPath(const char* path, const char* temporaryFilePath, int maxSize) { + return [UNativeCamera loadImageAtPath:[NSString stringWithUTF8String:path] tempFilePath:[NSString stringWithUTF8String:temporaryFilePath] maximumSize:maxSize]; +} \ No newline at end of file diff --git a/Assets/3rd/NativeCamera/Plugins/iOS/NativeCamera.mm.meta b/Assets/3rd/NativeCamera/Plugins/iOS/NativeCamera.mm.meta new file mode 100644 index 0000000..1ae3d8c --- /dev/null +++ b/Assets/3rd/NativeCamera/Plugins/iOS/NativeCamera.mm.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: f71ce2f3d3a5dbd46af575e628ed9d6e +timeCreated: 1498722774 +licenseType: Pro +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + iPhone: iOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Android/NativeGallery.jar b/Assets/3rd/NativeGallery/Android/NativeGallery.jar deleted file mode 100644 index 8d505f1..0000000 Binary files a/Assets/3rd/NativeGallery/Android/NativeGallery.jar and /dev/null differ diff --git a/Assets/3rd/NativeGallery/NativeGalleryUtl.cs b/Assets/3rd/NativeGallery/NativeGalleryUtl.cs deleted file mode 100644 index 885b06d..0000000 --- a/Assets/3rd/NativeGallery/NativeGalleryUtl.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Coolape; - -public class NativeGalleryUtl -{ - public static IEnumerator TakeScreenshotAndSave(string album, string fileName) - { - yield return new WaitForEndOfFrame(); - - Texture2D ss = new Texture2D(Screen.width, Screen.height, TextureFormat.RGB24, false); - ss.ReadPixels(new Rect(0, 0, Screen.width, Screen.height), 0, 0); - ss.Apply(); - - // Save the screenshot to Gallery/Photos - Debug.Log("Permission result: " + NativeGallery.SaveImageToGallery(ss, album, fileName)); - - // To avoid memory leaks - Object.Destroy(ss); - } - - public static void PickImage(object callback, int maxSize = -1) - { - NativeGallery.Permission permission = NativeGallery.GetImageFromGallery((path) => - { - Debug.Log("Image path: " + path); - if (path != null) - { - // Create Texture from selected image - Texture2D texture = NativeGallery.LoadImageAtPath(path, maxSize); - if (texture == null) - { - Debug.Log("Couldn't load texture from " + path); - return; - } - Utl.doCallback(callback, texture); - - /* - // Assign texture to a temporary quad and destroy it after 5 seconds - GameObject quad = GameObject.CreatePrimitive(PrimitiveType.Quad); - quad.transform.position = Camera.main.transform.position + Camera.main.transform.forward * 2.5f; - quad.transform.forward = Camera.main.transform.forward; - quad.transform.localScale = new Vector3(1f, texture.height / (float)texture.width, 1f); - - Material material = quad.GetComponent().material; - if (!material.shader.isSupported) // happens when Standard shader is not included in the build - material.shader = Shader.Find("Legacy Shaders/Diffuse"); - - material.mainTexture = texture; - - Destroy(quad, 5f); - - // If a procedural texture is not destroyed manually, - // it will only be freed after a scene change - Destroy(texture, 5f); - */ - - } - }, "Select a PNG image", "image/png"); - - Debug.Log("Permission result: " + permission); - } - - public static void PickVideo() - { - NativeGallery.Permission permission = NativeGallery.GetVideoFromGallery((path) => - { - Debug.Log("Video path: " + path); - if (path != null) - { - // Play the selected video - Handheld.PlayFullScreenMovie("file://" + path); - } - }, "Select a video"); - - Debug.Log("Permission result: " + permission); - } -} diff --git a/Assets/3rd/NativeGallery/Plugins.meta b/Assets/3rd/NativeGallery/Plugins.meta new file mode 100644 index 0000000..38301fc --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a032e025a802f4707bf50d1d51778b1f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Plugins/Android.meta b/Assets/3rd/NativeGallery/Plugins/Android.meta new file mode 100644 index 0000000..c51c549 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 880df38a865ba4f91981f0af6cafd817 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Android/NGCallbackHelper.cs b/Assets/3rd/NativeGallery/Plugins/Android/NGCallbackHelper.cs similarity index 93% rename from Assets/3rd/NativeGallery/Android/NGCallbackHelper.cs rename to Assets/3rd/NativeGallery/Plugins/Android/NGCallbackHelper.cs index ac1bd3e..2facaa0 100644 --- a/Assets/3rd/NativeGallery/Android/NGCallbackHelper.cs +++ b/Assets/3rd/NativeGallery/Plugins/Android/NGCallbackHelper.cs @@ -1,31 +1,31 @@ -#if !UNITY_EDITOR && UNITY_ANDROID -using UnityEngine; - -namespace NativeGalleryNamespace -{ - public class NGCallbackHelper : MonoBehaviour - { - private System.Action mainThreadAction = null; - - private void Awake() - { - DontDestroyOnLoad( gameObject ); - } - - private void Update() - { - if( mainThreadAction != null ) - { - System.Action temp = mainThreadAction; - mainThreadAction = null; - temp(); - } - } - - public void CallOnMainThread( System.Action function ) - { - mainThreadAction = function; - } - } -} +#if !UNITY_EDITOR && UNITY_ANDROID +using UnityEngine; + +namespace NativeGalleryNamespace +{ + public class NGCallbackHelper : MonoBehaviour + { + private System.Action mainThreadAction = null; + + private void Awake() + { + DontDestroyOnLoad( gameObject ); + } + + private void Update() + { + if( mainThreadAction != null ) + { + System.Action temp = mainThreadAction; + mainThreadAction = null; + temp(); + } + } + + public void CallOnMainThread( System.Action function ) + { + mainThreadAction = function; + } + } +} #endif \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/Android/NGCallbackHelper.cs.meta b/Assets/3rd/NativeGallery/Plugins/Android/NGCallbackHelper.cs.meta similarity index 92% rename from Assets/3rd/NativeGallery/Android/NGCallbackHelper.cs.meta rename to Assets/3rd/NativeGallery/Plugins/Android/NGCallbackHelper.cs.meta index d9323e8..3509799 100644 --- a/Assets/3rd/NativeGallery/Android/NGCallbackHelper.cs.meta +++ b/Assets/3rd/NativeGallery/Plugins/Android/NGCallbackHelper.cs.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 2d517fd0f2f85f24698df2775bee58e9 timeCreated: 1544889149 -licenseType: Store +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] diff --git a/Assets/3rd/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs b/Assets/3rd/NativeGallery/Plugins/Android/NGMediaReceiveCallbackAndroid.cs similarity index 95% rename from Assets/3rd/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs rename to Assets/3rd/NativeGallery/Plugins/Android/NGMediaReceiveCallbackAndroid.cs index 5290ec3..7ecd4f0 100644 --- a/Assets/3rd/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs +++ b/Assets/3rd/NativeGallery/Plugins/Android/NGMediaReceiveCallbackAndroid.cs @@ -1,92 +1,92 @@ -#if !UNITY_EDITOR && UNITY_ANDROID -using UnityEngine; - -namespace NativeGalleryNamespace -{ - public class NGMediaReceiveCallbackAndroid : AndroidJavaProxy - { - private readonly NativeGallery.MediaPickCallback callback; - private readonly NativeGallery.MediaPickMultipleCallback callbackMultiple; - - private readonly NGCallbackHelper callbackHelper; - - public NGMediaReceiveCallbackAndroid( NativeGallery.MediaPickCallback callback, NativeGallery.MediaPickMultipleCallback callbackMultiple ) : base( "com.yasirkula.unity.NativeGalleryMediaReceiver" ) - { - this.callback = callback; - this.callbackMultiple = callbackMultiple; - callbackHelper = new GameObject( "NGCallbackHelper" ).AddComponent(); - } - - public void OnMediaReceived( string path ) - { - callbackHelper.CallOnMainThread( () => MediaReceiveCallback( path ) ); - } - - public void OnMultipleMediaReceived( string paths ) - { - string[] result = null; - if( !string.IsNullOrEmpty( paths ) ) - { - string[] pathsSplit = paths.Split( '>' ); - - int validPathCount = 0; - for( int i = 0; i < pathsSplit.Length; i++ ) - { - if( !string.IsNullOrEmpty( pathsSplit[i] ) ) - validPathCount++; - } - - if( validPathCount == 0 ) - pathsSplit = new string[0]; - else if( validPathCount != pathsSplit.Length ) - { - string[] validPaths = new string[validPathCount]; - for( int i = 0, j = 0; i < pathsSplit.Length; i++ ) - { - if( !string.IsNullOrEmpty( pathsSplit[i] ) ) - validPaths[j++] = pathsSplit[i]; - } - - pathsSplit = validPaths; - } - - result = pathsSplit; - } - - callbackHelper.CallOnMainThread( () => MediaReceiveMultipleCallback( result ) ); - } - - private void MediaReceiveCallback( string path ) - { - if( string.IsNullOrEmpty( path ) ) - path = null; - - try - { - if( callback != null ) - callback( path ); - } - finally - { - Object.Destroy( callbackHelper ); - } - } - - private void MediaReceiveMultipleCallback( string[] paths ) - { - if( paths != null && paths.Length == 0 ) - paths = null; - - try - { - if( callbackMultiple != null ) - callbackMultiple( paths ); - } - finally - { - Object.Destroy( callbackHelper ); - } - } - } -} +#if !UNITY_EDITOR && UNITY_ANDROID +using UnityEngine; + +namespace NativeGalleryNamespace +{ + public class NGMediaReceiveCallbackAndroid : AndroidJavaProxy + { + private readonly NativeGallery.MediaPickCallback callback; + private readonly NativeGallery.MediaPickMultipleCallback callbackMultiple; + + private readonly NGCallbackHelper callbackHelper; + + public NGMediaReceiveCallbackAndroid( NativeGallery.MediaPickCallback callback, NativeGallery.MediaPickMultipleCallback callbackMultiple ) : base( "com.yasirkula.unity.NativeGalleryMediaReceiver" ) + { + this.callback = callback; + this.callbackMultiple = callbackMultiple; + callbackHelper = new GameObject( "NGCallbackHelper" ).AddComponent(); + } + + public void OnMediaReceived( string path ) + { + callbackHelper.CallOnMainThread( () => MediaReceiveCallback( path ) ); + } + + public void OnMultipleMediaReceived( string paths ) + { + string[] result = null; + if( !string.IsNullOrEmpty( paths ) ) + { + string[] pathsSplit = paths.Split( '>' ); + + int validPathCount = 0; + for( int i = 0; i < pathsSplit.Length; i++ ) + { + if( !string.IsNullOrEmpty( pathsSplit[i] ) ) + validPathCount++; + } + + if( validPathCount == 0 ) + pathsSplit = new string[0]; + else if( validPathCount != pathsSplit.Length ) + { + string[] validPaths = new string[validPathCount]; + for( int i = 0, j = 0; i < pathsSplit.Length; i++ ) + { + if( !string.IsNullOrEmpty( pathsSplit[i] ) ) + validPaths[j++] = pathsSplit[i]; + } + + pathsSplit = validPaths; + } + + result = pathsSplit; + } + + callbackHelper.CallOnMainThread( () => MediaReceiveMultipleCallback( result ) ); + } + + private void MediaReceiveCallback( string path ) + { + if( string.IsNullOrEmpty( path ) ) + path = null; + + try + { + if( callback != null ) + callback( path ); + } + finally + { + Object.Destroy( callbackHelper ); + } + } + + private void MediaReceiveMultipleCallback( string[] paths ) + { + if( paths != null && paths.Length == 0 ) + paths = null; + + try + { + if( callbackMultiple != null ) + callbackMultiple( paths ); + } + finally + { + Object.Destroy( callbackHelper ); + } + } + } +} #endif \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs.meta b/Assets/3rd/NativeGallery/Plugins/Android/NGMediaReceiveCallbackAndroid.cs.meta similarity index 92% rename from Assets/3rd/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs.meta rename to Assets/3rd/NativeGallery/Plugins/Android/NGMediaReceiveCallbackAndroid.cs.meta index ab75fb0..f0bec22 100644 --- a/Assets/3rd/NativeGallery/Android/NGMediaReceiveCallbackAndroid.cs.meta +++ b/Assets/3rd/NativeGallery/Plugins/Android/NGMediaReceiveCallbackAndroid.cs.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 4c18d702b07a63945968db47201b95c9 timeCreated: 1519060539 -licenseType: Store +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] diff --git a/Assets/3rd/NativeGallery/Android/NGPermissionCallbackAndroid.cs b/Assets/3rd/NativeGallery/Plugins/Android/NGPermissionCallbackAndroid.cs similarity index 94% rename from Assets/3rd/NativeGallery/Android/NGPermissionCallbackAndroid.cs rename to Assets/3rd/NativeGallery/Plugins/Android/NGPermissionCallbackAndroid.cs index 163e70a..b2edf6e 100644 --- a/Assets/3rd/NativeGallery/Android/NGPermissionCallbackAndroid.cs +++ b/Assets/3rd/NativeGallery/Plugins/Android/NGPermissionCallbackAndroid.cs @@ -1,29 +1,29 @@ -#if !UNITY_EDITOR && UNITY_ANDROID -using System.Threading; -using UnityEngine; - -namespace NativeGalleryNamespace -{ - public class NGPermissionCallbackAndroid : AndroidJavaProxy - { - private object threadLock; - public int Result { get; private set; } - - public NGPermissionCallbackAndroid( object threadLock ) : base( "com.yasirkula.unity.NativeGalleryPermissionReceiver" ) - { - Result = -1; - this.threadLock = threadLock; - } - - public void OnPermissionResult( int result ) - { - Result = result; - - lock( threadLock ) - { - Monitor.Pulse( threadLock ); - } - } - } -} +#if !UNITY_EDITOR && UNITY_ANDROID +using System.Threading; +using UnityEngine; + +namespace NativeGalleryNamespace +{ + public class NGPermissionCallbackAndroid : AndroidJavaProxy + { + private object threadLock; + public int Result { get; private set; } + + public NGPermissionCallbackAndroid( object threadLock ) : base( "com.yasirkula.unity.NativeGalleryPermissionReceiver" ) + { + Result = -1; + this.threadLock = threadLock; + } + + public void OnPermissionResult( int result ) + { + Result = result; + + lock( threadLock ) + { + Monitor.Pulse( threadLock ); + } + } + } +} #endif \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/Android/NGPermissionCallbackAndroid.cs.meta b/Assets/3rd/NativeGallery/Plugins/Android/NGPermissionCallbackAndroid.cs.meta similarity index 92% rename from Assets/3rd/NativeGallery/Android/NGPermissionCallbackAndroid.cs.meta rename to Assets/3rd/NativeGallery/Plugins/Android/NGPermissionCallbackAndroid.cs.meta index 1030058..3f523ae 100644 --- a/Assets/3rd/NativeGallery/Android/NGPermissionCallbackAndroid.cs.meta +++ b/Assets/3rd/NativeGallery/Plugins/Android/NGPermissionCallbackAndroid.cs.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: a07afac614af1294d8e72a3c083be028 timeCreated: 1519060539 -licenseType: Store +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] diff --git a/Assets/3rd/NativeGallery/Plugins/Android/NativeGallery.jar b/Assets/3rd/NativeGallery/Plugins/Android/NativeGallery.jar new file mode 100644 index 0000000..dd5c019 Binary files /dev/null and b/Assets/3rd/NativeGallery/Plugins/Android/NativeGallery.jar differ diff --git a/Assets/3rd/NativeGallery/Android/NativeGallery.jar.meta b/Assets/3rd/NativeGallery/Plugins/Android/NativeGallery.jar.meta similarity index 86% rename from Assets/3rd/NativeGallery/Android/NativeGallery.jar.meta rename to Assets/3rd/NativeGallery/Plugins/Android/NativeGallery.jar.meta index 45a8c3f..138e8e8 100644 --- a/Assets/3rd/NativeGallery/Android/NativeGallery.jar.meta +++ b/Assets/3rd/NativeGallery/Plugins/Android/NativeGallery.jar.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 07368f3d2020fe6439475cfaa8578fd8 -timeCreated: 1544891451 -licenseType: Store +guid: 8ed2b1cd685da484194ba437e57d1e49 +timeCreated: 1570374101 +licenseType: Free PluginImporter: serializedVersion: 2 iconMap: {} diff --git a/Assets/3rd/NativeGallery/Plugins/Editor.meta b/Assets/3rd/NativeGallery/Plugins/Editor.meta new file mode 100644 index 0000000..d378e72 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d8aa34e33afa341a180dea50b2bdad62 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Editor/NGPostProcessBuild.cs b/Assets/3rd/NativeGallery/Plugins/Editor/NGPostProcessBuild.cs similarity index 88% rename from Assets/3rd/NativeGallery/Editor/NGPostProcessBuild.cs rename to Assets/3rd/NativeGallery/Plugins/Editor/NGPostProcessBuild.cs index 305cba0..8b7da5e 100644 --- a/Assets/3rd/NativeGallery/Editor/NGPostProcessBuild.cs +++ b/Assets/3rd/NativeGallery/Plugins/Editor/NGPostProcessBuild.cs @@ -1,63 +1,72 @@ -#if UNITY_IOS -using UnityEditor; -using UnityEditor.Callbacks; -using System.IO; -using UnityEditor.iOS.Xcode; -#endif - -public class NGPostProcessBuild -{ - private const bool ENABLED = true; - - private const string PHOTO_LIBRARY_USAGE_DESCRIPTION = "Save media to Photos"; - private const bool MINIMUM_TARGET_8_OR_ABOVE = false; - -#if UNITY_IOS -#pragma warning disable 0162 - [PostProcessBuild] - public static void OnPostprocessBuild( BuildTarget target, string buildPath ) - { - if( !ENABLED ) - return; - - if( target == BuildTarget.iOS ) - { - string pbxProjectPath = PBXProject.GetPBXProjectPath( buildPath ); - string plistPath = Path.Combine( buildPath, "Info.plist" ); - - PBXProject pbxProject = new PBXProject(); - pbxProject.ReadFromFile( pbxProjectPath ); - - string targetGUID = pbxProject.TargetGuidByName( PBXProject.GetUnityTargetName() ); - - if( MINIMUM_TARGET_8_OR_ABOVE ) - { - pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework Photos" ); - pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework MobileCoreServices" ); - pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework ImageIO" ); - } - else - { - pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-weak_framework Photos" ); - pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework AssetsLibrary" ); - pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework MobileCoreServices" ); - pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework ImageIO" ); - } - - pbxProject.RemoveFrameworkFromProject( targetGUID, "Photos.framework" ); - - File.WriteAllText( pbxProjectPath, pbxProject.WriteToString() ); - - PlistDocument plist = new PlistDocument(); - plist.ReadFromString( File.ReadAllText( plistPath ) ); - - PlistElementDict rootDict = plist.root; - rootDict.SetString( "NSPhotoLibraryUsageDescription", PHOTO_LIBRARY_USAGE_DESCRIPTION ); - rootDict.SetString( "NSPhotoLibraryAddUsageDescription", PHOTO_LIBRARY_USAGE_DESCRIPTION ); - - File.WriteAllText( plistPath, plist.WriteToString() ); - } - } -#pragma warning restore 0162 -#endif +#if UNITY_IOS +using UnityEditor; +using UnityEditor.Callbacks; +using System.IO; +using UnityEditor.iOS.Xcode; +#endif + +public class NGPostProcessBuild +{ + private const bool ENABLED = true; + + private const string PHOTO_LIBRARY_USAGE_DESCRIPTION = "Save media to Photos"; + private const bool MINIMUM_TARGET_8_OR_ABOVE = false; + +#if UNITY_IOS +#pragma warning disable 0162 + [PostProcessBuild] + public static void OnPostprocessBuild( BuildTarget target, string buildPath ) + { + if( !ENABLED ) + return; + + if( target == BuildTarget.iOS ) + { + string pbxProjectPath = PBXProject.GetPBXProjectPath( buildPath ); + string plistPath = Path.Combine( buildPath, "Info.plist" ); + + PBXProject pbxProject = new PBXProject(); + pbxProject.ReadFromFile( pbxProjectPath ); + +#if UNITY_2019_3_OR_NEWER + string targetGUID = pbxProject.GetUnityFrameworkTargetGuid(); +#else + string targetGUID = pbxProject.TargetGuidByName( PBXProject.GetUnityTargetName() ); +#endif + + // Minimum supported iOS version on Unity 2018.1 and later is 8.0 +#if !UNITY_2018_1_OR_NEWER + if( MINIMUM_TARGET_8_OR_ABOVE ) + { +#endif + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework Photos" ); + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework MobileCoreServices" ); + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework ImageIO" ); +#if !UNITY_2018_1_OR_NEWER + } + else + { + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-weak_framework Photos" ); + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework AssetsLibrary" ); + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework MobileCoreServices" ); + pbxProject.AddBuildProperty( targetGUID, "OTHER_LDFLAGS", "-framework ImageIO" ); + } +#endif + + pbxProject.RemoveFrameworkFromProject( targetGUID, "Photos.framework" ); + + File.WriteAllText( pbxProjectPath, pbxProject.WriteToString() ); + + PlistDocument plist = new PlistDocument(); + plist.ReadFromString( File.ReadAllText( plistPath ) ); + + PlistElementDict rootDict = plist.root; + rootDict.SetString( "NSPhotoLibraryUsageDescription", PHOTO_LIBRARY_USAGE_DESCRIPTION ); + rootDict.SetString( "NSPhotoLibraryAddUsageDescription", PHOTO_LIBRARY_USAGE_DESCRIPTION ); + + File.WriteAllText( plistPath, plist.WriteToString() ); + } + } +#pragma warning restore 0162 +#endif } \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/Editor/NGPostProcessBuild.cs.meta b/Assets/3rd/NativeGallery/Plugins/Editor/NGPostProcessBuild.cs.meta similarity index 92% rename from Assets/3rd/NativeGallery/Editor/NGPostProcessBuild.cs.meta rename to Assets/3rd/NativeGallery/Plugins/Editor/NGPostProcessBuild.cs.meta index bd4beff..15c37de 100644 --- a/Assets/3rd/NativeGallery/Editor/NGPostProcessBuild.cs.meta +++ b/Assets/3rd/NativeGallery/Plugins/Editor/NGPostProcessBuild.cs.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: dff1540cf22bfb749a2422f445cf9427 timeCreated: 1521452119 -licenseType: Store +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] diff --git a/Assets/3rd/NativeGallery/Plugins/Editor/NativeGallery.Editor.asmdef b/Assets/3rd/NativeGallery/Plugins/Editor/NativeGallery.Editor.asmdef new file mode 100644 index 0000000..d129dd2 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/Editor/NativeGallery.Editor.asmdef @@ -0,0 +1,15 @@ +{ + "name": "NativeGallery.Editor", + "references": [], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/Plugins/Editor/NativeGallery.Editor.asmdef.meta b/Assets/3rd/NativeGallery/Plugins/Editor/NativeGallery.Editor.asmdef.meta new file mode 100644 index 0000000..4683509 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/Editor/NativeGallery.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3dffc8e654f00c545a82d0a5274d51eb +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Plugins/NativeGallery.Runtime.asmdef b/Assets/3rd/NativeGallery/Plugins/NativeGallery.Runtime.asmdef new file mode 100644 index 0000000..c1fb4a7 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/NativeGallery.Runtime.asmdef @@ -0,0 +1,3 @@ +{ + "name": "NativeGallery.Runtime" +} diff --git a/Assets/3rd/NativeGallery/Plugins/NativeGallery.Runtime.asmdef.meta b/Assets/3rd/NativeGallery/Plugins/NativeGallery.Runtime.asmdef.meta new file mode 100644 index 0000000..ad16344 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/NativeGallery.Runtime.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 777e6aa34fa63442d979fd3ac881b77b +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/NativeGallery.cs b/Assets/3rd/NativeGallery/Plugins/NativeGallery.cs similarity index 68% rename from Assets/3rd/NativeGallery/NativeGallery.cs rename to Assets/3rd/NativeGallery/Plugins/NativeGallery.cs index 8b1eb12..2e1371a 100644 --- a/Assets/3rd/NativeGallery/NativeGallery.cs +++ b/Assets/3rd/NativeGallery/Plugins/NativeGallery.cs @@ -1,665 +1,762 @@ -using System; -using System.IO; -using UnityEngine; -using Object = UnityEngine.Object; -#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS ) -using NativeGalleryNamespace; -#endif - -public static class NativeGallery -{ - public struct ImageProperties - { - public readonly int width; - public readonly int height; - public readonly string mimeType; - public readonly ImageOrientation orientation; - - public ImageProperties( int width, int height, string mimeType, ImageOrientation orientation ) - { - this.width = width; - this.height = height; - this.mimeType = mimeType; - this.orientation = orientation; - } - } - - public struct VideoProperties - { - public readonly int width; - public readonly int height; - public readonly long duration; - public readonly float rotation; - - public VideoProperties( int width, int height, long duration, float rotation ) - { - this.width = width; - this.height = height; - this.duration = duration; - this.rotation = rotation; - } - } - - public enum Permission { Denied = 0, Granted = 1, ShouldAsk = 2 }; - - // EXIF orientation: http://sylvana.net/jpegcrop/exif_orientation.html (indices are reordered) - public enum ImageOrientation { Unknown = -1, Normal = 0, Rotate90 = 1, Rotate180 = 2, Rotate270 = 3, FlipHorizontal = 4, Transpose = 5, FlipVertical = 6, Transverse = 7 }; - - public delegate void MediaSaveCallback( string error ); - public delegate void MediaPickCallback( string path ); - public delegate void MediaPickMultipleCallback( string[] paths ); - - #region Platform Specific Elements -#if !UNITY_EDITOR && UNITY_ANDROID - private static AndroidJavaClass m_ajc = null; - private static AndroidJavaClass AJC - { - get - { - if( m_ajc == null ) - m_ajc = new AndroidJavaClass( "com.yasirkula.unity.NativeGallery" ); - - return m_ajc; - } - } - - private static AndroidJavaObject m_context = null; - private static AndroidJavaObject Context - { - get - { - if( m_context == null ) - { - using( AndroidJavaObject unityClass = new AndroidJavaClass( "com.unity3d.player.UnityPlayer" ) ) - { - m_context = unityClass.GetStatic( "currentActivity" ); - } - } - - return m_context; - } - } -#elif !UNITY_EDITOR && UNITY_IOS - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern int _NativeGallery_CheckPermission(); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern int _NativeGallery_RequestPermission(); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern int _NativeGallery_CanOpenSettings(); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern void _NativeGallery_OpenSettings(); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern void _NativeGallery_ImageWriteToAlbum( string path, string album ); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern void _NativeGallery_VideoWriteToAlbum( string path, string album ); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern void _NativeGallery_PickImage( string imageSavePath, int maxSize ); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern void _NativeGallery_PickVideo(); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern string _NativeGallery_GetImageProperties( string path ); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern string _NativeGallery_GetVideoProperties( string path ); - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern string _NativeGallery_LoadImageAtPath( string path, string temporaryFilePath, int maxSize ); -#endif - -#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS ) - private static string m_temporaryImagePath = null; - private static string TemporaryImagePath - { - get - { - if( m_temporaryImagePath == null ) - { - m_temporaryImagePath = Path.Combine( Application.temporaryCachePath, "__tmpImG" ); - Directory.CreateDirectory( Application.temporaryCachePath ); - } - - return m_temporaryImagePath; - } - } -#endif - -#if !UNITY_EDITOR && UNITY_IOS - private static string m_iOSSelectedImagePath = null; - private static string IOSSelectedImagePath - { - get - { - if( m_iOSSelectedImagePath == null ) - { - m_iOSSelectedImagePath = Path.Combine( Application.temporaryCachePath, "tmp.png" ); - Directory.CreateDirectory( Application.temporaryCachePath ); - } - - return m_iOSSelectedImagePath; - } - } -#endif - #endregion - - #region Runtime Permissions - public static Permission CheckPermission( bool readPermissionOnly = false ) - { -#if !UNITY_EDITOR && UNITY_ANDROID - Permission result = (Permission) AJC.CallStatic( "CheckPermission", Context, readPermissionOnly ); - if( result == Permission.Denied && (Permission) PlayerPrefs.GetInt( "NativeGalleryPermission", (int) Permission.ShouldAsk ) == Permission.ShouldAsk ) - result = Permission.ShouldAsk; - - return result; -#elif !UNITY_EDITOR && UNITY_IOS - return (Permission) _NativeGallery_CheckPermission(); -#else - return Permission.Granted; -#endif - } - - public static Permission RequestPermission( bool readPermissionOnly = false ) - { -#if !UNITY_EDITOR && UNITY_ANDROID - object threadLock = new object(); - lock( threadLock ) - { - NGPermissionCallbackAndroid nativeCallback = new NGPermissionCallbackAndroid( threadLock ); - - AJC.CallStatic( "RequestPermission", Context, nativeCallback, readPermissionOnly, PlayerPrefs.GetInt( "NativeGalleryPermission", (int) Permission.ShouldAsk ) ); - - if( nativeCallback.Result == -1 ) - System.Threading.Monitor.Wait( threadLock ); - - if( (Permission) nativeCallback.Result != Permission.ShouldAsk && PlayerPrefs.GetInt( "NativeGalleryPermission", -1 ) != nativeCallback.Result ) - { - PlayerPrefs.SetInt( "NativeGalleryPermission", nativeCallback.Result ); - PlayerPrefs.Save(); - } - - return (Permission) nativeCallback.Result; - } -#elif !UNITY_EDITOR && UNITY_IOS - return (Permission) _NativeGallery_RequestPermission(); -#else - return Permission.Granted; -#endif - } - - public static bool CanOpenSettings() - { -#if !UNITY_EDITOR && UNITY_IOS - return _NativeGallery_CanOpenSettings() == 1; -#else - return true; -#endif - } - - public static void OpenSettings() - { -#if !UNITY_EDITOR && UNITY_ANDROID - AJC.CallStatic( "OpenSettings", Context ); -#elif !UNITY_EDITOR && UNITY_IOS - _NativeGallery_OpenSettings(); -#endif - } - #endregion - - #region Save Functions - public static Permission SaveImageToGallery( byte[] mediaBytes, string album, string filenameFormatted, MediaSaveCallback callback = null ) - { - return SaveToGallery( mediaBytes, album, filenameFormatted, true, callback ); - } - - public static Permission SaveImageToGallery( string existingMediaPath, string album, string filenameFormatted, MediaSaveCallback callback = null ) - { - return SaveToGallery( existingMediaPath, album, filenameFormatted, true, callback ); - } - - public static Permission SaveImageToGallery( Texture2D image, string album, string filenameFormatted, MediaSaveCallback callback = null ) - { - if( image == null ) - throw new ArgumentException( "Parameter 'image' is null!" ); - - if( filenameFormatted.EndsWith( ".jpeg" ) || filenameFormatted.EndsWith( ".jpg" ) ) - return SaveToGallery( GetTextureBytes( image, true ), album, filenameFormatted, true, callback ); - else if( filenameFormatted.EndsWith( ".png" ) ) - return SaveToGallery( GetTextureBytes( image, false ), album, filenameFormatted, true, callback ); - else - return SaveToGallery( GetTextureBytes( image, false ), album, filenameFormatted + ".png", true, callback ); - } - - public static Permission SaveVideoToGallery( byte[] mediaBytes, string album, string filenameFormatted, MediaSaveCallback callback = null ) - { - return SaveToGallery( mediaBytes, album, filenameFormatted, false, callback ); - } - - public static Permission SaveVideoToGallery( string existingMediaPath, string album, string filenameFormatted, MediaSaveCallback callback = null ) - { - return SaveToGallery( existingMediaPath, album, filenameFormatted, false, callback ); - } - #endregion - - #region Load Functions - public static bool CanSelectMultipleFilesFromGallery() - { -#if !UNITY_EDITOR && UNITY_ANDROID - return AJC.CallStatic( "CanSelectMultipleMedia" ); -#else - return false; -#endif - } - - public static Permission GetImageFromGallery( MediaPickCallback callback, string title = "", string mime = "image/*", int maxSize = -1 ) - { - return GetMediaFromGallery( callback, true, mime, title, maxSize ); - } - - public static Permission GetVideoFromGallery( MediaPickCallback callback, string title = "", string mime = "video/*" ) - { - return GetMediaFromGallery( callback, false, mime, title, -1 ); - } - - public static Permission GetImagesFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "image/*", int maxSize = -1 ) - { - return GetMultipleMediaFromGallery( callback, true, mime, title, maxSize ); - } - - public static Permission GetVideosFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "video/*" ) - { - return GetMultipleMediaFromGallery( callback, false, mime, title, -1 ); - } - - public static bool IsMediaPickerBusy() - { -#if !UNITY_EDITOR && UNITY_IOS - return NGMediaReceiveCallbackiOS.IsBusy; -#else - return false; -#endif - } - #endregion - - #region Internal Functions - private static Permission SaveToGallery( byte[] mediaBytes, string album, string filenameFormatted, bool isImage, MediaSaveCallback callback ) - { - Permission result = RequestPermission( false ); - if( result == Permission.Granted ) - { - if( mediaBytes == null || mediaBytes.Length == 0 ) - throw new ArgumentException( "Parameter 'mediaBytes' is null or empty!" ); - - if( album == null || album.Length == 0 ) - throw new ArgumentException( "Parameter 'album' is null or empty!" ); - - if( filenameFormatted == null || filenameFormatted.Length == 0 ) - throw new ArgumentException( "Parameter 'filenameFormatted' is null or empty!" ); - - string path = GetSavePath( album, filenameFormatted ); - - File.WriteAllBytes( path, mediaBytes ); - - SaveToGalleryInternal( path, album, isImage, callback ); - } - - return result; - } - - private static Permission SaveToGallery( string existingMediaPath, string album, string filenameFormatted, bool isImage, MediaSaveCallback callback ) - { - Permission result = RequestPermission( false ); - if( result == Permission.Granted ) - { - if( !File.Exists( existingMediaPath ) ) - throw new FileNotFoundException( "File not found at " + existingMediaPath ); - - if( album == null || album.Length == 0 ) - throw new ArgumentException( "Parameter 'album' is null or empty!" ); - - if( filenameFormatted == null || filenameFormatted.Length == 0 ) - throw new ArgumentException( "Parameter 'filenameFormatted' is null or empty!" ); - - string path = GetSavePath( album, filenameFormatted ); - - File.Copy( existingMediaPath, path, true ); - - SaveToGalleryInternal( path, album, isImage, callback ); - } - - return result; - } - - private static void SaveToGalleryInternal( string path, string album, bool isImage, MediaSaveCallback callback ) - { -#if !UNITY_EDITOR && UNITY_ANDROID - AJC.CallStatic( "MediaScanFile", Context, path ); - - if( callback != null ) - callback( null ); - - Debug.Log( "Saving to gallery: " + path ); -#elif !UNITY_EDITOR && UNITY_IOS - NGMediaSaveCallbackiOS.Initialize( callback ); - if( isImage ) - _NativeGallery_ImageWriteToAlbum( path, album ); - else - _NativeGallery_VideoWriteToAlbum( path, album ); - - Debug.Log( "Saving to Pictures: " + Path.GetFileName( path ) ); -#else - if( callback != null ) - callback( null ); -#endif - } - - private static string GetSavePath( string album, string filenameFormatted ) - { - string saveDir; -#if !UNITY_EDITOR && UNITY_ANDROID - saveDir = AJC.CallStatic( "GetMediaPath", album ); -#else - saveDir = Application.persistentDataPath; -#endif - - if( filenameFormatted.Contains( "{0}" ) ) - { - int fileIndex = 0; - string path; - do - { - path = Path.Combine( saveDir, string.Format( filenameFormatted, ++fileIndex ) ); - } while( File.Exists( path ) ); - - return path; - } - - saveDir = Path.Combine( saveDir, filenameFormatted ); - -#if !UNITY_EDITOR && UNITY_IOS - // iOS internally copies images/videos to Photos directory of the system, - // but the process is async. The redundant file is deleted by objective-c code - // automatically after the media is saved but while it is being saved, the file - // should NOT be overwritten. Therefore, always ensure a unique filename on iOS - if( File.Exists( saveDir ) ) - { - return GetSavePath( album, - Path.GetFileNameWithoutExtension( filenameFormatted ) + " {0}" + Path.GetExtension( filenameFormatted ) ); - } -#endif - - return saveDir; - } - - private static Permission GetMediaFromGallery( MediaPickCallback callback, bool imageMode, string mime, string title, int maxSize ) - { - Permission result = RequestPermission( true ); - if( result == Permission.Granted && !IsMediaPickerBusy() ) - { -#if !UNITY_EDITOR && UNITY_ANDROID - AJC.CallStatic( "PickMedia", Context, new NGMediaReceiveCallbackAndroid( callback, null ), imageMode, false, mime, title ); -#elif !UNITY_EDITOR && UNITY_IOS - NGMediaReceiveCallbackiOS.Initialize( callback ); - if( imageMode ) - { - if( maxSize <= 0 ) - maxSize = SystemInfo.maxTextureSize; - - _NativeGallery_PickImage( IOSSelectedImagePath, maxSize ); - } - else - _NativeGallery_PickVideo(); -#else - if( callback != null ) - callback( null ); -#endif - } - - return result; - } - - private static Permission GetMultipleMediaFromGallery( MediaPickMultipleCallback callback, bool imageMode, string mime, string title, int maxSize ) - { - Permission result = RequestPermission( true ); - if( result == Permission.Granted && !IsMediaPickerBusy() ) - { - if( CanSelectMultipleFilesFromGallery() ) - { -#if !UNITY_EDITOR && UNITY_ANDROID - AJC.CallStatic( "PickMedia", Context, new NGMediaReceiveCallbackAndroid( null, callback ), imageMode, true, mime, title ); -#else - if( callback != null ) - callback( null ); -#endif - } - else if( callback != null ) - callback( null ); - } - - return result; - } - - private static byte[] GetTextureBytes( Texture2D texture, bool isJpeg ) - { - try - { - return isJpeg ? texture.EncodeToJPG( 100 ) : texture.EncodeToPNG(); - } - catch( UnityException ) - { - return GetTextureBytesFromCopy( texture, isJpeg ); - } - catch( ArgumentException ) - { - return GetTextureBytesFromCopy( texture, isJpeg ); - } - -#pragma warning disable 0162 - return null; -#pragma warning restore 0162 - } - - private static byte[] GetTextureBytesFromCopy( Texture2D texture, bool isJpeg ) - { - // Texture is marked as non-readable, create a readable copy and save it instead - Debug.LogWarning( "Saving non-readable textures is slower than saving readable textures" ); - - Texture2D sourceTexReadable = null; - RenderTexture rt = RenderTexture.GetTemporary( texture.width, texture.height ); - RenderTexture activeRT = RenderTexture.active; - - try - { - Graphics.Blit( texture, rt ); - RenderTexture.active = rt; - - sourceTexReadable = new Texture2D( texture.width, texture.height, texture.format, false ); - sourceTexReadable.ReadPixels( new Rect( 0, 0, texture.width, texture.height ), 0, 0, false ); - sourceTexReadable.Apply( false, false ); - } - catch( Exception e ) - { - Debug.LogException( e ); - - Object.DestroyImmediate( sourceTexReadable ); - return null; - } - finally - { - RenderTexture.active = activeRT; - RenderTexture.ReleaseTemporary( rt ); - } - - try - { - return isJpeg ? sourceTexReadable.EncodeToJPG( 100 ) : sourceTexReadable.EncodeToPNG(); - } - catch( Exception e ) - { - Debug.LogException( e ); - return null; - } - finally - { - Object.DestroyImmediate( sourceTexReadable ); - } - } - #endregion - - #region Utility Functions - public static Texture2D LoadImageAtPath( string imagePath, int maxSize = -1, bool markTextureNonReadable = true, - bool generateMipmaps = true, bool linearColorSpace = false ) - { - if( string.IsNullOrEmpty( imagePath ) ) - throw new ArgumentException( "Parameter 'imagePath' is null or empty!" ); - - if( !File.Exists( imagePath ) ) - throw new FileNotFoundException( "File not found at " + imagePath ); - - if( maxSize <= 0 ) - maxSize = SystemInfo.maxTextureSize; - -#if !UNITY_EDITOR && UNITY_ANDROID - string loadPath = AJC.CallStatic( "LoadImageAtPath", Context, imagePath, TemporaryImagePath, maxSize ); -#elif !UNITY_EDITOR && UNITY_IOS - string loadPath = _NativeGallery_LoadImageAtPath( imagePath, TemporaryImagePath, maxSize ); -#else - string loadPath = imagePath; -#endif - - String extension = Path.GetExtension( imagePath ).ToLowerInvariant(); - TextureFormat format = ( extension == ".jpg" || extension == ".jpeg" ) ? TextureFormat.RGB24 : TextureFormat.RGBA32; - - Texture2D result = new Texture2D( 2, 2, format, generateMipmaps, linearColorSpace ); - - try - { - if( !result.LoadImage( File.ReadAllBytes( loadPath ), markTextureNonReadable ) ) - { - Object.DestroyImmediate( result ); - return null; - } - } - catch( Exception e ) - { - Debug.LogException( e ); - - Object.DestroyImmediate( result ); - return null; - } - finally - { - if( loadPath != imagePath ) - { - try - { - File.Delete( loadPath ); - } - catch { } - } - } - - return result; - } - - public static ImageProperties GetImageProperties( string imagePath ) - { - if( !File.Exists( imagePath ) ) - throw new FileNotFoundException( "File not found at " + imagePath ); - -#if !UNITY_EDITOR && UNITY_ANDROID - string value = AJC.CallStatic( "GetImageProperties", Context, imagePath ); -#elif !UNITY_EDITOR && UNITY_IOS - string value = _NativeGallery_GetImageProperties( imagePath ); -#else - string value = null; -#endif - - int width = 0, height = 0; - string mimeType = null; - ImageOrientation orientation = ImageOrientation.Unknown; - if( !string.IsNullOrEmpty( value ) ) - { - string[] properties = value.Split( '>' ); - if( properties != null && properties.Length >= 4 ) - { - if( !int.TryParse( properties[0].Trim(), out width ) ) - width = 0; - if( !int.TryParse( properties[1].Trim(), out height ) ) - height = 0; - - mimeType = properties[2].Trim(); - if( mimeType.Length == 0 ) - { - String extension = Path.GetExtension( imagePath ).ToLowerInvariant(); - if( extension == ".png" ) - mimeType = "image/png"; - else if( extension == ".jpg" || extension == ".jpeg" ) - mimeType = "image/jpeg"; - else if( extension == ".gif" ) - mimeType = "image/gif"; - else if( extension == ".bmp" ) - mimeType = "image/bmp"; - else - mimeType = null; - } - - int orientationInt; - if( int.TryParse( properties[3].Trim(), out orientationInt ) ) - orientation = (ImageOrientation) orientationInt; - -#if !UNITY_EDITOR && UNITY_IOS - if( orientation == ImageOrientation.Unknown ) // selected media is saved in correct orientation on iOS - orientation = ImageOrientation.Normal; -#endif - } - } - - return new ImageProperties( width, height, mimeType, orientation ); - } - - public static VideoProperties GetVideoProperties( string videoPath ) - { - if( !File.Exists( videoPath ) ) - throw new FileNotFoundException( "File not found at " + videoPath ); - -#if !UNITY_EDITOR && UNITY_ANDROID - string value = AJC.CallStatic( "GetVideoProperties", Context, videoPath ); -#elif !UNITY_EDITOR && UNITY_IOS - string value = _NativeGallery_GetVideoProperties( videoPath ); -#else - string value = null; -#endif - - int width = 0, height = 0; - long duration = 0L; - float rotation = 0f; - if( !string.IsNullOrEmpty( value ) ) - { - string[] properties = value.Split( '>' ); - if( properties != null && properties.Length >= 4 ) - { - if( !int.TryParse( properties[0].Trim(), out width ) ) - width = 0; - if( !int.TryParse( properties[1].Trim(), out height ) ) - height = 0; - if( !long.TryParse( properties[2].Trim(), out duration ) ) - duration = 0L; - if( !float.TryParse( properties[3].Trim(), out rotation ) ) - rotation = 0f; - } - } - - if( rotation == -90f ) - rotation = 270f; - - return new VideoProperties( width, height, duration, rotation ); - } - #endregion +using System; +using System.IO; +using UnityEngine; +using Object = UnityEngine.Object; +#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS ) +using NativeGalleryNamespace; +#endif + +public static class NativeGallery +{ + public struct ImageProperties + { + public readonly int width; + public readonly int height; + public readonly string mimeType; + public readonly ImageOrientation orientation; + + public ImageProperties( int width, int height, string mimeType, ImageOrientation orientation ) + { + this.width = width; + this.height = height; + this.mimeType = mimeType; + this.orientation = orientation; + } + } + + public struct VideoProperties + { + public readonly int width; + public readonly int height; + public readonly long duration; + public readonly float rotation; + + public VideoProperties( int width, int height, long duration, float rotation ) + { + this.width = width; + this.height = height; + this.duration = duration; + this.rotation = rotation; + } + } + + public enum Permission { Denied = 0, Granted = 1, ShouldAsk = 2 }; + private enum MediaType { Image = 0, Video = 1, Audio = 2 }; + + // EXIF orientation: http://sylvana.net/jpegcrop/exif_orientation.html (indices are reordered) + public enum ImageOrientation { Unknown = -1, Normal = 0, Rotate90 = 1, Rotate180 = 2, Rotate270 = 3, FlipHorizontal = 4, Transpose = 5, FlipVertical = 6, Transverse = 7 }; + + public delegate void MediaSaveCallback( string error ); + public delegate void MediaPickCallback( string path ); + public delegate void MediaPickMultipleCallback( string[] paths ); + + #region Platform Specific Elements +#if !UNITY_EDITOR && UNITY_ANDROID + private static AndroidJavaClass m_ajc = null; + private static AndroidJavaClass AJC + { + get + { + if( m_ajc == null ) + m_ajc = new AndroidJavaClass( "com.yasirkula.unity.NativeGallery" ); + + return m_ajc; + } + } + + private static AndroidJavaObject m_context = null; + private static AndroidJavaObject Context + { + get + { + if( m_context == null ) + { + using( AndroidJavaObject unityClass = new AndroidJavaClass( "com.unity3d.player.UnityPlayer" ) ) + { + m_context = unityClass.GetStatic( "currentActivity" ); + } + } + + return m_context; + } + } +#elif !UNITY_EDITOR && UNITY_IOS + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeGallery_CheckPermission(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeGallery_RequestPermission(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeGallery_CanOpenSettings(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeGallery_OpenSettings(); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeGallery_ImageWriteToAlbum( string path, string album ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeGallery_VideoWriteToAlbum( string path, string album ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeGallery_PickImage( string imageSavePath ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeGallery_PickVideo( string videoSavePath ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeGallery_GetImageProperties( string path ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeGallery_GetVideoProperties( string path ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeGallery_GetVideoThumbnail( string path, string thumbnailSavePath, int maxSize, double captureTimeInSeconds ); + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern string _NativeGallery_LoadImageAtPath( string path, string temporaryFilePath, int maxSize ); +#endif + +#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS ) + private static string m_temporaryImagePath = null; + private static string TemporaryImagePath + { + get + { + if( m_temporaryImagePath == null ) + { + m_temporaryImagePath = Path.Combine( Application.temporaryCachePath, "tmpImg" ); + Directory.CreateDirectory( Application.temporaryCachePath ); + } + + return m_temporaryImagePath; + } + } + + private static string m_selectedImagePath = null; + private static string SelectedImagePath + { + get + { + if( m_selectedImagePath == null ) + { + m_selectedImagePath = Path.Combine( Application.temporaryCachePath, "pickedImg" ); + Directory.CreateDirectory( Application.temporaryCachePath ); + } + + return m_selectedImagePath; + } + } + + private static string m_selectedVideoPath = null; + private static string SelectedVideoPath + { + get + { + if( m_selectedVideoPath == null ) + { + m_selectedVideoPath = Path.Combine( Application.temporaryCachePath, "pickedVideo" ); + Directory.CreateDirectory( Application.temporaryCachePath ); + } + + return m_selectedVideoPath; + } + } + + private static string m_selectedAudioPath = null; + private static string SelectedAudioPath + { + get + { + if( m_selectedAudioPath == null ) + { + m_selectedAudioPath = Path.Combine( Application.temporaryCachePath, "pickedAudio" ); + Directory.CreateDirectory( Application.temporaryCachePath ); + } + + return m_selectedAudioPath; + } + } +#endif + #endregion + + #region Runtime Permissions + public static Permission CheckPermission( bool readPermissionOnly = false ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + Permission result = (Permission) AJC.CallStatic( "CheckPermission", Context, readPermissionOnly ); + if( result == Permission.Denied && (Permission) PlayerPrefs.GetInt( "NativeGalleryPermission", (int) Permission.ShouldAsk ) == Permission.ShouldAsk ) + result = Permission.ShouldAsk; + + return result; +#elif !UNITY_EDITOR && UNITY_IOS + return (Permission) _NativeGallery_CheckPermission(); +#else + return Permission.Granted; +#endif + } + + public static Permission RequestPermission( bool readPermissionOnly = false ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + object threadLock = new object(); + lock( threadLock ) + { + NGPermissionCallbackAndroid nativeCallback = new NGPermissionCallbackAndroid( threadLock ); + + AJC.CallStatic( "RequestPermission", Context, nativeCallback, readPermissionOnly, PlayerPrefs.GetInt( "NativeGalleryPermission", (int) Permission.ShouldAsk ) ); + + if( nativeCallback.Result == -1 ) + System.Threading.Monitor.Wait( threadLock ); + + if( (Permission) nativeCallback.Result != Permission.ShouldAsk && PlayerPrefs.GetInt( "NativeGalleryPermission", -1 ) != nativeCallback.Result ) + { + PlayerPrefs.SetInt( "NativeGalleryPermission", nativeCallback.Result ); + PlayerPrefs.Save(); + } + + return (Permission) nativeCallback.Result; + } +#elif !UNITY_EDITOR && UNITY_IOS + return (Permission) _NativeGallery_RequestPermission(); +#else + return Permission.Granted; +#endif + } + + public static bool CanOpenSettings() + { +#if !UNITY_EDITOR && UNITY_IOS + return _NativeGallery_CanOpenSettings() == 1; +#else + return true; +#endif + } + + public static void OpenSettings() + { +#if !UNITY_EDITOR && UNITY_ANDROID + AJC.CallStatic( "OpenSettings", Context ); +#elif !UNITY_EDITOR && UNITY_IOS + _NativeGallery_OpenSettings(); +#endif + } + #endregion + + #region Save Functions + public static Permission SaveImageToGallery( byte[] mediaBytes, string album, string filename, MediaSaveCallback callback = null ) + { + return SaveToGallery( mediaBytes, album, filename, MediaType.Image, callback ); + } + + public static Permission SaveImageToGallery( string existingMediaPath, string album, string filename, MediaSaveCallback callback = null ) + { + return SaveToGallery( existingMediaPath, album, filename, MediaType.Image, callback ); + } + + public static Permission SaveImageToGallery( Texture2D image, string album, string filename, MediaSaveCallback callback = null ) + { + if( image == null ) + throw new ArgumentException( "Parameter 'image' is null!" ); + + if( filename.EndsWith( ".jpeg" ) || filename.EndsWith( ".jpg" ) ) + return SaveToGallery( GetTextureBytes( image, true ), album, filename, MediaType.Image, callback ); + else if( filename.EndsWith( ".png" ) ) + return SaveToGallery( GetTextureBytes( image, false ), album, filename, MediaType.Image, callback ); + else + return SaveToGallery( GetTextureBytes( image, false ), album, filename + ".png", MediaType.Image, callback ); + } + + public static Permission SaveVideoToGallery( byte[] mediaBytes, string album, string filename, MediaSaveCallback callback = null ) + { + return SaveToGallery( mediaBytes, album, filename, MediaType.Video, callback ); + } + + public static Permission SaveVideoToGallery( string existingMediaPath, string album, string filename, MediaSaveCallback callback = null ) + { + return SaveToGallery( existingMediaPath, album, filename, MediaType.Video, callback ); + } + + private static Permission SaveAudioToGallery( byte[] mediaBytes, string album, string filename, MediaSaveCallback callback = null ) + { + return SaveToGallery( mediaBytes, album, filename, MediaType.Audio, callback ); + } + + private static Permission SaveAudioToGallery( string existingMediaPath, string album, string filename, MediaSaveCallback callback = null ) + { + return SaveToGallery( existingMediaPath, album, filename, MediaType.Audio, callback ); + } + #endregion + + #region Load Functions + public static bool CanSelectMultipleFilesFromGallery() + { +#if !UNITY_EDITOR && UNITY_ANDROID + return AJC.CallStatic( "CanSelectMultipleMedia" ); +#else + return false; +#endif + } + + public static Permission GetImageFromGallery( MediaPickCallback callback, string title = "", string mime = "image/*" ) + { + return GetMediaFromGallery( callback, MediaType.Image, mime, title ); + } + + public static Permission GetVideoFromGallery( MediaPickCallback callback, string title = "", string mime = "video/*" ) + { + return GetMediaFromGallery( callback, MediaType.Video, mime, title ); + } + + private static Permission GetAudioFromGallery( MediaPickCallback callback, string title = "", string mime = "audio/*" ) + { + return GetMediaFromGallery( callback, MediaType.Audio, mime, title ); + } + + public static Permission GetImagesFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "image/*" ) + { + return GetMultipleMediaFromGallery( callback, MediaType.Image, mime, title ); + } + + public static Permission GetVideosFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "video/*" ) + { + return GetMultipleMediaFromGallery( callback, MediaType.Video, mime, title ); + } + + private static Permission GetAudiosFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "audio/*" ) + { + return GetMultipleMediaFromGallery( callback, MediaType.Audio, mime, title ); + } + + public static bool IsMediaPickerBusy() + { +#if !UNITY_EDITOR && UNITY_IOS + return NGMediaReceiveCallbackiOS.IsBusy; +#else + return false; +#endif + } + #endregion + + #region Internal Functions + private static Permission SaveToGallery( byte[] mediaBytes, string album, string filename, MediaType mediaType, MediaSaveCallback callback ) + { + Permission result = RequestPermission( false ); + if( result == Permission.Granted ) + { + if( mediaBytes == null || mediaBytes.Length == 0 ) + throw new ArgumentException( "Parameter 'mediaBytes' is null or empty!" ); + + if( album == null || album.Length == 0 ) + throw new ArgumentException( "Parameter 'album' is null or empty!" ); + + if( filename == null || filename.Length == 0 ) + throw new ArgumentException( "Parameter 'filename' is null or empty!" ); + + if( string.IsNullOrEmpty( Path.GetExtension( filename ) ) ) + Debug.LogWarning( "'filename' doesn't have an extension, this might result in unexpected behaviour!" ); + + string path = GetTemporarySavePath( filename ); +#if UNITY_EDITOR + Debug.Log( "SaveToGallery called successfully in the Editor" ); +#else + File.WriteAllBytes( path, mediaBytes ); +#endif + + SaveToGalleryInternal( path, album, mediaType, callback ); + } + + return result; + } + + private static Permission SaveToGallery( string existingMediaPath, string album, string filename, MediaType mediaType, MediaSaveCallback callback ) + { + Permission result = RequestPermission( false ); + if( result == Permission.Granted ) + { + if( !File.Exists( existingMediaPath ) ) + throw new FileNotFoundException( "File not found at " + existingMediaPath ); + + if( album == null || album.Length == 0 ) + throw new ArgumentException( "Parameter 'album' is null or empty!" ); + + if( filename == null || filename.Length == 0 ) + throw new ArgumentException( "Parameter 'filename' is null or empty!" ); + + if( string.IsNullOrEmpty( Path.GetExtension( filename ) ) ) + { + string originalExtension = Path.GetExtension( existingMediaPath ); + if( string.IsNullOrEmpty( originalExtension ) ) + Debug.LogWarning( "'filename' doesn't have an extension, this might result in unexpected behaviour!" ); + else + filename += originalExtension; + } + + string path = GetTemporarySavePath( filename ); +#if UNITY_EDITOR + Debug.Log( "SaveToGallery called successfully in the Editor" ); +#else + File.Copy( existingMediaPath, path, true ); +#endif + + SaveToGalleryInternal( path, album, mediaType, callback ); + } + + return result; + } + + private static void SaveToGalleryInternal( string path, string album, MediaType mediaType, MediaSaveCallback callback ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + AJC.CallStatic( "SaveMedia", Context, (int) mediaType, path, album ); + + File.Delete( path ); + + if( callback != null ) + callback( null ); +#elif !UNITY_EDITOR && UNITY_IOS + if( mediaType == MediaType.Audio ) + { + if( callback != null ) + callback( "Saving audio files is not supported on iOS" ); + + return; + } + + Debug.Log( "Saving to Pictures: " + Path.GetFileName( path ) ); + + NGMediaSaveCallbackiOS.Initialize( callback ); + if( mediaType == MediaType.Image ) + _NativeGallery_ImageWriteToAlbum( path, album ); + else if( mediaType == MediaType.Video ) + _NativeGallery_VideoWriteToAlbum( path, album ); +#else + if( callback != null ) + callback( null ); +#endif + } + + private static string GetTemporarySavePath( string filename ) + { + string saveDir = Path.Combine( Application.persistentDataPath, "NGallery" ); + Directory.CreateDirectory( saveDir ); + +#if !UNITY_EDITOR && UNITY_IOS + // Ensure a unique temporary filename on iOS: + // iOS internally copies images/videos to Photos directory of the system, + // but the process is async. The redundant file is deleted by objective-c code + // automatically after the media is saved but while it is being saved, the file + // should NOT be overwritten. Therefore, always ensure a unique filename on iOS + string path = Path.Combine( saveDir, filename ); + if( File.Exists( path ) ) + { + int fileIndex = 0; + string filenameWithoutExtension = Path.GetFileNameWithoutExtension( filename ); + string extension = Path.GetExtension( filename ); + + do + { + path = Path.Combine( saveDir, string.Concat( filenameWithoutExtension, ++fileIndex, extension ) ); + } while( File.Exists( path ) ); + } + + return path; +#else + return Path.Combine( saveDir, filename ); +#endif + } + + private static Permission GetMediaFromGallery( MediaPickCallback callback, MediaType mediaType, string mime, string title ) + { + Permission result = RequestPermission( true ); + if( result == Permission.Granted && !IsMediaPickerBusy() ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + string savePath; + if( mediaType == MediaType.Image ) + savePath = SelectedImagePath; + else if( mediaType == MediaType.Video ) + savePath = SelectedVideoPath; + else + savePath = SelectedAudioPath; + + AJC.CallStatic( "PickMedia", Context, new NGMediaReceiveCallbackAndroid( callback, null ), (int) mediaType, false, savePath, mime, title ); +#elif !UNITY_EDITOR && UNITY_IOS + NGMediaReceiveCallbackiOS.Initialize( callback ); + if( mediaType == MediaType.Image ) + _NativeGallery_PickImage( SelectedImagePath ); + else if( mediaType == MediaType.Video ) + _NativeGallery_PickVideo( SelectedVideoPath ); + else if( callback != null ) // Selecting audio files is not supported on iOS + callback( null ); +#else + if( callback != null ) + callback( null ); +#endif + } + + return result; + } + + private static Permission GetMultipleMediaFromGallery( MediaPickMultipleCallback callback, MediaType mediaType, string mime, string title ) + { + Permission result = RequestPermission( true ); + if( result == Permission.Granted && !IsMediaPickerBusy() ) + { + if( CanSelectMultipleFilesFromGallery() ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + string savePath; + if( mediaType == MediaType.Image ) + savePath = SelectedImagePath; + else if( mediaType == MediaType.Video ) + savePath = SelectedVideoPath; + else + savePath = SelectedAudioPath; + + AJC.CallStatic( "PickMedia", Context, new NGMediaReceiveCallbackAndroid( null, callback ), (int) mediaType, true, savePath, mime, title ); +#else + if( callback != null ) + callback( null ); +#endif + } + else if( callback != null ) + callback( null ); + } + + return result; + } + + private static byte[] GetTextureBytes( Texture2D texture, bool isJpeg ) + { + try + { + return isJpeg ? texture.EncodeToJPG( 100 ) : texture.EncodeToPNG(); + } + catch( UnityException ) + { + return GetTextureBytesFromCopy( texture, isJpeg ); + } + catch( ArgumentException ) + { + return GetTextureBytesFromCopy( texture, isJpeg ); + } + +#pragma warning disable 0162 + return null; +#pragma warning restore 0162 + } + + private static byte[] GetTextureBytesFromCopy( Texture2D texture, bool isJpeg ) + { + // Texture is marked as non-readable, create a readable copy and save it instead + Debug.LogWarning( "Saving non-readable textures is slower than saving readable textures" ); + + Texture2D sourceTexReadable = null; + RenderTexture rt = RenderTexture.GetTemporary( texture.width, texture.height ); + RenderTexture activeRT = RenderTexture.active; + + try + { + Graphics.Blit( texture, rt ); + RenderTexture.active = rt; + + sourceTexReadable = new Texture2D( texture.width, texture.height, texture.format, false ); + sourceTexReadable.ReadPixels( new Rect( 0, 0, texture.width, texture.height ), 0, 0, false ); + sourceTexReadable.Apply( false, false ); + } + catch( Exception e ) + { + Debug.LogException( e ); + + Object.DestroyImmediate( sourceTexReadable ); + return null; + } + finally + { + RenderTexture.active = activeRT; + RenderTexture.ReleaseTemporary( rt ); + } + + try + { + return isJpeg ? sourceTexReadable.EncodeToJPG( 100 ) : sourceTexReadable.EncodeToPNG(); + } + catch( Exception e ) + { + Debug.LogException( e ); + return null; + } + finally + { + Object.DestroyImmediate( sourceTexReadable ); + } + } + #endregion + + #region Utility Functions + public static Texture2D LoadImageAtPath( string imagePath, int maxSize = -1, bool markTextureNonReadable = true, + bool generateMipmaps = true, bool linearColorSpace = false ) + { + if( string.IsNullOrEmpty( imagePath ) ) + throw new ArgumentException( "Parameter 'imagePath' is null or empty!" ); + + if( !File.Exists( imagePath ) ) + throw new FileNotFoundException( "File not found at " + imagePath ); + + if( maxSize <= 0 ) + maxSize = SystemInfo.maxTextureSize; + +#if !UNITY_EDITOR && UNITY_ANDROID + string loadPath = AJC.CallStatic( "LoadImageAtPath", Context, imagePath, TemporaryImagePath, maxSize ); +#elif !UNITY_EDITOR && UNITY_IOS + string loadPath = _NativeGallery_LoadImageAtPath( imagePath, TemporaryImagePath, maxSize ); +#else + string loadPath = imagePath; +#endif + + String extension = Path.GetExtension( imagePath ).ToLowerInvariant(); + TextureFormat format = ( extension == ".jpg" || extension == ".jpeg" ) ? TextureFormat.RGB24 : TextureFormat.RGBA32; + + Texture2D result = new Texture2D( 2, 2, format, generateMipmaps, linearColorSpace ); + + try + { + if( !result.LoadImage( File.ReadAllBytes( loadPath ), markTextureNonReadable ) ) + { + Object.DestroyImmediate( result ); + return null; + } + } + catch( Exception e ) + { + Debug.LogException( e ); + + Object.DestroyImmediate( result ); + return null; + } + finally + { + if( loadPath != imagePath ) + { + try + { + File.Delete( loadPath ); + } + catch { } + } + } + + return result; + } + + public static Texture2D GetVideoThumbnail( string videoPath, int maxSize = -1, double captureTimeInSeconds = -1.0 ) + { + if( maxSize <= 0 ) + maxSize = SystemInfo.maxTextureSize; + +#if !UNITY_EDITOR && UNITY_ANDROID + string thumbnailPath = AJC.CallStatic( "GetVideoThumbnail", Context, videoPath, TemporaryImagePath + ".png", false, maxSize, captureTimeInSeconds ); +#elif !UNITY_EDITOR && UNITY_IOS + string thumbnailPath = _NativeGallery_GetVideoThumbnail( videoPath, TemporaryImagePath + ".png", maxSize, captureTimeInSeconds ); +#else + string thumbnailPath = null; +#endif + + if( !string.IsNullOrEmpty( thumbnailPath ) ) + return LoadImageAtPath( thumbnailPath, maxSize ); + else + return null; + } + + public static ImageProperties GetImageProperties( string imagePath ) + { + if( !File.Exists( imagePath ) ) + throw new FileNotFoundException( "File not found at " + imagePath ); + +#if !UNITY_EDITOR && UNITY_ANDROID + string value = AJC.CallStatic( "GetImageProperties", Context, imagePath ); +#elif !UNITY_EDITOR && UNITY_IOS + string value = _NativeGallery_GetImageProperties( imagePath ); +#else + string value = null; +#endif + + int width = 0, height = 0; + string mimeType = null; + ImageOrientation orientation = ImageOrientation.Unknown; + if( !string.IsNullOrEmpty( value ) ) + { + string[] properties = value.Split( '>' ); + if( properties != null && properties.Length >= 4 ) + { + if( !int.TryParse( properties[0].Trim(), out width ) ) + width = 0; + if( !int.TryParse( properties[1].Trim(), out height ) ) + height = 0; + + mimeType = properties[2].Trim(); + if( mimeType.Length == 0 ) + { + String extension = Path.GetExtension( imagePath ).ToLowerInvariant(); + if( extension == ".png" ) + mimeType = "image/png"; + else if( extension == ".jpg" || extension == ".jpeg" ) + mimeType = "image/jpeg"; + else if( extension == ".gif" ) + mimeType = "image/gif"; + else if( extension == ".bmp" ) + mimeType = "image/bmp"; + else + mimeType = null; + } + + int orientationInt; + if( int.TryParse( properties[3].Trim(), out orientationInt ) ) + orientation = (ImageOrientation) orientationInt; + } + } + + return new ImageProperties( width, height, mimeType, orientation ); + } + + public static VideoProperties GetVideoProperties( string videoPath ) + { + if( !File.Exists( videoPath ) ) + throw new FileNotFoundException( "File not found at " + videoPath ); + +#if !UNITY_EDITOR && UNITY_ANDROID + string value = AJC.CallStatic( "GetVideoProperties", Context, videoPath ); +#elif !UNITY_EDITOR && UNITY_IOS + string value = _NativeGallery_GetVideoProperties( videoPath ); +#else + string value = null; +#endif + + int width = 0, height = 0; + long duration = 0L; + float rotation = 0f; + if( !string.IsNullOrEmpty( value ) ) + { + string[] properties = value.Split( '>' ); + if( properties != null && properties.Length >= 4 ) + { + if( !int.TryParse( properties[0].Trim(), out width ) ) + width = 0; + if( !int.TryParse( properties[1].Trim(), out height ) ) + height = 0; + if( !long.TryParse( properties[2].Trim(), out duration ) ) + duration = 0L; + if( !float.TryParse( properties[3].Trim(), out rotation ) ) + rotation = 0f; + } + } + + if( rotation == -90f ) + rotation = 270f; + + return new VideoProperties( width, height, duration, rotation ); + } + #endregion } \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/Plugins/NativeGallery.cs.meta b/Assets/3rd/NativeGallery/Plugins/NativeGallery.cs.meta new file mode 100644 index 0000000..c1cee3f --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/NativeGallery.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 89147d0c91efd4310bf3b6ab773df35b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/README.txt b/Assets/3rd/NativeGallery/Plugins/README.txt similarity index 59% rename from Assets/3rd/NativeGallery/README.txt rename to Assets/3rd/NativeGallery/Plugins/README.txt index d502ed2..41bf40b 100644 --- a/Assets/3rd/NativeGallery/README.txt +++ b/Assets/3rd/NativeGallery/Plugins/README.txt @@ -1,87 +1,113 @@ -= Native Gallery for Android & iOS = - -Online documentation & example code available at: https://github.com/yasirkula/UnityNativeGallery -E-mail: yasirkula@gmail.com - -1. ABOUT -This plugin helps you interact with Gallery/Photos on Android & iOS. - -2. HOW TO -for Android: set "Write Permission" to "External (SDCard)" in Player Settings -for iOS: there are two ways to set up the plugin on iOS: - -a. Automated Setup for iOS -- change the value of PHOTO_LIBRARY_USAGE_DESCRIPTION in Plugins/NativeGallery/Editor/NGPostProcessBuild.cs (optional) -- if your minimum Deployment Target (iOS Version) is at least 8.0, set the value of MINIMUM_TARGET_8_OR_ABOVE to true in NGPostProcessBuild.cs - -b. Manual Setup for iOS -- set the value of ENABLED to false in NGPostProcessBuild.cs -- build your project -- enter a Photo Library Usage Description to Info.plist in Xcode -- also enter a "Photo Library Additions Usage Description" to Info.plist in Xcode, if exists -- insert "-weak_framework Photos -framework AssetsLibrary -framework MobileCoreServices -framework ImageIO" to the "Other Linker Flags" of Unity-iPhone Target (if your Deployment Target is at least 8.0, it is sufficient to insert "-framework Photos -framework MobileCoreServices -framework ImageIO") -- lastly, remove Photos.framework from Link Binary With Libraries of Unity-iPhone Target in Build Phases, if exists - -3. SCRIPTING API -Please see the online documentation for a more in-depth documentation of the Scripting API: https://github.com/yasirkula/UnityNativeGallery - -enum NativeGallery.Permission { Denied = 0, Granted = 1, ShouldAsk = 2 }; -enum NativeGallery.ImageOrientation { Unknown = -1, Normal = 0, Rotate90 = 1, Rotate180 = 2, Rotate270 = 3, FlipHorizontal = 4, Transpose = 5, FlipVertical = 6, Transverse = 7 }; // EXIF orientation: http://sylvana.net/jpegcrop/exif_orientation.html (indices are reordered) - -delegate void MediaSaveCallback( string error ); -delegate void NativeGallery.MediaPickCallback( string path ); -delegate void MediaPickMultipleCallback( string[] paths ); - -//// Saving Media To Gallery/Photos //// - -// On Android, your images are saved at DCIM/album/filenameFormatted. On iOS, the image will be saved in the corresponding album -// filenameFormatted is string.Format'ed to avoid overwriting the same file on Android, if desired. If, for example, you want your images to be saved in a format like "My img 1.png", "My img 2.png" and etc., you can set the filenameFormatted as "My img {0}.png". {0} here is replaced with a unique number to avoid overwriting an existing file. If you don't use a {0} in your filenameFormatted parameter and a file with the same name does exist at that path, the file will be overwritten. On the other hand, a saved image is never overwritten on iOS -// MediaSaveCallback takes a string parameter which stores an error string if something goes wrong while saving the image/video, or null if it is saved successfully -NativeGallery.Permission NativeGallery.SaveImageToGallery( byte[] mediaBytes, string album, string filenameFormatted, MediaSaveCallback callback = null ); -NativeGallery.Permission NativeGallery.SaveImageToGallery( string existingMediaPath, string album, string filenameFormatted, MediaSaveCallback callback = null ); -NativeGallery.Permission NativeGallery.SaveImageToGallery( Texture2D image, string album, string filenameFormatted, MediaSaveCallback callback = null ); -NativeGallery.Permission NativeGallery.SaveVideoToGallery( byte[] mediaBytes, string album, string filenameFormatted, MediaSaveCallback callback = null ); -NativeGallery.Permission NativeGallery.SaveVideoToGallery( string existingMediaPath, string album, string filenameFormatted, MediaSaveCallback callback = null ); - - -//// Retrieving Media From Gallery/Photos //// - -// This operation is asynchronous! After user selects an image/video or cancels the operation, the callback is called (on main thread) -// MediaPickCallback takes a string parameter which stores the path of the selected image/video, or null if nothing is selected -// MediaPickMultipleCallback takes a string[] parameter which stores the path(s) of the selected image(s)/video(s), or null if nothing is selected -// title: determines the title of the image picker dialog on Android. Has no effect on iOS -// mime: filters the available images/videos on Android. For example, to request a JPEG image from the user, mime can be set as "image/jpeg". Setting multiple mime types is not possible (in that case, you should leave mime as is). On iOS, selected images will always be in PNG format and thus, this parameter has no effect on iOS -// maxSize: determines the maximum size of the returned image in pixels on iOS. A larger image will be down-scaled for better performance. If untouched, its value will be set to SystemInfo.maxTextureSize. Has no effect on Android -NativeGallery.Permission NativeGallery.GetImageFromGallery( MediaPickCallback callback, string title = "", string mime = "image/*", int maxSize = -1 ); -NativeGallery.Permission NativeGallery.GetVideoFromGallery( MediaPickCallback callback, string title = "", string mime = "video/*" ); -NativeGallery.Permission NativeGallery.GetImagesFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "image/*", int maxSize = -1 ); -NativeGallery.Permission NativeGallery.GetVideosFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "video/*" ); - -// Returns true if selecting multiple images/videos from Gallery/Photos is possible on this device (only available on Android 18 and later; iOS not supported) -bool NativeGallery.CanSelectMultipleFilesFromGallery(); - -// Returns true if the user is currently picking media from Gallery/Photos. In that case, another GetImageFromGallery or GetVideoFromGallery request will simply be ignored -bool NativeGallery.IsMediaPickerBusy(); - - -//// Runtime Permissions //// - -// Interacting with Gallery/Photos is only possible when permission state is Permission.Granted. Most of the functions request permission internally (and return the result) but you can also check/request the permissions manually -NativeGallery.Permission NativeGallery.CheckPermission(); -NativeGallery.Permission NativeGallery.RequestPermission(); - -// If permission state is Permission.Denied, user must grant the necessary permission (Storage on Android and Photos on iOS) manually from the Settings. These functions help you open the Settings directly from within the app -void NativeGallery.OpenSettings(); -bool NativeGallery.CanOpenSettings(); - - -//// Utility Functions //// - -// maxSize: determines the maximum size of the returned Texture2D in pixels. Larger textures will be down-scaled. If untouched, its value will be set to SystemInfo.maxTextureSize. It is recommended to set a proper maxSize for better performance -// markTextureNonReadable: marks the generated texture as non-readable for better memory usage. If you plan to modify the texture later (e.g. GetPixels/SetPixels), set its value to false -// generateMipmaps: determines whether texture should have mipmaps or not -// linearColorSpace: determines whether texture should be in linear color space or sRGB color space -Texture2D NativeGallery.LoadImageAtPath( string imagePath, int maxSize = -1, bool markTextureNonReadable = true, bool generateMipmaps = true, bool linearColorSpace = false ): creates a Texture2D from the specified image file in correct orientation and returns it. Returns null, if something goes wrong - -NativeGallery.ImageProperties NativeGallery.GetImageProperties( string imagePath ): returns an ImageProperties instance that holds the width, height and mime type information of an image file without creating a Texture2D object. Mime type will be null, if it can't be determined -NativeGallery.VideoProperties NativeGallery.GetVideoProperties( string videoPath ): returns a VideoProperties instance that holds the width, height, duration (in milliseconds) and rotation information of a video file \ No newline at end of file += Native Gallery for Android & iOS = + +Online documentation & example code available at: https://github.com/yasirkula/UnityNativeGallery +E-mail: yasirkula@gmail.com + + +1. ABOUT +This plugin helps you interact with Gallery/Photos on Android & iOS. + + +2. HOW TO +for Android: set "Write Permission" to "External (SDCard)" in Player Settings +for iOS: there are two ways to set up the plugin on iOS: + +a. Automated Setup for iOS +- (optional) change the value of PHOTO_LIBRARY_USAGE_DESCRIPTION in Plugins/NativeGallery/Editor/NGPostProcessBuild.cs +- (Unity 2017.4 or earlier) if your minimum Deployment Target (iOS Version) is at least 8.0, set the value of MINIMUM_TARGET_8_OR_ABOVE to true in NGPostProcessBuild.cs + +b. Manual Setup for iOS +- set the value of ENABLED to false in NGPostProcessBuild.cs +- build your project +- enter a Photo Library Usage Description to Info.plist in Xcode +- also enter a "Photo Library Additions Usage Description" to Info.plist in Xcode, if exists +- insert "-weak_framework Photos -framework AssetsLibrary -framework MobileCoreServices -framework ImageIO" to the "Other Linker Flags" of Unity-iPhone Target (if your Deployment Target is at least 8.0, it is sufficient to insert "-framework Photos -framework MobileCoreServices -framework ImageIO") +- lastly, remove Photos.framework from Link Binary With Libraries of Unity-iPhone Target in Build Phases, if exists + + +3. FAQ +- How can I fetch the path of the saved image or the original path of the picked image? +You can't. On iOS, these files are stored in an internal directory that we have no access to (I don't think there is even a way to fetch that internal path). On Android, with Storage Access Framework, the absolute path is hidden behind the SAF-layer. There are some tricks here and there to convert SAF-path to absolute path but they don't work in all cases (most of the snippets that can be found on Stackoverflow can't return the absolute path if the file is stored on external SD card). + +- Can't access the Gallery, it says "java.lang.ClassNotFoundException: com.yasirkula.unity.NativeGallery" in Logcat +If your project uses ProGuard, try adding the following line to ProGuard filters: -keep class com.yasirkula.unity.* { *; } + +- Nothing happens when I try to access the Gallery on Android +Make sure that you've set the "Write Permission" to "External (SDCard)" in Player Settings. + +- Saving image/video doesn't work properly +Make sure that the "filename" parameter of the Save function includes the file's extension, as well + + +4. SCRIPTING API +Please see the online documentation for a more in-depth documentation of the Scripting API: https://github.com/yasirkula/UnityNativeGallery + +enum NativeGallery.Permission { Denied = 0, Granted = 1, ShouldAsk = 2 }; +enum NativeGallery.ImageOrientation { Unknown = -1, Normal = 0, Rotate90 = 1, Rotate180 = 2, Rotate270 = 3, FlipHorizontal = 4, Transpose = 5, FlipVertical = 6, Transverse = 7 }; // EXIF orientation: http://sylvana.net/jpegcrop/exif_orientation.html (indices are reordered) + +delegate void MediaSaveCallback( string error ); +delegate void NativeGallery.MediaPickCallback( string path ); +delegate void MediaPickMultipleCallback( string[] paths ); + +//// Saving Media To Gallery/Photos //// + +// On Android, your images are saved at DCIM/album/filename. On iOS, the image will be saved in the corresponding album. +// NOTE: Make sure that the filename parameter includes the file's extension, as well +// IMPORTANT: NativeGallery will never overwrite existing media on the Gallery. If there is a name conflict, NativeGallery will ensure a unique filename. So don't put '{0}' in filename anymore (for new users, putting {0} in filename was recommended in order to ensure unique filenames in earlier versions, this is no longer necessary). +// MediaSaveCallback takes a string parameter which stores an error string if something goes wrong while saving the image/video, or null if it is saved successfully +NativeGallery.Permission NativeGallery.SaveImageToGallery( byte[] mediaBytes, string album, string filename, MediaSaveCallback callback = null ); +NativeGallery.Permission NativeGallery.SaveImageToGallery( string existingMediaPath, string album, string filename, MediaSaveCallback callback = null ); +NativeGallery.Permission NativeGallery.SaveImageToGallery( Texture2D image, string album, string filename, MediaSaveCallback callback = null ); +NativeGallery.Permission NativeGallery.SaveVideoToGallery( byte[] mediaBytes, string album, string filename, MediaSaveCallback callback = null ); +NativeGallery.Permission NativeGallery.SaveVideoToGallery( string existingMediaPath, string album, string filename, MediaSaveCallback callback = null ); + + +//// Retrieving Media From Gallery/Photos //// + +// This operation is asynchronous! After user selects an image/video or cancels the operation, the callback is called (on main thread) +// MediaPickCallback takes a string parameter which stores the path of the selected image/video, or null if nothing is selected +// MediaPickMultipleCallback takes a string[] parameter which stores the path(s) of the selected image(s)/video(s), or null if nothing is selected +// title: determines the title of the image picker dialog on Android. Has no effect on iOS +// mime: filters the available images/videos on Android. For example, to request a JPEG image from the user, mime can be set as "image/jpeg". Setting multiple mime types is not possible (in that case, you should leave mime as is). Has no effect on iOS +NativeGallery.Permission NativeGallery.GetImageFromGallery( MediaPickCallback callback, string title = "", string mime = "image/*" ); +NativeGallery.Permission NativeGallery.GetVideoFromGallery( MediaPickCallback callback, string title = "", string mime = "video/*" ); +NativeGallery.Permission NativeGallery.GetImagesFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "image/*" ); +NativeGallery.Permission NativeGallery.GetVideosFromGallery( MediaPickMultipleCallback callback, string title = "", string mime = "video/*" ); + +// Returns true if selecting multiple images/videos from Gallery/Photos is possible on this device (only available on Android 18 and later; iOS not supported) +bool NativeGallery.CanSelectMultipleFilesFromGallery(); + +// Returns true if the user is currently picking media from Gallery/Photos. In that case, another GetImageFromGallery or GetVideoFromGallery request will simply be ignored +bool NativeGallery.IsMediaPickerBusy(); + + +//// Runtime Permissions //// + +// Interacting with Gallery/Photos is only possible when permission state is Permission.Granted. Most of the functions request permission internally (and return the result) but you can also check/request the permissions manually +NativeGallery.Permission NativeGallery.CheckPermission(); +NativeGallery.Permission NativeGallery.RequestPermission(); + +// If permission state is Permission.Denied, user must grant the necessary permission (Storage on Android and Photos on iOS) manually from the Settings. These functions help you open the Settings directly from within the app +void NativeGallery.OpenSettings(); +bool NativeGallery.CanOpenSettings(); + + +//// Utility Functions //// + +// Creates a Texture2D from the specified image file in correct orientation and returns it. Returns null, if something goes wrong +// maxSize: determines the maximum size of the returned Texture2D in pixels. Larger textures will be down-scaled. If untouched, its value will be set to SystemInfo.maxTextureSize. It is recommended to set a proper maxSize for better performance +// markTextureNonReadable: marks the generated texture as non-readable for better memory usage. If you plan to modify the texture later (e.g. GetPixels/SetPixels), set its value to false +// generateMipmaps: determines whether texture should have mipmaps or not +// linearColorSpace: determines whether texture should be in linear color space or sRGB color space +Texture2D NativeGallery.LoadImageAtPath( string imagePath, int maxSize = -1, bool markTextureNonReadable = true, bool generateMipmaps = true, bool linearColorSpace = false ); + +// Creates a Texture2D thumbnail from a video file and returns it. Returns null, if something goes wrong +// maxSize: determines the maximum size of the returned Texture2D in pixels. Larger thumbnails will be down-scaled. If untouched, its value will be set to SystemInfo.maxTextureSize. It is recommended to set a proper maxSize for better performance +// captureTimeInSeconds: determines the frame of the video that the thumbnail is captured from. If untouched, OS will decide this value +Texture2D NativeGallery.GetVideoThumbnail( string videoPath, int maxSize = -1, double captureTimeInSeconds = -1.0 ); + +// Returns an ImageProperties instance that holds the width, height and mime type information of an image file without creating a Texture2D object. Mime type will be null, if it can't be determined +NativeGallery.ImageProperties NativeGallery.GetImageProperties( string imagePath ); + +// Returns a VideoProperties instance that holds the width, height, duration (in milliseconds) and rotation information of a video file. To play a video in correct orientation, you should rotate it by rotation degrees clockwise. For a 90-degree or 270-degree rotated video, values of width and height should be swapped to get the display size of the video +NativeGallery.VideoProperties NativeGallery.GetVideoProperties( string videoPath ); \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/Plugins/README.txt.meta b/Assets/3rd/NativeGallery/Plugins/README.txt.meta new file mode 100644 index 0000000..40e49a2 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/README.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1852f26c8592c453f8f7423bf2a283d7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/Plugins/iOS.meta b/Assets/3rd/NativeGallery/Plugins/iOS.meta new file mode 100644 index 0000000..d5178c1 --- /dev/null +++ b/Assets/3rd/NativeGallery/Plugins/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8af1e45d8c954cd0a87623adcbc246d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaReceiveCallbackiOS.cs similarity index 94% rename from Assets/3rd/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs rename to Assets/3rd/NativeGallery/Plugins/iOS/NGMediaReceiveCallbackiOS.cs index 513219a..7b307b4 100644 --- a/Assets/3rd/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs +++ b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaReceiveCallbackiOS.cs @@ -1,72 +1,72 @@ -#if !UNITY_EDITOR && UNITY_IOS -using UnityEngine; - -namespace NativeGalleryNamespace -{ - public class NGMediaReceiveCallbackiOS : MonoBehaviour - { - private static NGMediaReceiveCallbackiOS instance; - private NativeGallery.MediaPickCallback callback; - - private float nextBusyCheckTime; - - public static bool IsBusy { get; private set; } - - [System.Runtime.InteropServices.DllImport( "__Internal" )] - private static extern int _NativeGallery_IsMediaPickerBusy(); - - public static void Initialize( NativeGallery.MediaPickCallback callback ) - { - if( IsBusy ) - return; - - if( instance == null ) - { - instance = new GameObject( "NGMediaReceiveCallbackiOS" ).AddComponent(); - DontDestroyOnLoad( instance.gameObject ); - } - - instance.callback = callback; - - instance.nextBusyCheckTime = Time.realtimeSinceStartup + 1f; - IsBusy = true; - } - - private void Update() - { - if( IsBusy ) - { - if( Time.realtimeSinceStartup >= nextBusyCheckTime ) - { - nextBusyCheckTime = Time.realtimeSinceStartup + 1f; - - if( _NativeGallery_IsMediaPickerBusy() == 0 ) - { - if( callback != null ) - { - callback( null ); - callback = null; - } - - IsBusy = false; - } - } - } - } - - public void OnMediaReceived( string path ) - { - if( string.IsNullOrEmpty( path ) ) - path = null; - - if( callback != null ) - { - callback( path ); - callback = null; - } - - IsBusy = false; - } - } -} +#if !UNITY_EDITOR && UNITY_IOS +using UnityEngine; + +namespace NativeGalleryNamespace +{ + public class NGMediaReceiveCallbackiOS : MonoBehaviour + { + private static NGMediaReceiveCallbackiOS instance; + private NativeGallery.MediaPickCallback callback; + + private float nextBusyCheckTime; + + public static bool IsBusy { get; private set; } + + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern int _NativeGallery_IsMediaPickerBusy(); + + public static void Initialize( NativeGallery.MediaPickCallback callback ) + { + if( IsBusy ) + return; + + if( instance == null ) + { + instance = new GameObject( "NGMediaReceiveCallbackiOS" ).AddComponent(); + DontDestroyOnLoad( instance.gameObject ); + } + + instance.callback = callback; + + instance.nextBusyCheckTime = Time.realtimeSinceStartup + 1f; + IsBusy = true; + } + + private void Update() + { + if( IsBusy ) + { + if( Time.realtimeSinceStartup >= nextBusyCheckTime ) + { + nextBusyCheckTime = Time.realtimeSinceStartup + 1f; + + if( _NativeGallery_IsMediaPickerBusy() == 0 ) + { + IsBusy = false; + + if( callback != null ) + { + callback( null ); + callback = null; + } + } + } + } + } + + public void OnMediaReceived( string path ) + { + IsBusy = false; + + if( string.IsNullOrEmpty( path ) ) + path = null; + + if( callback != null ) + { + callback( path ); + callback = null; + } + } + } +} #endif \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs.meta b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaReceiveCallbackiOS.cs.meta similarity index 92% rename from Assets/3rd/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs.meta rename to Assets/3rd/NativeGallery/Plugins/iOS/NGMediaReceiveCallbackiOS.cs.meta index 3ebbab4..00b8b23 100644 --- a/Assets/3rd/NativeGallery/iOS/NGMediaReceiveCallbackiOS.cs.meta +++ b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaReceiveCallbackiOS.cs.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 71fb861c149c2d1428544c601e52a33c timeCreated: 1519060539 -licenseType: Store +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] diff --git a/Assets/3rd/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaSaveCallbackiOS.cs similarity index 95% rename from Assets/3rd/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs rename to Assets/3rd/NativeGallery/Plugins/iOS/NGMediaSaveCallbackiOS.cs index 713acff..974ac58 100644 --- a/Assets/3rd/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs +++ b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaSaveCallbackiOS.cs @@ -1,46 +1,46 @@ -#if !UNITY_EDITOR && UNITY_IOS -using UnityEngine; - -namespace NativeGalleryNamespace -{ - public class NGMediaSaveCallbackiOS : MonoBehaviour - { - private static NGMediaSaveCallbackiOS instance; - private NativeGallery.MediaSaveCallback callback; - - public static void Initialize( NativeGallery.MediaSaveCallback callback ) - { - if( instance == null ) - { - instance = new GameObject( "NGMediaSaveCallbackiOS" ).AddComponent(); - DontDestroyOnLoad( instance.gameObject ); - } - else if( instance.callback != null ) - instance.callback( null ); - - instance.callback = callback; - } - - public void OnMediaSaveCompleted( string message ) - { - if( callback != null ) - { - callback( null ); - callback = null; - } - } - - public void OnMediaSaveFailed( string error ) - { - if( string.IsNullOrEmpty( error ) ) - error = "Unknown error"; - - if( callback != null ) - { - callback( error ); - callback = null; - } - } - } -} +#if !UNITY_EDITOR && UNITY_IOS +using UnityEngine; + +namespace NativeGalleryNamespace +{ + public class NGMediaSaveCallbackiOS : MonoBehaviour + { + private static NGMediaSaveCallbackiOS instance; + private NativeGallery.MediaSaveCallback callback; + + public static void Initialize( NativeGallery.MediaSaveCallback callback ) + { + if( instance == null ) + { + instance = new GameObject( "NGMediaSaveCallbackiOS" ).AddComponent(); + DontDestroyOnLoad( instance.gameObject ); + } + else if( instance.callback != null ) + instance.callback( null ); + + instance.callback = callback; + } + + public void OnMediaSaveCompleted( string message ) + { + if( callback != null ) + { + callback( null ); + callback = null; + } + } + + public void OnMediaSaveFailed( string error ) + { + if( string.IsNullOrEmpty( error ) ) + error = "Unknown error"; + + if( callback != null ) + { + callback( error ); + callback = null; + } + } + } +} #endif \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs.meta b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaSaveCallbackiOS.cs.meta similarity index 92% rename from Assets/3rd/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs.meta rename to Assets/3rd/NativeGallery/Plugins/iOS/NGMediaSaveCallbackiOS.cs.meta index be840a4..734c853 100644 --- a/Assets/3rd/NativeGallery/iOS/NGMediaSaveCallbackiOS.cs.meta +++ b/Assets/3rd/NativeGallery/Plugins/iOS/NGMediaSaveCallbackiOS.cs.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 9cbb865d0913a0d47bb6d2eb3ad04c4f timeCreated: 1519060539 -licenseType: Store +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] diff --git a/Assets/3rd/NativeGallery/iOS/NativeGallery.mm b/Assets/3rd/NativeGallery/Plugins/iOS/NativeGallery.mm similarity index 67% rename from Assets/3rd/NativeGallery/iOS/NativeGallery.mm rename to Assets/3rd/NativeGallery/Plugins/iOS/NativeGallery.mm index 5d0ce4e..2af90d9 100644 --- a/Assets/3rd/NativeGallery/iOS/NativeGallery.mm +++ b/Assets/3rd/NativeGallery/Plugins/iOS/NativeGallery.mm @@ -1,593 +1,781 @@ -#import -#import -#import -#import -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 -#import -#endif - -#ifdef UNITY_4_0 || UNITY_5_0 -#import "iPhone_View.h" -#else -extern UIViewController* UnityGetGLViewController(); -#endif - -@interface UNativeGallery:NSObject -+ (int)checkPermission; -+ (int)requestPermission; -+ (int)canOpenSettings; -+ (void)openSettings; -+ (void)saveMedia:(NSString *)path albumName:(NSString *)album isImg:(BOOL)isImg; -+ (void)pickMedia:(BOOL)imageMode savePath:(NSString *)imageSavePath; -+ (void)pickMediaSetMaxSize:(int)maxSize; -+ (int)isMediaPickerBusy; -+ (char *)getImageProperties:(NSString *)path; -+ (char *)getVideoProperties:(NSString *)path; -+ (char *)loadImageAtPath:(NSString *)path tempFilePath:(NSString *)tempFilePath maximumSize:(int)maximumSize; -@end - -@implementation UNativeGallery - -static NSString *pickedMediaSavePath; -static UIPopoverController *popup; -static UIImagePickerController *imagePicker; -static int pickMediaMaxSize = -1; -static int imagePickerState = 0; // 0 -> none, 1 -> showing (always in this state on iPad), 2 -> finished - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -+ (int)checkPermission { -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) - { -#endif - // version >= iOS 8: check permission using Photos framework - PHAuthorizationStatus status = [PHPhotoLibrary authorizationStatus]; - if (status == PHAuthorizationStatusAuthorized) - return 1; - else if (status == PHAuthorizationStatusNotDetermined ) - return 2; - else - return 0; -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - } - else - { - // version < iOS 8: check permission using AssetsLibrary framework (Photos framework not available) - ALAuthorizationStatus status = [ALAssetsLibrary authorizationStatus]; - if (status == ALAuthorizationStatusAuthorized) - return 1; - else if (status == ALAuthorizationStatusNotDetermined) - return 2; - else - return 0; - } -#endif -} -#pragma clang diagnostic pop - -+ (int)requestPermission { -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) - { -#endif - // version >= iOS 8: request permission using Photos framework - return [self requestPermissionNew]; -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - } - else - { - // version < iOS 8: request permission using AssetsLibrary framework (Photos framework not available) - return [self requestPermissionOld]; - } -#endif -} - -// Credit: https://stackoverflow.com/a/25453667/2373034 -+ (int)canOpenSettings { - if (&UIApplicationOpenSettingsURLString != NULL) - return 1; - else - return 0; -} - -// Credit: https://stackoverflow.com/a/25453667/2373034 -+ (void)openSettings { - if (&UIApplicationOpenSettingsURLString != NULL) - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]; -} - -+ (void)saveMedia:(NSString *)path albumName:(NSString *)album isImg:(BOOL)isImg { -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) - { -#endif - // version >= iOS 8: save to specified album using Photos framework - [self saveMediaNew:path albumName:album isImage:isImg]; -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - } - else - { - // version < iOS 8: save using AssetsLibrary framework (Photos framework not available) - [self saveMediaOld:path albumName:album isImage:isImg]; - } -#endif -} - -// Credit: https://stackoverflow.com/a/26933380/2373034 -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -+ (int)requestPermissionOld { -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - ALAuthorizationStatus status = [ALAssetsLibrary authorizationStatus]; - - if (status == ALAuthorizationStatusAuthorized) { - return 1; - } - else if (status == ALAuthorizationStatusNotDetermined) { - __block BOOL authorized = NO; - ALAssetsLibrary *lib = [[ALAssetsLibrary alloc] init]; - - dispatch_semaphore_t sema = dispatch_semaphore_create(0); - [lib enumerateGroupsWithTypes:ALAssetsGroupAll usingBlock:^(ALAssetsGroup *group, BOOL *stop) { - *stop = YES; - authorized = YES; - dispatch_semaphore_signal(sema); - } failureBlock:^(NSError *error) { - dispatch_semaphore_signal(sema); - }]; - dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER); - - if (authorized) - return 1; - else - return 0; - } - else { - return 0; - } -#endif - - return 0; -} -#pragma clang diagnostic pop - -// Credit: https://stackoverflow.com/a/32989022/2373034 -+ (int)requestPermissionNew { - PHAuthorizationStatus status = [PHPhotoLibrary authorizationStatus]; - - if (status == PHAuthorizationStatusAuthorized) { - return 1; - } - else if (status == PHAuthorizationStatusNotDetermined) { - __block BOOL authorized = NO; - - dispatch_semaphore_t sema = dispatch_semaphore_create(0); - [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) { - authorized = (status == PHAuthorizationStatusAuthorized); - dispatch_semaphore_signal(sema); - }]; - dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER); - - if (authorized) - return 1; - else - return 0; - } - else { - return 0; - } -} - -// Credit: https://stackoverflow.com/a/22056664/2373034 -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -+ (void)saveMediaOld:(NSString *)path albumName:(NSString *)album isImage:(BOOL)isImage { -#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - ALAssetsLibrary *library = [[ALAssetsLibrary alloc] init]; - - if (!isImage && ![library videoAtPathIsCompatibleWithSavedPhotosAlbum:[NSURL fileURLWithPath:path]]) - { - [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", "Video format is not compatible with Photos"); - return; - } - - void (^saveBlock)(ALAssetsGroup *assetCollection) = ^void(ALAssetsGroup *assetCollection) { - void (^saveResultBlock)(NSURL *assetURL, NSError *error) = ^void(NSURL *assetURL, NSError *error) { - [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; - - if (error.code == 0) { - [library assetForURL:assetURL resultBlock:^(ALAsset *asset) { - [assetCollection addAsset:asset]; - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveCompleted", ""); - } failureBlock:^(NSError* error) { - NSLog(@"Error moving asset to album: %@", error); - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); - }]; - } - else { - NSLog(@"Error creating asset: %@", error); - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); - } - }; - - if (!isImage) - [library writeImageDataToSavedPhotosAlbum:[NSData dataWithContentsOfFile:path] metadata:nil completionBlock:saveResultBlock]; - else - [library writeVideoAtPathToSavedPhotosAlbum:[NSURL fileURLWithPath:path] completionBlock:saveResultBlock]; - }; - - __block BOOL albumFound = NO; - [library enumerateGroupsWithTypes:ALAssetsGroupAlbum usingBlock:^(ALAssetsGroup *group, BOOL *stop) { - if ([[group valueForProperty:ALAssetsGroupPropertyName] isEqualToString:album]) { - *stop = YES; - albumFound = YES; - saveBlock(group); - } - else if (group == nil && albumFound==NO) { // Album doesn't exist - [library addAssetsGroupAlbumWithName:album resultBlock:^(ALAssetsGroup *group) { - saveBlock(group); - } - failureBlock:^(NSError *error) { - NSLog(@"Error creating album: %@", error); - [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); - }]; - } - } failureBlock:^(NSError* error) { - NSLog(@"Error listing albums: %@", error); - [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); - }]; -#endif -} -#pragma clang diagnostic pop - -// Credit: https://stackoverflow.com/a/39909129/2373034 -+ (void)saveMediaNew:(NSString *)path albumName:(NSString *)album isImage:(BOOL)isImage { - void (^saveBlock)(PHAssetCollection *assetCollection) = ^void(PHAssetCollection *assetCollection) { - [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{ - PHAssetChangeRequest *assetChangeRequest; - if (isImage) - assetChangeRequest = [PHAssetChangeRequest creationRequestForAssetFromImageAtFileURL:[NSURL fileURLWithPath:path]]; - else - assetChangeRequest = [PHAssetChangeRequest creationRequestForAssetFromVideoAtFileURL:[NSURL fileURLWithPath:path]]; - - PHAssetCollectionChangeRequest *assetCollectionChangeRequest = [PHAssetCollectionChangeRequest changeRequestForAssetCollection:assetCollection]; - [assetCollectionChangeRequest addAssets:@[[assetChangeRequest placeholderForCreatedAsset]]]; - - } completionHandler:^(BOOL success, NSError *error) { - [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; - - if (success) - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveCompleted", ""); - else { - NSLog(@"Error creating asset: %@", error); - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); - } - }]; - }; - - PHFetchOptions *fetchOptions = [[PHFetchOptions alloc] init]; - fetchOptions.predicate = [NSPredicate predicateWithFormat:@"localizedTitle = %@", album]; - PHFetchResult *fetchResult = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeAlbum subtype:PHAssetCollectionSubtypeAny options:fetchOptions]; - if (fetchResult.count > 0) { - saveBlock(fetchResult.firstObject); - } - else { - __block PHObjectPlaceholder *albumPlaceholder; - [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{ - PHAssetCollectionChangeRequest *changeRequest = [PHAssetCollectionChangeRequest creationRequestForAssetCollectionWithTitle:album]; - albumPlaceholder = changeRequest.placeholderForCreatedAssetCollection; - } completionHandler:^(BOOL success, NSError *error) { - if (success) { - PHFetchResult *fetchResult = [PHAssetCollection fetchAssetCollectionsWithLocalIdentifiers:@[albumPlaceholder.localIdentifier] options:nil]; - if (fetchResult.count > 0) - saveBlock(fetchResult.firstObject); - else { - [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", "Album placeholder not found" ); - } - } - else { - NSLog(@"Error creating album: %@", error); - [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; - UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); - } - }]; - } -} - -// Credit: https://stackoverflow.com/a/10531752/2373034 -+ (void)pickMedia:(BOOL)imageMode savePath:(NSString *)imageSavePath { - imagePicker = [[UIImagePickerController alloc] init]; - imagePicker.delegate = self; - imagePicker.allowsEditing = NO; - imagePicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; - - if (imageMode) - imagePicker.mediaTypes = [NSArray arrayWithObject:(NSString *)kUTTypeImage]; - else - imagePicker.mediaTypes = [NSArray arrayWithObjects:(NSString *)kUTTypeMovie, (NSString *)kUTTypeVideo, nil]; - - pickedMediaSavePath = imageSavePath; - - imagePickerState = 1; - UIViewController *rootViewController = UnityGetGLViewController(); - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) // iPhone - [rootViewController presentViewController:imagePicker animated:YES completion:^{ imagePickerState = 0; }]; - else { // iPad - popup = [[UIPopoverController alloc] initWithContentViewController:imagePicker]; - popup.delegate = self; - [popup presentPopoverFromRect:CGRectMake( rootViewController.view.frame.size.width / 2, rootViewController.view.frame.size.height / 4, 0, 0 ) inView:rootViewController.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES]; - } -} - -+ (void)pickMediaSetMaxSize:(int)maxSize { - pickMediaMaxSize = maxSize; -} - -+ (int)isMediaPickerBusy { - if (imagePickerState == 2) - return 1; - - if (imagePicker != nil) { - if (imagePickerState == 1 || [imagePicker presentingViewController] == UnityGetGLViewController()) - return 1; - else { - imagePicker = nil; - return 0; - } - } - else - return 0; -} - -// Credit: https://stackoverflow.com/a/4170099/2373034 -+ (NSArray *)getImageMetadata:(NSString *)path { - int width = 0; - int height = 0; - int orientation = -1; - - CGImageSourceRef imageSource = CGImageSourceCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:path], nil); - if (imageSource != nil) { - NSDictionary *options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:(__bridge NSString *)kCGImageSourceShouldCache]; - CFDictionaryRef imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, (__bridge CFDictionaryRef)options); - CFRelease(imageSource); - - CGFloat widthF = 0.0f, heightF = 0.0f; - if (imageProperties != nil) { - if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyPixelWidth)) - CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth), kCFNumberCGFloatType, &widthF); - - if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyPixelHeight)) - CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight), kCFNumberCGFloatType, &heightF); - - if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyOrientation)) { - CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyOrientation), kCFNumberIntType, &orientation); - - if (orientation > 4) { // landscape image - CGFloat temp = widthF; - widthF = heightF; - heightF = temp; - } - } - - CFRelease(imageProperties); - } - - width = (int)roundf(widthF); - height = (int)roundf(heightF); - } - - return [[NSArray alloc] initWithObjects:[NSNumber numberWithInt:width], [NSNumber numberWithInt:height], [NSNumber numberWithInt:orientation], nil]; -} - -+ (char *)getImageProperties:(NSString *)path { - NSArray *metadata = [self getImageMetadata:path]; - - int orientationUnity; - int orientation = [metadata[2] intValue]; - - // To understand the magic numbers, see ImageOrientation enum in NativeGallery.cs - // and http://sylvana.net/jpegcrop/exif_orientation.html - if (orientation == 1) - orientationUnity = 0; - else if (orientation == 2) - orientationUnity = 4; - else if (orientation == 3) - orientationUnity = 2; - else if (orientation == 4) - orientationUnity = 6; - else if (orientation == 5) - orientationUnity = 5; - else if (orientation == 6) - orientationUnity = 1; - else if (orientation == 7) - orientationUnity = 7; - else if (orientation == 8) - orientationUnity = 3; - else - orientationUnity = -1; - - return [self getCString:[NSString stringWithFormat:@"%d>%d> >%d", [metadata[0] intValue], [metadata[1] intValue], orientationUnity]]; -} - -+ (char *)getVideoProperties:(NSString *)path { - CGSize size = CGSizeZero; - float rotation = 0; - long long duration = 0; - - AVURLAsset *asset = [AVURLAsset URLAssetWithURL:[NSURL fileURLWithPath:path] options:nil]; - if (asset != nil) { - duration = (long long) round(CMTimeGetSeconds([asset duration]) * 1000); - CGAffineTransform transform = [asset preferredTransform]; - NSArray* videoTracks = [asset tracksWithMediaType:AVMediaTypeVideo]; - if (videoTracks != nil && [videoTracks count] > 0) { - size = [[videoTracks objectAtIndex:0] naturalSize]; - transform = [[videoTracks objectAtIndex:0] preferredTransform]; - } - - rotation = atan2(transform.b, transform.a) * (180.0 / M_PI); - } - - return [self getCString:[NSString stringWithFormat:@"%d>%d>%lld>%f", (int)roundf(size.width), (int)roundf(size.height), duration, rotation]]; -} - -+ (UIImage *)scaleImage:(UIImage *)image maxSize:(int)maxSize { - CGFloat width = image.size.width; - CGFloat height = image.size.height; - - UIImageOrientation orientation = image.imageOrientation; - if (width <= maxSize && height <= maxSize && orientation != UIImageOrientationDown && - orientation != UIImageOrientationLeft && orientation != UIImageOrientationRight && - orientation != UIImageOrientationLeftMirrored && orientation != UIImageOrientationRightMirrored && - orientation != UIImageOrientationUpMirrored && orientation != UIImageOrientationDownMirrored) - return image; - - CGFloat scaleX = 1.0f; - CGFloat scaleY = 1.0f; - if (width > maxSize) - scaleX = maxSize / width; - if (height > maxSize) - scaleY = maxSize / height; - - // Credit: https://github.com/mbcharbonneau/UIImage-Categories/blob/master/UIImage%2BAlpha.m - CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image.CGImage); - BOOL hasAlpha = alpha == kCGImageAlphaFirst || alpha == kCGImageAlphaLast || alpha == kCGImageAlphaPremultipliedFirst || alpha == kCGImageAlphaPremultipliedLast; - - CGFloat scaleRatio = scaleX < scaleY ? scaleX : scaleY; - CGRect imageRect = CGRectMake(0, 0, width * scaleRatio, height * scaleRatio); - UIGraphicsBeginImageContextWithOptions(imageRect.size, !hasAlpha, image.scale); - [image drawInRect:imageRect]; - image = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - - return image; -} - -+ (char *)loadImageAtPath:(NSString *)path tempFilePath:(NSString *)tempFilePath maximumSize:(int)maximumSize { - NSArray *metadata = [self getImageMetadata:path]; - int orientationInt = [metadata[2] intValue]; // 1: correct orientation, [1,8]: valid orientation range - if (( orientationInt <= 1 || orientationInt > 8 ) && [metadata[0] intValue] <= maximumSize && [metadata[1] intValue] <= maximumSize) - return [self getCString:path]; - - UIImage *image = [UIImage imageWithContentsOfFile:path]; - if (image == nil) - return [self getCString:path]; - - UIImage *scaledImage = [self scaleImage:image maxSize:maximumSize]; - if (scaledImage != image) { - [UIImagePNGRepresentation(scaledImage) writeToFile:tempFilePath atomically:YES]; - return [self getCString:tempFilePath]; - } - else - return [self getCString:path]; -} - -+ (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { - NSString *path; - if ([info[UIImagePickerControllerMediaType] isEqualToString:(NSString *)kUTTypeImage]) { // image picked - // Temporarily save image as PNG - UIImage *image = info[UIImagePickerControllerOriginalImage]; - if (image == nil) - path = nil; - else { - [UIImagePNGRepresentation([self scaleImage:image maxSize:pickMediaMaxSize]) writeToFile:pickedMediaSavePath atomically:YES]; - path = pickedMediaSavePath; - } - } - else { // video picked - NSURL *mediaUrl = info[UIImagePickerControllerMediaURL] ?: info[UIImagePickerControllerReferenceURL]; - if (mediaUrl == nil) - path = nil; - else - path = [mediaUrl path]; - } - - popup = nil; - imagePicker = nil; - imagePickerState = 2; - UnitySendMessage("NGMediaReceiveCallbackiOS", "OnMediaReceived", [self getCString:path]); - - [picker dismissViewControllerAnimated:NO completion:nil]; -} - -+ (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker -{ - popup = nil; - imagePicker = nil; - UnitySendMessage("NGMediaReceiveCallbackiOS", "OnMediaReceived", ""); - - [picker dismissViewControllerAnimated:YES completion:nil]; -} - -+ (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController { - popup = nil; - imagePicker = nil; - UnitySendMessage("NGMediaReceiveCallbackiOS", "OnMediaReceived", ""); -} - -// Credit: https://stackoverflow.com/a/37052118/2373034 -+ (char *)getCString:(NSString *)source { - if (source == nil) - source = @""; - - const char *sourceUTF8 = [source UTF8String]; - char *result = (char*) malloc(strlen(sourceUTF8) + 1); - strcpy(result, sourceUTF8); - - return result; -} - -@end - -extern "C" int _NativeGallery_CheckPermission() { - return [UNativeGallery checkPermission]; -} - -extern "C" int _NativeGallery_RequestPermission() { - return [UNativeGallery requestPermission]; -} - -extern "C" int _NativeGallery_CanOpenSettings() { - return [UNativeGallery canOpenSettings]; -} - -extern "C" void _NativeGallery_OpenSettings() { - [UNativeGallery openSettings]; -} - -extern "C" void _NativeGallery_ImageWriteToAlbum(const char* path, const char* album) { - [UNativeGallery saveMedia:[NSString stringWithUTF8String:path] albumName:[NSString stringWithUTF8String:album] isImg:YES]; -} - -extern "C" void _NativeGallery_VideoWriteToAlbum(const char* path, const char* album) { - [UNativeGallery saveMedia:[NSString stringWithUTF8String:path] albumName:[NSString stringWithUTF8String:album] isImg:NO]; -} - -extern "C" void _NativeGallery_PickImage(const char* imageSavePath, int maxSize) { - [UNativeGallery pickMediaSetMaxSize:maxSize]; - [UNativeGallery pickMedia:YES savePath:[NSString stringWithUTF8String:imageSavePath]]; -} - -extern "C" void _NativeGallery_PickVideo() { - [UNativeGallery pickMedia:NO savePath:nil]; -} - -extern "C" int _NativeGallery_IsMediaPickerBusy() { - return [UNativeGallery isMediaPickerBusy]; -} - -extern "C" char* _NativeGallery_GetImageProperties(const char* path) { - return [UNativeGallery getImageProperties:[NSString stringWithUTF8String:path]]; -} - -extern "C" char* _NativeGallery_GetVideoProperties(const char* path) { - return [UNativeGallery getVideoProperties:[NSString stringWithUTF8String:path]]; -} - -extern "C" char* _NativeGallery_LoadImageAtPath(const char* path, const char* temporaryFilePath, int maxSize) { - return [UNativeGallery loadImageAtPath:[NSString stringWithUTF8String:path] tempFilePath:[NSString stringWithUTF8String:temporaryFilePath] maximumSize:maxSize]; -} +#import +#import +#import +#import +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 +#import +#endif + +#ifdef UNITY_4_0 || UNITY_5_0 +#import "iPhone_View.h" +#else +extern UIViewController* UnityGetGLViewController(); +#endif + +@interface UNativeGallery:NSObject ++ (int)checkPermission; ++ (int)requestPermission; ++ (int)canOpenSettings; ++ (void)openSettings; ++ (void)saveMedia:(NSString *)path albumName:(NSString *)album isImg:(BOOL)isImg; ++ (void)pickMedia:(BOOL)imageMode savePath:(NSString *)mediaSavePath; ++ (int)isMediaPickerBusy; ++ (char *)getImageProperties:(NSString *)path; ++ (char *)getVideoProperties:(NSString *)path; ++ (char *)getVideoThumbnail:(NSString *)path savePath:(NSString *)savePath maximumSize:(int)maximumSize captureTime:(double)captureTime; ++ (char *)loadImageAtPath:(NSString *)path tempFilePath:(NSString *)tempFilePath maximumSize:(int)maximumSize; +@end + +@implementation UNativeGallery + +static NSString *pickedMediaSavePath; +static NSString *resultPath; +static UIPopoverController *popup; +static UIImagePickerController *imagePicker; +static int imagePickerState = 0; // 0 -> none, 1 -> showing (always in this state on iPad), 2 -> finished + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++ (int)checkPermission { +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) + { +#endif + // version >= iOS 8: check permission using Photos framework + PHAuthorizationStatus status = [PHPhotoLibrary authorizationStatus]; + if (status == PHAuthorizationStatusAuthorized) + return 1; + else if (status == PHAuthorizationStatusNotDetermined ) + return 2; + else + return 0; +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + } + else + { + // version < iOS 8: check permission using AssetsLibrary framework (Photos framework not available) + ALAuthorizationStatus status = [ALAssetsLibrary authorizationStatus]; + if (status == ALAuthorizationStatusAuthorized) + return 1; + else if (status == ALAuthorizationStatusNotDetermined) + return 2; + else + return 0; + } +#endif +} +#pragma clang diagnostic pop + ++ (int)requestPermission { +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) + { +#endif + // version >= iOS 8: request permission using Photos framework + return [self requestPermissionNew]; +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + } + else + { + // version < iOS 8: request permission using AssetsLibrary framework (Photos framework not available) + return [self requestPermissionOld]; + } +#endif +} + +// Credit: https://stackoverflow.com/a/25453667/2373034 ++ (int)canOpenSettings { + if (&UIApplicationOpenSettingsURLString != NULL) + return 1; + else + return 0; +} + +// Credit: https://stackoverflow.com/a/25453667/2373034 ++ (void)openSettings { + if (&UIApplicationOpenSettingsURLString != NULL) + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]; +} + ++ (void)saveMedia:(NSString *)path albumName:(NSString *)album isImg:(BOOL)isImg { +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) + { +#endif + // version >= iOS 8: save to specified album using Photos framework + [self saveMediaNew:path albumName:album isImage:isImg]; +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + } + else + { + // version < iOS 8: save using AssetsLibrary framework (Photos framework not available) + [self saveMediaOld:path albumName:album isImage:isImg]; + } +#endif +} + +// Credit: https://stackoverflow.com/a/26933380/2373034 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++ (int)requestPermissionOld { +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + ALAuthorizationStatus status = [ALAssetsLibrary authorizationStatus]; + + if (status == ALAuthorizationStatusAuthorized) { + return 1; + } + else if (status == ALAuthorizationStatusNotDetermined) { + __block BOOL authorized = NO; + ALAssetsLibrary *lib = [[ALAssetsLibrary alloc] init]; + + dispatch_semaphore_t sema = dispatch_semaphore_create(0); + [lib enumerateGroupsWithTypes:ALAssetsGroupAll usingBlock:^(ALAssetsGroup *group, BOOL *stop) { + *stop = YES; + authorized = YES; + dispatch_semaphore_signal(sema); + } failureBlock:^(NSError *error) { + dispatch_semaphore_signal(sema); + }]; + dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER); + + if (authorized) + return 1; + else + return 0; + } + else { + return 0; + } +#endif + + return 0; +} +#pragma clang diagnostic pop + +// Credit: https://stackoverflow.com/a/32989022/2373034 ++ (int)requestPermissionNew { + PHAuthorizationStatus status = [PHPhotoLibrary authorizationStatus]; + + if (status == PHAuthorizationStatusAuthorized) { + return 1; + } + else if (status == PHAuthorizationStatusNotDetermined) { + __block BOOL authorized = NO; + + dispatch_semaphore_t sema = dispatch_semaphore_create(0); + [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) { + authorized = (status == PHAuthorizationStatusAuthorized); + dispatch_semaphore_signal(sema); + }]; + dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER); + + if (authorized) + return 1; + else + return 0; + } + else { + return 0; + } +} + +// Credit: https://stackoverflow.com/a/22056664/2373034 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++ (void)saveMediaOld:(NSString *)path albumName:(NSString *)album isImage:(BOOL)isImage { +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 + ALAssetsLibrary *library = [[ALAssetsLibrary alloc] init]; + + if (!isImage && ![library videoAtPathIsCompatibleWithSavedPhotosAlbum:[NSURL fileURLWithPath:path]]) + { + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", "Video format is not compatible with Photos"); + return; + } + + void (^saveBlock)(ALAssetsGroup *assetCollection) = ^void(ALAssetsGroup *assetCollection) { + void (^saveResultBlock)(NSURL *assetURL, NSError *error) = ^void(NSURL *assetURL, NSError *error) { + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; + + if (error.code == 0) { + [library assetForURL:assetURL resultBlock:^(ALAsset *asset) { + [assetCollection addAsset:asset]; + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveCompleted", ""); + } failureBlock:^(NSError* error) { + NSLog(@"Error moving asset to album: %@", error); + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); + }]; + } + else { + NSLog(@"Error creating asset: %@", error); + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); + } + }; + + if (!isImage) + [library writeImageDataToSavedPhotosAlbum:[NSData dataWithContentsOfFile:path] metadata:nil completionBlock:saveResultBlock]; + else + [library writeVideoAtPathToSavedPhotosAlbum:[NSURL fileURLWithPath:path] completionBlock:saveResultBlock]; + }; + + __block BOOL albumFound = NO; + [library enumerateGroupsWithTypes:ALAssetsGroupAlbum usingBlock:^(ALAssetsGroup *group, BOOL *stop) { + if ([[group valueForProperty:ALAssetsGroupPropertyName] isEqualToString:album]) { + *stop = YES; + albumFound = YES; + saveBlock(group); + } + else if (group == nil && albumFound==NO) { // Album doesn't exist + [library addAssetsGroupAlbumWithName:album resultBlock:^(ALAssetsGroup *group) { + saveBlock(group); + } + failureBlock:^(NSError *error) { + NSLog(@"Error creating album: %@", error); + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); + }]; + } + } failureBlock:^(NSError* error) { + NSLog(@"Error listing albums: %@", error); + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); + }]; +#endif +} +#pragma clang diagnostic pop + +// Credit: https://stackoverflow.com/a/39909129/2373034 ++ (void)saveMediaNew:(NSString *)path albumName:(NSString *)album isImage:(BOOL)isImage { + void (^saveBlock)(PHAssetCollection *assetCollection) = ^void(PHAssetCollection *assetCollection) { + [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{ + PHAssetChangeRequest *assetChangeRequest; + if (isImage) + assetChangeRequest = [PHAssetChangeRequest creationRequestForAssetFromImageAtFileURL:[NSURL fileURLWithPath:path]]; + else + assetChangeRequest = [PHAssetChangeRequest creationRequestForAssetFromVideoAtFileURL:[NSURL fileURLWithPath:path]]; + + PHAssetCollectionChangeRequest *assetCollectionChangeRequest = [PHAssetCollectionChangeRequest changeRequestForAssetCollection:assetCollection]; + [assetCollectionChangeRequest addAssets:@[[assetChangeRequest placeholderForCreatedAsset]]]; + + } completionHandler:^(BOOL success, NSError *error) { + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; + + if (success) + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveCompleted", ""); + else { + NSLog(@"Error creating asset: %@", error); + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); + } + }]; + }; + + PHFetchOptions *fetchOptions = [[PHFetchOptions alloc] init]; + fetchOptions.predicate = [NSPredicate predicateWithFormat:@"localizedTitle = %@", album]; + PHFetchResult *fetchResult = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeAlbum subtype:PHAssetCollectionSubtypeAny options:fetchOptions]; + if (fetchResult.count > 0) { + saveBlock(fetchResult.firstObject); + } + else { + __block PHObjectPlaceholder *albumPlaceholder; + [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{ + PHAssetCollectionChangeRequest *changeRequest = [PHAssetCollectionChangeRequest creationRequestForAssetCollectionWithTitle:album]; + albumPlaceholder = changeRequest.placeholderForCreatedAssetCollection; + } completionHandler:^(BOOL success, NSError *error) { + if (success) { + PHFetchResult *fetchResult = [PHAssetCollection fetchAssetCollectionsWithLocalIdentifiers:@[albumPlaceholder.localIdentifier] options:nil]; + if (fetchResult.count > 0) + saveBlock(fetchResult.firstObject); + else { + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", "Album placeholder not found" ); + } + } + else { + NSLog(@"Error creating album: %@", error); + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; + UnitySendMessage("NGMediaSaveCallbackiOS", "OnMediaSaveFailed", [self getCString:[error localizedDescription]]); + } + }]; + } +} + +// Credit: https://stackoverflow.com/a/10531752/2373034 ++ (void)pickMedia:(BOOL)imageMode savePath:(NSString *)mediaSavePath { + imagePicker = [[UIImagePickerController alloc] init]; + imagePicker.delegate = self; + imagePicker.allowsEditing = NO; + imagePicker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; + + if (imageMode) + imagePicker.mediaTypes = [NSArray arrayWithObject:(NSString *)kUTTypeImage]; + else + { + imagePicker.mediaTypes = [NSArray arrayWithObjects:(NSString *)kUTTypeMovie, (NSString *)kUTTypeVideo, nil]; + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 + // Don't compress the picked video if possible + if ([[[UIDevice currentDevice] systemVersion] compare:@"11.0" options:NSNumericSearch] != NSOrderedAscending) + imagePicker.videoExportPreset = AVAssetExportPresetPassthrough; +#endif + } + + pickedMediaSavePath = mediaSavePath; + + imagePickerState = 1; + UIViewController *rootViewController = UnityGetGLViewController(); + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) // iPhone + [rootViewController presentViewController:imagePicker animated:YES completion:^{ imagePickerState = 0; }]; + else { // iPad + popup = [[UIPopoverController alloc] initWithContentViewController:imagePicker]; + popup.delegate = self; + [popup presentPopoverFromRect:CGRectMake( rootViewController.view.frame.size.width / 2, rootViewController.view.frame.size.height / 2, 1, 1 ) inView:rootViewController.view permittedArrowDirections:0 animated:YES]; + } +} + ++ (int)isMediaPickerBusy { + if (imagePickerState == 2) + return 1; + + if (imagePicker != nil) { + if (imagePickerState == 1 || [imagePicker presentingViewController] == UnityGetGLViewController()) + return 1; + else { + imagePicker = nil; + return 0; + } + } + else + return 0; +} + +// Credit: https://stackoverflow.com/a/4170099/2373034 ++ (NSArray *)getImageMetadata:(NSString *)path { + int width = 0; + int height = 0; + int orientation = -1; + + CGImageSourceRef imageSource = CGImageSourceCreateWithURL((__bridge CFURLRef)[NSURL fileURLWithPath:path], nil); + if (imageSource != nil) { + NSDictionary *options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:(__bridge NSString *)kCGImageSourceShouldCache]; + CFDictionaryRef imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, (__bridge CFDictionaryRef)options); + CFRelease(imageSource); + + CGFloat widthF = 0.0f, heightF = 0.0f; + if (imageProperties != nil) { + if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyPixelWidth)) + CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth), kCFNumberCGFloatType, &widthF); + + if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyPixelHeight)) + CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight), kCFNumberCGFloatType, &heightF); + + if (CFDictionaryContainsKey(imageProperties, kCGImagePropertyOrientation)) { + CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(imageProperties, kCGImagePropertyOrientation), kCFNumberIntType, &orientation); + + if (orientation > 4) { // landscape image + CGFloat temp = widthF; + widthF = heightF; + heightF = temp; + } + } + + CFRelease(imageProperties); + } + + width = (int)roundf(widthF); + height = (int)roundf(heightF); + } + + return [[NSArray alloc] initWithObjects:[NSNumber numberWithInt:width], [NSNumber numberWithInt:height], [NSNumber numberWithInt:orientation], nil]; +} + ++ (char *)getImageProperties:(NSString *)path { + NSArray *metadata = [self getImageMetadata:path]; + + int orientationUnity; + int orientation = [metadata[2] intValue]; + + // To understand the magic numbers, see ImageOrientation enum in NativeGallery.cs + // and http://sylvana.net/jpegcrop/exif_orientation.html + if (orientation == 1) + orientationUnity = 0; + else if (orientation == 2) + orientationUnity = 4; + else if (orientation == 3) + orientationUnity = 2; + else if (orientation == 4) + orientationUnity = 6; + else if (orientation == 5) + orientationUnity = 5; + else if (orientation == 6) + orientationUnity = 1; + else if (orientation == 7) + orientationUnity = 7; + else if (orientation == 8) + orientationUnity = 3; + else + orientationUnity = -1; + + return [self getCString:[NSString stringWithFormat:@"%d>%d> >%d", [metadata[0] intValue], [metadata[1] intValue], orientationUnity]]; +} + ++ (char *)getVideoProperties:(NSString *)path { + CGSize size = CGSizeZero; + float rotation = 0; + long long duration = 0; + + AVURLAsset *asset = [AVURLAsset URLAssetWithURL:[NSURL fileURLWithPath:path] options:nil]; + if (asset != nil) { + duration = (long long) round(CMTimeGetSeconds([asset duration]) * 1000); + CGAffineTransform transform = [asset preferredTransform]; + NSArray* videoTracks = [asset tracksWithMediaType:AVMediaTypeVideo]; + if (videoTracks != nil && [videoTracks count] > 0) { + size = [[videoTracks objectAtIndex:0] naturalSize]; + transform = [[videoTracks objectAtIndex:0] preferredTransform]; + } + + rotation = atan2(transform.b, transform.a) * (180.0 / M_PI); + } + + return [self getCString:[NSString stringWithFormat:@"%d>%d>%lld>%f", (int)roundf(size.width), (int)roundf(size.height), duration, rotation]]; +} + ++ (char *)getVideoThumbnail:(NSString *)path savePath:(NSString *)savePath maximumSize:(int)maximumSize captureTime:(double)captureTime { + AVAssetImageGenerator *thumbnailGenerator = [[AVAssetImageGenerator alloc] initWithAsset:[[AVURLAsset alloc] initWithURL:[NSURL fileURLWithPath:path] options:nil]]; + thumbnailGenerator.appliesPreferredTrackTransform = YES; + thumbnailGenerator.maximumSize = CGSizeMake((CGFloat) maximumSize, (CGFloat) maximumSize); + thumbnailGenerator.requestedTimeToleranceBefore = kCMTimeZero; + thumbnailGenerator.requestedTimeToleranceAfter = kCMTimeZero; + + if (captureTime < 0.0) + captureTime = 0.0; + else { + AVURLAsset *asset = [AVURLAsset URLAssetWithURL:[NSURL fileURLWithPath:path] options:nil]; + if (asset != nil) { + double videoDuration = CMTimeGetSeconds([asset duration]); + if (videoDuration > 0.0 && captureTime >= videoDuration - 0.1) { + if (captureTime > videoDuration) + captureTime = videoDuration; + + thumbnailGenerator.requestedTimeToleranceBefore = CMTimeMakeWithSeconds(1.0, 600); + } + } + } + + NSError *error = nil; + CGImageRef image = [thumbnailGenerator copyCGImageAtTime:CMTimeMakeWithSeconds(captureTime, 600) actualTime:nil error:&error]; + if (image == nil) { + if (error != nil) + NSLog(@"Error generating video thumbnail: %@", error); + else + NSLog(@"Error generating video thumbnail..."); + + return ""; + } + + UIImage *thumbnail = [[UIImage alloc] initWithCGImage:image]; + CGImageRelease(image); + + if (![UIImagePNGRepresentation(thumbnail) writeToFile:savePath atomically:YES]) { + NSLog(@"Error saving thumbnail image"); + return ""; + } + + return [self getCString:savePath]; +} + ++ (UIImage *)scaleImage:(UIImage *)image maxSize:(int)maxSize { + CGFloat width = image.size.width; + CGFloat height = image.size.height; + + UIImageOrientation orientation = image.imageOrientation; + if (width <= maxSize && height <= maxSize && orientation != UIImageOrientationDown && + orientation != UIImageOrientationLeft && orientation != UIImageOrientationRight && + orientation != UIImageOrientationLeftMirrored && orientation != UIImageOrientationRightMirrored && + orientation != UIImageOrientationUpMirrored && orientation != UIImageOrientationDownMirrored) + return image; + + CGFloat scaleX = 1.0f; + CGFloat scaleY = 1.0f; + if (width > maxSize) + scaleX = maxSize / width; + if (height > maxSize) + scaleY = maxSize / height; + + // Credit: https://github.com/mbcharbonneau/UIImage-Categories/blob/master/UIImage%2BAlpha.m + CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image.CGImage); + BOOL hasAlpha = alpha == kCGImageAlphaFirst || alpha == kCGImageAlphaLast || alpha == kCGImageAlphaPremultipliedFirst || alpha == kCGImageAlphaPremultipliedLast; + + CGFloat scaleRatio = scaleX < scaleY ? scaleX : scaleY; + CGRect imageRect = CGRectMake(0, 0, width * scaleRatio, height * scaleRatio); + UIGraphicsBeginImageContextWithOptions(imageRect.size, !hasAlpha, image.scale); + [image drawInRect:imageRect]; + image = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + + return image; +} + ++ (char *)loadImageAtPath:(NSString *)path tempFilePath:(NSString *)tempFilePath maximumSize:(int)maximumSize { + // Check if the image can be loaded by Unity without requiring a conversion to PNG + // Credit: https://stackoverflow.com/a/12048937/2373034 + NSString *extension = [path pathExtension]; + BOOL conversionNeeded = [extension caseInsensitiveCompare:@"jpg"] != NSOrderedSame && [extension caseInsensitiveCompare:@"jpeg"] != NSOrderedSame && [extension caseInsensitiveCompare:@"png"] != NSOrderedSame; + + if (!conversionNeeded) { + // Check if the image needs to be processed at all + NSArray *metadata = [self getImageMetadata:path]; + int orientationInt = [metadata[2] intValue]; // 1: correct orientation, [1,8]: valid orientation range + if (orientationInt == 1 && [metadata[0] intValue] <= maximumSize && [metadata[1] intValue] <= maximumSize) + return [self getCString:path]; + } + + UIImage *image = [UIImage imageWithContentsOfFile:path]; + if (image == nil) + return [self getCString:path]; + + UIImage *scaledImage = [self scaleImage:image maxSize:maximumSize]; + if (conversionNeeded || scaledImage != image) { + if (![UIImagePNGRepresentation(scaledImage) writeToFile:tempFilePath atomically:YES]) { + NSLog(@"Error creating scaled image"); + return [self getCString:path]; + } + + return [self getCString:tempFilePath]; + } + else + return [self getCString:path]; +} + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++ (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { + resultPath = nil; + + if ([info[UIImagePickerControllerMediaType] isEqualToString:(NSString *)kUTTypeImage]) { // image picked + // On iOS 8.0 or later, try to obtain the raw data of the image (which allows picking gifs properly or preserving metadata) + if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) { + PHAsset *asset = nil; +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 + if ([[[UIDevice currentDevice] systemVersion] compare:@"11.0" options:NSNumericSearch] != NSOrderedAscending) { + // Try fetching the source image via UIImagePickerControllerImageURL + NSURL *mediaUrl = info[UIImagePickerControllerImageURL]; + if (mediaUrl != nil) { + NSString *imagePath = [mediaUrl path]; + if (imagePath != nil && [[NSFileManager defaultManager] fileExistsAtPath:imagePath]) { + NSError *error; + NSString *newPath = [pickedMediaSavePath stringByAppendingPathExtension:[imagePath pathExtension]]; + + if (![[NSFileManager defaultManager] fileExistsAtPath:newPath] || [[NSFileManager defaultManager] removeItemAtPath:newPath error:&error]) { + if ([[NSFileManager defaultManager] copyItemAtPath:imagePath toPath:newPath error:&error]) { + resultPath = newPath; + NSLog(@"Copied source image from UIImagePickerControllerImageURL"); + } + else + NSLog(@"Error copying image: %@", error); + } + else + NSLog(@"Error deleting existing image: %@", error); + } + } + + if (resultPath == nil) + asset = info[UIImagePickerControllerPHAsset]; + } +#endif + + if (resultPath == nil) { + if (asset == nil) { + NSURL *mediaUrl = info[UIImagePickerControllerReferenceURL] ?: info[UIImagePickerControllerMediaURL]; + if (mediaUrl != nil) + asset = [[PHAsset fetchAssetsWithALAssetURLs:[NSArray arrayWithObject:mediaUrl] options:nil] firstObject]; + } + + if (asset != nil) { + PHImageRequestOptions *options = [[PHImageRequestOptions alloc] init]; + options.synchronous = YES; + options.version = PHImageRequestOptionsVersionCurrent; + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 + if ([[[UIDevice currentDevice] systemVersion] compare:@"13.0" options:NSNumericSearch] != NSOrderedAscending) { + [[PHImageManager defaultManager] requestImageDataAndOrientationForAsset:asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, CGImagePropertyOrientation orientation, NSDictionary *imageInfo) { + if (imageData != nil) + [self trySaveSourceImage:imageData withInfo:imageInfo]; + else + NSLog(@"Couldn't fetch raw image data"); + }]; + } + else { +#endif + [[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *imageInfo) { + if (imageData != nil) + [self trySaveSourceImage:imageData withInfo:imageInfo]; + else + NSLog(@"Couldn't fetch raw image data"); + }]; +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 + } +#endif + } + } + } + + if (resultPath == nil) { + // Temporarily save image as PNG + UIImage *image = info[UIImagePickerControllerOriginalImage]; + if (image != nil) { + resultPath = [pickedMediaSavePath stringByAppendingPathExtension:@"png"]; + if (![UIImagePNGRepresentation(image) writeToFile:resultPath atomically:YES]) { + NSLog(@"Error creating PNG image"); + resultPath = nil; + } + } + else + NSLog(@"Error fetching original image from picker"); + } + } + else { // video picked + NSURL *mediaUrl = info[UIImagePickerControllerMediaURL] ?: info[UIImagePickerControllerReferenceURL]; + if (mediaUrl != nil) { + resultPath = [mediaUrl path]; + + // On iOS 13, picked file becomes unreachable as soon as the UIImagePickerController disappears, + // in that case, copy the video to a temporary location + if ([[[UIDevice currentDevice] systemVersion] compare:@"13.0" options:NSNumericSearch] != NSOrderedAscending) { + NSError *error; + NSString *newPath = [pickedMediaSavePath stringByAppendingPathExtension:[resultPath pathExtension]]; + + if (![[NSFileManager defaultManager] fileExistsAtPath:newPath] || [[NSFileManager defaultManager] removeItemAtPath:newPath error:&error]) { + if ([[NSFileManager defaultManager] copyItemAtPath:resultPath toPath:newPath error:&error]) + resultPath = newPath; + else { + NSLog(@"Error copying video: %@", error); + resultPath = nil; + } + } + else { + NSLog(@"Error deleting existing video: %@", error); + resultPath = nil; + } + } + } + } + + popup = nil; + imagePicker = nil; + imagePickerState = 2; + UnitySendMessage("NGMediaReceiveCallbackiOS", "OnMediaReceived", [self getCString:resultPath]); + + [picker dismissViewControllerAnimated:NO completion:nil]; +} +#pragma clang diagnostic pop + ++ (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker +{ + popup = nil; + imagePicker = nil; + UnitySendMessage("NGMediaReceiveCallbackiOS", "OnMediaReceived", ""); + + [picker dismissViewControllerAnimated:YES completion:nil]; +} + ++ (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController { + popup = nil; + imagePicker = nil; + UnitySendMessage("NGMediaReceiveCallbackiOS", "OnMediaReceived", ""); +} + ++ (void)trySaveSourceImage:(NSData *)imageData withInfo:(NSDictionary *)info { + NSString *filePath = info[@"PHImageFileURLKey"]; + if (filePath != nil) // filePath can actually be an NSURL, convert it to NSString + filePath = [NSString stringWithFormat:@"%@", filePath]; + + if (filePath == nil || [filePath length] == 0) + { + filePath = info[@"PHImageFileUTIKey"]; + if (filePath != nil) + filePath = [NSString stringWithFormat:@"%@", filePath]; + } + + if (filePath == nil || [filePath length] == 0) + resultPath = pickedMediaSavePath; + else + resultPath = [pickedMediaSavePath stringByAppendingPathExtension:[filePath pathExtension]]; + + NSError *error; + if (![[NSFileManager defaultManager] fileExistsAtPath:resultPath] || [[NSFileManager defaultManager] removeItemAtPath:resultPath error:&error]) { + if (![imageData writeToFile:resultPath atomically:YES]) { + NSLog(@"Error copying source image to file"); + resultPath = nil; + } + } + else { + NSLog(@"Error deleting existing image: %@", error); + resultPath = nil; + } +} + +// Credit: https://stackoverflow.com/a/37052118/2373034 ++ (char *)getCString:(NSString *)source { + if (source == nil) + source = @""; + + const char *sourceUTF8 = [source UTF8String]; + char *result = (char*) malloc(strlen(sourceUTF8) + 1); + strcpy(result, sourceUTF8); + + return result; +} + +@end + +extern "C" int _NativeGallery_CheckPermission() { + return [UNativeGallery checkPermission]; +} + +extern "C" int _NativeGallery_RequestPermission() { + return [UNativeGallery requestPermission]; +} + +extern "C" int _NativeGallery_CanOpenSettings() { + return [UNativeGallery canOpenSettings]; +} + +extern "C" void _NativeGallery_OpenSettings() { + [UNativeGallery openSettings]; +} + +extern "C" void _NativeGallery_ImageWriteToAlbum(const char* path, const char* album) { + [UNativeGallery saveMedia:[NSString stringWithUTF8String:path] albumName:[NSString stringWithUTF8String:album] isImg:YES]; +} + +extern "C" void _NativeGallery_VideoWriteToAlbum(const char* path, const char* album) { + [UNativeGallery saveMedia:[NSString stringWithUTF8String:path] albumName:[NSString stringWithUTF8String:album] isImg:NO]; +} + +extern "C" void _NativeGallery_PickImage(const char* imageSavePath) { + [UNativeGallery pickMedia:YES savePath:[NSString stringWithUTF8String:imageSavePath]]; +} + +extern "C" void _NativeGallery_PickVideo(const char* videoSavePath) { + [UNativeGallery pickMedia:NO savePath:[NSString stringWithUTF8String:videoSavePath]]; +} + +extern "C" int _NativeGallery_IsMediaPickerBusy() { + return [UNativeGallery isMediaPickerBusy]; +} + +extern "C" char* _NativeGallery_GetImageProperties(const char* path) { + return [UNativeGallery getImageProperties:[NSString stringWithUTF8String:path]]; +} + +extern "C" char* _NativeGallery_GetVideoProperties(const char* path) { + return [UNativeGallery getVideoProperties:[NSString stringWithUTF8String:path]]; +} + +extern "C" char* _NativeGallery_GetVideoThumbnail(const char* path, const char* thumbnailSavePath, int maxSize, double captureTimeInSeconds) { + return [UNativeGallery getVideoThumbnail:[NSString stringWithUTF8String:path] savePath:[NSString stringWithUTF8String:thumbnailSavePath] maximumSize:maxSize captureTime:captureTimeInSeconds]; +} + +extern "C" char* _NativeGallery_LoadImageAtPath(const char* path, const char* temporaryFilePath, int maxSize) { + return [UNativeGallery loadImageAtPath:[NSString stringWithUTF8String:path] tempFilePath:[NSString stringWithUTF8String:temporaryFilePath] maximumSize:maxSize]; +} \ No newline at end of file diff --git a/Assets/3rd/NativeGallery/iOS/NativeGallery.mm.meta b/Assets/3rd/NativeGallery/Plugins/iOS/NativeGallery.mm.meta similarity index 91% rename from Assets/3rd/NativeGallery/iOS/NativeGallery.mm.meta rename to Assets/3rd/NativeGallery/Plugins/iOS/NativeGallery.mm.meta index 5e6d375..dd3697a 100644 --- a/Assets/3rd/NativeGallery/iOS/NativeGallery.mm.meta +++ b/Assets/3rd/NativeGallery/Plugins/iOS/NativeGallery.mm.meta @@ -1,33 +1,33 @@ -fileFormatVersion: 2 -guid: 953e0b740eb03144883db35f72cad8a6 -timeCreated: 1498722774 -licenseType: Store -PluginImporter: - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - data: - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 953e0b740eb03144883db35f72cad8a6 +timeCreated: 1498722774 +licenseType: Pro +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + iPhone: iOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/Scripts.meta b/Assets/3rd/Scripts.meta new file mode 100644 index 0000000..19a131a --- /dev/null +++ b/Assets/3rd/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e47fe566f99c4c4bb3667394434195a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rd/Scripts/MyCamera.cs b/Assets/3rd/Scripts/MyCamera.cs new file mode 100644 index 0000000..9078842 --- /dev/null +++ b/Assets/3rd/Scripts/MyCamera.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Coolape; + +public static class MyCamera +{ + + public static NativeCamera.Permission getImage(object callback, int maxSize = -1) + { + NativeCamera.Permission pm; + pm = NativeCamera.CheckPermission(); + if (pm == NativeCamera.Permission.Granted) + { + NativeCamera.TakePicture((path) => + { + Utl.doCallback(callback, path); + }, maxSize, true, NativeCamera.PreferredCamera.Default); + } + return pm; + } + + public static NativeCamera.Permission getImageFacing(object callback, int maxSize = -1) + { + NativeCamera.Permission pm; + pm = NativeCamera.CheckPermission(); + if (pm == NativeCamera.Permission.Granted) + { + NativeCamera.TakePicture((path) => + { + Utl.doCallback(callback, path); + }, maxSize, true, NativeCamera.PreferredCamera.Front); + } + return pm; + } + + public static NativeCamera.Permission getVideo(object callback) + { + NativeCamera.Permission pm; + pm = NativeCamera.CheckPermission(); + if (pm == NativeCamera.Permission.Granted) + { + NativeCamera.RecordVideo((path) => + { + Utl.doCallback(callback, path); + }); + } + return pm; + } + + public static bool openSetting() + { + if (NativeCamera.CanOpenSettings()) + { + NativeCamera.OpenSettings(); + return true; + } + return false; + } + +} diff --git a/Assets/3rd/NativeGallery/NativeGalleryUtl.cs.meta b/Assets/3rd/Scripts/MyCamera.cs.meta similarity index 83% rename from Assets/3rd/NativeGallery/NativeGalleryUtl.cs.meta rename to Assets/3rd/Scripts/MyCamera.cs.meta index b2af0b6..fae124b 100644 --- a/Assets/3rd/NativeGallery/NativeGalleryUtl.cs.meta +++ b/Assets/3rd/Scripts/MyCamera.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ddbd1086fc9d14bf6814614e75efda21 +guid: 27474c449f2934a59b021704591ab111 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/3rd/Scripts/MyGallery.cs b/Assets/3rd/Scripts/MyGallery.cs new file mode 100644 index 0000000..1a57b2a --- /dev/null +++ b/Assets/3rd/Scripts/MyGallery.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Coolape; + +public static class MyGallery +{ + + public static NativeGallery.Permission getImage(object callback) + { + NativeGallery.Permission pm; + pm = NativeGallery.CheckPermission(); + if (pm == NativeGallery.Permission.Granted) + { + NativeGallery.GetImageFromGallery((path) => + { + Utl.doCallback(callback, path); + }); + } + return pm; + } + + public static NativeGallery.Permission getMultImages(object callback) + { + NativeGallery.Permission pm; + pm = NativeGallery.CheckPermission(); + if (pm == NativeGallery.Permission.Granted) + { + NativeGallery.GetImagesFromGallery((pathList) => + { + Utl.doCallback(callback, pathList); + }); + } + return pm; + } + + public static bool openSetting() + { + if (NativeGallery.CanOpenSettings()) + { + NativeGallery.OpenSettings(); + return true; + } + return false; + } + +} diff --git a/Assets/3rd/Scripts/MyGallery.cs.meta b/Assets/3rd/Scripts/MyGallery.cs.meta new file mode 100644 index 0000000..cd6232f --- /dev/null +++ b/Assets/3rd/Scripts/MyGallery.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 64663a08f69c441d19f0d7a50eae5465 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIInput.cs b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIInput.cs index 8434509..25e581e 100644 --- a/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIInput.cs +++ b/Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/UI/UIInput.cs @@ -498,6 +498,7 @@ public class UIInput : MonoBehaviour protected virtual void OnSelect (bool isSelected) { + if (!enabled) return; // add by chenbin if (isSelected) { #if !MOBILE diff --git a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs index 7408096..d62f1fc 100644 --- a/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs +++ b/Assets/CoolapeFrame/Scripts/ui/form/CLUIElementPopList.cs @@ -1,12 +1,21 @@ using UnityEngine; using System.Collections; using Coolape; +using System.Collections.Generic; [RequireComponent (typeof(UIPopupList))] public class CLUIElementPopList : UIEventListener { UIPopupList _poplist; + public List onSelect = new List(); + protected void ExecuteOnChange() + { + if (EventDelegate.IsValid(onSelect)) + { + EventDelegate.Execute(onSelect, gameObject); // modify by chenbin + } + } public UIPopupList poplist { get { if (_poplist == null) { @@ -31,5 +40,6 @@ public class CLUIElementPopList : UIEventListener { string val = orgs [1].ToString (); poplist.value = val; + ExecuteOnChange(); } } diff --git a/Assets/CoolapeFrameData/cfg/publishChannel.cfg b/Assets/CoolapeFrameData/cfg/publishChannel.cfg index 3613b10..43ca98a 100644 --- a/Assets/CoolapeFrameData/cfg/publishChannel.cfg +++ b/Assets/CoolapeFrameData/cfg/publishChannel.cfg @@ -1 +1 @@ -tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion=0.911ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<1000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7CmSubChannel<2000FmBundleVersion;0.2ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPEmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform;iosEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmaeBGeneraliOSHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathp#?152x152OtrCRM/xRes/icon/180.png=76x76OtrCRM/xRes/icon/114.pngL1024x1024(App Store)PtrCRM/xRes/icon/1024.png=57x57OtrCRM/xRes/icon/114.png?120x120OtrCRM/xRes/icon/120.pngK20x20(Notification)OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.pngH40x40(Spotlight)OtrCRM/xRes/icon/114.png?167x167OtrCRM/xRes/icon/180.pngJ120x120(Spotlight)OtrCRM/xRes/icon/120.pngK60x60(Notification)OtrCRM/xRes/icon/114.pngH80x80(Spotlight)OtrCRM/xRes/icon/114.png=48x48OtrCRM/xRes/icon/114.pngK40x40(Notification)OtrCRM/xRes/icon/114.png=72x72OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.pngG29x29(Settings)OtrCRM/xRes/icon/114.png?114x114OtrCRM/xRes/icon/114.pngG58x58(Settings)OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngG87x87(Settings)OtrCRM/xRes/icon/114.png?180x180OtrCRM/xRes/icon/180.pngCchannelEnumX?GeneralBGeneraliOSBchannelKeyX?generalBgeneraliOSHchannelAliasEnumX>通用A通用iOS \ No newline at end of file +tBchannelMapr?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode DmCtccChannel7FmBundleVersion<0.92ImKeystoreNamePath8 +Assets/trCRM/xRes/keystore/tianrun.keystoreEisUseUnityIAPCmSubChannel<1000EmKeyaliasPassCtianrun2020BisMoreGameGisSwitchAccountMmCreateEclipseProjectLmLicenseVerificationJmBundleIndentifierHcom.cdtianrun.moEmCopyDirPathsUAmPlatform?androidEmKeyaliasName?tianrun8(mOtherScriptingDefineSymbolsKUSE_LOCATION_SERVERAserverKey8,d265697d3e1ff6fe9435580ea91c4482Cmd5SignCode7BmAlertDesc7JisBuildWithLogView@mChlNmae?GeneralHmSplashImagePath7EmKeystorePassCtianrun2020HmDefaultIconPathv=72x72OtrCRM/xRes/icon/114.png?192x192OtrCRM/xRes/icon/180.png=48x48OtrCRM/xRes/icon/114.png=36x36OtrCRM/xRes/icon/114.png=96x96OtrCRM/xRes/icon/114.png?144x144OtrCRM/xRes/icon/180.pngBgeneraliOSp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCodeDmCtccChannel7CmSubChannel<2000FmBundleVersion;0.2ImKeystoreNamePath8 +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 79400c5..4c61ff9 100644 --- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v +++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v @@ -1,624 +1,654 @@ -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/.DS_Store,132382935420000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/Materials.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/Textures.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/bullet.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/effect.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/roles.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/sound.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/things.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/.DS_Store,132387593210000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust.meta,132370050250000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel.meta,132358191610000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon.meta,132354924130000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login.meta,132357183660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo.meta,132355584600000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main.meta,132358714190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news.meta,132358719900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work.meta,132362623900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/button.png,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/button.png.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/input.png,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/input.png.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/logo.png,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/logo.png.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/name.PNG,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/name.PNG.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/password.png,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/password.png.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/user.png,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/user.png.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/add.png,132369178310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/add.png.meta,132370050420000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/bg.png,132369178310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/bg.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/border.png,132369418910000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/border.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/check.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/check.png.meta,132373051960000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_followup.png,132369178310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_followup.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_tel.png,132369178310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_tel.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/del.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/del.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/follow.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/follow.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/get.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/get.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/important.png,132369985090000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/important.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/input.png,132370063000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/input.png.meta,132370066210000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/kuang.png,132370137580000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/kuang.png.meta,132370139550000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png.meta,132382937770000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/more.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/more.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/msg.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/msg.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/oean.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/oean.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/pause.png,132374733320000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/pause.png.meta,132374737620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/peo.png,132369178310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/peo.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/phone.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/phone.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play.png,132374733320000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play.png.meta,132374737610000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/position.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/position.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/record.png,132373001210000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/record.png.meta,132373051970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/remove.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/remove.png.meta,132373051980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/right.png,132369418910000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/right.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/screen.png,132369178310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/screen.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/search.png,132369368650000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/search.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/star.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/star.png.meta,132373051980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/suc.png,132369418910000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/suc.png.meta,132370050430000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/task.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/task.png.meta,132373051980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/time.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/time.png.meta,132373051980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/write.png,132370137410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/write.png.meta,132373051980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_bg.png,131311223440000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_bg.png.meta,132358191870000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_prog.png,131311223440000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_prog.png.meta,132358191870000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png,132385882340000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png.meta,132385886260000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/company_1.png,132354738840000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/company_1.png.meta,132354924310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/icon_26_no.png,132295947250000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/icon_26_no.png.meta,132299620200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/.DS_Store,132357183320000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_bg.png,132355621780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_bg.png.meta,132357184000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_invisible.png,132357080820000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_invisible.png.meta,132357184000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_no.png,132357080740000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_no.png.meta,132357184000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_password.png,132357080660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_password.png.meta,132357184000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_people.png,132357080600000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_people.png.meta,132357184000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_sms.png,132357080500000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_sms.png.meta,132357184000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_visible.png,132357080180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_visible.png.meta,132357184000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo.png,132357074320000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo.png.meta,132355584900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo2.png,132382210800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo2.png.meta,132382996250000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me.png,132358139420000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me.png.meta,132358715030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me2.png,132358139320000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me2.png.meta,132358715030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news.png,132358139260000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news.png.meta,132358715030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news2.png,132358139180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news2.png.meta,132358715030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work.png,132358139120000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work.png.meta,132358715030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work2.png,132358139020000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work2.png.meta,132358715030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/log_bg.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/log_bg.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_about.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_about.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_check.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_check.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_customer.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_customer.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_enterprise.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_enterprise.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_opinion.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_opinion.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_order.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_order.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set2.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set2.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_check.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_check.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_clean_up.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_clean_up.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_data.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_data.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_fingerprint.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_fingerprint.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password2.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password2.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_remind.png,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_remind.png.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_bg_20.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_bg_20.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_notice.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_notice.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_peo.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_peo.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_remind.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_remind.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_time.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_time.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_unread.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_unread.png.meta,132364422840000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_wait.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_wait.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_1.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_1.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_2.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_2.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_3.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_3.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_4.png,132364409570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_4.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg.png,132358142200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num1.png,132358139900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num1.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num2.png,132358139940000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num2.png.meta,132364422850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/add.png,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/add.png.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/close.png,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/close.png.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt.png,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt.png.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt_bg.png,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt_bg.png.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/shut.png,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/shut.png.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/system.png,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/system.png.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/upload.png,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/upload.png.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/_empty.png,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/_empty.png.meta,132349404900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button.png,132355593960000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button2.png,132355621780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button2.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check.png,132378740960000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check_full.png,132378741100000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check_full.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/choose.png,132378740080000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/choose.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/company_bg.png,132355581300000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/company_bg.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off.png,132354738840000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off_bg.png,132354747600000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off_bg.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio.png,132378740300000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio_full.png,132378740800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio_full.png.meta,132378906780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png,132387304220000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png.meta,132387308870000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png,132387304220000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png.meta,132387308870000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png,132387304220000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png.meta,132387308880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png,132387304220000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png.meta,132387308880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png,132384733440000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png.meta,132384750880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/icon_bg.png,132382189960000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/icon_bg.png.meta,132382937850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg.png,132362267920000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_noshadow.png,132362259600000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_noshadow.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_shadow.png,132362263300000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_shadow.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_color.png,132361704560000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_color.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_head_bg.png,132361702720000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_head_bg.png.meta,132362624190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_1.png,132382190380000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_1.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_2.png,132382190820000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_2.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_3.png,132382191180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_3.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_4.png,132382191560000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_4.png.meta,132362624190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_5.png,132382191840000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_5.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_ranking.png,132361704640000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_ranking.png.meta,132362624200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/cfg.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/font.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/localization.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132393880440000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/.DS_Store,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua,132393878950000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/battle.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/city.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db.meta,132358701520000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/json.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/.DS_Store,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioInputStream.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioInputStream.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioOutputStream.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioOutputStream.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioType.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioType.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioUtl.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioUtl.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfg.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfg.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfgTool.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfgTool.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/city/CLLCity.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/city/CLLCity.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua,132392675540000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua.meta,132370178140000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua.meta,132368762790000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua,132392844270000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua.meta,132389456290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua,132392747890000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua.meta,132358701520000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua,132378178470000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua.meta,132378001360000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132392845370000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua.meta,132383043620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/json/json.lua,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/json/json.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpc.lua,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpc.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpcserver.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpcserver.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/.DS_Store,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua,132393428770000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNetSerialize.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132393428880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua.meta,132355452450000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua,132386912690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua,132393570190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua.meta,132291379270000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPool.lua,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPool.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLQueue.lua,132387257440000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLQueue.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLStack.lua,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLStack.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/class.lua,132358326170000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/public/class.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/.DS_Store,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/BitUtl.lua,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/BitUtl.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLPrintEx.lua,132363110630000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLPrintEx.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLUpdateUpgrader.lua,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLUpdateUpgrader.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLVerManager.lua,132355853980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLVerManager.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua,132393428910000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132389116860000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132393428950000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua.meta,132289221090000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve.lua,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve.lua.meta,132289129810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua,132387312130000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua.meta,132387250260000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellWWWProgress.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellWWWProgress.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame1.lua,132383029110000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame1.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame2.lua,132357332480000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame2.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderDay.lua,132379574590000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderDay.lua.meta,132372979000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua,132379548310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua.meta,132372979000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPoplist.lua,132375652310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICellPoplist.lua.meta,132372990210000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua.meta,132387249510000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua,132363130990000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua.meta,132289223570000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCompany.lua,132359038150000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCompany.lua.meta,132358926240000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilter.lua,132385114470000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilter.lua.meta,132370154700000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilterGroup.lua,132383024660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilterGroup.lua.meta,132370154670000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua,132392766900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua.meta,132370115410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustProc.lua,132369992340000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustProc.lua.meta,132369989000000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua,132381516850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua.meta,132376505230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua.meta,132378658180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132392707040000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua.meta,132378223060000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua,132369454510000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua.meta,132368777750000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua,132379832580000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua.meta,132378928680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua.meta,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua.meta,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua.meta,132373690990000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua,132381618580000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua.meta,132364230620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform2.lua,132382130700000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform2.lua.meta,132376325680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua,132382142740000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua.meta,132376479150000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellSysMessageList.lua,132369998130000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellSysMessageList.lua.meta,132369239290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/.DS_Store,132289134230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua.meta,132372977860000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua,132385986530000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPHotWheel.lua,132373598700000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPHotWheel.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua,132384246060000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua.meta,132384230110000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSceneManager.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSceneManager.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua,132393345290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua,132393345290000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWWWProgress.lua,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWWWProgress.lua.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua,132389492220000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua.meta,132290913220000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua,132363128810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua.meta,132289134270000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua,132389478740000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua.meta,132290982930000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua,132369424200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua.meta,132300378700000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua,132393878950000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua.meta,132289134270000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua,132370001540000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua.meta,132355739310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua,132389322620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua.meta,132389322620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua.meta,132367521030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132392769470000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua.meta,132372871250000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua.meta,132370233760000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132392842200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua.meta,132370115140000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua,132370162600000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua.meta,132369988710000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua.meta,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua,132392803970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua.meta,132355735820000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua,132387297660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua.meta,132375465560000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua,132380867870000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua.meta,132373063880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132393009810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua.meta,132370897440000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132393009810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua,132381390070000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua.meta,132373879180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPopCheckBoxs.lua,132379834520000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPopCheckBoxs.lua.meta,132378929380000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua,132389371100000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua.meta,132357319630000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua,132389371200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua.meta,132357323740000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua,132389371310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua.meta,132357325780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua,132392804180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua.meta,132358703190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua.meta,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua,132389322620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua.meta,132389322620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua,132369409870000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua.meta,132366143690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua,132370405780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua.meta,132364876240000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab,132388653070000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab,132388402720000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab.meta,132357347880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame2.prefab,132388402730000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame2.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab,132392092800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab.meta,132378911310000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132392092830000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab.meta,132378654680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab,132392092800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab.meta,132378243900000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132392092830000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab.meta,132378243860000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132392092830000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab.meta,132378243880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab,132388402850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab.meta,132362722920000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform2.prefab,132388402860000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform2.prefab.meta,132364370610000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab,132388402820000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab.meta,132364353170000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab,132388402700000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132389322950000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab.meta,132372971640000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132392092840000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm2.prefab,132389322990000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm2.prefab.meta,132389322620000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132392092810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab.meta,132367521230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132392769960000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab.meta,132372671680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab,132389322960000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta,132370155540000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132392769970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab.meta,132370116810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab,132388441590000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab.meta,132369515950000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab,132392725330000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab,132388402660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab,132393411800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab,132393880350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab.meta,132355322410000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab,132389154550000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab.meta,132289211980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMask4Panel.prefab,132388402790000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMask4Panel.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab,132389322970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab.meta,132290983200000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab,132388402750000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab.meta,132375465810000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab,132389154540000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab.meta,132373063990000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab,132388402890000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab.meta,132300379190000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab,132392831890000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab.meta,132374439140000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab,132388653090000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta,132388652660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132392092800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388322350000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132393414070000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab,132388441590000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab.meta,132378946840000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab,132388402690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab.meta,132372993660000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab,132389457040000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab.meta,132357319780000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab,132389457030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab.meta,132357323920000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab,132389457030000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab.meta,132357326010000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSceneManager.prefab,132388402680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSceneManager.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectCompany.prefab,132388402830000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectCompany.prefab.meta,132354941680000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab,132392092830000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab.meta,132392091690000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab,132389322980000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab,132388402870000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelStart.prefab,132388402670000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelStart.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab,132388402850000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab.meta,132366143840000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgList.prefab,132388402830000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgList.prefab.meta,132364451640000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab,132393880340000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab.meta,132289770230000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWWWProgress.prefab,132388402790000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWWWProgress.prefab.meta,132289129800000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWebView.prefab,132389457040000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWebView.prefab.meta,132290913500000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab,132388402880000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab.meta,132387251970000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/www/baidumap.html,132354704180000000 -/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM_iOS/Assets/trCRM/upgradeRes4Dev/priority/www/baidumap.html.meta,132352746670000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/.DS_Store,132382935420000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/Materials.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/Textures.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/bullet.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/effect.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/roles.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/sound.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/things.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/.DS_Store,132389408480000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust.meta,132370050250000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid.meta,132387593500000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel.meta,132358191610000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon.meta,132354924130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login.meta,132357183660000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo.meta,132355584600000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main.meta,132358714190000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine.meta,132388581200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news.meta,132358719900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order.meta,132389409090000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work.meta,132362623900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/button.png,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/button.png.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/input.png,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/input.png.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/logo.png,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/logo.png.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/name.PNG,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/name.PNG.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/password.png,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/password.png.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/user.png,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape/user.png.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/add.png,132369178310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/add.png.meta,132370050420000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/bg.png,132369178310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/bg.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/border.png,132369418910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/border.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/check.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/check.png.meta,132373051960000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_followup.png,132369178310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_followup.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png,132387463310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_task.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_tel.png,132369178310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/cus_tel.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/del.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/del.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/follow.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/follow.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png,132387463310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/full_star.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png,132387463310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/funnel.png.meta,132387559010000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/get.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/get.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/important.png,132369985090000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/important.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/input.png,132370063000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/input.png.meta,132370066210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/kuang.png,132370137580000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/kuang.png.meta,132370139550000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png,132387463310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/limt.png.meta,132382937770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/more.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/more.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/msg.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/msg.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/oean.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/oean.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png,132388221620000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/order.png.meta,132388222820000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/pause.png,132374733320000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/pause.png.meta,132374737620000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/peo.png,132369178310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/peo.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/phone.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/phone.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play.png,132374733320000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play.png.meta,132374737610000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png,132387463310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/play2.png.meta,132387559010000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/position.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/position.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/record.png,132373001210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/record.png.meta,132373051970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/remove.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/remove.png.meta,132373051980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/right.png,132369418910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/right.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/screen.png,132369178310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/screen.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/search.png,132369368650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/search.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/star.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/star.png.meta,132373051980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/suc.png,132369418910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/suc.png.meta,132370050430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/task.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/task.png.meta,132373051980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/time.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/time.png.meta,132373051980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/write.png,132370137410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/write.png.meta,132373051980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png,132387591150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/1.png.meta,132387593650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png,132387591150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/2.png.meta,132387593650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png,132387591150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid/3.png.meta,132387593650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_bg.png,131311223440000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_bg.png.meta,132358191870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_prog.png,131311223440000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/hotWheel_prog.png.meta,132358191870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png,132385882340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png.meta,132385886260000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/company_1.png,132354738840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/company_1.png.meta,132354924310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/icon_26_no.png,132295947250000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/icon/icon_26_no.png.meta,132299620200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/.DS_Store,132357183320000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_bg.png,132355621780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_bg.png.meta,132357184000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_invisible.png,132357080820000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_invisible.png.meta,132357184000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_no.png,132357080740000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_no.png.meta,132357184000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_password.png,132357080660000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_password.png.meta,132357184000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_people.png,132357080600000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_people.png.meta,132357184000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_sms.png,132357080500000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_sms.png.meta,132357184000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_visible.png,132357080180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/login/log_visible.png.meta,132357184000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png,132352154700000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png.meta,132395475380000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo.png,132357074320000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo.png.meta,132355584900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo2.png,132382210800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo2.png.meta,132382996250000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me.png,132358139420000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me.png.meta,132358715030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me2.png,132358139320000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_me2.png.meta,132358715030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news.png,132358139260000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news.png.meta,132358715030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news2.png,132358139180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_news2.png.meta,132358715030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work.png,132358139120000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work.png.meta,132358715030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work2.png,132358139020000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/main/icon_work2.png.meta,132358715030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/log_bg.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/log_bg.png.meta,132388581350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_about.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_about.png.meta,132388581340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_check.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_check.png.meta,132388581350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_customer.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_customer.png.meta,132388581350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_enterprise.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_enterprise.png.meta,132388581350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_opinion.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_opinion.png.meta,132388581350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_order.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_order.png.meta,132388581360000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set.png.meta,132388581340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set2.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/me_set2.png.meta,132388581340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_check.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_check.png.meta,132388581350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_clean_up.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_clean_up.png.meta,132388581340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_data.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_data.png.meta,132388581350000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_fingerprint.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_fingerprint.png.meta,132388581340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password.png.meta,132388581340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password2.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_password2.png.meta,132388581360000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_remind.png,132388430540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/mine/myset_remind.png.meta,132388581360000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_bg_20.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_bg_20.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_notice.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_notice.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_peo.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_peo.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_remind.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_remind.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_time.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_time.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_unread.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_unread.png.meta,132364422840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_wait.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/new2_wait.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_1.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_1.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_2.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_2.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_3.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_3.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_4.png,132364409570000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_4.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg.png,132358142200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num1.png,132358139900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num1.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num2.png,132358139940000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/news/news_bg_num2.png.meta,132364422850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/add.png,132385001580000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/add.png.meta,132389409210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/close.png,132384986880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/close.png.meta,132389409210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt.png,132385002260000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt.png.meta,132389409210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt_bg.png,132385002400000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt_bg.png.meta,132389409210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/shut.png,132385001020000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/shut.png.meta,132389409210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/system.png,132385006780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/system.png.meta,132389413780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/upload.png,132385001460000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/upload.png.meta,132389409210000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/_empty.png,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/_empty.png.meta,132349404900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button.png,132355593960000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button2.png,132355621780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/button2.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check.png,132378740960000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check_full.png,132378741100000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/check_full.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/choose.png,132378740080000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/choose.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/company_bg.png,132355581300000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/company_bg.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off.png,132354738840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off_bg.png,132354747600000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/on_off_bg.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio.png,132378740300000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio_full.png,132378740800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/radio_full.png.meta,132378906780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png.meta,132387308870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png.meta,132387308870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png.meta,132387308880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png,132387304220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png.meta,132387308880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png,132384733440000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png.meta,132384750880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/icon_bg.png,132382189960000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/icon_bg.png.meta,132382937850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg.png,132362267920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_noshadow.png,132362259600000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_noshadow.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_shadow.png,132362263300000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_bg_shadow.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_color.png,132361704560000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_color.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_head_bg.png,132361702720000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_head_bg.png.meta,132362624190000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_1.png,132382190380000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_1.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_2.png,132382190820000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_2.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_3.png,132382191180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_3.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_4.png,132382191560000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_4.png.meta,132362624190000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_5.png,132382191840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_icon_5.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_ranking.png,132361704640000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/work_ranking.png.meta,132362624200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/cfg.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/font.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization.meta,132289129810000000 +/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,132395514380000000 +/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,132393865850000000 +/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 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/city.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db.meta,132358701520000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/json.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/.DS_Store,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioInputStream.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioInputStream.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioOutputStream.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioOutputStream.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioType.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioType.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioUtl.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/bio/BioUtl.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfg.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfg.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/cfg/DBCfgTool.lua,132289129800000000 +/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,132395487830000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua.meta,132370178140000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,132390879140000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua.meta,132368762790000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua,132392912840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua.meta,132389399450000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua,132395111970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua.meta,132358701520000000 +/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/DBTextures.lua,132395115510000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua.meta,132395107700000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132392912840000000 +/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 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpc.lua,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpc.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpcserver.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/json/rpcserver.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/.DS_Store,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua,132393856560000000 +/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,132395138200000000 +/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,132395086720000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua,132393856560000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua.meta,132291379270000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPool.lua,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPool.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua,132387631170000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLPrefs.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLQueue.lua,132387257440000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLQueue.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLStack.lua,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLStack.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/class.lua,132358326170000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/class.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/.DS_Store,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/BitUtl.lua,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/BitUtl.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLPrintEx.lua,132363110630000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLPrintEx.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/CLLUpdateUpgrader.lua,132289129810000000 +/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,132393856560000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132394484680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132395119010000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua.meta,132289221090000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve.lua,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve.lua.meta,132289129810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua,132387312130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua.meta,132387250260000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellServer.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellWWWProgress.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLCellWWWProgress.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame1.lua,132383029110000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame1.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame2.lua,132357332480000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLFrame2.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderDay.lua,132379574590000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderDay.lua.meta,132372979000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua,132379548310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLLUICalenderMonth.lua.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,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 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCompany.lua,132359038150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCompany.lua.meta,132358926240000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilter.lua,132385114470000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilter.lua.meta,132370154700000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilterGroup.lua,132383024660000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilterGroup.lua.meta,132370154670000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua,132395170970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua.meta,132370115410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustProc.lua,132369992340000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustProc.lua.meta,132369989000000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua,132381516850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua.meta,132376505230000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua,132395464700000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua.meta,132395463710000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132395490740000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua.meta,132378658180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132395508020000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua.meta,132378223060000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua,132387683750000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellGuidPage.lua.meta,132387614100000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua,132395109920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta,132394685710000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua,132369454510000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua.meta,132368777750000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/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 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua.meta,132364230620000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform2.lua,132382130700000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform2.lua.meta,132376325680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua,132382142740000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua.meta,132376479150000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellSysMessageList.lua,132369998130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellSysMessageList.lua.meta,132369239290000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/.DS_Store,132289134230000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132388113060000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua.meta,132372977860000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua,132385986530000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPHotWheel.lua,132373598700000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPHotWheel.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua,132384246060000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua.meta,132384230110000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSceneManager.lua,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSceneManager.lua.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua,132393336840000000 +/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,132394712450000000 +/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 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua,132389498980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua.meta,132290913220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua,132363128810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua.meta,132289134270000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua,132395486230000000 +/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,132395329700000000 +/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/TRPAbout.lua,132395510560000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua.meta,132395478930000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua,132389290650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua.meta,132389285830000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua,132391020080000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua.meta,132367521030000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132395173700000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua.meta,132372871250000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua,132394398930000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua.meta,132370233760000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132392912840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua.meta,132370115140000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua,132370162600000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua.meta,132369988710000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua,132391744840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua.meta,132391705230000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua,132395328010000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua.meta,132395296940000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua,132387685130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPGuid.lua.meta,132387611790000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua,132392912840000000 +/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/TRPMyInfor.lua,132395509310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua.meta,132395345760000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132395457540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua.meta,132370897440000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua,132395202120000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta,132388537450000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua,132395201980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta,132395119260000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132395497160000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta,132388185120000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua,132395327770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta,132395326130000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua,132381390070000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua.meta,132373879180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPopCheckBoxs.lua,132379834520000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPopCheckBoxs.lua.meta,132378929380000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua,132389372680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep1.lua.meta,132357319630000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua,132389372680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua.meta,132357323740000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua,132389372680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua.meta,132357325780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua,132392912840000000 +/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 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua.meta,132366143690000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua,132370405780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua.meta,132364876240000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab,132389106170000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab,132395472260000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab.meta,132395463160000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab,132385940230000000 +/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,132395500650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab.meta,132378911310000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132395500660000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab.meta,132378654680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab,132395500650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab.meta,132378243900000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132395500660000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab.meta,132378243860000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132395500650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab.meta,132378243880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab,132384959410000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab.meta,132362722920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform2.prefab,132382133180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform2.prefab.meta,132364370610000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab,132384959400000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab.meta,132364353170000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab,132395491860000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta,132395481440000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab,132381333780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132395210550000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab.meta,132372971640000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132395124750000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm2.prefab,132395125170000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm2.prefab.meta,132389286040000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132395124770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab.meta,132367521230000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132395125180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab.meta,132372671680000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab,132395124780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta,132370155540000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132395329770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab.meta,132370116810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab,132395125180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab.meta,132369515950000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab,132395125170000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta,132391705920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab,132395329760000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta,132395297380000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab,132395125160000000 +/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,132393862380000000 +/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,132395328280000000 +/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,132395124970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMain.prefab.meta,132289211980000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMask4Panel.prefab,132395124960000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMask4Panel.prefab.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab,132395366400000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab.meta,132290983200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab,132395124950000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab.meta,132375465810000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab,132395124950000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab.meta,132373063990000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab,132395124950000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab.meta,132300379190000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab,132395473220000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab.meta,132395345870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab,132395131260000000 +/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/PanelNewFollowSimple.prefab,132395131300000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab.meta,132388537780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab,132395329750000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta,132395131650000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132395497470000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388185850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab,132395331760000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta,132395326430000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132395124930000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab,132395125200000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab.meta,132378946840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab,132395124920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab.meta,132372993660000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab,132395124910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab.meta,132357319780000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab,132395124910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab.meta,132357323920000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab,132395124910000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab.meta,132357326010000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSceneManager.prefab,132395124900000000 +/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,132395124900000000 +/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,132395124890000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab.meta,132389524930000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab,132395124890000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSetting.prefab.meta,132389267620000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab,132395124890000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelStart.prefab,132395124880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelStart.prefab.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab,132395124880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgDetail.prefab.meta,132366143840000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgList.prefab,132395124880000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSysMsgList.prefab.meta,132364451640000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab,132395329770000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab.meta,132289770230000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWWWProgress.prefab,132395124860000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWWWProgress.prefab.meta,132289129800000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWebView.prefab,132395124870000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWebView.prefab.meta,132290913500000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab,132395124850000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab.meta,132387251970000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www/baidumap.html,132354704180000000 +/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www/baidumap.html.meta,132352746670000000 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v index d06febd..9e69d1d 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 5679a46..6bc8e1d 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Publish.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Publish.v @@ -138,7 +138,7 @@ 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,f5d617f7342053a0236bb93b9d1a1e46 +trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,731d340cf928509a7459dfea0d34f3a5 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,076cfb6761ed5c0568690aa273d8ee37 trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,c89d42f4c6ebe72da436e07ee70f69ad @@ -149,9 +149,9 @@ trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 -trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,434601ac6cfd2ce441a0009f109f0757 +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,45fa84a08829940b752de51f3e244d2e trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 -trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e8749743983d92 +trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,acd2930ce707586398f07b9586363436 trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 @@ -163,7 +163,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa55337 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b -trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,96b4f88eea21e061eff2e3f76fbb623b +trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387 trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,0fc6aaf236b8ee14c9660ddb68f63b1d trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 @@ -184,8 +184,9 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,121935e641c34f4 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,1b18f9bdb869156c26bc4f1131a2dd6c -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,39703716cb222091e69ae0eefbf54f5f +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,e2a1a87681380484a6e5ba27f2ca5c03 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,22bbf5d8704540ab66e713b768dd6ef2 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 @@ -204,19 +205,19 @@ 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,8ce0b645f948233e6328b20a07a5999c -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,4bf6daac6cc6e35679ca2bad64b0c18e +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,756c08832a0f69ec66e386da4fd35ca7 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,1cd7b0d9c92e9fce1eb3b99195fea068 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,ad3d36656af6d646814046ff9059ab72 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,e6c7e0aafd60eb1de8bf0ab7758bac11 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,3fc6451c6f494803506287fc7a51e755 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58 @@ -225,8 +226,8 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2 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,48fffb94cf7ab94e6c0b2e542bf2d08e -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,ef981e78f783343271b8c655f358084c -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,cc63f363eb32dda89ab4e4b4956c0014 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,336ea3b9be70d8d1fff12f59c101193a +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,fd9e0f654d9fc598d78f14299505fe7d 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 @@ -240,11 +241,11 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3 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,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/InputCheckboxs.unity3d,a929e8a7fd7ba3bc89bdda0686b6d7dd +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,2a350eede0835511478be0acab26101c +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,e07d80bb7138625773b65173d2d9680e +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,e40080e427014e2c3897f4a85414b1a8 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,c013e2e5d6cf85b427db0330d5765b87 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 @@ -260,7 +261,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,7a3ae06303e65f59f15af5b906b7a471 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,01e2d641bf61652b730108d269a56d6b +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f 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 @@ -270,7 +271,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,e1b7e9cecfa7c0104e475a8d84cc28db trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,c4a2f36dec38a689f49f356f05a62d88 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,a36eb5726ffa300ee44ffe16b48312dd trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd @@ -285,8 +286,8 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,82aaf6542a4ad8546a55f66997d61f66 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,003d70126d4efbaf73eb9bc83e4ba142 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836 trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 diff --git a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v index 10de968..9d5fb03 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v @@ -1,295 +1,312 @@ -trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c -trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 -trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c -trCRM/upgradeRes/other/uiAtlas/mine/Android/me_check.unity3d,19ab7fd3e0e61658db44cb333c6fad0e -trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 -trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 -trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a -trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 -trCRM/upgradeRes/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,f5d617f7342053a0236bb93b9d1a1e46 -trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 -trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa -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/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,4bf6daac6cc6e35679ca2bad64b0c18e -trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 -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/lua/CLLMainLua.lua,c0cae0cd02eba21111cf005f6c608901 -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,28ca57d169af022ec621dece879bdcfc -trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 -trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d -trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password2.unity3d,5dc8eaeca2eeedb771451233e5d8bf98 -trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772 -trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 -trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da -trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 -trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 -trCRM/upgradeRes/priority/lua/db/DBRoot.lua,c89d42f4c6ebe72da436e07ee70f69ad -trCRM/upgradeRes/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,0a1669987fdd4ce81f5b7cba8ce77876 -trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f -trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 -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/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 -trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7 -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/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d -trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,acf45d3619beb2deb72cce95732c68c4 -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/cust/Android/task.unity3d,737ce6fdd55d7642f690531d9410ff6a -trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3ddd6f65cf62f4a19 -trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e -trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,39703716cb222091e69ae0eefbf54f5f -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/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/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,0fc6aaf236b8ee14c9660ddb68f63b1d -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/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,48fffb94cf7ab94e6c0b2e542bf2d08e -trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1 -trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 -trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 -trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 -trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414 -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/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b -trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 -trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,3fc6451c6f494803506287fc7a51e755 -trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 -trCRM/upgradeRes/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840 -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0 -trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 -trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd -trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,eecf93435d855908ef5d364f5dcbaffd -trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,121935e641c34f4e3f9293381d7ff359 -trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f -trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 -trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 -trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 -trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d -trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f -trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,28e85a4963ed89f85f2451670a154f04 -trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa -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_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe -trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 -trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 -trCRM/upgradeRes/priority/lua/db/DBUser.lua,f5151070816fc7da19ae939c9533bbf9 -trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 -trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 -trCRM/upgradeRes/priority/lua/db/DBOrder.lua,076cfb6761ed5c0568690aa273d8ee37 -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,7a3ae06303e65f59f15af5b906b7a471 -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/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d -trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,cc63f363eb32dda89ab4e4b4956c0014 -trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 -trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 -trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 -trCRM/upgradeRes/other/uiAtlas/mine/Android/me_enterprise.unity3d,59d7dae785dea4fa88b52f40a8d167cf -trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc -trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d -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/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/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1 -trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c -trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29 -trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d -trCRM/upgradeRes/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2 -trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9 -trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e -trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 -trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519 -trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,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,126902c484a19b9f09e7bae17655611a -trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa -trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd -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/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/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb -trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75 -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/lua/ui/cell/TRCellProductList.lua,b2827429c70df8b7aa8e87451a96bf67 -trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,c4a2f36dec38a689f49f356f05a62d88 -trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e -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,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/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 -trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 -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/other/uiAtlas/order/Android/upload.unity3d,a7cb722ecba5f405105f0cfda4695e74 -trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd -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/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d -trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 -trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac -trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,003d70126d4efbaf73eb9bc83e4ba142 -trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 -trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 -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,95f9affe3cc17545ceca81ac7124c322 -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,8ce0b645f948233e6328b20a07a5999c -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,85784ec79aefde29be3ef308e7b5203b -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/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,947abdf2c019f44a26211acf6f31e2dd -trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f -trCRM/upgradeRes/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b -trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 -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 -trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 -trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec -trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,96b4f88eea21e061eff2e3f76fbb623b -trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e -trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 -trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 -trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 -trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,d27c231bd910b5d72c90a86efda2a660 -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/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e -trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 -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/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 -trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a -trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,ad3d36656af6d646814046ff9059ab72 -trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592 -trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,6b50b4e4afbdc66704ed49d4b15135f9 -trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,e1b7e9cecfa7c0104e475a8d84cc28db -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,434601ac6cfd2ce441a0009f109f0757 -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/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b -trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,7049ee32087377d48468ccee634e67c7 -trCRM/upgradeRes/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a -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/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e -trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f -trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf -trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab -trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 -trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b -trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e -trCRM/upgradeRes/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc -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/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081 -trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 -trCRM/upgradeRes/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e -trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff +trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,be687e94841bf222fa7b0c6a7a591156 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a -trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6 -trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 -trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a -trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e -trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 +trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a +trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 +trCRM/upgradeRes/other/uiAtlas/order/Android/add.unity3d,bf6728a3e41783ee7d63c130107a16e1 +trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df96a841ce2f91 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 +trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be +trCRM/upgradeRes/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85 +trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,cc945b5bffde4fec044e5660d2a5fe82 +trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a +trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 +trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,ea072d32d1080c13d24c10eb53dc010e +trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7 +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893 +trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8 +trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 +trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,ce405f9722a7c2ab354a4091d49faa62 +trCRM/upgradeRes/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971 +trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6 +trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099 +trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 +trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0 +trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514 +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0 +trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d +trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,232cf2b7f74f088e8b44c4c47cda5e95 +trCRM/upgradeRes/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe +trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128 +trCRM/upgradeRes/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba85cb8e969e744ff706f3a +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password2.unity3d,5dc8eaeca2eeedb771451233e5d8bf98 +trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527 +trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8 +trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 +trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1 +trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 +trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342 +trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c +trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3 +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa +trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445 +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d +trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,6f9a3135448a4746c463a41295275c57 +trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722 +trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,45f706ba538ab2b39364826b8fc7e214 +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd +trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073 +trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,b9645fe9ff5972788d341acc70b7be30 +trCRM/upgradeRes/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae +trCRM/upgradeRes/other/uiAtlas/guid/Android/3.unity3d,6fafc74e9a154b5b3c19accabd3e11b0 trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2 +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_4.unity3d,67187ab01b7b863b2a7f37b430212a3d +trCRM/upgradeRes/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f +trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_check.unity3d,19ab7fd3e0e61658db44cb333c6fad0e +trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75 +trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d +trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772 +trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd +trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 +trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0 +trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f +trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6 +trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524 +trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf +trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,e6c7e0aafd60eb1de8bf0ab7758bac11 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,756c08832a0f69ec66e386da4fd35ca7 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 +trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,b22b74b2ee1d57cccbaa92c6971dd9df +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_password.unity3d,04bebaa914245dd4d2376f9ded0ad15f +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac +trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc +trCRM/upgradeRes/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 +trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680 +trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836 +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,150f48b7b68e00e8b3e513ec2b75333a +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f +trCRM/upgradeRes/priority/lua/db/DBTextures.lua,fd2b6a27eee4bcec69b1fd1b4bec92ba +trCRM/upgradeRes/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2 +trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,99670420a41bf33b055763d28c547a26 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033 +trCRM/upgradeRes/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990 +trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e +trCRM/upgradeRes/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b +trCRM/upgradeRes/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,def4741f89df3925682e53df01bb70cc +trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea +trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe +trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 +trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140 +trCRM/upgradeRes/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 +trCRM/upgradeRes/priority/lua/db/DBCust.lua,8a34500a2252a4b7780c5d3aacabb1ee +trCRM/upgradeRes/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,0a1669987fdd4ce81f5b7cba8ce77876 +trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5 +trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 +trCRM/upgradeRes/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e +trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductList.lua,b2827429c70df8b7aa8e87451a96bf67 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_enterprise.unity3d,59d7dae785dea4fa88b52f40a8d167cf +trCRM/upgradeRes/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39 +trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef +trCRM/upgradeRes/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8 +trCRM/upgradeRes/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab +trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5 +trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e +trCRM/upgradeRes/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118 +trCRM/upgradeRes/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc +trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 +trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd +trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 +trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501 +trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141 +trCRM/upgradeRes/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,068f97e365e79ae11418ff16a1cf2f89 +trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 +trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua,720f3ff97d9b71a9108fd949bf779b30 +trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 +trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 +trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe +trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 +trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowList.unity3d,74006579cdb0ea8b4e120e1b52dd5c55 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 +trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69 +trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e +trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,42de16eb98a338177801da06f8fc5895 +trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 +trCRM/upgradeRes/priority/lua/db/DBOrder.lua,076cfb6761ed5c0568690aa273d8ee37 +trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244 +trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592 +trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7 +trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,a929e8a7fd7ba3bc89bdda0686b6d7dd +trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,38a15680b2d8765d9ba614c9a81c641d +trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf +trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e +trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 +trCRM/upgradeRes/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 +trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d +trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad +trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8 +trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 +trCRM/upgradeRes/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540 +trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e +trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703 +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee +trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef +trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 +trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d +trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661 +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,40fb760b32740191d3b4fa3f84de1720 +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368 +trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0 +trCRM/upgradeRes/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f +trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c +trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa +trCRM/upgradeRes/priority/lua/db/DBUser.lua,f5151070816fc7da19ae939c9533bbf9 +trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 +trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c +trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e +trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8 +trCRM/upgradeRes/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081 +trCRM/upgradeRes/other/uiAtlas/order/Android/upload.unity3d,a7cb722ecba5f405105f0cfda4695e74 +trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd1e08640243d +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_about.unity3d,3da9c9416127c69bc20c281f44520f6e +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44 +trCRM/upgradeRes/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c +trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e +trCRM/upgradeRes/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a +trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b +trCRM/upgradeRes/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d7642f690531d9410ff6a +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f +trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d +trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,44306fc53f8711f95e0698e2613563cf +trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 +trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff +trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,42b2a61f171153603c9adda32bf7cb7d +trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c +trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,e28ed051439e06abe8ffc14ebf9cf1d2 +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_remind.unity3d,99a50a17b34f464693ac84d1c6f38966 +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,336ea3b9be70d8d1fff12f59c101193a +trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 +trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e +trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa +trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e +trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d +trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8 +trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843 +trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,778f0d663544d0b2379e87b50ea49031 +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 +trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,7fe7010d91b43edf001169feb70ce395 +trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e +trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b +trCRM/upgradeRes/priority/ui/panel/Android/PanelAbout.unity3d,2c583d1e0c0eabc9e831a40c2be189e8 +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c7400323115d8be90421d +trCRM/upgradeRes/priority/lua/CLLMainLua.lua,c0cae0cd02eba21111cf005f6c608901 +trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695 +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782 +trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,acd2930ce707586398f07b9586363436 +trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b +trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd +trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a +trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3ddd6f65cf62f4a19 +trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc +trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 +trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set2.unity3d,e528f24899ef583c113ca69bbb510ebd +trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9 +trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0 +trCRM/upgradeRes/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 +trCRM/upgradeRes/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840 +trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831 +trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a +trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7 +trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,2739446b89e4fb5c449abb46ff406785 +trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b +trCRM/upgradeRes/priority/lua/net/NetProto.lua,3493f7ceb04a0b147ce63d323e3553af +trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6 +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e +trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326 +trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowTask.unity3d,00abbad1fdb08fdf2dcdcd6f2a70f95c +trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 +trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19 +trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductSelected.lua,e7f4b1e06a54d5fa52cf9a4ed00f5233 +trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d8cf58c7fc6a45b9 +trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,11da82174234ef319918c3e06f3775d6 +trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32 +trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a +trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da +trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5 +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,3ee9577410d709f08bf37e7c9a2b19a1 +trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f +trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d +trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29 +trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1 +trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01 +trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc +trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14 +trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b +trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,e32c3b520335c1b2966d8a503518275c +trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,56aa22c08fd4a18488f213a650f67ff1 +trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7 +trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38 +trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022 +trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a +trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,59750609585193c66d08adfa8544d946 +trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 +trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 +trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f +trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd +trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7 +trCRM/upgradeRes/other/uiAtlas/news/Android/news_4.unity3d,8c7beff66dc0cfe9f44082bdacc8007c +trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8 +trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec +trCRM/upgradeRes/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942 +trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,7a3ae06303e65f59f15af5b906b7a471 +trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa +trCRM/upgradeRes/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7 +trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928 +trCRM/upgradeRes/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd +trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6 +trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,21f43d920caab4d30c9ce7f9a1255603 +trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2 +trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239 +trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f +trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c +trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af +trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d +trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223 +trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectProduct.unity3d,d54579853bc1e958ced6fa6e3d928d2b +trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,3655882d094b886c89c7e48099136a46 +trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58 +trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 +trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43 +trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38 +trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 +trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a +trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v index 10a804f..0d7f850 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v @@ -1 +1 @@ -[{"md5":"83db54bd186e56564559b7fe7ec2a8be", "name":"2020_06_09_20_51_56", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"852b36d50f2f0ce00eccc80db6bc90a8", "name":"2020_06_14_21_46_25", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48678082118825ed76d8db161dcaa5cd", "name":"2020_06_20_15_13_36", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6188d18083bf95616165d76c2041b90e", "name":"2020_06_20_15_48_55", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8881cf3c9691c0a734344aed5602c30c", "name":"2020_06_20_18_18_34", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2fd0a9e5ce5b42edeebe951171c1ed22", "name":"2020_07_01_20_58_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7b90e2f5881d8a1af537d69c4abf0037", "name":"2020_07_01_21_29_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"abb908553432e1a98008de2dae335477", "name":"2020_07_01_22_22_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"248d184f53bb2907277d004865bed27e", "name":"2020_07_02_10_08_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5de2ba51b6af6e896a72e6ba0d483fd7", "name":"2020_07_02_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"532f0cecf5aa77742c01988183936269", "name":"2020_07_02_10_23_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d91a8b5136448c3934d0c936fced2d81", "name":"2020_07_02_11_17_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"991793ef158bdde3e7d70a8f69178cb0", "name":"2020_07_02_11_24_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e74624581a23d2c051f66d949e52537", "name":"2020_07_02_11_47_16", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7bc64e0ac434fc831cfdd79e6448263", "name":"2020_07_02_11_48_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b08313a39f814ec82ea0c676b4abdfd0", "name":"2020_07_02_11_51_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40023ffc5fdfc497eb36b985591b1460", "name":"2020_07_02_11_55_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"929720526e51a4a8b81827bb0611e134", "name":"2020_07_02_12_34_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9cf65334eafd25813932e7797ac18364", "name":"2020_07_02_12_37_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"029093af4b6b56448c3b995326ec9a5e", "name":"2020_07_02_12_49_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f6c68dfc0d14a3d55957903af0978381", "name":"2020_07_02_12_51_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"86afa249af5db0a282f2bc472045b1a9", "name":"2020_07_02_12_53_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"29f14097aa74aba0aca1c3c56b2bd2bb", "name":"2020_07_05_14_55_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"874de9b2b6f7e0fd732e08b5ea59b03a", "name":"2020_07_05_15_27_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e44ed0d01c1393cf14e97a3b74ed9a11", "name":"2020_07_05_21_14_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ea9af802bcedca448cea33dbdc82c0af", "name":"2020_07_06_09_49_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"caf10f439c895c895281993c970ce498", "name":"2020_07_07_09_45_55", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48fe564cbc4d1e850feaf7d83db95e7d", "name":"2020_07_07_10_05_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a46aac41a106a00e083554f282affcad", "name":"2020_07_07_10_08_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad7f4dae1b60de21fda92c02e51a549b", "name":"2020_07_07_10_21_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad4e9a71aa1fbfbf09b2fded8b5268b4", "name":"2020_07_07_10_28_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65f76f395c64e70fe91e17faa5cfe1c0", "name":"2020_07_07_10_29_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e2719cb0d8417b42e9c169e102519047", "name":"2020_07_07_10_31_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77fb67623b2551aa5637a5c3e1a7a20b", "name":"2020_07_07_10_32_31", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c65e208afdf7325dc035e1ed30b5e882", "name":"2020_07_07_10_33_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"09f03a7efedcdee13e59e6e82e7e787f", "name":"2020_07_07_10_34_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"038fa1d071d5b6ba5eb97cae7ec44dfa", "name":"2020_07_07_10_41_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f9052a0f8588b4462c4b7484b273a81c", "name":"2020_07_07_13_51_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"fca57a14b9326d6b4bbe6a76fd14d2b3", "name":"2020_07_07_14_04_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"db29543735363798b292609f421505b2", "name":"2020_07_07_14_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48654c656fc5ee1de7b7e147e2423200", "name":"2020_07_07_14_19_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"06cf91af553fcd8cfeb17fdf1cb3b9bc", "name":"2020_07_07_14_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9d7d1eefc31cfa737befb6b151b41448", "name":"2020_07_07_14_20_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b39df8ca67d48cc85a3a36459e0329df", "name":"2020_07_07_15_07_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b1e0ddeb104f0cc994d6a4fad1113836", "name":"2020_07_07_14_02_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb0db9cc4641358853303c738de59bbe", "name":"2020_07_07_14_10_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4510eac2b9966d0e192f73dc9717e65d", "name":"2020_07_07_14_13_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a0fd1e686304d3f30e36d9616b52bec9", "name":"2020_07_07_14_15_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb253314e7a22106a7879ea1c19f7519", "name":"2020_07_07_14_16_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d133bbe311e292732d2b912362e49cfc", "name":"2020_07_07_14_18_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c076515cee1efa128b9037b327625899", "name":"2020_07_07_14_19_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"511d316e0eb5a14b9bdb9cfea8b9d27f", "name":"2020_07_07_15_59_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"061b5ab80025e127ebe5989ccf5f0cf0", "name":"2020_07_07_16_25_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e87dbbeb2c5f5f8fdf6fa10b7d69876", "name":"2020_07_07_16_27_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c39d52fc0764bd34d5290bca509298b4", "name":"2020_07_07_16_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b9dddfa50494ccea917ba30950bc9298", "name":"2020_07_07_16_32_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c644faf22a45c1b45f26fd319404ce32", "name":"2020_07_07_16_49_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5789a7880ebbcb55782155302b1a2ef4", "name":"2020_07_07_17_30_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"93d36e7f45d121367cc1711972a2cac1", "name":"2020_07_07_17_47_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3793c236cda944d5a9308dcdf818fd82", "name":"2020_07_07_18_55_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f9939500d4aa88338e898dac98edee0", "name":"2020_07_07_19_20_56", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c77123a8b28d7e5da3b70f7aaebb0d48", "name":"2020_07_07_19_26_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01889e33c81edc18e8ca5aa65166d3dd", "name":"2020_07_07_19_48_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c3b643abcee574491912ae03a3fb2c5f", "name":"2020_07_07_19_49_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c07e0f977c72720644ede63e17c85193", "name":"2020_07_07_20_08_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71b5e55707b8bfdbb4d13dbf9429d9e", "name":"2020_07_07_20_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9080c5a030fb57300860b809808fc832", "name":"2020_07_07_20_50_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3e7137c562bf90d3cfa8bbe37b1cc30", "name":"2020_07_07_21_12_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e8704b794aa8dcd82c02127010dba8c", "name":"2020_07_08_22_12_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e62b707f07ef5795372e23e5fbb97692", "name":"2020_07_08_22_14_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"54e0a143d9013b230920b7898be56361", "name":"2020_07_08_22_47_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71f02fca91b21e3ac8b668d1d86891c5", "name":"2020_07_08_23_06_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6116bfda92f11adc871feba849ad0a7", "name":"2020_07_09_08_52_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"197c33d30db832223da91066c3882917", "name":"2020_07_09_08_57_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f55f5e0f14dc1155b89d9868f6cb4884", "name":"2020_07_09_09_18_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dce47a78ddfe761905bfc095d7dcbc85", "name":"2020_07_09_09_20_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6db83be729a0e22f9993019551b1275b", "name":"2020_07_09_09_27_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e151c779182bdb13615ed656fb56fe82", "name":"2020_07_09_18_20_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6ec058f8223393df2dbd399cf01699f", "name":"2020_07_09_19_41_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71a8d5a4df42c98c74e346b9e943bf5", "name":"2020_07_10_07_58_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3576ab21bf1d7e103f31a63b7f367b90", "name":"2020_07_10_09_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"015d7b9f1dd9205bb91a7406c4d4c6f7", "name":"2020_07_10_12_53_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d8567597904a6031403d49fab9903d1d", "name":"2020_07_10_12_46_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad28312d5a1031d795e3c9654458ee03", "name":"2020_07_11_11_10_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"046046c4220dfee37405fba363ef4da9", "name":"2020_07_11_12_40_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77db9e1d39248c5e3ed87ff56cfdfd4f", "name":"2020_07_11_15_24_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8401e218df01ff6f8efac33e5d6e39a0", "name":"2020_07_11_15_28_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ef765772eff5ee3b08cb5422440719e2", "name":"2020_07_11_15_29_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"aa2f703664719834f26dcd21d2883e85", "name":"2020_07_11_16_44_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"68b800c76132086b6936702c22dda550", "name":"2020_07_11_18_36_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1c9460ffdd897dc6f03dcebb22e981dc", "name":"2020_07_11_18_44_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"670b46534aa13c4a24a8d67353af7946", "name":"2020_07_11_18_47_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92b2cf4bd87d5d2fb08ed54aa3336924", "name":"2020_07_11_18_49_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dfc491e8cf9e084c0deab072647a35a9", "name":"2020_07_11_20_48_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c793ce6d28a001e2d302998ef4c29515", "name":"2020_07_11_22_06_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"45aa16ae7ea8e23b77d51529c0fe18b0", "name":"2020_07_11_22_53_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b0efd17d53fcbe40d24b0bc7f305836f", "name":"2020_07_12_22_49_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7c46945478a830e39b984d91fab0f225", "name":"2020_07_12_23_16_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"615ade37c66732294ac2cecb29278c8f", "name":"2020_07_14_10_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"28895fabb70f998f86e2846baf92a465", "name":"2020_07_14_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7777caf9f2f719ff98d0d742d1837a2", "name":"2020_07_14_10_29_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65639996001bf1e68b9f6ec3f513798e", "name":"2020_07_14_12_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0017a9e89ecd0b3e08a523ddf6b72ba7", "name":"2020_07_14_14_15_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5c8af675013cc61e95427af31b777026", "name":"2020_07_14_14_31_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"59305f2e5d8e08a66da2128d80239354", "name":"2020_07_14_16_56_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"934af9763bccdaf254c054283f1aaaba", "name":"2020_07_14_17_40_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1cb7e22ce6b9edd721b6130ec62e3371", "name":"2020_07_14_17_57_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c7a73701efdd17079287252a525ba239", "name":"2020_07_14_18_15_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f718ecfce4b717fd57bdd72086518d41", "name":"2020_07_14_21_20_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1be9165a7b27a9f6dae87338944e63f3", "name":"2020_07_14_21_25_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8039b9bd5e69aa086a66737a192b250e", "name":"2020_07_14_21_27_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d42cc224bd9d955b2f9f9ab7b772ae01", "name":"2020_07_14_22_21_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d3b3eafe86fc020d290ff91f023e166d", "name":"2020_07_14_22_21_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cbb35899ffb39e5c7f2d22b476b52524", "name":"2020_07_15_21_20_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cb60a9a25fa44d0675187334c0077291", "name":"2020_07_15_21_22_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e6839dd2c69455fc4de0a1ef8ed1feb5", "name":"2020_07_15_21_26_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1d04fca58e24da050dd4940af0c2e029", "name":"2020_07_16_08_18_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"37ccd2b42009f0ea9370f041d78dddd0", "name":"2020_07_16_08_22_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e89f5d3dc3f315fbb51f13fa12da29b3", "name":"2020_07_16_08_26_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d2fcafd35f779e5a4c10be5aadb78792", "name":"2020_07_16_08_27_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"58435802f03161785dbe6bb06270081f", "name":"2020_07_16_08_44_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a2df25938ae3b4bd71dd019de6d45678", "name":"2020_07_16_23_17_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4cc49ae5a0c1d39a44822d7d044e20db", "name":"2020_07_16_23_19_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a3e1f999ae1954e71e729ed7899bf54e", "name":"2020_07_16_23_22_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1dfb90afcf900ab3f79b29c1a316730d", "name":"2020_07_16_23_23_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92f8331d68e51569638660bb20ab81a9", "name":"2020_07_16_23_41_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file +[{"md5":"83db54bd186e56564559b7fe7ec2a8be", "name":"2020_06_09_20_51_56", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"852b36d50f2f0ce00eccc80db6bc90a8", "name":"2020_06_14_21_46_25", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48678082118825ed76d8db161dcaa5cd", "name":"2020_06_20_15_13_36", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6188d18083bf95616165d76c2041b90e", "name":"2020_06_20_15_48_55", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8881cf3c9691c0a734344aed5602c30c", "name":"2020_06_20_18_18_34", "upload":{"5310a90c21d9b86e0cbee2faa79045c9":true, "d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2fd0a9e5ce5b42edeebe951171c1ed22", "name":"2020_07_01_20_58_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7b90e2f5881d8a1af537d69c4abf0037", "name":"2020_07_01_21_29_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"abb908553432e1a98008de2dae335477", "name":"2020_07_01_22_22_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"248d184f53bb2907277d004865bed27e", "name":"2020_07_02_10_08_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5de2ba51b6af6e896a72e6ba0d483fd7", "name":"2020_07_02_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"532f0cecf5aa77742c01988183936269", "name":"2020_07_02_10_23_48", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d91a8b5136448c3934d0c936fced2d81", "name":"2020_07_02_11_17_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"991793ef158bdde3e7d70a8f69178cb0", "name":"2020_07_02_11_24_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2e74624581a23d2c051f66d949e52537", "name":"2020_07_02_11_47_16", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7bc64e0ac434fc831cfdd79e6448263", "name":"2020_07_02_11_48_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b08313a39f814ec82ea0c676b4abdfd0", "name":"2020_07_02_11_51_41", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"40023ffc5fdfc497eb36b985591b1460", "name":"2020_07_02_11_55_23", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"929720526e51a4a8b81827bb0611e134", "name":"2020_07_02_12_34_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9cf65334eafd25813932e7797ac18364", "name":"2020_07_02_12_37_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"029093af4b6b56448c3b995326ec9a5e", "name":"2020_07_02_12_49_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f6c68dfc0d14a3d55957903af0978381", "name":"2020_07_02_12_51_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"86afa249af5db0a282f2bc472045b1a9", "name":"2020_07_02_12_53_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"29f14097aa74aba0aca1c3c56b2bd2bb", "name":"2020_07_05_14_55_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"874de9b2b6f7e0fd732e08b5ea59b03a", "name":"2020_07_05_15_27_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e44ed0d01c1393cf14e97a3b74ed9a11", "name":"2020_07_05_21_14_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ea9af802bcedca448cea33dbdc82c0af", "name":"2020_07_06_09_49_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"caf10f439c895c895281993c970ce498", "name":"2020_07_07_09_45_55", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48fe564cbc4d1e850feaf7d83db95e7d", "name":"2020_07_07_10_05_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a46aac41a106a00e083554f282affcad", "name":"2020_07_07_10_08_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad7f4dae1b60de21fda92c02e51a549b", "name":"2020_07_07_10_21_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad4e9a71aa1fbfbf09b2fded8b5268b4", "name":"2020_07_07_10_28_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65f76f395c64e70fe91e17faa5cfe1c0", "name":"2020_07_07_10_29_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e2719cb0d8417b42e9c169e102519047", "name":"2020_07_07_10_31_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77fb67623b2551aa5637a5c3e1a7a20b", "name":"2020_07_07_10_32_31", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c65e208afdf7325dc035e1ed30b5e882", "name":"2020_07_07_10_33_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"09f03a7efedcdee13e59e6e82e7e787f", "name":"2020_07_07_10_34_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"038fa1d071d5b6ba5eb97cae7ec44dfa", "name":"2020_07_07_10_41_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f9052a0f8588b4462c4b7484b273a81c", "name":"2020_07_07_13_51_52", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"fca57a14b9326d6b4bbe6a76fd14d2b3", "name":"2020_07_07_14_04_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"db29543735363798b292609f421505b2", "name":"2020_07_07_14_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"48654c656fc5ee1de7b7e147e2423200", "name":"2020_07_07_14_19_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"06cf91af553fcd8cfeb17fdf1cb3b9bc", "name":"2020_07_07_14_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9d7d1eefc31cfa737befb6b151b41448", "name":"2020_07_07_14_20_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b39df8ca67d48cc85a3a36459e0329df", "name":"2020_07_07_15_07_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b1e0ddeb104f0cc994d6a4fad1113836", "name":"2020_07_07_14_02_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb0db9cc4641358853303c738de59bbe", "name":"2020_07_07_14_10_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4510eac2b9966d0e192f73dc9717e65d", "name":"2020_07_07_14_13_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a0fd1e686304d3f30e36d9616b52bec9", "name":"2020_07_07_14_15_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"bb253314e7a22106a7879ea1c19f7519", "name":"2020_07_07_14_16_50", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d133bbe311e292732d2b912362e49cfc", "name":"2020_07_07_14_18_25", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c076515cee1efa128b9037b327625899", "name":"2020_07_07_14_19_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"511d316e0eb5a14b9bdb9cfea8b9d27f", "name":"2020_07_07_15_59_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"061b5ab80025e127ebe5989ccf5f0cf0", "name":"2020_07_07_16_25_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e87dbbeb2c5f5f8fdf6fa10b7d69876", "name":"2020_07_07_16_27_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c39d52fc0764bd34d5290bca509298b4", "name":"2020_07_07_16_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b9dddfa50494ccea917ba30950bc9298", "name":"2020_07_07_16_32_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c644faf22a45c1b45f26fd319404ce32", "name":"2020_07_07_16_49_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5789a7880ebbcb55782155302b1a2ef4", "name":"2020_07_07_17_30_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"93d36e7f45d121367cc1711972a2cac1", "name":"2020_07_07_17_47_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3793c236cda944d5a9308dcdf818fd82", "name":"2020_07_07_18_55_24", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4f9939500d4aa88338e898dac98edee0", "name":"2020_07_07_19_20_56", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c77123a8b28d7e5da3b70f7aaebb0d48", "name":"2020_07_07_19_26_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"01889e33c81edc18e8ca5aa65166d3dd", "name":"2020_07_07_19_48_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c3b643abcee574491912ae03a3fb2c5f", "name":"2020_07_07_19_49_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c07e0f977c72720644ede63e17c85193", "name":"2020_07_07_20_08_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71b5e55707b8bfdbb4d13dbf9429d9e", "name":"2020_07_07_20_15_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"9080c5a030fb57300860b809808fc832", "name":"2020_07_07_20_50_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f3e7137c562bf90d3cfa8bbe37b1cc30", "name":"2020_07_07_21_12_54", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7e8704b794aa8dcd82c02127010dba8c", "name":"2020_07_08_22_12_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e62b707f07ef5795372e23e5fbb97692", "name":"2020_07_08_22_14_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"54e0a143d9013b230920b7898be56361", "name":"2020_07_08_22_47_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"71f02fca91b21e3ac8b668d1d86891c5", "name":"2020_07_08_23_06_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6116bfda92f11adc871feba849ad0a7", "name":"2020_07_09_08_52_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"197c33d30db832223da91066c3882917", "name":"2020_07_09_08_57_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f55f5e0f14dc1155b89d9868f6cb4884", "name":"2020_07_09_09_18_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dce47a78ddfe761905bfc095d7dcbc85", "name":"2020_07_09_09_20_28", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"6db83be729a0e22f9993019551b1275b", "name":"2020_07_09_09_27_36", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e151c779182bdb13615ed656fb56fe82", "name":"2020_07_09_18_20_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c6ec058f8223393df2dbd399cf01699f", "name":"2020_07_09_19_41_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b71a8d5a4df42c98c74e346b9e943bf5", "name":"2020_07_10_07_58_27", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3576ab21bf1d7e103f31a63b7f367b90", "name":"2020_07_10_09_20_07", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"015d7b9f1dd9205bb91a7406c4d4c6f7", "name":"2020_07_10_12_53_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d8567597904a6031403d49fab9903d1d", "name":"2020_07_10_12_46_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ad28312d5a1031d795e3c9654458ee03", "name":"2020_07_11_11_10_47", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"046046c4220dfee37405fba363ef4da9", "name":"2020_07_11_12_40_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"77db9e1d39248c5e3ed87ff56cfdfd4f", "name":"2020_07_11_15_24_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8401e218df01ff6f8efac33e5d6e39a0", "name":"2020_07_11_15_28_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ef765772eff5ee3b08cb5422440719e2", "name":"2020_07_11_15_29_53", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"aa2f703664719834f26dcd21d2883e85", "name":"2020_07_11_16_44_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"68b800c76132086b6936702c22dda550", "name":"2020_07_11_18_36_00", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1c9460ffdd897dc6f03dcebb22e981dc", "name":"2020_07_11_18_44_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"670b46534aa13c4a24a8d67353af7946", "name":"2020_07_11_18_47_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92b2cf4bd87d5d2fb08ed54aa3336924", "name":"2020_07_11_18_49_13", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dfc491e8cf9e084c0deab072647a35a9", "name":"2020_07_11_20_48_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c793ce6d28a001e2d302998ef4c29515", "name":"2020_07_11_22_06_57", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"45aa16ae7ea8e23b77d51529c0fe18b0", "name":"2020_07_11_22_53_42", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b0efd17d53fcbe40d24b0bc7f305836f", "name":"2020_07_12_22_49_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7c46945478a830e39b984d91fab0f225", "name":"2020_07_12_23_16_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"615ade37c66732294ac2cecb29278c8f", "name":"2020_07_14_10_12_12", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"28895fabb70f998f86e2846baf92a465", "name":"2020_07_14_10_19_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a7777caf9f2f719ff98d0d742d1837a2", "name":"2020_07_14_10_29_44", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"65639996001bf1e68b9f6ec3f513798e", "name":"2020_07_14_12_31_21", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0017a9e89ecd0b3e08a523ddf6b72ba7", "name":"2020_07_14_14_15_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"5c8af675013cc61e95427af31b777026", "name":"2020_07_14_14_31_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"59305f2e5d8e08a66da2128d80239354", "name":"2020_07_14_16_56_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"934af9763bccdaf254c054283f1aaaba", "name":"2020_07_14_17_40_04", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1cb7e22ce6b9edd721b6130ec62e3371", "name":"2020_07_14_17_57_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"c7a73701efdd17079287252a525ba239", "name":"2020_07_14_18_15_59", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f718ecfce4b717fd57bdd72086518d41", "name":"2020_07_14_21_20_43", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1be9165a7b27a9f6dae87338944e63f3", "name":"2020_07_14_21_25_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8039b9bd5e69aa086a66737a192b250e", "name":"2020_07_14_21_27_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d42cc224bd9d955b2f9f9ab7b772ae01", "name":"2020_07_14_22_21_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d3b3eafe86fc020d290ff91f023e166d", "name":"2020_07_14_22_21_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cbb35899ffb39e5c7f2d22b476b52524", "name":"2020_07_15_21_20_51", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"cb60a9a25fa44d0675187334c0077291", "name":"2020_07_15_21_22_22", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e6839dd2c69455fc4de0a1ef8ed1feb5", "name":"2020_07_15_21_26_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1d04fca58e24da050dd4940af0c2e029", "name":"2020_07_16_08_18_49", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"37ccd2b42009f0ea9370f041d78dddd0", "name":"2020_07_16_08_22_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"e89f5d3dc3f315fbb51f13fa12da29b3", "name":"2020_07_16_08_26_29", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d2fcafd35f779e5a4c10be5aadb78792", "name":"2020_07_16_08_27_20", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"58435802f03161785dbe6bb06270081f", "name":"2020_07_16_08_44_39", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a2df25938ae3b4bd71dd019de6d45678", "name":"2020_07_16_23_17_30", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"4cc49ae5a0c1d39a44822d7d044e20db", "name":"2020_07_16_23_19_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"a3e1f999ae1954e71e729ed7899bf54e", "name":"2020_07_16_23_22_05", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1dfb90afcf900ab3f79b29c1a316730d", "name":"2020_07_16_23_23_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"92f8331d68e51569638660bb20ab81a9", "name":"2020_07_16_23_41_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7fcf2020f2e3cfc6754edec369606935", "name":"2020_07_17_16_39_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d6594bf0fc23f0f4569414a38f954888", "name":"2020_07_17_16_45_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1fbde337eee663e800c6d79725685a21", "name":"2020_07_17_16_53_34", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"b273d7416a75fe4b50c8d18966a4ef9f", "name":"2020_07_17_16_59_58", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ba8b387feddd0e1037284da0ffa08fb8", "name":"2020_07_17_17_22_38", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d0f3e0d18e42fa39a56b4b14975dcb6c", "name":"2020_07_17_17_32_01", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"75818552962263afb5701fef0ad50c7d", "name":"2020_07_17_22_27_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0b38957fcd9cee5c847e3cd85d20dc64", "name":"2020_07_17_22_30_35", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"dc81751c36901303eab177f47779b29d", "name":"2020_07_17_22_52_03", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"ada31c8671bb6d21f17be688b8230314", "name":"2020_07_17_22_54_26", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f147c624209e55e010742a6f7baa5550", "name":"2020_07_17_22_56_46", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0678dfa4525c42b91a9012a2d080b871", "name":"2020_07_17_22_59_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"f5684c9c6b4d9295844cf82fae208a3c", "name":"2020_07_17_23_03_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"d7976ebf674b8af12b6e2f7b6f14f920", "name":"2020_07_17_23_06_09", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1048d7961214f0ddc3ecbb2ce5ba18c4", "name":"2020_07_17_23_08_14", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2923dfc95530a24b93d6f39c1bb06adb", "name":"2020_07_18_09_20_17", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"2b22f264f3fb7c8f33ef4cba3a1f0607", "name":"2020_07_18_09_35_19", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"1fb0370bce73cf93e6f0a25c6bcc26b0", "name":"2020_07_18_09_41_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"3c3457022aff04bebc70d4a265bd94bd", "name":"2020_07_18_09_55_33", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"36cb557aa9f52084c060467e6498f8be", "name":"2020_07_18_10_06_10", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"17213786aaf7b5f6848c4f851e161903", "name":"2020_07_18_12_28_37", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"979abb82fb4ff1492767d0d77a8d6bdf", "name":"2020_07_18_12_37_06", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"7d67bd512b62c3332ac932c259afc5dc", "name":"2020_07_18_12_43_40", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"63c2f68ffc326d7373b31914163e918b", "name":"2020_07_18_16_04_38", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"8e287656e0a7f11f09441e015e626d31", "name":"2020_07_18_20_41_45", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"0db6350217c95cc761d8203c796666eb", "name":"2020_07_18_20_46_18", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"74531716270cdfa784be81b73e352188", "name":"2020_07_18_20_47_02", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}, {"md5":"90aff843ab26f9038a44236c6e594d67", "name":"2020_07_18_21_08_15", "upload":{"d265697d3e1ff6fe9435580ea91c4482":true}, "exist":true, "remark":""}] \ No newline at end of file diff --git a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v index 0e8c224..3d29333 100644 --- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v +++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v @@ -1,6 +1,6 @@ trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd -trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,96b4f88eea21e061eff2e3f76fbb623b +trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_check.unity3d,19ab7fd3e0e61658db44cb333c6fad0e trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833 @@ -10,9 +10,10 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,e28ed051439e06abe8ffc14ebf9cf1d2 -trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 +trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,8a34500a2252a4b7780c5d3aacabb1ee trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPGuid.lua,ee29c8c2537cd4c445afe1397450cdae +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287 @@ -20,32 +21,31 @@ 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,4bf6daac6cc6e35679ca2bad64b0c18e +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,756c08832a0f69ec66e386da4fd35ca7 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,cd2ced3b17c33b4750ddcade27f6b98f +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7 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/ui/panel/Android/PanelNewFollowTask.unity3d,00abbad1fdb08fdf2dcdcd6f2a70f95c trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,c0cae0cd02eba21111cf005f6c608901 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 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua,7fe7010d91b43edf001169feb70ce395 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,c4a2f36dec38a689f49f356f05a62d88 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,068f97e365e79ae11418ff16a1cf2f89 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 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14 -trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f @@ -58,7 +58,8 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c2 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set2.unity3d,e528f24899ef583c113ca69bbb510ebd trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,acf45d3619beb2deb72cce95732c68c4 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,56aa22c08fd4a18488f213a650f67ff1 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d,2c583d1e0c0eabc9e831a40c2be189e8 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0 trCRM/upgradeRes4Publish/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f @@ -67,36 +68,37 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79db trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e 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,39703716cb222091e69ae0eefbf54f5f +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,8ef3b142a4375bdb311d15f962a3a9f2 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df96a841ce2f91 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,ef981e78f783343271b8c655f358084c +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua,336ea3b9be70d8d1fff12f59c101193a trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_about.unity3d,3da9c9416127c69bc20c281f44520f6e trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee -trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,0fc6aaf236b8ee14c9660ddb68f63b1d +trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,44306fc53f8711f95e0698e2613563cf 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,c89d42f4c6ebe72da436e07ee70f69ad +trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971 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/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd 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/InputCheckboxs.unity3d,a929e8a7fd7ba3bc89bdda0686b6d7dd +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e 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,d27c231bd910b5d72c90a86efda2a660 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e 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 @@ -110,6 +112,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653de trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be876e0cfa0ca96777260f +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de22265b04840 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua,af8af3fde5f3526b36c48517a5da89d0 @@ -123,13 +126,17 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a555 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 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,3655882d094b886c89c7e48099136a46 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,1ec2853e1a8660c4cadcace8f333f5af +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,11da82174234ef319918c3e06f3775d6 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc -trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,f5d617f7342053a0236bb93b9d1a1e46 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,ce405f9722a7c2ab354a4091d49faa62 +trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,42de16eb98a338177801da06f8fc5895 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 @@ -138,21 +145,22 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492 trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,076cfb6761ed5c0568690aa273d8ee37 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,90d589021f3db8641b14920daf93f1dc trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,7a3ae06303e65f59f15af5b906b7a471 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,cc63f363eb32dda89ab4e4b4956c0014 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,38a15680b2d8765d9ba614c9a81c641d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680 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,4526242a599f63c0bac766360a515e23 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,cc945b5bffde4fec044e5660d2a5fe82 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 @@ -169,20 +177,23 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,473a578d9811d494d 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,1b18f9bdb869156c26bc4f1131a2dd6c +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,be687e94841bf222fa7b0c6a7a591156 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,6f9a3135448a4746c463a41295275c57 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/priority/lua/db/DBTextures.lua,fd2b6a27eee4bcec69b1fd1b4bec92ba trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82 -trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,126902c484a19b9f09e7bae17655611a +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,b9645fe9ff5972788d341acc70b7be30 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d,74006579cdb0ea8b4e120e1b52dd5c55 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,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/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5 trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43 @@ -191,13 +202,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c 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,ad3d36656af6d646814046ff9059ab72 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,778f0d663544d0b2379e87b50ea49031 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,7af548695c754297fbf27cfedeb54a14 +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,99670420a41bf33b055763d28c547a26 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 @@ -212,35 +223,39 @@ trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_password.unity3d,6a41f0 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/add.unity3d,bf6728a3e41783ee7d63c130107a16e1 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136 +trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/upload.unity3d,a7cb722ecba5f405105f0cfda4695e74 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,0725109e55276b5158f6ce642d28dfa6 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,450e7e75ebfe83bb65d59beb3ce60782 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000 trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,003d70126d4efbaf73eb9bc83e4ba142 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,2739446b89e4fb5c449abb46ff406785 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,95f9affe3cc17545ceca81ac7124c322 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,40fb760b32740191d3b4fa3f84de1720 +trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d +trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536 trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,85784ec79aefde29be3ef308e7b5203b +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,720f3ff97d9b71a9108fd949bf779b30 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 -trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5 +trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05 trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd 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,48fffb94cf7ab94e6c0b2e542bf2d08e -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6 +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,42b2a61f171153603c9adda32bf7cb7d trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectCompany.unity3d,2aa019a477ea5b160780ded080dc82ec @@ -255,7 +270,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d,d58c2f53bba trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead294d1b61e trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7 -trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,476b749169d54c4b08e8749743983d92 +trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,acd2930ce707586398f07b9586363436 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,2691ddc66dff5da22fda3ffe11c897dd trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea @@ -264,13 +279,13 @@ trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4f trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa -trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,6b50b4e4afbdc66704ed49d4b15135f9 +trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,ea072d32d1080c13d24c10eb53dc010e 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,434601ac6cfd2ce441a0009f109f0757 +trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,3493f7ceb04a0b147ce63d323e3553af trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_opinion.unity3d,1935579d226c7400323115d8be90421d -trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,3fc6451c6f494803506287fc7a51e755 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,7049ee32087377d48468ccee634e67c7 +trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,e32c3b520335c1b2966d8a503518275c +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,b22b74b2ee1d57cccbaa92c6971dd9df 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 @@ -284,8 +299,9 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775f trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_fingerprint.unity3d,de777211a380a09ea82e1092a9fba414 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e -trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,121935e641c34f4e3f9293381d7ff359 -trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,e1b7e9cecfa7c0104e475a8d84cc28db +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,21f43d920caab4d30c9ce7f9a1255603 +trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c +trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e diff --git a/Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs b/Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs index 9669f66..a281458 100644 --- a/Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs +++ b/Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs @@ -180,11 +180,11 @@ public static class XluaGenCodeConfig typeof(CLUIElement), typeof(CLUIElementDate), typeof(CLUIElementPopList), + typeof(InvokeEx), //========================== typeof(MyMain), typeof(MyCfg), typeof(NativeGallery), - typeof(NativeGalleryUtl), typeof(LBSUtl), typeof(MyWWWTexture), typeof(MyLocation), @@ -200,6 +200,9 @@ public static class XluaGenCodeConfig typeof(CLUIPopListPanel), typeof(CLUIScrollViewWithEvent), typeof(Client4Stomp), + typeof(MyGallery), + typeof(NativeCamera), + typeof(MyCamera), }; //C#静态调用Lua的配置（包括事件的原型），仅可以配delegate，interface diff --git a/Assets/trCRM/_scene/Main.unity b/Assets/trCRM/_scene/Main.unity index 8f6ea44..8eeb9e9 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: 1.3333334 + aspectRatio: 0.48828125 --- !u!65 &447471687 BoxCollider: m_ObjectHideFlags: 0 @@ -1143,7 +1143,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 12 + aspectRatio: 12.2 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png new file mode 100644 index 0000000..c4b31d1 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png differ diff --git a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png.meta b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png.meta new file mode 100644 index 0000000..5abc018 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6600cae924a2e47d1afe4667c36c4cf1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab index 9d0ea0b..d86f82f 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab @@ -1809,6 +1809,20 @@ MonoBehaviour: paddingTop: 0 paddingBottom: 0 path: trCRM/upgradeRes4Dev/other/uiAtlas/order/system.png + - name: logo_512 + x: 0 + y: 0 + width: 512 + height: 512 + borderLeft: 0 + borderRight: 0 + borderTop: 0 + borderBottom: 0 + paddingLeft: 0 + paddingRight: 0 + paddingTop: 0 + paddingBottom: 0 + path: trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png mPixelSize: 1 mReplacement: {fileID: 0} mCoordinates: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua index f3d644e..11bebe1 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua @@ -27,7 +27,8 @@ DBCust.FilterGroup = { custTypeList = "custTypeList", -- list 客户类型 dealFlagList = "dealFlagList", -- list 客户状态 loginNoList = "loginNoList", -- list 归属工号 - taskList = "taskList" -- list 任务名称 + taskList = "taskList", -- list 任务名称 + followUpTypeList = "followUpTypeList" -- 跟进类型 } DBCust.FieldType = { @@ -37,7 +38,16 @@ DBCust.FieldType = { number = "数字文本框", dateTime = "时间文本框", text = "普通文本框", - phone = "电话号码框" + phone = "电话号码框", + empty ="empty" +} +---@class _FieldMode +_FieldMode = { + inputOnly = 0, -- 纯输入 + showOnly = 1, -- 纯展示模式 + modifyOnly = 2, -- 修改模式 + showAndModify = 3, -- 展示械式，同时也可以modify + button = 4, -- 类似按钮的功能 } DBCust.onGetFilter = function(data) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua index 096969a..a2678a3 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua @@ -4,12 +4,14 @@ require "db.DBCust" require "db.DBStatistics" require "db.DBUser" require "db.DBOrder" +require "db.DBTextures" ---@class DBRoot DBRoot = {} DBRoot.db = {} DBRoot.init = function() DBMessage.init() + DBTextures.init() NetProto.setReceiveCMDCallback(DBRoot.onReceiveData) end @@ -18,6 +20,7 @@ DBRoot.clean = function() DBMessage.clean() DBCust.clean() DBStatistics.clean() + DBTextures.clean() end DBRoot.funcs = { diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua new file mode 100644 index 0000000..3b9d90b --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua @@ -0,0 +1,53 @@ +DBTextures = {} +local db = {} + +function DBTextures.init() + InvokeEx.cancelInvoke(DBTextures.releaseTimeout) + InvokeEx.invoke(DBTextures.releaseTimeout, 60) +end + +function DBTextures.clean() + InvokeEx.cancelInvoke(DBTextures.releaseTimeout) + for k, v in ipairs(db) do + GameObject.DestroyImmediate(v) + end + db = {} +end + +function DBTextures.releaseTimeout() + for k, v in ipairs(db) do + if DateEx.nowMS - v.lastUseTime > 300000 then + GameObject.DestroyImmediate(v.texture) + db[k] = nil + end + end +end + +---@return UnityEngine.UnityWebRequest +function DBTextures.getByUrl(url, callback, orgs) + local tt = db[url] + if tt then + tt.lastUseTime = DateEx.nowMS + db[url] = tt + Utl.doCallback(callback, tt.texture, orgs) + return nil + end + + local request = + WWWEx.get( + url, + nil, + CLAssetType.texture, + function(content) + db[url] = {texture = content, lastUseTime = DateEx.nowMS} + Utl.doCallback(callback, content, orgs) + end, + nil, + orgs, + true, + 1 + ) + return request +end + +return DBTextures diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua.meta new file mode 100644 index 0000000..1be7011 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0c5a5751e2f924a6abdab89e00841a0f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua index 71d553d..a8977b5 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua @@ -241,6 +241,7 @@ NetProto.cmds = { load_wfTicket_Settings = "load_WfTicket_Settings", -- 工单配置信息 selectProductInfo = "selectProductInfo", -- 商品列表 createWfInfo = "createWfInfo", -- 创建订单 + create_followUp_task = "create_followUp_task", -- 创建跟进预约 } --------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------- @@ -566,5 +567,12 @@ NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec) NetProto.sendSocket(content, callback, timeOutSec) end +NetProto.send.create_followUp_task = function(followUpTaskJson, callback, timeOutSec) + local content = {} + content.action = NetProto.cmds.create_followUp_task + content.followUpTaskJson = followUpTaskJson + content.followUpTaskJson.groupId = NetProto.groupId + NetProto.sendSocket(content, callback, timeOutSec) +end ------------------------------------------------------ return NetProto diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua index a4b67a9..7ee0792 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua @@ -261,7 +261,13 @@ Mp3PlayerByUrl = CS.Mp3PlayerByUrl CLUICheckbox = CS.CLUICheckbox ---@type CLUIPopListPanel CLUIPopListPanel = CS.CLUIPopListPanel -CLUIScrollViewWithEvent= CS.CLUIScrollViewWithEvent +CLUIScrollViewWithEvent = CS.CLUIScrollViewWithEvent +---@type MyGallery +MyGallery = CS.MyGallery +---@type NativeCamera +NativeCamera = CS.NativeCamera +---@type MyCamera +MyCamera = CS.MyCamera ------------------------------------------------------- json = require("json.json") diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua index ac124cd..b01e6f8 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua @@ -317,11 +317,13 @@ function hideTopPanel(p) end end +---@param go UnityEngine.GameObject function SetActive(go, isActive) if (go == nil) then return end - NGUITools.SetActive(go, isActive) + -- NGUITools.SetActive(go, isActive) + go:SetActive(isActive) end function getCC(transform, path, com) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua index 28a5ff1..37cbd83 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua @@ -85,7 +85,7 @@ MyUtl.doCall = function(custId, phoneNo, cust) hideHotWheel() if content.success then MyUtl.toastS("拨号成功！") - getPanelAsy("PanelNewFollow", onLoadedPanelTT, cust) + getPanelAsy("PanelNewFollowSimple", onLoadedPanelTT, cust) end end ) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua index 87a6933..36dc346 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua @@ -67,6 +67,7 @@ function _cell.uiEventDelegate(go) local goName = go.name if goName == "ButtonFollow" then elseif goName == "ButtonTask" then + getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, mData) elseif goName == "ButtonContact" then MyUtl.callCust(mData) end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua new file mode 100644 index 0000000..e8b0a08 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua @@ -0,0 +1,30 @@ +-- 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 UIWidget + uiobjs.widget = csSelf:GetComponent("UIWidget") +end + +-- 显示， +-- 注意，c#侧不会在调用show时，调用refresh +function _cell.show(go, data) + mData = data + uiobjs.widget.height = mData.height or 40 +end + +-- 取得数据 +function _cell.getData() + return mData +end + +-------------------------------------------- +return _cell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua.meta new file mode 100644 index 0000000..eaf453e --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 60ac659ac409f43f6b5e7ec6133bf1cd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua index 2420491..76bbfe1 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua @@ -1,17 +1,20 @@ ---@class _ParamFieldAttr +---@field id ---@field attrType ---@field ifMust boolean 1:true +---@field ifTime boolean 1:true +---@field cannotEdit ---@field attrName ---@field attrValue ----@field id ---@field checkMin ---@field checkMax ---@field popOptions ---@field popValues ---@field donotJoinKey boolean 是否要拼接key +---@field height numb 高度，只有在emptyspace有用 ---@class _ParamCellExtendFiled ----@field isEditMode boolean +---@field showMode _FieldMode ---@field attr _ParamFieldAttr ---@field onSelect function 当选择了poplist ---@field onClick function 当点击了输入框 @@ -39,10 +42,6 @@ function _cell.init(csObj) uiobjs.spriteBg = getCC(transform, "Background", "UISprite") end - -- if uiobjs.spriteBg then - -- uiobjs.spriteBg.width = NumEx.getIntPart(CSPMain.contentRect.z) - -- end - uiobjs.boxCollider = csSelf:GetComponent("BoxCollider") ---@type UIInput uiobjs.input = csSelf:GetComponent("UIInput") @@ -67,35 +66,6 @@ function _cell.show(go, data) attr = mData.attr attr.ifMust = attr.ifMust or 0 - if data.isEditMode then - _cell.enabeldObj(uiobjs.boxCollider, true) - if uiobjs.Label then - uiobjs.Label.text = uiobjs.inputLabel - end - if uiobjs.input then - uiobjs.input.defaultText = uiobjs.inputLabel - end - _cell.enabeldObj(uiobjs.Label4, true) - _cell.enabeldObj(uiobjs.SpriteRight, true) - if uiobjs.ButtonReset then - uiobjs.ButtonReset.disabled = false - end - else - _cell.enabeldObj(uiobjs.boxCollider, false) - if uiobjs.Label then - uiobjs.Label.text = "" - end - if uiobjs.input then - uiobjs.input.defaultText = "" - end - _cell.enabeldObj(uiobjs.Label4, false) - _cell.enabeldObj(uiobjs.SpriteRight, false) - - if uiobjs.ButtonReset then - uiobjs.ButtonReset.disabled = true - end - end - local jsonKey if attr.donotJoinKey then jsonKey = attr.id @@ -114,7 +84,6 @@ function _cell.show(go, data) uiobjs.checkbox.labeName.text = attr.attrName end - _cell.enabeldObj(uiobjs.input, true) if attr.attrType == DBCust.FieldType.text then uiobjs.input.keyboardType = UIInput.KeyboardType.Default elseif attr.attrType == DBCust.FieldType.number then @@ -126,14 +95,15 @@ function _cell.show(go, data) elseif attr.attrType == DBCust.FieldType.multext then uiobjs.input.keyboardType = UIInput.KeyboardType.Default elseif attr.attrType == DBCust.FieldType.dateTime then - _cell.enabeldObj(uiobjs.input, false) + local elementDate = csSelf:GetComponent("CLUIElementDate") + if elementDate then + elementDate.isSetTime = ((attr.ifTime and attr.ifTime == 1) and true or false) + end elseif attr.attrType == DBCust.FieldType.checkbox then - _cell.enabeldObj(uiobjs.input, false) local max = tonumber(attr.checkMax) or 0 uiobjs.checkbox.isMultMode = (max > 1) or (max == 0) uiobjs.checkbox:init(attr) elseif attr.attrType == DBCust.FieldType.popuplist then - _cell.enabeldObj(uiobjs.input, false) if attr.popOptions then uiobjs.popList:refreshItems(attr.popOptions, attr.popValues) else @@ -146,6 +116,9 @@ function _cell.show(go, data) uiobjs.popList:refreshItems(array, array) end end + + -- 设置展示的模式 + _cell.setElementMode(mData.showMode or _FieldMode.inputOnly) end function _cell.enabeldObj(obj, val) @@ -154,6 +127,123 @@ function _cell.enabeldObj(obj, val) end end +function _cell.setElementMode(mode) + local isPopList = uiobjs.popList + local isPopCheckbox = uiobjs.checkbox + ---@type UIInput + local input = uiobjs.input + local inputOnGUI = csSelf:GetComponent("UIInputOnGUI") + local boxcollider = uiobjs.boxCollider + local ButtonReset = uiobjs.ButtonReset + + if mode == _FieldMode.inputOnly then + _cell.enabeldObj(boxcollider, true) + _cell.enabeldObj(inputOnGUI, true) + _cell.enabeldObj(input, true) + if uiobjs.Label2 then + uiobjs.Label2.color = ColorEx.getColor(0xff999999) + end + if uiobjs.ButtonReset then + uiobjs.ButtonReset.disabled = false + end + if uiobjs.Label then + uiobjs.Label.text = uiobjs.inputLabel + end + if uiobjs.input then + uiobjs.input.defaultText = uiobjs.inputLabel + end + _cell.enabeldObj(uiobjs.Label4, true) -- multext + if + attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or + attr.attrType == DBCust.FieldType.popuplist + then + _cell.enabeldObj(uiobjs.SpriteRight, true) + else + _cell.enabeldObj(uiobjs.SpriteRight, false) + end + elseif mode == _FieldMode.showOnly then + _cell.enabeldObj(boxcollider, false) + _cell.enabeldObj(inputOnGUI, false) + _cell.enabeldObj(input, false) + if uiobjs.Label2 then + uiobjs.Label2.color = ColorEx.getColor(0xff999999) + end + if uiobjs.ButtonReset then + uiobjs.ButtonReset.disabled = true + end + if uiobjs.Label then + uiobjs.Label.text = "" + end + if uiobjs.input then + uiobjs.input.defaultText = "" + end + _cell.enabeldObj(uiobjs.Label4, false) + _cell.enabeldObj(uiobjs.SpriteRight, false) + elseif mode == _FieldMode.modifyOnly then + _cell.enabeldObj(boxcollider, true) + _cell.enabeldObj(inputOnGUI, false) + _cell.enabeldObj(input, false) + if uiobjs.Label2 then + uiobjs.Label2.color = ColorEx.getColor(0xff999999) + end + if uiobjs.ButtonReset then + uiobjs.ButtonReset.disabled = true + end + if uiobjs.Label then + uiobjs.Label.text = uiobjs.inputLabel + end + if uiobjs.input then + uiobjs.input.defaultText = uiobjs.inputLabel + end + _cell.enabeldObj(uiobjs.Label4, true) + _cell.enabeldObj(uiobjs.SpriteRight, true) + elseif mode == _FieldMode.showAndModify then + _cell.enabeldObj(boxcollider, true) + _cell.enabeldObj(inputOnGUI, false) + _cell.enabeldObj(input, false) + if uiobjs.Label2 then + uiobjs.Label2.color = ColorEx.getColor(0xff999999) + end + if uiobjs.ButtonReset then + uiobjs.ButtonReset.disabled = true + end + if uiobjs.Label then + uiobjs.Label.text = "" + end + if uiobjs.input then + uiobjs.input.defaultText = "" + end + _cell.enabeldObj(uiobjs.Label4, false) + _cell.enabeldObj(uiobjs.SpriteRight, true) + elseif mode == _FieldMode.button then + _cell.enabeldObj(boxcollider, true) + _cell.enabeldObj(inputOnGUI, false) + _cell.enabeldObj(input, false) + if uiobjs.Label2 then + uiobjs.Label2.color = ColorEx.getColor(0xff363636) + end + if uiobjs.ButtonReset then + uiobjs.ButtonReset.disabled = true + end + if uiobjs.Label then + uiobjs.Label.text = "" + end + if uiobjs.input then + uiobjs.input.defaultText = "" + end + _cell.enabeldObj(uiobjs.Label4, false) + _cell.enabeldObj(uiobjs.SpriteRight, true) + end + + -- 再次修正input + if + attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or + attr.attrType == DBCust.FieldType.popuplist + then + _cell.enabeldObj(input, false) + end +end + -- 取得数据 function _cell.getData() return mData @@ -164,12 +254,12 @@ function _cell.uiEventDelegate(go) -- 说明大文本框改变了 NGUITools.AddWidgetCollider(csSelf.gameObject, false) uiobjs.Label4.enabled = (uiobjs.element.value == "" and true or false) - Utl.doCallback(mData.onMultTextInputChg, csSelf.gameObject) + Utl.doCallback(mData.onMultTextInputChg, uiobjs.element) elseif attr.attrType == DBCust.FieldType.number or attr.attrType == DBCust.FieldType.phone or attr.attrType == DBCust.FieldType.text then - Utl.doCallback(mData.onInputChange, csSelf.gameObject) + Utl.doCallback(mData.onInputChange, uiobjs.element) end end @@ -178,9 +268,9 @@ function _cell.onNotifyLua(go) attr.attrType == DBCust.FieldType.popuplist or attr.attrType == DBCust.FieldType.checkbox or attr.attrType == DBCust.FieldType.dateTime then - Utl.doCallback(mData.onSelect, csSelf.gameObject) + Utl.doCallback(mData.onSelect, uiobjs.element) else - Utl.doCallback(mData.onClick, csSelf.gameObject) + Utl.doCallback(mData.onClick, uiobjs.element) end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua index b2a2eac..aab44c6 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua @@ -15,6 +15,7 @@ local uiobjs = {} local fieldsObjs = {} local queue = CLLQueue.new() local isLoading = false +local count = 0 -- 初始化，只调用一次 function _cell.init(csObj) @@ -36,18 +37,6 @@ function _cell.show(go, data) end function _cell.refresh() - --[[ - local taskId = tostring(cust.taskId) - if (not isFieldLoading) or taskId ~= oldtaskId then - isFieldLoading = true - oldtaskId = taskId - fields = DBCust.getFieldsByTask(taskId) - if fields and #fields > 0 then - showHotWheel() - _cell.initField(1, taskId) - end - end - ]] if queue:size() == 0 then return end @@ -56,7 +45,9 @@ function _cell.refresh() mData = queue:deQueue() if mData.fields and #(mData.fields) > 0 then showHotWheel() - _cell.initField(1) + for i, v in ipairs(mData.fields) do + _cell.initField(i) + end else _cell.onFinisInitFields() end @@ -73,6 +64,8 @@ function _cell.initField(index) name = "InputMultText" elseif fileAttr.attrType == DBCust.FieldType.checkbox then name = "InputCheckboxs" + elseif fileAttr.attrType == DBCust.FieldType.empty then + name = "EmptySpace" else name = "InputText" end @@ -82,36 +75,45 @@ end ---@param go UnityEngine.GameObject function _cell.onLoadField(name, go, orgs) local index = orgs - go.transform.parent = transform - go.transform.localScale = Vector3.one - go.transform.localEulerAngles = Vector3.zero ---@type _ParamCellExtendFiled local param = mData.fields[index] local cell = go:GetComponent("CLCellLua") - SetActive(go, true) if param.attr.attrType == DBCust.FieldType.multext then -- 要设置一次 param.orgOnMultTextInputChg = param.onMultTextInputChg param.onMultTextInputChg = _cell.onMultTextInputChg end cell:init(param, nil) - table.insert(fieldsObjs, cell) - uiobjs.Table:Reposition() + fieldsObjs[index] = cell + count = count + 1 Utl.doCallback(mData.onLoadOneField, cell) - if index == #(mData.fields) then + if count == #(mData.fields) then _cell.onFinisInitFields() - else - _cell.initField(index + 1) end end function _cell.onFinisInitFields() - isLoading = false - uiobjs.Table:Reposition() + for i, cell in ipairs(fieldsObjs) do + -- 在完成的时候时候再处理，是为了保证加进去的顺序不变 + cell.transform.parent = transform + cell.transform.localScale = Vector3.one + cell.transform.localEulerAngles = Vector3.zero + SetActive(cell.gameObject, true) + uiobjs.Table:Reposition() + end uiobjs.formRoot:setValue(mData.data) + uiobjs.Table.repositionNow = true hideHotWheel() - Utl.doCallback(mData.onFinish, csSelf.gameObject) - _cell.refresh() + + csSelf:invoke4Lua( + function() + Utl.doCallback(mData.onFinish, csSelf.gameObject) + isLoading = false + -- 再次处理 + _cell.refresh() + end, + 0.1 + ) end function _cell.release() @@ -120,6 +122,7 @@ function _cell.release() CLUIOtherObjPool.returnObj(v.gameObject) end fieldsObjs = {} + count = 0 end function _cell.onMultTextInputChg(go) @@ -139,5 +142,11 @@ function _cell.getData() return mData end + +function _cell.OnDisable() + if #(fieldsObjs) > 0 then + printe("动态加载的字段没有释放") + end +end -------------------------------------------- return _cell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua new file mode 100644 index 0000000..ab59861 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua @@ -0,0 +1,69 @@ +---@class _ParamCellImage +---@field path string +---@field onDelete function + +-- xx单元 +local _cell = {} +---@type Coolape.CLCellLua +local csSelf = nil +local transform = nil +---@type _ParamCellImage +local mData = nil +local uiobjs = {} + +-- 初始化，只调用一次 +function _cell.init(csObj) + csSelf = csObj + transform = csSelf.transform + ---@type UITexture + uiobjs.texture = csSelf:GetComponent("UITexture") +end + +-- 显示， +-- 注意，c#侧不会在调用show时，调用refresh +function _cell.show(go, data) + mData = data + local url + if startswith(mData.path, "/") then + url = joinStr("file://", mData.path) + else + url = mData.path + end + print(url) + if uiobjs.texture.mainTexture and uiobjs.texture.mainTexture.name == mData.path then + else + _cell.release() + DBTextures.getByUrl(url, _cell.onGetTextue, mData.path) + end +end + +function _cell.onGetTextue(content, orgs) + if mData.path ~= orgs then + GameObject.DestroyImmediate(content) + content = nil + return + end + _cell.release() + content.name = orgs + uiobjs.texture.mainTexture = content +end + +function _cell.release() + if uiobjs.texture.mainTexture ~= nil then + uiobjs.texture.mainTexture = nil + end +end + +-- 取得数据 +function _cell.getData() + return mData +end + +function _cell.uiEventDelegate(go) + if go.name == "ButtonDel" then + Utl.doCallback(mData.onDelete, mData) + end +end + +-------------------------------------------- +return _cell diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta new file mode 100644 index 0000000..18f93b0 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b0b74c6ac6d214694bf232a299e48b6b +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 8c072d6..953dfd5 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 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua index e4cc84c..0b9b6c0 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua @@ -80,6 +80,10 @@ function CSPMine.uiEventDelegate(go) MyLocation.self:getMyLocation(CSPMine.onGetLocation) elseif goName == "ButtonSetting" or goName == "ButtonMySetting" then getPanelAsy("PanelSetting", onLoadedPanelTT) + elseif goName == "SpriteTopBg" then + getPanelAsy("PanelMyInfor", onLoadedPanelTT) + elseif goName == "ButtonAbout" then + getPanelAsy("PanelAbout", onLoadedPanelTT) end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua index 4570932..711a797 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua @@ -154,9 +154,14 @@ function CSPTasks.setEventDelegate() getPanelAsy("PanelCustList", onLoadedPanelTT) end, ButtonRecord = function() + getPanelAsy("PanelFollowList", onLoadedPanelTT) end, ButtonCustOcean = function() - end + end, + ButtonOrder = function() + getPanelAsy("PanelOrderList", onLoadedPanelTT) + end, + } end -- 处理ui上的事件，例如点击等 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua new file mode 100644 index 0000000..28375a5 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua @@ -0,0 +1,136 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPAbout:TRBasePanel 邮件列表 +local TRPAbout = class("TRPAbout", TRBasePanel) + +local uiobjs = {} +-- 初始化，只会调用一次 +function TRPAbout:init(csObj) + TRPAbout.super.init(self, csObj) + self:initFiledsAttr() + self:setEventDelegate() + + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 500, 0) + ---@type UIScrollView + uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView") + ---@type UITable + uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable") + ---@type CLUIFormRoot + uiobjs.TableForm = uiobjs.Table:GetComponent("CLUIFormRoot") + ---@type Coolape.CLCellLua + uiobjs.TableLua = uiobjs.Table:GetComponent("CLCellLua") +end + +function TRPAbout:initFiledsAttr() + ---@type _ParamFieldAttr + local attr + self.baseFiledsAttr = {} + attr = {} + attr.attrName = "更新动态" + attr.id = "upgrade" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "服务协议" + attr.id = "serviceAgreement" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "发布评价" + attr.id = "assess" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) +end + +-- 设置数据 +---@param paras _ParamTRPAbout +function TRPAbout:setData(paras) + self.mdata = {} +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPAbout:show() + ---@type _ParamCellExtendFiledRoot + local fieldRootInfor = {} + fieldRootInfor.fields = {} + fieldRootInfor.data = self.mdata + fieldRootInfor.onFinish = self:wrapFunc(self.reposition) + for i, v in ipairs(self.baseFiledsAttr) do + ---@type _ParamCellExtendFiled + local d = {} + d.attr = v + d.showMode = _FieldMode.button + d.onClick = self:wrapFunc(self.onClickField) + d.onSelect = self:wrapFunc(self.onSelectField) + table.insert(fieldRootInfor.fields, d) + end + + uiobjs.TableLua:init(fieldRootInfor, nil) +end + +---@param el CLUIElement +function TRPAbout:onClickField(el) + if el.jsonKey == "upgrade" then + -- 更新 + elseif el.jsonKey == "serviceAgreement" then + -- 显示协议 + elseif el.jsonKey == "assess" then + -- 评价（这个做起来麻烦） + end +end + +function TRPAbout:onSelectField(go) +end + +function TRPAbout:reposition() + uiobjs.Table:Reposition() + uiobjs.Table.repositionNow = true + uiobjs.scrollView:ResetPosition() +end + +-- 刷新 +function TRPAbout:refresh() + uiobjs.TableLua.luaTable.release() +end + +-- 关闭页面 +function TRPAbout:hide() + uiobjs.TableLua.luaTable.release() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPAbout:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + --[[ + if cmd == xx then + end + ]] + end +end + +function TRPAbout:setEventDelegate() + self.EventDelegate = {} +end + +-- 处理ui上的事件，例如点击等 +function TRPAbout:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func(go) + end +end + +-- 当顶层页面发生变化时回调 +function TRPAbout:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPAbout diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua.meta new file mode 100644 index 0000000..fcdd906 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 77275b0fc303540009ae226937adc14b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua index 454affc..f10f212 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua @@ -246,6 +246,7 @@ function TRPCustDetail:setEventDelegate() ButtonNewFollow = function() end, ButtonNewTask = function() + getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, self.mdata) end, ButtonCall = function() MyUtl.callCust(self.mdata) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua index f7aec06..41625ee 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua @@ -75,7 +75,7 @@ function TRPCustFilter:setData(paras) end d = {} - d.title = "任务类型" + d.title = "客户类型" d.key = DBCust.FilterGroup.custTypeList d.key2 = "custType" d.list = DBCust.getFilter(DBCust.FilterGroup.custTypeList) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua new file mode 100644 index 0000000..dda8f91 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua @@ -0,0 +1,223 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPFollowList:TRBasePanel 邮件列表 +local TRPFollowList = class("TRPFollowList", TRBasePanel) + +local uiobjs = {} +-- 初始化，只会调用一次 +function TRPFollowList:init(csObj) + TRPFollowList.super.init(self, csObj) + self:setEventDelegate() + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0) + uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput") + uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite") + uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel") + ---@type CLUIScrollViewWithEvent + uiobjs.scrollView = getCC(self.transform, "PanelContent", "CLUIScrollViewWithEvent") + uiobjs.scrollView:init( + self:wrapFunc(self.onShowRefreshFlg), + self:wrapFunc(self.onhideRefreshFlg), + self:wrapFunc(self.refreshList) + ) + ---@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") + uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList") +end + +-- 设置数据 +---@param paras _ParamTRPFollowList +function TRPFollowList:setData(paras) + self.mdata = paras +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPFollowList:show() + uiobjs.InputSeachKey.value = "" + self:refreshFilterBtnStatus() + self:showList({}) + showHotWheel() + NetProto.send.list_customers(self.filterValue, "", 1) +end + +function TRPFollowList:showList(list) + SetActive(uiobjs.ButtonHeadList.gameObject, false) + SetActive(uiobjs.ButtonEndList.gameObject, false) + uiobjs.Grid:setList( + list or {}, + self:wrapFunc(self.initCell), + self:wrapFunc(self.onHeadList), + self:wrapFunc(self.onEndList) + ) + uiobjs.scrollView:ResetPosition() +end + +function TRPFollowList:appList(list) + SetActive(uiobjs.ButtonEndList.gameObject, false) + uiobjs.Grid:appendList(list) +end + +function TRPFollowList:onShowRefreshFlg() + -- printe("TRPFollowList:onShowRefreshFlg") + uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 395, 0) + SetActive(uiobjs.ButtonHeadList.gameObject, true) +end +function TRPFollowList:onhideRefreshFlg() + -- printe("TRPFollowList:onhideRefreshFlg") + SetActive(uiobjs.ButtonHeadList.gameObject, false) +end +function TRPFollowList:refreshList() + local queryKey = uiobjs.InputSeachKey.value + showHotWheel() + NetProto.send.list_customers(self.filterValue, queryKey, 1) +end + +function TRPFollowList:onHeadList(head) + printw("到最顶端了") + -- uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0) + -- SetActive(uiobjs.ButtonHeadList.gameObject, true) +end + +function TRPFollowList: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.list_customers(self.filterValue, queryKey, self.pageInfo.current_page + 1) + else + uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -335 + SetActive(uiobjs.ButtonEndList.gameObject, true) + end +end + +function TRPFollowList:initCell(cell, data) + cell:init(data, self:wrapFunc(self.onClickCell)) +end + +function TRPFollowList:onClickCell(cell, data) + getPanelAsy("PanelCustDetail", onLoadedPanelTT, data) +end + +function TRPFollowList:refreshFilterBtnStatus() + if self:hadFilterVal() then + uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc) + uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc) + uiobjs.ButtonFilterSp.spriteName = "cust_funnel" + else + uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff999999) + uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff999999) + uiobjs.ButtonFilterSp.spriteName = "cust_screen" + end +end + +function TRPFollowList:hadFilterVal() + for i, v in ipairs(self.filters or {}) do + for j, f in ipairs(v.list) do + if f.selected then + return true + end + end + end + return false +end +-- 刷新 +function TRPFollowList:refresh() +end + +-- 关闭页面 +function TRPFollowList:hide() + self.filterValue = nil +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPFollowList:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + if cmd == NetProto.cmds.list_customers 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() + elseif cmd == NetProto.cmds.update_customer then + uiobjs.Grid:refreshContentOnly() + elseif cmd == NetProto.cmds.save_customer then + self:refreshList() + end + end +end + +function TRPFollowList:setEventDelegate() + self.EventDelegate = { + ButtonAddCust = function() + getPanelAsy("PanelNewCust", onLoadedPanelTT) + end, + ButtonFilter = function() + getPanelAsy( + "PanelCustFilter", + onLoadedPanelTT, + { + callback = self:wrapFunc(self.onSetFilter), + queryKey = uiobjs.InputSeachKey.value, + defautFilter = self.filters + } + ) + end, + InputSeachKey = function() + local queryKey = uiobjs.InputSeachKey.value + NetProto.send.list_customers(self.filterValue, queryKey, 1) + end + } +end + +function TRPFollowList:getFilterStr() + if not self.filters then + return "" + end + local ret = {} + for i, g in ipairs(self.filters) do + local list = {} + for j, f in ipairs(g.list) do + if f.selected and f.value ~= -1 then + table.insert(list, f.value) + end + end + ret[g.key2] = table.concat(list, ",") + end + return ret +end + +function TRPFollowList:onSetFilter(filters, queryKey) + local oldqueryKey = uiobjs.InputSeachKey.value + uiobjs.InputSeachKey.value = queryKey + self.filters = filters + self:refreshFilterBtnStatus() + local queryKey = uiobjs.InputSeachKey.value + queryKey = trim(queryKey) + showHotWheel() + self.filterValue = self:getFilterStr() + if oldqueryKey == queryKey then + NetProto.send.list_customers(self.filterValue, queryKey, 1) + else + -- 会触发input的onChange事件 + end +end + +-- 处理ui上的事件，例如点击等 +function TRPFollowList:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPFollowList:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPFollowList diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua.meta new file mode 100644 index 0000000..5df0705 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9c4440fd5b0834ec99547d54ad460778 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua new file mode 100644 index 0000000..cb93f3c --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua @@ -0,0 +1,264 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPMyInfor:TRBasePanel 邮件列表 +local TRPMyInfor = class("TRPMyInfor", TRBasePanel) + +local uiobjs = {} +-- 初始化，只会调用一次 +function TRPMyInfor:init(csObj) + TRPMyInfor.super.init(self, csObj) + self:initFiledsAttr() + self:setEventDelegate() + + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 40 + 300, 0) + ---@type UIScrollView + uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView") + ---@type UITable + uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable") + ---@type CLUIFormRoot + uiobjs.TableForm = uiobjs.Table:GetComponent("CLUIFormRoot") + ---@type Coolape.CLCellLua + uiobjs.TableLua = uiobjs.Table:GetComponent("CLCellLua") + + ---@type CLUIFormRoot + uiobjs.Top = getCC(self.transform, "Top", "CLUIFormRoot") + ---@type UITexture + uiobjs.HeadIcon = getCC(uiobjs.Top.transform, "SpriteHeadBg/SpriteHeadIcon", "UITexture") +end + +function TRPMyInfor:initFiledsAttr() + ---@type _ParamFieldAttr + local attr + self.baseFiledsAttr = {} + attr = {} + attr.attrName = "姓名" + attr.id = "loginName" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "工号" + attr.id = "loginNo" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.cannotEdit = true + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "部门" + attr.id = "" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.cannotEdit = true + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "角色" + attr.id = "" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.cannotEdit = true + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrType = DBCust.FieldType.empty + attr.height = 40 + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "邮箱" + attr.id = "" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.cannotEdit = true + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "手机" + attr.id = "" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.cannotEdit = true + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "分机号" + attr.id = "" + attr.attrType = DBCust.FieldType.text + attr.ifMust = 0 + attr.cannotEdit = true + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) +end + +-- 设置数据 +---@param paras _ParamTRPMyInfor +function TRPMyInfor:setData(paras) + self.mdata = {} + -- 初始化顶部数据 + local currGroup = Prefs.getCurrGroup(Prefs.getUserName()) + local companyInfro = json.decode(currGroup) + local user = DBUser.getUserById(companyInfro.login_no) + self.mdata.company_id = companyInfro.company_id + self.mdata.company_name = companyInfro.company_name + if user then + self.mdata.loginNo = user.loginNo + self.mdata.loginName = user.loginName + self.mdata.imageUrl = user.imageUrl + else + printe("账号信息未取得！") + end +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPMyInfor:show() + ---@type _ParamCellExtendFiledRoot + local fieldRootInfor = {} + fieldRootInfor.fields = {} + fieldRootInfor.data = self.mdata + fieldRootInfor.onFinish = self:wrapFunc(self.reposition) + for i, v in ipairs(self.baseFiledsAttr) do + ---@type _ParamCellExtendFiled + local d = {} + d.attr = v + if d.attr.id == "loginNo" then + d.showMode = _FieldMode.showOnly + else + d.showMode = _FieldMode.showAndModify + end + d.onClick = self:wrapFunc(self.onClickField) + d.onSelect = self:wrapFunc(self.onSelectField) + table.insert(fieldRootInfor.fields, d) + end + + uiobjs.TableLua:init(fieldRootInfor, nil) + + self:setHeadInfor() +end + +function TRPMyInfor:setHeadInfor() + DBUser.getIcon( + self.mdata.loginNo, + function(content) + uiobjs.HeadIcon.mainTexture = content + end + ) +end + +function TRPMyInfor:onClickField(go) + ---@type CLUIElement + local el = go:GetComponent("CLUIElement") + getPanelAsy( + "PanelModifyFiled", + onLoadedPanelTT, + { + label = el.labeName.text, + key = el.jsonKey, + value = el.value, + canNull = el.canNull, + callback = self:wrapFunc(self.onFinishSetField) + } + ) +end + +function TRPMyInfor:onFinishSetField(key, val) + if tostring(val) ~= tostring(self.mdata[key]) then + -- self:sendModifymsg(key, val, true) + --//TODO: + end +end + +function TRPMyInfor:onSelectField(go) +end + +function TRPMyInfor:reposition() + uiobjs.Table:Reposition() + uiobjs.Table.repositionNow = true + uiobjs.scrollView:ResetPosition() +end + +-- 刷新 +function TRPMyInfor:refresh() +end + +-- 关闭页面 +function TRPMyInfor:hide() + uiobjs.TableLua.luaTable.release() +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPMyInfor:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + --[[ + if cmd == xx then + end + ]] + end +end + +function TRPMyInfor:setEventDelegate() + self.EventDelegate = { + SpriteTopbg = function(go) + -- 修改头像 + ---@type UIPopupList + local popList = go:GetComponent("UIPopupList") + if popList.value == "1" then + -- 相机 + local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage)) + if permission ~= NativeCamera.Permission.Granted then + CLUIUtl.showConfirm( + "没有使用相机的权限，打开设置允许使用相机", + function() + if not MyCamera.openSetting() then + MyUtl.toastW("打开权限设置失败") + end + end, + nil + ) + end + elseif popList.value == "2" then + local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage)) + if permission ~= NativeGallery.Permission.Granted then + CLUIUtl.showConfirm( + "没有使用相册的权限，打开设置允许使用相册", + function() + if not MyGallery.openSetting() then + MyUtl.toastW("打开权限设置失败") + end + end, + nil + ) + end + end + end + } +end + +function TRPMyInfor:onGetImage(path) + if isNilOrEmpty(path) then + return + end + --//TODO: +end + +-- 处理ui上的事件，例如点击等 +function TRPMyInfor:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func(go) + end +end + +-- 当顶层页面发生变化时回调 +function TRPMyInfor:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPMyInfor diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua.meta new file mode 100644 index 0000000..1025b06 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0a1491007cef149c2814b7daec88add3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua index f6065e6..770b207 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua @@ -137,7 +137,6 @@ function TRPNewCust:showExtentFiles(taskId) ---@type _ParamCellExtendFiledRoot local param = {} param.data = self.mdata and self.mdata.jsonStr or {} - -- param.isEditMode = true param.onFinish = self:wrapFunc(self.setExtendFieldsMode) param.fields = {} local fields = DBCust.getFieldsByTask(taskId) or {} @@ -146,7 +145,7 @@ function TRPNewCust:showExtentFiles(taskId) for i, v in ipairs(fields) do filedInfor = {} filedInfor.attr = v - filedInfor.isEditMode = true + filedInfor.showMode = self.isNewCust and _FieldMode.inputOnly or _FieldMode.modifyOnly if not self.isNewCust then filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend) filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend) diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua similarity index 82% rename from Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua rename to Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua index ee1bba4..34b6682 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua @@ -1,14 +1,14 @@ ---@type IDBasePanel local TRBasePanel = require("ui.panel.TRBasePanel") ----@class TRPNewFollow:TRBasePanel 邮件列表 -local TRPNewFollow = class("TRPNewFollow", TRBasePanel) +---@class TRPNewFollowSimple:TRBasePanel 邮件列表 +local TRPNewFollowSimple = class("TRPNewFollowSimple", TRBasePanel) local uiobjs = {} local stars = {} -- 初始化，只会调用一次 -function TRPNewFollow:init(csObj) - TRPNewFollow.super.init(self, csObj) +function TRPNewFollowSimple:init(csObj) + TRPNewFollowSimple.super.init(self, csObj) self:initFiledsAttr() self:setEventDelegate() MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0) @@ -25,7 +25,7 @@ function TRPNewFollow:init(csObj) uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave") end -function TRPNewFollow:initFiledsAttr() +function TRPNewFollowSimple:initFiledsAttr() ---@type _ParamFieldAttr local attr self.baseFiledsAttr = {} @@ -35,6 +35,9 @@ function TRPNewFollow:initFiledsAttr() attr.attrType = DBCust.FieldType.popuplist attr.ifMust = 0 attr.donotJoinKey = true + local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.followUpTypeList) + attr.popOptions = popInfor.options + attr.popValues = popInfor.values table.insert(self.baseFiledsAttr, attr) attr = {} @@ -58,8 +61,8 @@ function TRPNewFollow:initFiledsAttr() end -- 设置数据 ----@param paras _ParamTRPNewFollow -function TRPNewFollow:setData(paras) +---@param paras _ParamTRPNewFollowSimple +function TRPNewFollowSimple:setData(paras) self.mdata = {} self.mdata.custId = paras.custId self.mdata.taskId = paras.taskId @@ -68,19 +71,19 @@ function TRPNewFollow:setData(paras) end -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh -function TRPNewFollow:show() +function TRPNewFollowSimple:show() self:refreshContent() SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow) uiobjs.scrollView:ResetPosition() end -function TRPNewFollow:refreshContent() +function TRPNewFollowSimple:refreshContent() self:showBaseFields() self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1) end -function TRPNewFollow:showBaseFields() +function TRPNewFollowSimple:showBaseFields() ---@type _ParamCellExtendFiledRoot local param = {} param.data = self.mdata or {} @@ -104,10 +107,9 @@ function TRPNewFollow:showBaseFields() uiobjs.DetailRoot:init(param, nil) end -function TRPNewFollow:onPopupFieldValChg(go) +function TRPNewFollowSimple:onPopupFieldValChg(go) ---@type CLUIElement local el = go:GetComponent("CLUIElement") - printe(el.jsonKey) if el.jsonKey == "dealFlag" then if uiobjs.followUpContent and isNilOrEmpty(uiobjs.followUpContent.value) then local popList = go:GetComponent("UIPopupList") @@ -116,12 +118,12 @@ function TRPNewFollow:onPopupFieldValChg(go) end end -function TRPNewFollow:reposition() +function TRPNewFollowSimple:reposition() uiobjs.DetailRootTabel.repositionNow = true uiobjs.Table.repositionNow = true end -function TRPNewFollow:setExtendFieldsMode(root) +function TRPNewFollowSimple:setExtendFieldsMode(root) local elements = root:GetComponentsInChildren(typeof(CLUIElement), true) for i = 0, elements.Length - 1 do self:setElementMode(elements[i]) @@ -133,7 +135,7 @@ function TRPNewFollow:setExtendFieldsMode(root) self:reposition() end -function TRPNewFollow:setElementMode(el) +function TRPNewFollowSimple:setElementMode(el) local isPopList = el:GetComponent("UIPopupList") local isPopCheckbox = el:GetComponent("CLUICheckbox") ---@type UIInput @@ -174,18 +176,18 @@ function TRPNewFollow:setElementMode(el) end -- 刷新 -function TRPNewFollow:refresh() +function TRPNewFollowSimple:refresh() end -- 关闭页面 -function TRPNewFollow:hide() +function TRPNewFollowSimple:hide() if uiobjs.DetailRoot.luaTable then uiobjs.DetailRoot.luaTable.release() end end -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 -function TRPNewFollow:procNetwork(cmd, succ, msg, paras) +function TRPNewFollowSimple:procNetwork(cmd, succ, msg, paras) if (succ == NetSuccess) then if cmd == NetProto.cmds.update_customer then self:refreshContent() @@ -193,7 +195,7 @@ function TRPNewFollow:procNetwork(cmd, succ, msg, paras) end end -function TRPNewFollow:setEventDelegate() +function TRPNewFollowSimple:setEventDelegate() self.EventDelegate = { ButtonSave = function() local err = uiobjs.DetailFromRoot:checkValid() @@ -217,7 +219,7 @@ function TRPNewFollow:setEventDelegate() } end -- 处理ui上的事件，例如点击等 -function TRPNewFollow:uiEventDelegate(go) +function TRPNewFollowSimple:uiEventDelegate(go) local func = self.EventDelegate[go.name] if func then func() @@ -225,8 +227,8 @@ function TRPNewFollow:uiEventDelegate(go) end -- 当顶层页面发生变化时回调 -function TRPNewFollow:onTopPanelChange(topPanel) +function TRPNewFollowSimple:onTopPanelChange(topPanel) end -------------------------------------------- -return TRPNewFollow +return TRPNewFollowSimple diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua.meta rename to Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua new file mode 100644 index 0000000..52149e3 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua @@ -0,0 +1,229 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPNewFollowTask:TRBasePanel +local TRPNewFollowTask = class("TRPNewFollowTask", TRBasePanel) + +local uiobjs = {} + +local stars = {} +-- 初始化，只会调用一次 +function TRPNewFollowTask:init(csObj) + TRPNewFollowTask.super.init(self, csObj) + self:initFiledsAttr() + self:setEventDelegate() + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0) + ---@type UIScrollView + uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView") + ---@type UITable + uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable") + ---@type CLUIFormRoot + uiobjs.DetailFromRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLUIFormRoot") + uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLCellLua") + ---@type UITable + uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable") + + uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave") +end + +function TRPNewFollowTask:initFiledsAttr() + ---@type _ParamFieldAttr + local attr + self.baseFiledsAttr = {} + attr = {} + attr.attrName = "跟进内容" + attr.id = "bookingNote" + attr.attrType = DBCust.FieldType.multext + attr.ifMust = 1 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "跟进时间" + attr.id = "FollowUpTime" + attr.attrType = DBCust.FieldType.dateTime + attr.ifTime = 1 + attr.ifMust = 1 + attr.donotJoinKey = true + table.insert(self.baseFiledsAttr, attr) + + attr = {} + attr.attrName = "跟进人员" + attr.id = "loginNo" + attr.attrType = DBCust.FieldType.popuplist + attr.ifMust = 1 + attr.donotJoinKey = true + local popList = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList) + attr.popOptions = popList.options + attr.popValues = popList.values + table.insert(self.baseFiledsAttr, attr) +end + +-- 设置数据 +---@param paras _ParamTRPNewFollowTask +function TRPNewFollowTask:setData(paras) + self.mdata = {} + self.mdata.custId = paras.custId + self.mdata.taskId = paras.taskId + + self.isNewFollow = true +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPNewFollowTask:show() + self:refreshContent() + SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow) + + uiobjs.scrollView:ResetPosition() +end + +function TRPNewFollowTask:refreshContent() + self:showBaseFields() + self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1) +end + +function TRPNewFollowTask:showBaseFields() + ---@type _ParamCellExtendFiledRoot + local param = {} + param.data = self.mdata or {} + param.onFinish = self:wrapFunc(self.setExtendFieldsMode) + param.fields = {} + ---@type _ParamCellExtendFiled + local filedInfor + + for i, v in ipairs(self.baseFiledsAttr) do + -- 工单模板 + filedInfor = {} + filedInfor.attr = v + filedInfor.isEditMode = true + if filedInfor.attr.attrType == DBCust.FieldType.multext then + filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) + end + filedInfor.onClick = nil + filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg) + table.insert(param.fields, filedInfor) + end + + uiobjs.DetailRoot:init(param, nil) +end +function TRPNewFollowTask:onPopupFieldValChg(go) + ---@type CLUIElement + local el = go:GetComponent("CLUIElement") + if el.jsonKey == "dealFlag" then + if uiobjs.followUpContent and isNilOrEmpty(uiobjs.followUpContent.value) then + local popList = go:GetComponent("UIPopupList") + uiobjs.followUpContent.value = popList.selectedItem + end + end +end + +function TRPNewFollowTask:reposition() + uiobjs.DetailRootTabel.repositionNow = true + uiobjs.Table.repositionNow = true +end + +function TRPNewFollowTask:setExtendFieldsMode(root) + local elements = root:GetComponentsInChildren(typeof(CLUIElement), true) + for i = 0, elements.Length - 1 do + self:setElementMode(elements[i]) + if elements[i].jsonKey == "followUpContent" then + ---@type CLUIElement + uiobjs.followUpContent = elements[i] + end + end + self:reposition() +end + +function TRPNewFollowTask:setElementMode(el) + local isPopList = el:GetComponent("UIPopupList") + local isPopCheckbox = el:GetComponent("CLUICheckbox") + ---@type UIInput + local input = el:GetComponent("UIInput") + local inputOnGUI = el:GetComponent("UIInputOnGUI") + local boxcollider = el:GetComponent("BoxCollider") + local ButtonReset = getCC(el.transform, "ButtonReset", "MyInputReset") + + if (not self.isNewFollow) and (el.jsonKey == "taskId" or el.jsonKey == "phoneNo") then + boxcollider.enabled = false + else + boxcollider.enabled = true + end + + if ButtonReset then + ButtonReset.disabled = (not self.isNewFollow) + end + if input then + if isPopList or isPopCheckbox then + input.enabled = false + if inputOnGUI then + inputOnGUI.enabled = false + end + else + if self.isNewFollow then + input.enabled = true + if inputOnGUI then + inputOnGUI.enabled = true + end + else + input.enabled = false + if inputOnGUI then + inputOnGUI.enabled = false + end + end + end + end +end + +-- 刷新 +function TRPNewFollowTask:refresh() +end + +-- 关闭页面 +function TRPNewFollowTask:hide() + if uiobjs.DetailRoot.luaTable then + uiobjs.DetailRoot.luaTable.release() + end +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPNewFollowTask:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + if cmd == NetProto.cmds.update_customer then + self:refreshContent() + end + end +end + +function TRPNewFollowTask:setEventDelegate() + self.EventDelegate = { + ButtonSave = function() + local err = uiobjs.DetailFromRoot:checkValid() + if not isNilOrEmpty(err) then + MyUtl.toastW(err) + return + end + self.mdata = uiobjs.DetailFromRoot:getValue(self.mdata, true) + showHotWheel() + NetProto.send.create_followUp_task(self.mdata, function(content) + hideHotWheel() + if content.success then + MyUtl.toastS("创建成功") + hideTopPanel(self.csSelf) + end + end) + end + } +end +-- 处理ui上的事件，例如点击等 +function TRPNewFollowTask:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPNewFollowTask:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPNewFollowTask diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta new file mode 100644 index 0000000..0d0298d --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 43c998ce92f98402b92939549b3dab8d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua index 68227ab..f1643f9 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua @@ -33,6 +33,11 @@ function TRPNewOrder:init(csObj) 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.InputAttachment = getCC(uiobjs.Table.transform, "InputAttachment", "UIPopupList") + uiobjs.gridImages = getCC(uiobjs.InputAttachment.transform, "Grid", "UIGrid") + uiobjs.gridImagesPrefab = getChild(uiobjs.gridImages.transform, "00000").gameObject + -- uiobjs.elements = uiobjs.DetailRoot.gameObject:GetComponentsInChildren(typeof(CLUIElement), true) uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave") end @@ -138,7 +143,7 @@ function TRPNewOrder:setData(paras) ---@type _DBCust self.cust = nil else - --//TODO:初始值 + -- 初始值 self.isNewOrder = true ---@type _DBCust self.cust = paras @@ -150,6 +155,7 @@ function TRPNewOrder:setData(paras) local templateInfor = DBOrder.getTemplateInfor(self.mdata.templetId) self.mdata.content = templateInfor.content self.selectedProducts = {} + self.images = {} end end @@ -171,6 +177,10 @@ end -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh function TRPNewOrder:show() + SetActive(uiobjs.gridProjects.transform.parent.gameObject, false) + SetActive(uiobjs.StepFormRoot.gameObject, false) + SetActive(uiobjs.ExtendRoot.gameObject, false) + self:refreshContent() SetActive(uiobjs.ButtonSave.gameObject, self.isNewOrder) @@ -180,8 +190,6 @@ end function TRPNewOrder:refreshContent() self:showBaseFields() 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 @@ -217,6 +225,8 @@ function TRPNewOrder:showBaseFields() local param = {} param.data = self.mdata or {} param.onFinish = function(go) + local templetId = self.mdata and self.mdata.templetId or nil + self:showExtentFiles(templetId) if self.cust then uiobjs.DetailFromRoot:setValue(self.cust, true) end @@ -230,7 +240,7 @@ function TRPNewOrder:showBaseFields() -- 工单模板 filedInfor = {} filedInfor.attr = v - filedInfor.isEditMode = true + filedInfor.showMode = self.isNewOrder and _FieldMode.inputOnly or _FieldMode.modifyOnly if filedInfor.attr.attrType == DBCust.FieldType.multext then filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) end @@ -260,7 +270,7 @@ function TRPNewOrder:showExtentFiles(templetId) for i, v in ipairs(fields) do filedInfor = {} filedInfor.attr = v - filedInfor.isEditMode = true + filedInfor.showMode = self.isNewOrder and _FieldMode.inputOnly or _FieldMode.modifyOnly if filedInfor.attr.attrType == DBCust.FieldType.multext then filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition) end @@ -299,11 +309,16 @@ function TRPNewOrder:showExtentFiles(templetId) local d = uiobjs.DetailFromRoot:getValue(true) d.content = cfgInfor.content uiobjs.DetailFromRoot:setValue(d) - ------- + + -- 附件 + self:showImages() + ----------------------------------- uiobjs.StepRoot:Reposition() end function TRPNewOrder:reposition() + uiobjs.DetailRootTabel:Reposition() + uiobjs.Table:Reposition() uiobjs.DetailRootTabel.repositionNow = true uiobjs.Table.repositionNow = true end @@ -566,12 +581,75 @@ function TRPNewOrder:setEventDelegate() {selectedProducts = self.selectedProducts, callback = self:wrapFunc(self.onGetSelectedProducts)} ) end, - InputAttachment = function() + InputAttachment = function(go) -- 添加附件 + ---@type UIPopupList + local popList = go:GetComponent("UIPopupList") + if popList.value == "1" then + -- 相机 + local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage)) + if permission ~= NativeCamera.Permission.Granted then + CLUIUtl.showConfirm( + "没有使用相机的权限，打开设置允许使用相机", + function() + if not MyCamera.openSetting() then + MyUtl.toastW("打开权限设置失败") + end + end, + nil + ) + end + elseif popList.value == "2" then + local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage)) + if permission ~= NativeGallery.Permission.Granted then + CLUIUtl.showConfirm( + "没有使用相册的权限，打开设置允许使用相册", + function() + if not MyGallery.openSetting() then + MyUtl.toastW("打开权限设置失败") + end + end, + nil + ) + end + end end } end +function TRPNewOrder:onGetImage(path) + if isNilOrEmpty(path) then + return + end + for i, v in ipairs(self.images) do + if v.path == path then + MyUtl.toast("已在列表中") + return + end + end + table.insert(self.images, {path = path, onDelete = self:wrapFunc(self.onDelImage)}) + self:showImages() +end + +function TRPNewOrder:showImages() + CLUIUtl.resetList4Lua(uiobjs.gridImages, uiobjs.gridImagesPrefab, self.images, self:wrapFunc(self.initImageCell)) +end + +function TRPNewOrder:initImageCell(cell, data) + cell:init(data, nil) +end + +---@type _ParamCellImage +function TRPNewOrder:onDelImage(data) + for i, v in ipairs(self.images) do + if v.path == data.path then + table.remove(self.images, i) + break + end + end + self:showImages() +end + function TRPNewOrder:onGetSelectedProducts(list) self.selectedProducts = list self:showProducts() @@ -581,7 +659,7 @@ end function TRPNewOrder:uiEventDelegate(go) local func = self.EventDelegate[go.name] if func then - func() + func(go) end end diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua new file mode 100644 index 0000000..e726c5a --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua @@ -0,0 +1,223 @@ +---@type IDBasePanel +local TRBasePanel = require("ui.panel.TRBasePanel") +---@class TRPOrderList:TRBasePanel 邮件列表 +local TRPOrderList = class("TRPOrderList", TRBasePanel) + +local uiobjs = {} +-- 初始化，只会调用一次 +function TRPOrderList:init(csObj) + TRPOrderList.super.init(self, csObj) + self:setEventDelegate() + MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0) + uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput") + uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite") + uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel") + ---@type CLUIScrollViewWithEvent + uiobjs.scrollView = getCC(self.transform, "PanelContent", "CLUIScrollViewWithEvent") + uiobjs.scrollView:init( + self:wrapFunc(self.onShowRefreshFlg), + self:wrapFunc(self.onhideRefreshFlg), + self:wrapFunc(self.refreshList) + ) + ---@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") + uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList") +end + +-- 设置数据 +---@param paras _ParamTRPOrderList +function TRPOrderList:setData(paras) + self.mdata = paras +end + +-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh +function TRPOrderList:show() + uiobjs.InputSeachKey.value = "" + self:refreshFilterBtnStatus() + self:showList({}) + showHotWheel() + NetProto.send.list_customers(self.filterValue, "", 1) +end + +function TRPOrderList:showList(list) + SetActive(uiobjs.ButtonHeadList.gameObject, false) + SetActive(uiobjs.ButtonEndList.gameObject, false) + uiobjs.Grid:setList( + list or {}, + self:wrapFunc(self.initCell), + self:wrapFunc(self.onHeadList), + self:wrapFunc(self.onEndList) + ) + uiobjs.scrollView:ResetPosition() +end + +function TRPOrderList:appList(list) + SetActive(uiobjs.ButtonEndList.gameObject, false) + uiobjs.Grid:appendList(list) +end + +function TRPOrderList:onShowRefreshFlg() + -- printe("TRPOrderList:onShowRefreshFlg") + uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 222, 0) + SetActive(uiobjs.ButtonHeadList.gameObject, true) +end +function TRPOrderList:onhideRefreshFlg() + -- printe("TRPOrderList:onhideRefreshFlg") + SetActive(uiobjs.ButtonHeadList.gameObject, false) +end +function TRPOrderList:refreshList() + local queryKey = uiobjs.InputSeachKey.value + showHotWheel() + NetProto.send.list_customers(self.filterValue, queryKey, 1) +end + +function TRPOrderList:onHeadList(head) + printw("到最顶端了") + -- uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0) + -- SetActive(uiobjs.ButtonHeadList.gameObject, true) +end + +function TRPOrderList: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.list_customers(self.filterValue, queryKey, self.pageInfo.current_page + 1) + else + uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -235 + SetActive(uiobjs.ButtonEndList.gameObject, true) + end +end + +function TRPOrderList:initCell(cell, data) + cell:init(data, self:wrapFunc(self.onClickCell)) +end + +function TRPOrderList:onClickCell(cell, data) + getPanelAsy("PanelCustDetail", onLoadedPanelTT, data) +end + +function TRPOrderList:refreshFilterBtnStatus() + if self:hadFilterVal() then + uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc) + uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc) + uiobjs.ButtonFilterSp.spriteName = "cust_funnel" + else + uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff999999) + uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff999999) + uiobjs.ButtonFilterSp.spriteName = "cust_screen" + end +end + +function TRPOrderList:hadFilterVal() + for i, v in ipairs(self.filters or {}) do + for j, f in ipairs(v.list) do + if f.selected then + return true + end + end + end + return false +end +-- 刷新 +function TRPOrderList:refresh() +end + +-- 关闭页面 +function TRPOrderList:hide() + self.filterValue = nil +end + +-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据 +function TRPOrderList:procNetwork(cmd, succ, msg, paras) + if (succ == NetSuccess) then + if cmd == NetProto.cmds.list_customers 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() + elseif cmd == NetProto.cmds.update_customer then + uiobjs.Grid:refreshContentOnly() + elseif cmd == NetProto.cmds.save_customer then + self:refreshList() + end + end +end + +function TRPOrderList:setEventDelegate() + self.EventDelegate = { + ButtonAddCust = function() + getPanelAsy("PanelNewCust", onLoadedPanelTT) + end, + ButtonFilter = function() + getPanelAsy( + "PanelCustFilter", + onLoadedPanelTT, + { + callback = self:wrapFunc(self.onSetFilter), + queryKey = uiobjs.InputSeachKey.value, + defautFilter = self.filters + } + ) + end, + InputSeachKey = function() + local queryKey = uiobjs.InputSeachKey.value + NetProto.send.list_customers(self.filterValue, queryKey, 1) + end + } +end + +function TRPOrderList:getFilterStr() + if not self.filters then + return "" + end + local ret = {} + for i, g in ipairs(self.filters) do + local list = {} + for j, f in ipairs(g.list) do + if f.selected and f.value ~= -1 then + table.insert(list, f.value) + end + end + ret[g.key2] = table.concat(list, ",") + end + return ret +end + +function TRPOrderList:onSetFilter(filters, queryKey) + local oldqueryKey = uiobjs.InputSeachKey.value + uiobjs.InputSeachKey.value = queryKey + self.filters = filters + self:refreshFilterBtnStatus() + local queryKey = uiobjs.InputSeachKey.value + queryKey = trim(queryKey) + showHotWheel() + self.filterValue = self:getFilterStr() + if oldqueryKey == queryKey then + NetProto.send.list_customers(self.filterValue, queryKey, 1) + else + -- 会触发input的onChange事件 + end +end + +-- 处理ui上的事件，例如点击等 +function TRPOrderList:uiEventDelegate(go) + local func = self.EventDelegate[go.name] + if func then + func() + end +end + +-- 当顶层页面发生变化时回调 +function TRPOrderList:onTopPanelChange(topPanel) +end + +-------------------------------------------- +return TRPOrderList diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta new file mode 100644 index 0000000..04473c7 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d60d253842c4a479ab6d9971a9d9dc3e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab new file mode 100644 index 0000000..99ae111 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab @@ -0,0 +1,103 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4016113218096866173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5617798433501596391} + - component: {fileID: 7475180248637872789} + - component: {fileID: 5112765744569259920} + - component: {fileID: 114984807402381024} + m_Layer: 5 + m_Name: EmptySpace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5617798433501596391 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4016113218096866173} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7475180248637872789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4016113218096866173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 40 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 28.125 +--- !u!114 &5112765744569259920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4016113218096866173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 7475180248637872789} + offset: 0 + sizeAdjust: 1 +--- !u!114 &114984807402381024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4016113218096866173} + 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/TRCellEmptySpace.lua + isNeedResetAtlase: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab.meta new file mode 100644 index 0000000..a723569 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fc72c3452d46140da8533e6170eea08d +PrefabImporter: + 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 a1758b6..47e17eb 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab @@ -337,7 +337,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} m_Name: m_EditorClassIdentifier: - widget: {fileID: 0} + widget: {fileID: 3135104635965478356} offset: 0 sizeAdjust: 1 --- !u!1 &5713654144068856770 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab index e7fa6ae..5d31157 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab @@ -261,7 +261,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4366778029194131019} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} m_Name: @@ -427,7 +427,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} m_Name: m_EditorClassIdentifier: - widget: {fileID: 0} + widget: {fileID: 4462264015671642074} offset: 0 sizeAdjust: 1 --- !u!1 &4634753059616572994 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab index e147fe4..a1b329b 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab @@ -304,12 +304,12 @@ MonoBehaviour: mColor: {r: 1, g: 1, b: 1, a: 1} mPivot: 1 mWidth: 1125 - mHeight: 160 + mHeight: 166 mDepth: 0 autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1.5800562 + aspectRatio: 5.2083335 mType: 1 mFillDirection: 4 mFillAmount: 1 @@ -337,7 +337,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} m_Name: m_EditorClassIdentifier: - widget: {fileID: 0} + widget: {fileID: 2839739815580303652} offset: 0 sizeAdjust: 1 --- !u!1 &3697089830196127904 @@ -479,7 +479,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4190302636056289163} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -83, z: 0} + m_LocalPosition: {x: 0, y: -89, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8914706348937367773} @@ -553,6 +553,8 @@ GameObject: - component: {fileID: 2201719010312833371} - component: {fileID: 114036264039868146} - component: {fileID: 4159195424412484572} + - component: {fileID: 1282812251363180281} + - component: {fileID: 4763460103473277405} m_Layer: 5 m_Name: InputMultText m_TagString: Untagged @@ -593,7 +595,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1125, y: 160, z: 0} - m_Center: {x: 0, y: -80, z: 0} + m_Center: {x: 0, y: 0, z: 0} --- !u!114 &3278600689168548542 MonoBehaviour: m_ObjectHideFlags: 0 @@ -729,6 +731,59 @@ MonoBehaviour: onDrag: [] onBecameVisible: [] onBecameInvisible: [] +--- !u!114 &1282812251363180281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4384702830002398302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 512 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 160 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7.03125 +--- !u!114 &4763460103473277405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4384702830002398302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 1282812251363180281} + offset: 0 + sizeAdjust: 1 --- !u!1 &4476086160367826707 GameObject: m_ObjectHideFlags: 0 @@ -892,7 +947,7 @@ MonoBehaviour: mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} mPivot: 2 mWidth: 720 - mHeight: 46 + mHeight: 52 mDepth: 1 autoResizeBoxCollider: 0 hideIfOffScreen: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab index 30fdf46..1078723 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab @@ -254,6 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &114097241059719580 MonoBehaviour: m_ObjectHideFlags: 0 @@ -281,7 +282,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} m_Name: m_EditorClassIdentifier: - widget: {fileID: 0} + widget: {fileID: 850321821054899805} offset: 0 sizeAdjust: 1 --- !u!1 &3752426191522449626 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab index 48d9fc6..62d1728 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab @@ -184,6 +184,90 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!1 &3779000128578336148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3168767990445357510} + - component: {fileID: 8643254210907420438} + m_Layer: 5 + m_Name: SpriteRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3168767990445357510 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3779000128578336148} + 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: 2423944239439220864} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8643254210907420438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3779000128578336148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 2423944239439220864} + relative: 1 + absolute: -49 + rightAnchor: + target: {fileID: 2423944239439220864} + relative: 1 + absolute: -21 + 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.05 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_right + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &4625788788876681624 GameObject: m_ObjectHideFlags: 0 @@ -364,6 +448,7 @@ Transform: - {fileID: 28764931924455384} - {fileID: 608007034948422929} - {fileID: 3889093227389003832} + - {fileID: 3168767990445357510} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -387,7 +472,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6259930685614177535} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} m_Name: @@ -580,7 +665,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} m_Name: m_EditorClassIdentifier: - widget: {fileID: 0} + widget: {fileID: 1657931634484404253} offset: 0 sizeAdjust: 1 --- !u!1 &6856486077525911941 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab new file mode 100644 index 0000000..2842b53 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab @@ -0,0 +1,1173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1109134228478850563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 199023215890844114} + - component: {fileID: 6417366748587192642} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &199023215890844114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109134228478850563} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 250, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3525718649886801613} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6417366748587192642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109134228478850563} + 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: 360 + mHeight: 36 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 9 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u6210\u90FD\u6DFB\u95F0\u901A\u8BAF\u6709\u9650\u516C\u53F8" + mFontSize: 36 + 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 &1638535167947371583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1715114665865423050} + - component: {fileID: 6148777806740609723} + - component: {fileID: 1665965393149718395} + - component: {fileID: 9014366078765270571} + m_Layer: 5 + m_Name: DragContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1715114665865423050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638535167947371583} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: 9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4885025209588052394} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6148777806740609723 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638535167947371583} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2022, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1665965393149718395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638535167947371583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 4885025209802410114} + draggablePanel: {fileID: 0} +--- !u!114 &9014366078765270571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1638535167947371583} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4885025209588052394} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 4885025209588052394} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 4885025209588052394} + relative: 0 + absolute: 150 + topAnchor: + target: {fileID: 4885025209588052394} + relative: 1 + absolute: -132 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1127 + mHeight: 2022 + mDepth: -1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.55736893 +--- !u!1 &2646645108189517374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8615271394257052439} + - component: {fileID: 2594529902939183144} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8615271394257052439 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2646645108189517374} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -540, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3260711839874522371} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2594529902939183144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2646645108189517374} + 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: -70 + 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: 384 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 7 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u52A9\u529B\u4F01\u4E1A\u9500\u552E\u6210\u957F" + 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 &3377653670929726191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3377653670929726190} + - component: {fileID: 3377653670929726189} + m_Layer: 5 + m_Name: SpriteLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3377653670929726190 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653670929726191} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -332, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3260711839874522371} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3377653670929726189 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653670929726191} + 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: 300 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: -412 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -211 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 300 + mHeight: 300 + mDepth: 1 + 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: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: logo_512 + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &3377653671809927864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3377653671809927871} + - component: {fileID: 3377653671809927869} + - component: {fileID: 3377653671809927870} + - component: {fileID: 4975592500484722759} + - component: {fileID: 7628694758041971091} + - component: {fileID: 5704952207260630023} + m_Layer: 5 + m_Name: SpriteTopbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3377653671809927871 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653671809927864} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -131, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3260711839874522371} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3377653671809927869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653671809927864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 1 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 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: 1 + mWidth: 1125 + mHeight: 500 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.25 + mType: 4 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 2 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &3377653671809927870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653671809927864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 3377653671809927869} + offset: 0 + sizeAdjust: 1 +--- !u!65 &4975592500484722759 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653671809927864} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 500, z: 0} + m_Center: {x: 0, y: -250, z: 0} +--- !u!114 &7628694758041971091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653671809927864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3} + m_Name: + m_EditorClassIdentifier: + atlasName: + atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + fontName: + bitmapFont: {fileID: 0} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} + fontSize: 46 + fontStyle: 0 + backgroundSprite: cust_right + highlightSprite: cust_right + position: 0 + alignment: 1 + items: + - "\u62CD\u7167" + - "\u4ECE\u76F8\u518C\u9009\u62E9" + valueItems: + - 1 + - 2 + 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: [] + mSelectedItem: "\u62CD\u7167" + mPanel: {fileID: 0} + mChild: {fileID: 0} + mBackground: {fileID: 0} + mHighlight: {fileID: 0} + mHighlightedLabel: {fileID: 0} + mLabelList: [] + mBgBorder: 0 + eventReceiver: {fileID: 0} + functionName: OnSelectionChange + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &5704952207260630023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3377653671809927864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: + onSelect: + - mTarget: {fileID: 5197292460261144610} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: + oneShot: 0 +--- !u!1 &3971446323443766474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3525718649886801613} + - component: {fileID: 4932227537987491152} + m_Layer: 5 + m_Name: Bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3525718649886801613 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3971446323443766474} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1152, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 199023215890844114} + - {fileID: 4237191701206112797} + m_Father: {fileID: 4885025209588052394} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4932227537987491152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3971446323443766474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3} + m_Name: + m_EditorClassIdentifier: + uiCamera: {fileID: 0} + container: {fileID: 0} + side: 7 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!1 &4088240388675691109 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237191701206112797} + - component: {fileID: 5313811084405524511} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4237191701206112797 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4088240388675691109} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 200, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3525718649886801613} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5313811084405524511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4088240388675691109} + 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: 724 + mHeight: 30 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 23.8 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "Copyright \xA9 www.ttf-cti.com, All Rights Reserved." + mFontSize: 30 + 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 &4885025208609904021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4885025208609904018} + - component: {fileID: 4885025208609904019} + - component: {fileID: 8858847778803926917} + - component: {fileID: 6013611229774104509} + m_Layer: 5 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4885025208609904018 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025208609904021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 613, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1406674117765565303} + m_Father: {fileID: 4885025209802410117} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4885025208609904019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025208609904021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3} + m_Name: + m_EditorClassIdentifier: + columns: 1 + direction: 0 + sorting: 0 + pivot: 1 + cellAlignment: 1 + hideInactive: 1 + keepWithinPanel: 0 + padding: {x: 0, y: 0} +--- !u!114 &8858847778803926917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025208609904021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!114 &6013611229774104509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025208609904021} + 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 &4885025209588052397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4885025209588052394} + - component: {fileID: 4885025209588052392} + - component: {fileID: 5197292460261144610} + m_Layer: 5 + m_Name: PanelAbout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4885025209588052394 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025209588052397} + 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: 4885025209802410117} + - {fileID: 1715114665865423050} + - {fileID: 3260711839874522371} + - {fileID: 3525718649886801613} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4885025209588052392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025209588052397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3000 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 0 + mClipRange: {x: 0, y: 0, z: 300, w: 200} + mClipSoftness: {x: 4, y: 4} + mDepth: 1 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &5197292460261144610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025209588052397} + 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/TRPAbout.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: "\u5173\u4E8E" +--- !u!1 &4885025209802410116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4885025209802410117} + - component: {fileID: 4885025209802410115} + - component: {fileID: 4885025209802410114} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4885025209802410117 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025209802410116} + 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: 4885025208609904018} + m_Father: {fileID: 4885025209588052394} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4885025209802410115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025209802410116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3004 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: 0, y: 0, z: 1125, w: 1920} + mClipSoftness: {x: 4, y: 8} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &4885025209802410114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025209802410116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3} + m_Name: + m_EditorClassIdentifier: + movement: 1 + dragEffect: 2 + restrictWithinPanel: 1 + disableDragIfFits: 1 + smoothDragStart: 1 + iOSDragEmulation: 1 + scrollWheelFactor: 0.25 + momentumAmount: 35 + dampenStrength: 9 + horizontalScrollBar: {fileID: 0} + verticalScrollBar: {fileID: 0} + showScrollBars: 1 + customMovement: {x: 1, y: 0} + contentPivot: 1 + scale: {x: 0, y: 0, z: 0} + relativePositionOnReset: {x: 0, y: 0} + centerOnChild: {fileID: 0} +--- !u!1 &5971097602697633529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3260711839874522371} + - component: {fileID: 7789518643453119789} + - component: {fileID: 2466853325450932829} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3260711839874522371 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5971097602697633529} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1152, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3377653671809927871} + - {fileID: 3377653670929726190} + - {fileID: 8615271394257052439} + m_Father: {fileID: 4885025209588052394} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7789518643453119789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5971097602697633529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3} + m_Name: + m_EditorClassIdentifier: + uiCamera: {fileID: 0} + container: {fileID: 0} + side: 3 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!114 &2466853325450932829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5971097602697633529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!1 &9017457117160355037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1406674117765565303} + - component: {fileID: 4485860286604695566} + - component: {fileID: 2551690000971893892} + m_Layer: 5 + m_Name: Empty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1406674117765565303 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9017457117160355037} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -19.904232, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4885025208609904018} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4485860286604695566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9017457117160355037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 40 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 28.125 +--- !u!114 &2551690000971893892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9017457117160355037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 4485860286604695566} + offset: 0 + sizeAdjust: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta new file mode 100644 index 0000000..96ebb15 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 724bb40539c204cc4b051f59fe05ee1f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab index ac18fd0..5d9dfc0 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100000} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 150, y: 108, z: 0} + m_LocalPosition: {x: 200, y: 108, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5071924032703442501} @@ -124,7 +124,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100006} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -150, y: 107.625, z: 0} + m_LocalPosition: {x: -200, y: 107.625, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1892811297692553155} @@ -219,7 +219,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100008} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 300, y: -0, z: 0} + m_LocalPosition: {x: 384, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4760587421058288492} @@ -319,7 +319,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100010} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 200, y: -0, z: 0} + m_LocalPosition: {x: 256, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4760587421058288492} @@ -419,7 +419,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100012} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 100, y: -0, z: 0} + m_LocalPosition: {x: 128, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4760587421058288492} @@ -619,7 +619,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100016} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -100, y: -0, z: 0} + m_LocalPosition: {x: -128, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4760587421058288492} @@ -719,7 +719,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100018} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -200, y: -0, z: 0} + m_LocalPosition: {x: -256, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4760587421058288492} @@ -819,7 +819,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100020} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -300, y: -0, z: 0} + m_LocalPosition: {x: -384, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4760587421058288492} @@ -962,7 +962,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 3.0869565 + aspectRatio: 3.4347825 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -1091,7 +1091,7 @@ MonoBehaviour: relative: 1 absolute: 0 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: 975 mHeight: 2 @@ -1179,7 +1179,7 @@ MonoBehaviour: mColor: {r: 1, g: 1, b: 1, a: 1} mPivot: 4 mWidth: 974 - mHeight: 1207 + mHeight: 1208 mDepth: -1 autoResizeBoxCollider: 1 hideIfOffScreen: 0 @@ -1211,7 +1211,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 974, y: 1207, z: 0} + m_Size: {x: 974, y: 1208, z: 0} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &100030 GameObject: @@ -1240,7 +1240,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100030} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 70, z: 0} + m_LocalPosition: {x: 0, y: 100, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 400028} @@ -1988,13 +1988,13 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1 + aspectRatio: 1.173913 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} mText: 07 mFontSize: 46 - mFontStyle: 0 + mFontStyle: 1 mAlignment: 0 mEncoding: 0 mMaxLineCount: 1 @@ -2144,7 +2144,7 @@ MonoBehaviour: relative: 1 absolute: 0 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: 975 mHeight: 2 @@ -2195,7 +2195,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 126816} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 150, y: 13.503111, z: 0} + m_LocalPosition: {x: 200, y: 13.503111, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4609361254695165463} @@ -2247,7 +2247,7 @@ MonoBehaviour: mParameters: - obj: {fileID: 0} field: - name: + name: go oneShot: 0 --- !u!114 &11488248 MonoBehaviour: @@ -2477,13 +2477,13 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1 + aspectRatio: 1.173913 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} mText: 07 mFontSize: 46 - mFontStyle: 0 + mFontStyle: 1 mAlignment: 0 mEncoding: 0 mMaxLineCount: 1 @@ -2577,7 +2577,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 2.0434783 + aspectRatio: 2.2173913 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -2677,13 +2677,13 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 1 + aspectRatio: 1.173913 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} mText: 07 mFontSize: 46 - mFontStyle: 0 + mFontStyle: 1 mAlignment: 0 mEncoding: 0 mMaxLineCount: 1 @@ -2880,7 +2880,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.26086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -3323,6 +3323,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!1 &149142 GameObject: m_ObjectHideFlags: 0 @@ -3514,7 +3515,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -3614,7 +3615,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 5.3913045 + aspectRatio: 5.5652175 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -4034,6 +4035,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!1 &161162 GameObject: m_ObjectHideFlags: 0 @@ -4250,6 +4252,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!1 &163254 GameObject: m_ObjectHideFlags: 0 @@ -4369,6 +4372,7 @@ Transform: m_Children: - {fileID: 438004} - {fileID: 443124} + - {fileID: 3677142684319551476} m_Father: {fileID: 400030} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4791,7 +4795,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.26086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -4850,7 +4854,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186332} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -150, y: 13, z: 0} + m_LocalPosition: {x: -200, y: 13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6435624578293171811} @@ -5072,7 +5076,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.3043478 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -5394,7 +5398,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -6031,7 +6035,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -6836,7 +6840,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -6936,7 +6940,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -7120,7 +7124,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8048,7 +8052,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8685,7 +8689,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -8785,7 +8789,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9260,7 +9264,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9360,7 +9364,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9460,7 +9464,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9560,7 +9564,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9660,7 +9664,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9760,7 +9764,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9860,7 +9864,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -9960,7 +9964,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -10642,7 +10646,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -10742,7 +10746,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -10926,7 +10930,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -11233,7 +11237,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -11786,7 +11790,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -12300,7 +12304,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -12400,7 +12404,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -12830,7 +12834,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -13014,7 +13018,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -13114,7 +13118,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -13382,7 +13386,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -13566,7 +13570,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -13666,7 +13670,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -13989,6 +13993,90 @@ MonoBehaviour: mSpriteName: public__empty mFillCenter: 1 isGrayMode: 0 +--- !u!1 &2831968163769875995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3677142684319551476} + - component: {fileID: 3542153036601243251} + m_Layer: 5 + m_Name: SpriteLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3677142684319551476 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2831968163769875995} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 463106} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3542153036601243251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2831968163769875995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mPivot: 4 + mWidth: 2 + mHeight: 80 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.025 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: public__empty + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &2847393239508893841 GameObject: m_ObjectHideFlags: 0 @@ -14057,7 +14145,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -14280,7 +14368,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -14380,7 +14468,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -14589,7 +14677,7 @@ MonoBehaviour: sorting: 0 pivot: 4 maxPerLine: 0 - cellWidth: 100 + cellWidth: 128 cellHeight: 200 animateSmoothly: 0 hideInactive: 0 @@ -14665,7 +14753,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -15011,7 +15099,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -15111,7 +15199,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -15754,7 +15842,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -15977,7 +16065,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -16245,7 +16333,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -17761,7 +17849,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -17945,7 +18033,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -18045,7 +18133,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -18145,7 +18233,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -19784,7 +19872,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -19884,7 +19972,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -19984,7 +20072,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -20084,7 +20172,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -20475,7 +20563,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -20659,7 +20747,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -20823,7 +20911,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -20923,7 +21011,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -21191,7 +21279,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -21291,7 +21379,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -21973,7 +22061,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -22196,7 +22284,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -22665,7 +22753,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -23056,7 +23144,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -23156,7 +23244,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -23793,7 +23881,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -24016,7 +24104,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -24200,7 +24288,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -24468,7 +24556,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -24982,7 +25070,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -25515,7 +25603,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -25822,7 +25910,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -26006,7 +26094,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -26610,7 +26698,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -26710,7 +26798,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -27179,7 +27267,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -27402,7 +27490,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -27916,7 +28004,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -28262,7 +28350,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -28485,7 +28573,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -29245,7 +29333,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -29843,7 +29931,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -29943,7 +30031,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -30250,7 +30338,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -30350,7 +30438,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -30657,7 +30745,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -30880,7 +30968,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -31064,7 +31152,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -31248,7 +31336,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -31348,7 +31436,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -31532,7 +31620,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -32460,7 +32548,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -32560,7 +32648,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -32744,7 +32832,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -32967,7 +33055,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -33481,7 +33569,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -33827,7 +33915,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -34095,7 +34183,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -34525,7 +34613,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -34709,7 +34797,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -35262,7 +35350,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -35485,7 +35573,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -35792,7 +35880,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -35892,7 +35980,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -35992,7 +36080,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -36299,7 +36387,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -36522,7 +36610,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -36706,7 +36794,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -36806,7 +36894,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -37359,7 +37447,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -37459,7 +37547,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} @@ -37643,7 +37731,7 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 0.5217391 + aspectRatio: 0.6086956 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab index 1dcb47c..6a2ce3b 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab @@ -1505,7 +1505,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2628189625839598053 Transform: m_ObjectHideFlags: 0 @@ -1552,7 +1552,7 @@ MonoBehaviour: mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 mWidth: 224 - mHeight: 56 + mHeight: 55 mDepth: 5 autoResizeBoxCollider: 0 hideIfOffScreen: 0 @@ -1561,7 +1561,7 @@ MonoBehaviour: keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} - mText: "\u786E\u8BA4\u64CD\u4F5C" + mText: mFontSize: 56 mFontStyle: 0 mAlignment: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab index 0989ff4..f9b4aec 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab @@ -905,6 +905,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!1 &330521499854047422 GameObject: m_ObjectHideFlags: 0 @@ -4787,6 +4788,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &7645822589242098017 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5133,6 +5135,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &1137789232 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8160,6 +8163,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &49758580 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8973,6 +8977,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &538149441 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10208,6 +10213,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &1411711555 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10408,6 +10414,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &945366800 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab index c5f005a..9a02905 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab @@ -3514,6 +3514,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!1 &8799149260921359694 GameObject: m_ObjectHideFlags: 0 @@ -3585,7 +3586,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} m_Name: m_EditorClassIdentifier: - cellCount: 10 + cellCount: 12 isPlayTween: 0 twType: 0 tweenSpeed: 0.01 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab index 2061ab0..60f0983 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab @@ -78,6 +78,9 @@ MonoBehaviour: itemList: [] grid: {fileID: 0} panel: {fileID: 0} + OnShowHeadListCallbacks: [] + OnHideHeadListCallbacks: [] + OnEndListCallbacks: [] --- !u!1 &556357319856344632 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab new file mode 100644 index 0000000..fb51725 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab @@ -0,0 +1,3162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &278930346909564096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 278930346909564097} + - component: {fileID: 278930346909564102} + - component: {fileID: 5208118765950135706} + m_Layer: 5 + m_Name: LabelTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &278930346909564097 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278930346909564096} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -283, y: -78, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &278930346909564102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278930346909564096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 8480910835625383501} + relative: 1 + absolute: 20 + 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: 334 + mHeight: 36 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 9.277778 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: 220-05-12 12:12:12 + mFontSize: 36 + 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!114 &5208118765950135706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278930346909564096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: lastFollowUpTime + 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 &484677292164181418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 354065260473062356} + - component: {fileID: 1406392244602882253} + - component: {fileID: 7388392709782603985} + - component: {fileID: 4570800116846598300} + - component: {fileID: 3530330921090777195} + m_Layer: 5 + m_Name: ButtonReset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &354065260473062356 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484677292164181418} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 643, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1386553543158924622} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1406392244602882253 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484677292164181418} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 90, y: 90, z: 0} + m_Center: {x: 0, y: -0.22070312, z: 0} +--- !u!114 &7388392709782603985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484677292164181418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 484677292164181418} + 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 &4570800116846598300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484677292164181418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1386553543158924622} + relative: 1 + absolute: -64 + rightAnchor: + target: {fileID: 1386553543158924622} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 44 + mHeight: 44 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: login_log_no + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &3530330921090777195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484677292164181418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce7ce3a27703447e98bd5b91307e34c8, type: 3} + m_Name: + m_EditorClassIdentifier: + input: {fileID: 8782740549429493529} +--- !u!1 &548600509429302323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1939218091175702615} + - component: {fileID: 1347489445814885466} + - component: {fileID: 746732593053275107} + - component: {fileID: 7749443043878678565} + m_Layer: 5 + m_Name: ButtonHeadList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1939218091175702615 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548600509429302323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -970, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3762967047178559308} + m_Father: {fileID: 3571988740661908126} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1347489445814885466 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548600509429302323} + 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 &746732593053275107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548600509429302323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 1674142065347108920} + 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: 960726833247064349} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &7749443043878678565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548600509429302323} + 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 &698817975637364213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6910580637329685701} + - component: {fileID: 8426088178445502306} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6910580637329685701 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698817975637364213} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 47, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1386553543158924622} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8426088178445502306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698817975637364213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1386553543158924622} + relative: 0 + absolute: 25 + rightAnchor: + target: {fileID: 1386553543158924622} + relative: 0 + absolute: 69 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 44 + mHeight: 44 + mDepth: 8 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_search + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &874262287710027083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3463038481719258851} + - component: {fileID: 3376297966861825577} + - component: {fileID: 257626866429932962} + m_Layer: 5 + m_Name: LabelDate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3463038481719258851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874262287710027083} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -416, y: 305, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3376297966861825577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874262287710027083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 983298697332217868} + relative: 1 + absolute: 30 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 100 + mHeight: 36 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.2222223 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: 07-01 + mFontSize: 36 + 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!114 &257626866429932962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874262287710027083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: lastFollowUpTime + 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 &960726833247064348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4845106627748195530} + - component: {fileID: 9064627789038377712} + - component: {fileID: 960726833247064349} + m_Layer: 5 + m_Name: PanelFollowList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4845106627748195530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960726833247064348} + 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: 2198844124020956472} + - {fileID: 142559740985517694} + - {fileID: 3955721642617299595} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9064627789038377712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960726833247064348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3000 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 0 + mClipRange: {x: 0, y: 0, z: 300, w: 200} + mClipSoftness: {x: 4, y: 4} + mDepth: 1 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &960726833247064349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960726833247064348} + 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/TRPFollowList.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: "\u8DDF\u65F6\u8BB0\u5F55" +--- !u!1 &1165551577796406054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2815697654931813194} + - component: {fileID: 3025679406803735025} + m_Layer: 5 + m_Name: SpriteHeadIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2815697654931813194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165551577796406054} + 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: 7998449905711696468} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3025679406803735025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165551577796406054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, 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: 85 + mHeight: 85 + mDepth: 6 + 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 + mRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + mTexture: {fileID: 0} + mMat: {fileID: 2100000, guid: 2ad608d4961f440808f08845745e5f23, type: 2} + mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3} + mBorder: {x: 0, y: 0, z: 0, w: 0} + mFixedAspect: 0 +--- !u!1 &1176488640897575637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1202781764663362730} + - component: {fileID: 6592977029420657972} + - component: {fileID: 7258243521143170126} + - component: {fileID: 6348333670869065997} + m_Layer: 5 + m_Name: ButtonAddCust + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1202781764663362730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176488640897575637} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 486, y: -66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3955721642617299595} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6592977029420657972 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176488640897575637} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 150, y: 100, z: 0} + m_Center: {x: 0, y: -0.22070312, z: 0} +--- !u!114 &7258243521143170126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176488640897575637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 1176488640897575637} + 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: 960726833247064349} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &6348333670869065997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176488640897575637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4845106627748195530} + relative: 1 + absolute: -100 + rightAnchor: + target: {fileID: 4845106627748195530} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 4 + mWidth: 50 + mHeight: 50 + mDepth: 10 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_add + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &1462227533783567335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6598323226947131766} + - component: {fileID: 5401131551136242969} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6598323226947131766 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1462227533783567335} + 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: 4713427279220898112} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5401131551136242969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1462227533783567335} + 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 &1674142065347108920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3762967047178559308} + - component: {fileID: 5295593588952884185} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3762967047178559308 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674142065347108920} + 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: 1939218091175702615} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5295593588952884185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674142065347108920} + 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: "\u4E0B\u62C9\u5237\u65B0" + 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 &2219765802441021296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 983298697332217868} + - component: {fileID: 1850720344096440284} + m_Layer: 5 + m_Name: SpriteStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &983298697332217868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2219765802441021296} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -459, y: 305, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1850720344096440284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2219765802441021296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 3874950999241017755} + relative: 0 + absolute: 40 + rightAnchor: + target: {fileID: 3874950999241017755} + relative: 0 + absolute: 66 + 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: 26 + mHeight: 26 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.07692308 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: news_new2_unread + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &2946007804854365517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1386553543158924622} + - component: {fileID: 8621486178709093981} + - component: {fileID: 8782740549429493529} + - component: {fileID: 6220856573568228280} + m_Layer: 5 + m_Name: InputSeachKey + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1386553543158924622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946007804854365517} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -473, y: -203, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4203889353262840543} + - {fileID: 6910580637329685701} + - {fileID: 354065260473062356} + m_Father: {fileID: 3955721642617299595} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8621486178709093981 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946007804854365517} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 685, y: 88, z: 0} + m_Center: {x: 342.5, y: 0, z: 0} +--- !u!114 &8782740549429493529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946007804854365517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 1958618184969664984} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 0.60296786, g: 1, b: 0, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: + - mTarget: {fileID: 960726833247064349} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + mValue: +--- !u!114 &6220856573568228280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946007804854365517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 3955721643049180485} + relative: 0 + absolute: 90 + rightAnchor: + target: {fileID: 3955721643049180485} + relative: 1 + absolute: -350 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 3 + mWidth: 685 + mHeight: 88 + mDepth: 6 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 29.931818 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: public_on_off_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &3955721642142727606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3955721642142727607} + - component: {fileID: 3955721642142727611} + - component: {fileID: 3723859385629282441} + - component: {fileID: 1882298584911531567} + m_Layer: 5 + m_Name: ButtonFilter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3955721642142727607 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642142727606} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 446, y: -203, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3955721642395686232} + m_Father: {fileID: 3955721642617299595} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3955721642142727611 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642142727606} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 200, y: 100, z: 0} + m_Center: {x: -61.2, y: 0, z: 0} +--- !u!114 &3723859385629282441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642142727606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 3955721643049180485} + relative: 1 + absolute: -140 + rightAnchor: + target: {fileID: 3955721643049180485} + relative: 1 + absolute: -90 + bottomAnchor: + target: {fileID: 0} + relative: 1 + absolute: -241 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -165 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 50 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_screen + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &1882298584911531567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642142727606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} + m_Name: + m_EditorClassIdentifier: + onHoverOver: [] + onHoverOut: [] + onPress: [] + onRelease: [] + onSelect: [] + onDeselect: [] + onClick: + - mTarget: {fileID: 960726833247064349} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] +--- !u!1 &3955721642395686231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3955721642395686232} + - component: {fileID: 3955721642395686233} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3955721642395686232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642395686231} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -45, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3955721642142727607} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3955721642395686233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642395686231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: -30 + rightAnchor: + target: {fileID: 3955721642142727607} + relative: 0 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 5 + mWidth: 100 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u7B5B\u9009" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &3955721642617299594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3955721642617299595} + - component: {fileID: 3955721642617299596} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3955721642617299595 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642617299594} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1152, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3955721643049180485} + - {fileID: 3955721642142727607} + - {fileID: 1386553543158924622} + - {fileID: 1202781764663362730} + m_Father: {fileID: 4845106627748195530} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3955721642617299596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721642617299594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3} + m_Name: + m_EditorClassIdentifier: + uiCamera: {fileID: 0} + container: {fileID: 0} + side: 3 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!1 &3955721643049180484 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3955721643049180485} + - component: {fileID: 3955721643049180486} + - component: {fileID: 6419205593341839487} + m_Layer: 5 + m_Name: SpriteBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3955721643049180485 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721643049180484} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -132, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3955721642617299595} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3955721643049180486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721643049180484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: -264 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -132 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 1 + mWidth: 1125 + mHeight: 132 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 8.522727 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_border + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &6419205593341839487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3955721643049180484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 3955721643049180486} + offset: 0 + sizeAdjust: 1 +--- !u!1 &4242472268879784115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 142559740985517694} + - component: {fileID: 1490398646817197740} + - component: {fileID: 230010558480425210} + - component: {fileID: 8007667535092837570} + m_Layer: 5 + m_Name: dragscroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &142559740985517694 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4242472268879784115} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -132, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4845106627748195530} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1490398646817197740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4242472268879784115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 4845106627748195530} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 4845106627748195530} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 4845106627748195530} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 4845106627748195530} + relative: 1 + absolute: -264 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1127 + mHeight: 2041 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.5521803 +--- !u!65 &230010558480425210 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4242472268879784115} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2041, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8007667535092837570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4242472268879784115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 1508147043489573693} + draggablePanel: {fileID: 0} +--- !u!1 &4266364974858932546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5870215753570824244} + - component: {fileID: 6392994605581518956} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5870215753570824244 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266364974858932546} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 448, y: -78, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6392994605581518956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266364974858932546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 3874950999241017755} + relative: 1 + absolute: -78 + rightAnchor: + target: {fileID: 3874950999241017755} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mPivot: 4 + mWidth: 28 + mHeight: 40 + mDepth: 9 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.7 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_right + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &4458887936443482893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3874950999241017755} + - component: {fileID: 2250912487829933996} + - component: {fileID: 3815709679151108350} + - component: {fileID: 198281615027052633} + - component: {fileID: 1681503641576792309} + - component: {fileID: 278930347561129313} + - component: {fileID: 3486617750815213348} + m_Layer: 5 + m_Name: 000000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3874950999241017755 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4458887936443482893} + 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: 806279074978620938} + - {fileID: 3144362247338188270} + - {fileID: 983298697332217868} + - {fileID: 4402214923497178614} + - {fileID: 7998449905711696468} + - {fileID: 2218852819735783465} + - {fileID: 278930346909564097} + - {fileID: 8480910835625383501} + - {fileID: 5870215753570824244} + - {fileID: 3463038481719258851} + m_Father: {fileID: 3571988740661908126} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2250912487829933996 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4458887936443482893} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 520, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3815709679151108350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4458887936443482893} + 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/TRCellCustList.lua + isNeedResetAtlase: 1 +--- !u!114 &198281615027052633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4458887936443482893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 520 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1.9711539 + 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 &1681503641576792309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4458887936443482893} + 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 &278930347561129313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4458887936443482893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!114 &3486617750815213348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4458887936443482893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 198281615027052633} + offset: 50 + sizeAdjust: 1 +--- !u!1 &5291245953107319067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4713427279220898112} + - component: {fileID: 2336988033220016205} + - component: {fileID: 5891329841378928678} + - component: {fileID: 28403593467981018} + m_Layer: 5 + m_Name: ButtonEndList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4713427279220898112 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5291245953107319067} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -335, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6598323226947131766} + m_Father: {fileID: 3571988740661908126} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2336988033220016205 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5291245953107319067} + 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 &5891329841378928678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5291245953107319067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 1462227533783567335} + 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: 960726833247064349} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &28403593467981018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5291245953107319067} + 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 &5487704797287005821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2218852819735783465} + - component: {fileID: 1949412162795032995} + m_Layer: 5 + m_Name: LabelServerNo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2218852819735783465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487704797287005821} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -347, y: 168, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1949412162795032995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487704797287005821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7998449905711696468} + relative: 1 + absolute: 30 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 3 + mWidth: 240 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5BA2\u6237\u7684\u540D\u5B57" + 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 &5642077603588667844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7998449905711696468} + - component: {fileID: 5461541515295621015} + m_Layer: 5 + m_Name: SpriteHeadBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7998449905711696468 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5642077603588667844} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -420, y: 168, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2815697654931813194} + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5461541515295621015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5642077603588667844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 3874950999241017755} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 3874950999241017755} + relative: 0 + absolute: 135 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6666667, g: 0.6666667, b: 0.6666667, a: 1} + mPivot: 4 + mWidth: 85 + mHeight: 85 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &5774333521253391733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4203889353262840543} + - component: {fileID: 1958618184969664984} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4203889353262840543 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774333521253391733} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 80, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1386553543158924622} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1958618184969664984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774333521253391733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 548 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 11.416667 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5BA2\u6237\u540D\u79F0/\u7535\u8BDD/\u516C\u53F8\u540D\u79F0" + mFontSize: 48 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 0 + mMaxLineCount: 1 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &6914922890608866405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2198844124020956472} + - component: {fileID: 3952185865456564782} + - component: {fileID: 1508147043489573693} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2198844124020956472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6914922890608866405} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 76.845825, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3571988740661908126} + m_Father: {fileID: 4845106627748195530} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3952185865456564782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6914922890608866405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3008 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: 0, y: 0, z: 1125, w: 2000} + mClipSoftness: {x: 4, y: 20} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: -76.845825} +--- !u!114 &1508147043489573693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6914922890608866405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5c85efbbc1ec4b75939e6d7f077e68c, type: 3} + m_Name: + m_EditorClassIdentifier: + movement: 1 + dragEffect: 2 + restrictWithinPanel: 1 + disableDragIfFits: 0 + smoothDragStart: 1 + iOSDragEmulation: 1 + scrollWheelFactor: 0.25 + momentumAmount: 35 + dampenStrength: 9 + horizontalScrollBar: {fileID: 0} + verticalScrollBar: {fileID: 0} + showScrollBars: 1 + customMovement: {x: 0, y: 1} + contentPivot: 1 + scale: {x: 0, y: 0, z: 0} + relativePositionOnReset: {x: 0, y: 0} + centerOnChild: {fileID: 0} + loopGrid: {fileID: 1319097907370432365} + thresholDelta: {x: 0, y: -150} +--- !u!1 &7547309985682024801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8480910835625383501} + - component: {fileID: 2484697251584708915} + m_Layer: 5 + m_Name: SpriteTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8480910835625383501 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7547309985682024801} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -325, y: -78, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2484697251584708915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7547309985682024801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7998449905711696468} + relative: 1 + absolute: 30 + rightAnchor: + target: {fileID: 7998449905711696468} + relative: 1 + absolute: 74 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 44 + mHeight: 44 + mDepth: 8 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: news_new2_time + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &8201534610273534874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3144362247338188270} + - component: {fileID: 9053077959055251803} + - component: {fileID: 4293973901741204264} + m_Layer: 5 + m_Name: LabelCustName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3144362247338188270 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8201534610273534874} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -347, y: -173, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9053077959055251803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8201534610273534874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7998449905711696468} + relative: 1 + absolute: 30 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 3 + mWidth: 572 + mHeight: 42 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 13.619047 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u6700\u540E\u8DDF\u8FDB:220-05-12 12:12:12" + mFontSize: 42 + 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!114 &4293973901741204264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8201534610273534874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: custName + formatValue: "[999999]\u6765\u81EA\u5BA2\u6237\uFF1A[-][4c4c4c]{0}[-]" + 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 &8395166501447565113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4402214923497178614} + - component: {fileID: 8942243451047726310} + - component: {fileID: 5606146670258992176} + - component: {fileID: 100775538809132375} + - component: {fileID: 1336215274169896194} + m_Layer: 5 + m_Name: LabelStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4402214923497178614 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395166501447565113} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 462, y: 168, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8942243451047726310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395166501447565113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + rightAnchor: + target: {fileID: 3874950999241017755} + 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.6, g: 0.6, b: 0.6, a: 1} + mPivot: 5 + mWidth: 144 + mHeight: 36 + mDepth: 4 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u6B63\u5728\u8DDF\u8FDB" + mFontSize: 36 + 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!114 &5606146670258992176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395166501447565113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: dealFlag + 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!114 &100775538809132375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395166501447565113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3} + m_Name: + m_EditorClassIdentifier: + atlasName: + atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + fontName: + bitmapFont: {fileID: 0} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} + fontSize: 46 + fontStyle: 0 + backgroundSprite: cust_star + highlightSprite: cust_star + 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: 8942243451047726310} + mMethodName: SetCurrentSelection + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + mSelectedItem: + mPanel: {fileID: 0} + mChild: {fileID: 0} + mBackground: {fileID: 0} + mHighlight: {fileID: 0} + mHighlightedLabel: {fileID: 0} + mLabelList: [] + mBgBorder: 0 + eventReceiver: {fileID: 0} + functionName: + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &1336215274169896194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395166501447565113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: + onSelect: [] +--- !u!1 &8475948584043360104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 806279074978620938} + - component: {fileID: 6943948327540621292} + - component: {fileID: 278930346408598122} + m_Layer: 5 + m_Name: LabelNote + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &806279074978620938 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8475948584043360104} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -347, y: 40, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3874950999241017755} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6943948327540621292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8475948584043360104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7998449905711696468} + relative: 1 + absolute: 30 + rightAnchor: + target: {fileID: 3874950999241017755} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 3 + mWidth: 810 + mHeight: 42 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 18.595238 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5F88\u725Bx\u7684\u516C\u53F8\u5F88\u725Bx\u7684\u516C\u53F8\u5F88\u725Bx\u7684\u516C\u53F8\u5F88\u725Bx\u7684\u516C\u53F8" + mFontSize: 42 + 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: 1 + 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: 1 + AppendString: '...' + fontName: EmptyFont +--- !u!114 &278930346408598122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8475948584043360104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: _phoneNo + 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 &8773625663184743172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3571988740661908126} + - component: {fileID: 1770799480663822069} + - component: {fileID: 1319097907370432365} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3571988740661908126 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773625663184743172} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 347, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3874950999241017755} + - {fileID: 4713427279220898112} + - {fileID: 1939218091175702615} + m_Father: {fileID: 2198844124020956472} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1770799480663822069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773625663184743172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 1 + sorting: 1 + pivot: 1 + maxPerLine: 0 + cellWidth: 0 + cellHeight: 640 + animateSmoothly: 0 + hideInactive: 1 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} +--- !u!114 &1319097907370432365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8773625663184743172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} + m_Name: + m_EditorClassIdentifier: + cellCount: 10 + isPlayTween: 0 + twType: 0 + tweenSpeed: 0.01 + twDuration: 0.5 + twMethod: 2 + itemList: [] + grid: {fileID: 0} + panel: {fileID: 0} + OnShowHeadListCallbacks: [] + OnHideHeadListCallbacks: [] + OnEndListCallbacks: [] diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta new file mode 100644 index 0000000..da8c802 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 53030f81bc08641dfbe1db35fddfe6e2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab index f7d7358..78a97bc 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab @@ -11,8 +11,10 @@ GameObject: - component: {fileID: 745552340} - component: {fileID: 745552342} - component: {fileID: 745552341} + - component: {fileID: 6219061445155327309} + - component: {fileID: 212392421651251280} m_Layer: 5 - m_Name: Spritebg + m_Name: SpriteTopBg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -66,7 +68,7 @@ MonoBehaviour: mWidth: 1129 mHeight: 370 mDepth: 0 - autoResizeBoxCollider: 0 + autoResizeBoxCollider: 1 hideIfOffScreen: 0 keepAspectRatio: 0 aspectRatio: 3.0513513 @@ -100,6 +102,53 @@ MonoBehaviour: widget: {fileID: 745552342} offset: -2 sizeAdjust: 1 +--- !u!65 &6219061445155327309 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745552339} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1129, y: 370, z: 0} + m_Center: {x: 0, y: -185, z: 0} +--- !u!114 &212392421651251280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745552339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} + m_Name: + m_EditorClassIdentifier: + onHoverOver: [] + onHoverOut: [] + onPress: [] + onRelease: [] + onSelect: [] + onDeselect: [] + onClick: + - mTarget: {fileID: 7860134391406953152} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] --- !u!1 &1394948278 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab new file mode 100644 index 0000000..ab39c39 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab @@ -0,0 +1,1096 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &712379771404457164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 712379771404457163} + - component: {fileID: 712379771404457161} + - component: {fileID: 146794558934490435} + m_Layer: 5 + m_Name: PanelMyInfor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &712379771404457163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379771404457164} + 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: 712379771592879588} + - {fileID: 6765733308263746987} + - {fileID: 7451655348455209058} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &712379771404457161 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379771404457164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3000 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 0 + mClipRange: {x: 0, y: 0, z: 300, w: 200} + mClipSoftness: {x: 4, y: 4} + mDepth: 1 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &146794558934490435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379771404457164} + 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/TRPMyInfor.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: "\u4E2A\u4EBA\u4FE1\u606F" +--- !u!1 &712379771592879589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 712379771592879588} + - component: {fileID: 712379771592879586} + - component: {fileID: 712379771592879587} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &712379771592879588 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379771592879589} + 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: 712379772514857203} + m_Father: {fileID: 712379771404457163} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &712379771592879586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379771592879589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3005 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: 0, y: 0, z: 1125, w: 1920} + mClipSoftness: {x: 4, y: 8} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &712379771592879587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379771592879589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3} + m_Name: + m_EditorClassIdentifier: + movement: 1 + dragEffect: 2 + restrictWithinPanel: 1 + disableDragIfFits: 1 + smoothDragStart: 1 + iOSDragEmulation: 1 + scrollWheelFactor: 0.25 + momentumAmount: 35 + dampenStrength: 9 + horizontalScrollBar: {fileID: 0} + verticalScrollBar: {fileID: 0} + showScrollBars: 1 + customMovement: {x: 1, y: 0} + contentPivot: 1 + scale: {x: 0, y: 0, z: 0} + relativePositionOnReset: {x: 0, y: 0} + centerOnChild: {fileID: 0} +--- !u!1 &712379772514857204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 712379772514857203} + - component: {fileID: 712379772514857202} + - component: {fileID: 3519855807543091940} + - component: {fileID: 1827716693532746460} + m_Layer: 5 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &712379772514857203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379772514857204} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 613, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6461675368541154838} + m_Father: {fileID: 712379771592879588} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &712379772514857202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379772514857204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3} + m_Name: + m_EditorClassIdentifier: + columns: 1 + direction: 0 + sorting: 0 + pivot: 1 + cellAlignment: 1 + hideInactive: 1 + keepWithinPanel: 0 + padding: {x: 0, y: 0} +--- !u!114 &3519855807543091940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379772514857204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!114 &1827716693532746460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712379772514857204} + 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 &1231137005352992478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8799820086529144685} + - component: {fileID: 8823045915637172784} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8799820086529144685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231137005352992478} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 528, y: -312, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7451655348455209058} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8823045915637172784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231137005352992478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7275054153035427806} + relative: 1 + absolute: -48 + rightAnchor: + target: {fileID: 7275054153035427806} + relative: 1 + absolute: -21 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} + mPivot: 4 + mWidth: 27 + mHeight: 40 + mDepth: 6 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.05 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_right + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &1798168293896682392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7451655348455209058} + - component: {fileID: 2751722208154888268} + - component: {fileID: 7500181322985379644} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7451655348455209058 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798168293896682392} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1152, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7275054153035427806} + - {fileID: 7275054154318421903} + - {fileID: 8799820086529144685} + - {fileID: 4442359598240286326} + m_Father: {fileID: 712379771404457163} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2751722208154888268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798168293896682392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3} + m_Name: + m_EditorClassIdentifier: + uiCamera: {fileID: 0} + container: {fileID: 0} + side: 3 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!114 &7500181322985379644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798168293896682392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!1 &3966976740441936316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6461675368541154838} + - component: {fileID: 8388239091249233263} + - component: {fileID: 7584226296435501541} + m_Layer: 5 + m_Name: Empty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6461675368541154838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3966976740441936316} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -19.904232, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 712379772514857203} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8388239091249233263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3966976740441936316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 40 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 28.125 +--- !u!114 &7584226296435501541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3966976740441936316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 8388239091249233263} + offset: 0 + sizeAdjust: 1 +--- !u!1 &6671174817482445150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6765733308263746987} + - component: {fileID: 2269007158017933274} + - component: {fileID: 6716920492586306074} + - component: {fileID: 3976835817695667018} + m_Layer: 5 + m_Name: DragContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6765733308263746987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6671174817482445150} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: 9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 712379771404457163} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2269007158017933274 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6671174817482445150} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2022, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6716920492586306074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6671174817482445150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 712379771592879587} + draggablePanel: {fileID: 0} +--- !u!114 &3976835817695667018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6671174817482445150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 712379771404457163} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 712379771404457163} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 712379771404457163} + relative: 0 + absolute: 150 + topAnchor: + target: {fileID: 712379771404457163} + relative: 1 + absolute: -132 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1127 + mHeight: 2022 + mDepth: -1 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.55736893 +--- !u!1 &7275054153035427801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7275054153035427806} + - component: {fileID: 7275054153035427804} + - component: {fileID: 7275054153035427807} + - component: {fileID: 1091316070260880678} + - component: {fileID: 2591654861952486642} + - component: {fileID: 361966808711289190} + m_Layer: 5 + m_Name: SpriteTopbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7275054153035427806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153035427801} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -312, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7451655348455209058} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7275054153035427804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153035427801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 1 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 273 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4.120879 + mType: 4 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 2 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: public__empty + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &7275054153035427807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153035427801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 7275054153035427804} + offset: 0 + sizeAdjust: 1 +--- !u!65 &1091316070260880678 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153035427801} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 273, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2591654861952486642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153035427801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3} + m_Name: + m_EditorClassIdentifier: + atlasName: + atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + fontName: + bitmapFont: {fileID: 0} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} + fontSize: 46 + fontStyle: 0 + backgroundSprite: cust_right + highlightSprite: cust_right + position: 0 + alignment: 1 + items: + - "\u62CD\u7167" + - "\u4ECE\u76F8\u518C\u9009\u62E9" + valueItems: + - 1 + - 2 + 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: [] + mSelectedItem: "\u62CD\u7167" + mPanel: {fileID: 0} + mChild: {fileID: 0} + mBackground: {fileID: 0} + mHighlight: {fileID: 0} + mHighlightedLabel: {fileID: 0} + mLabelList: [] + mBgBorder: 0 + eventReceiver: {fileID: 0} + functionName: OnSelectionChange + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &361966808711289190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153035427801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: + onSelect: + - mTarget: {fileID: 146794558934490435} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: + oneShot: 0 +--- !u!1 &7275054153860004196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7275054153860004197} + - component: {fileID: 7275054153860004218} + m_Layer: 5 + m_Name: SpriteHeadIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7275054153860004197 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153860004196} + 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: 7275054154318421903} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7275054153860004218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054153860004196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, 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: 200 + mHeight: 200 + 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 + mRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + mTexture: {fileID: 2800000, guid: c49f3f5c9d04d4083947ee910e9a816e, type: 3} + mMat: {fileID: 2100000, guid: 2ad608d4961f440808f08845745e5f23, type: 2} + mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3} + mBorder: {x: 0, y: 0, z: 0, w: 0} + mFixedAspect: 0 +--- !u!1 &7275054154318421902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7275054154318421903} + - component: {fileID: 7275054154318421900} + m_Layer: 5 + m_Name: SpriteHeadBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7275054154318421903 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054154318421902} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -412, y: -312, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7275054153860004197} + m_Father: {fileID: 7451655348455209058} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7275054154318421900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275054154318421902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7275054153035427806} + relative: 0 + absolute: 51 + rightAnchor: + target: {fileID: 7275054153035427806} + relative: 0 + absolute: 250 + bottomAnchor: + target: {fileID: 0} + relative: 1 + absolute: -412 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -211 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 4 + mWidth: 199 + mHeight: 200 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.995 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: EmptyAtlas + mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + mSpriteName: work_work_head_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &7967778821288440671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4442359598240286326} + - component: {fileID: 7937706597113920841} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4442359598240286326 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7967778821288440671} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 492, y: -312, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7451655348455209058} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7937706597113920841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7967778821288440671} + 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: 7275054153035427806} + relative: 1 + absolute: -70 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 5 + mWidth: 192 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 4 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u4FEE\u6539\u5934\u50CF" + 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 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab.meta new file mode 100644 index 0000000..81fa1d3 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9df91fe6d3b344793a3225538d07b5ba +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab index 9bef24d..982fa26 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab @@ -688,6 +688,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &3423729636388972546 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3828,6 +3829,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &6561780794515061221 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4246,6 +4248,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &4653130227401068280 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6818,6 +6821,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &7163535886343167415 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7944,6 +7948,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &4220701522037042036 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab similarity index 99% rename from Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab rename to Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab index d59cb70..3c6772a 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab @@ -551,7 +551,7 @@ GameObject: - component: {fileID: 1907683157874330074} - component: {fileID: 7724873194386183766} m_Layer: 5 - m_Name: PanelNewFollow + m_Name: PanelNewFollowSimple m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -633,7 +633,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isPause: 0 - luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua + luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua isNeedBackplate: 1 destroyWhenHide: 0 isNeedResetAtlase: 1 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta rename to Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab.meta diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab new file mode 100644 index 0000000..37ae133 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab @@ -0,0 +1,649 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &328980738985470321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8405719512336295725} + - component: {fileID: 4793665127037870931} + - component: {fileID: 4569404973647487988} + - component: {fileID: 2469722214568661231} + m_Layer: 5 + m_Name: DetailRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8405719512336295725 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328980738985470321} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -30, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8271564019481054745} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4793665127037870931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328980738985470321} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3} + m_Name: + m_EditorClassIdentifier: + columns: 1 + direction: 0 + sorting: 0 + pivot: 1 + cellAlignment: 1 + hideInactive: 1 + keepWithinPanel: 0 + padding: {x: 0, y: -1} +--- !u!114 &4569404973647487988 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328980738985470321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!114 &2469722214568661231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328980738985470321} + 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 &2405347686691609928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 85942781782062204} + - component: {fileID: 3495134491120660627} + - component: {fileID: 2022783212242154028} + - component: {fileID: 5774097580592811788} + m_Layer: 5 + m_Name: DragScroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &85942781782062204 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2405347686691609928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5592195152047375516} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3495134491120660627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2405347686691609928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5592195152047375516} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 5592195152047375516} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 5592195152047375516} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 5592195152047375516} + relative: 1 + absolute: -132 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1125 + mHeight: 2172 + mDepth: 7 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.5179558 +--- !u!114 &2022783212242154028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2405347686691609928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 6376198817563156533} + draggablePanel: {fileID: 0} +--- !u!65 &5774097580592811788 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2405347686691609928} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1125, y: 2172, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4329241472409898578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4329241472409898579} + - component: {fileID: 4329241472409898588} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4329241472409898579 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4329241472409898578} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1152, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4329241472744673724} + m_Father: {fileID: 5592195152047375516} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4329241472409898588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4329241472409898578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3} + m_Name: + m_EditorClassIdentifier: + uiCamera: {fileID: 0} + container: {fileID: 0} + side: 3 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!1 &4329241472744673715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4329241472744673724} + - component: {fileID: 4329241472744673727} + - component: {fileID: 4329241472744673726} + - component: {fileID: 4329241472744673725} + m_Layer: 5 + m_Name: ButtonSave + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4329241472744673724 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4329241472744673715} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 510, y: -66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4329241472409898579} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4329241472744673727 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4329241472744673715} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 200, y: 100, z: 0} + m_Center: {x: -50, y: -0.22070312, z: 0} +--- !u!114 &4329241472744673726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4329241472744673715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 4329241472744673715} + 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: 6003453472346918249} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &4329241472744673725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4329241472744673715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 5592195152047375516} + relative: 1 + absolute: -163 + rightAnchor: + target: {fileID: 5592195152047375516} + relative: 1 + absolute: -51 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1} + mPivot: 5 + mWidth: 112 + mHeight: 56 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u4FDD\u5B58" + mFontSize: 56 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &6655210489690858908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5592195152047375516} + - component: {fileID: 2458329485491688165} + - component: {fileID: 6003453472346918249} + m_Layer: 5 + m_Name: PanelNewFollowTask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5592195152047375516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6655210489690858908} + 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: 5646390679247249172} + - {fileID: 85942781782062204} + - {fileID: 4329241472409898579} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2458329485491688165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6655210489690858908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3000 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 0 + mClipRange: {x: 0, y: 0, z: 300, w: 200} + mClipSoftness: {x: 4, y: 4} + mDepth: 1 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &6003453472346918249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6655210489690858908} + 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/TRPNewFollowTask.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: "\u65B0\u5EFA\u8DDF\u8FDB\u4EFB\u52A1" +--- !u!1 &7833718132027562127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8271564019481054745} + - component: {fileID: 6605656819427986464} + m_Layer: 5 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8271564019481054745 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7833718132027562127} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 937, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8405719512336295725} + m_Father: {fileID: 5646390679247249172} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6605656819427986464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7833718132027562127} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3} + m_Name: + m_EditorClassIdentifier: + columns: 1 + direction: 0 + sorting: 0 + pivot: 1 + cellAlignment: 1 + hideInactive: 1 + keepWithinPanel: 0 + padding: {x: 0, y: 30} +--- !u!1 &9049775882809917633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5646390679247249172} + - component: {fileID: 4803176237007059409} + - component: {fileID: 6376198817563156533} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5646390679247249172 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9049775882809917633} + 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: 8271564019481054745} + m_Father: {fileID: 5592195152047375516} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4803176237007059409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9049775882809917633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3001 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: 0, y: 0, z: 1126, w: 2000} + mClipSoftness: {x: 4, y: 10} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &6376198817563156533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9049775882809917633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3} + m_Name: + m_EditorClassIdentifier: + movement: 1 + dragEffect: 2 + restrictWithinPanel: 1 + disableDragIfFits: 1 + smoothDragStart: 1 + iOSDragEmulation: 1 + scrollWheelFactor: 0.25 + momentumAmount: 35 + dampenStrength: 9 + horizontalScrollBar: {fileID: 0} + verticalScrollBar: {fileID: 0} + showScrollBars: 1 + customMovement: {x: 1, y: 0} + contentPivot: 1 + scale: {x: 0, y: 0, z: 0} + relativePositionOnReset: {x: 0, y: 0} + centerOnChild: {fileID: 0} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta new file mode 100644 index 0000000..7b24ebf --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d070c4cc8d20a46e3b3f7c2d0ac02502 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab index f49f453..034f45d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab @@ -151,7 +151,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420220745163305833} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -48.154236, z: 0} + m_LocalPosition: {x: 0, y: -48.654293, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6406361052267521726} @@ -1075,7 +1075,7 @@ Transform: 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_LocalPosition: {x: 0, y: -177.77928, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5582618885866839856} @@ -1296,6 +1296,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} m_Name: m_EditorClassIdentifier: + onSelect: [] --- !u!114 &1374284702246386988 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1900,7 +1901,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2425227412765712263} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -188.9042, z: 0} + m_LocalPosition: {x: 0, y: -777.27924, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5247068646262692398} @@ -3737,6 +3738,158 @@ MonoBehaviour: isAppendEndingString: 0 AppendString: '...' fontName: EmptyFont +--- !u!1 &5487216764156978569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2509541483205259216} + - component: {fileID: 3489239926919154696} + - component: {fileID: 1838843289826127282} + - component: {fileID: 4460822429136587271} + - component: {fileID: 9035455709320344593} + - component: {fileID: 2085530375892443290} + m_Layer: 5 + m_Name: 00000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2509541483205259216 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487216764156978569} + 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: 6755470009267612121} + m_Father: {fileID: 4600755202396098814} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3489239926919154696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487216764156978569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 2085530375892443290} + offset: 50 + sizeAdjust: 1 +--- !u!114 &1838843289826127282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487216764156978569} + 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/TRCellImage.lua + isNeedResetAtlase: 1 +--- !u!114 &4460822429136587271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487216764156978569} + 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!65 &9035455709320344593 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487216764156978569} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 500, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2085530375892443290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5487216764156978569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 500 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2.05 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + mRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + mTexture: {fileID: 0} + mMat: {fileID: 0} + mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3} + mBorder: {x: 0, y: 0, z: 0, w: 0} + mFixedAspect: 0 --- !u!1 &5817392990340767882 GameObject: m_ObjectHideFlags: 0 @@ -4369,12 +4522,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6840166634573325542} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -350.25, z: 0} + m_LocalPosition: {x: 0, y: -938.87494, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7870608547099953618} - {fileID: 7657068295081712894} - - {fileID: 2296907656735151289} m_Father: {fileID: 9092197074366352143} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4443,6 +4595,7 @@ Transform: - {fileID: 675396154728095867} - {fileID: 695648132874815624} - {fileID: 4781790433082627634} + - {fileID: 2296907656735151289} m_Father: {fileID: 4808583122758801922} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4650,6 +4803,139 @@ MonoBehaviour: mSpriteName: work_work_color mFillCenter: 1 isGrayMode: 0 +--- !u!1 &7864880252234492747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6755470009267612121} + - component: {fileID: 3531358558082589502} + - component: {fileID: 5949980243057264043} + - component: {fileID: 433959213111062007} + m_Layer: 5 + m_Name: ButtonDel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6755470009267612121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7864880252234492747} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 470, y: 208, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2509541483205259216} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3531358558082589502 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7864880252234492747} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 100, y: 100, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5949980243057264043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7864880252234492747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 7864880252234492747} + 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: 1838843289826127282} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &433959213111062007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7864880252234492747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 2509541483205259216} + relative: 1 + absolute: -65 + rightAnchor: + target: {fileID: 2509541483205259216} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 2509541483205259216} + relative: 1 + absolute: -65 + topAnchor: + target: {fileID: 2509541483205259216} + relative: 1 + absolute: -20 + updateAnchors: 0 + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 4 + mWidth: 45 + mHeight: 45 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: login_log_no + mFillCenter: 1 + isGrayMode: 0 --- !u!1 &7898200024377142075 GameObject: m_ObjectHideFlags: 0 @@ -4663,14 +4949,16 @@ GameObject: - component: {fileID: 7847741233886550698} - component: {fileID: 3989876927114666004} - component: {fileID: 6582611865144033048} - - component: {fileID: 5684835301358909987} + - component: {fileID: 4891233890758738143} + - component: {fileID: 8089659989952212147} + - component: {fileID: 3196188467329571094} m_Layer: 5 m_Name: InputAttachment m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2296907656735151289 Transform: m_ObjectHideFlags: 0 @@ -4678,8 +4966,8 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1338.6248, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4096705695685564279} @@ -4687,8 +4975,9 @@ Transform: - {fileID: 22394276322990286} - {fileID: 5447743745483950510} - {fileID: 6561805268829721416} - m_Father: {fileID: 4781790433082627634} - m_RootOrder: 2 + - {fileID: 4600755202396098814} + m_Father: {fileID: 9092197074366352143} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6052790691369986581 BoxCollider: @@ -4785,7 +5074,7 @@ MonoBehaviour: widget: {fileID: 7847741233886550698} offset: 0 sizeAdjust: 1 ---- !u!114 &5684835301358909987 +--- !u!114 &4891233890758738143 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4794,31 +5083,91 @@ MonoBehaviour: m_GameObject: {fileID: 7898200024377142075} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, 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: + atlasName: + atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + fontName: + bitmapFont: {fileID: 0} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} + fontSize: 46 + fontStyle: 0 + backgroundSprite: help_chengfang + highlightSprite: help_chengfang + position: 0 + alignment: 1 + items: + - "\u62CD\u7167" + - "\u4ECE\u76F8\u518C\u9009\u62E9" + valueItems: + - 1 + - 2 + 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: [] + mSelectedItem: "\u62CD\u7167" + mPanel: {fileID: 0} + mChild: {fileID: 0} + mBackground: {fileID: 0} + mHighlight: {fileID: 0} + mHighlightedLabel: {fileID: 0} + mLabelList: [] + mBgBorder: 0 + eventReceiver: {fileID: 0} + functionName: OnSelectionChange + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &8089659989952212147 +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: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: + onSelect: - mTarget: {fileID: 6896994100725352575} mMethodName: uiEventDelegate mParameters: - obj: {fileID: 0} field: - name: go + name: oneShot: 0 +--- !u!114 &3196188467329571094 +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: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: + formatValue: + labeName: {fileID: 0} + defaultName: + canNull: 1 + 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 &8174250477570590167 GameObject: m_ObjectHideFlags: 0 @@ -4927,6 +5276,62 @@ MonoBehaviour: scale: {x: 0, y: 0, z: 0} relativePositionOnReset: {x: 0, y: 0} centerOnChild: {fileID: 0} +--- !u!1 &8177775070125587863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4600755202396098814} + - component: {fileID: 749625377866579281} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4600755202396098814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8177775070125587863} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -355, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2509541483205259216} + m_Father: {fileID: 2296907656735151289} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &749625377866579281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8177775070125587863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 1 + sorting: 1 + pivot: 1 + maxPerLine: 0 + cellWidth: 200 + cellHeight: 520 + animateSmoothly: 0 + hideInactive: 1 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} --- !u!1 &8432021983544835164 GameObject: m_ObjectHideFlags: 0 @@ -5040,7 +5445,7 @@ Transform: 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_LocalPosition: {x: 0, y: -269.90417, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3343166803441427381} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab new file mode 100644 index 0000000..328f2af --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab @@ -0,0 +1,2850 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &689014743870357672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3626394024244750507} + - component: {fileID: 6253284637496054712} + - component: {fileID: 6381322220925407996} + - component: {fileID: 8591004585366730333} + m_Layer: 5 + m_Name: InputSeachKey + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3626394024244750507 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689014743870357672} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -473, y: -203, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1962085272342370106} + - {fileID: 9118343692225302816} + - {fileID: 2703401422903623217} + m_Father: {fileID: 1695612814791429998} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6253284637496054712 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689014743870357672} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 685, y: 88, z: 0} + m_Center: {x: 342.5, y: 0, z: 0} +--- !u!114 &6381322220925407996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689014743870357672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3} + m_Name: + m_EditorClassIdentifier: + label: {fileID: 4198452043058615357} + inputType: 0 + onReturnKey: 0 + keyboardType: 0 + hideInput: 0 + alertModeKeybaord: 0 + validation: 0 + characterLimit: 0 + savedAs: + selectOnTab: {fileID: 0} + activeTextColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + caretColor: {r: 0.60296786, g: 1, b: 0, a: 0.8} + selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5} + onSubmit: [] + onChange: + - mTarget: {fileID: 3186475724049071352} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + mValue: +--- !u!114 &8591004585366730333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689014743870357672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1695612816179622048} + relative: 0 + absolute: 90 + rightAnchor: + target: {fileID: 1695612816179622048} + relative: 1 + absolute: -350 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1} + mPivot: 3 + mWidth: 685 + mHeight: 88 + mDepth: 6 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 29.931818 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: public_on_off_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &1695612814791429999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695612814791429998} + - component: {fileID: 1695612814791429993} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1695612814791429998 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612814791429999} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1152, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1695612816179622048} + - {fileID: 1695612815265812562} + - {fileID: 3626394024244750507} + - {fileID: 3592938584915241295} + m_Father: {fileID: 7084386452241072431} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1695612814791429993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612814791429999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3} + m_Name: + m_EditorClassIdentifier: + uiCamera: {fileID: 0} + container: {fileID: 0} + side: 3 + runOnlyOnce: 1 + relativeOffset: {x: 0, y: 0} + pixelOffset: {x: 0, y: 0} + widgetContainer: {fileID: 0} +--- !u!1 &1695612815265812563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695612815265812562} + - component: {fileID: 1695612815265812574} + - component: {fileID: 1351153961453305196} + - component: {fileID: 4283707919887131594} + m_Layer: 5 + m_Name: ButtonFilter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1695612815265812562 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612815265812563} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 446, y: -203, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1695612815524034749} + m_Father: {fileID: 1695612814791429998} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1695612815265812574 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612815265812563} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 200, y: 100, z: 0} + m_Center: {x: -61.2, y: 0, z: 0} +--- !u!114 &1351153961453305196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612815265812563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1695612816179622048} + relative: 1 + absolute: -140 + rightAnchor: + target: {fileID: 1695612816179622048} + relative: 1 + absolute: -90 + bottomAnchor: + target: {fileID: 0} + relative: 1 + absolute: -241 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -165 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 50 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_screen + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &4283707919887131594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612815265812563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3} + m_Name: + m_EditorClassIdentifier: + onHoverOver: [] + onHoverOut: [] + onPress: [] + onRelease: [] + onSelect: [] + onDeselect: [] + onClick: + - mTarget: {fileID: 3186475724049071352} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + onDoubleClick: [] + onDragStart: [] + onDragEnd: [] + onDragOver: [] + onDragOut: [] + onDrag: [] + onBecameVisible: [] + onBecameInvisible: [] +--- !u!1 &1695612815524034738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695612815524034749} + - component: {fileID: 1695612815524034748} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1695612815524034749 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612815524034738} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -45, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1695612815265812562} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1695612815524034748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612815524034738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: -30 + rightAnchor: + target: {fileID: 1695612815265812562} + relative: 0 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 5 + mWidth: 100 + mHeight: 50 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u7B5B\u9009" + mFontSize: 50 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 1 + mMaxLineCount: 0 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 2 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &1695612816179622049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695612816179622048} + - component: {fileID: 1695612816179622051} + - component: {fileID: 8680710569146082714} + m_Layer: 5 + m_Name: SpriteBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1695612816179622048 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612816179622049} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -132, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1695612814791429998} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1695612816179622051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612816179622049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: -264 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: -132 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 1 + mWidth: 1125 + mHeight: 132 + mDepth: 0 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 8.522727 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_border + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &8680710569146082714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695612816179622049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3} + m_Name: + m_EditorClassIdentifier: + widget: {fileID: 1695612816179622051} + offset: 0 + sizeAdjust: 1 +--- !u!1 &1985462028986172758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2348614472774421403} + - component: {fileID: 3874072677660107593} + - component: {fileID: 2476034615633612063} + - component: {fileID: 5642304504479858983} + m_Layer: 5 + m_Name: dragscroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2348614472774421403 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985462028986172758} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -132, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7084386452241072431} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3874072677660107593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985462028986172758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7084386452241072431} + relative: 0 + absolute: -1 + rightAnchor: + target: {fileID: 7084386452241072431} + relative: 1 + absolute: 1 + bottomAnchor: + target: {fileID: 7084386452241072431} + relative: 0 + absolute: -1 + topAnchor: + target: {fileID: 7084386452241072431} + relative: 1 + absolute: -264 + updateAnchors: 1 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1127 + mHeight: 2041 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.5521803 +--- !u!65 &2476034615633612063 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985462028986172758} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1127, y: 2041, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5642304504479858983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985462028986172758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollView: {fileID: 3856082394838288088} + draggablePanel: {fileID: 0} +--- !u!1 &2057208018642415336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1489313068704294014} + - component: {fileID: 4490464605866369609} + - component: {fileID: 1556436240581754139} + - component: {fileID: 2570989324121443772} + - component: {fileID: 3906990977458162960} + - component: {fileID: 2500474793020373124} + m_Layer: 5 + m_Name: 000000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1489313068704294014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057208018642415336} + 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: + - {fileID: 3052868478539615215} + - {fileID: 778711461429309451} + - {fileID: 3227090592335820265} + - {fileID: 2052025255483942931} + - {fileID: 5651383049230411697} + - {fileID: 4586775333025383884} + - {fileID: 2500474791147327780} + m_Father: {fileID: 1224924031667421051} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4490464605866369609 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057208018642415336} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 325, z: 0} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1556436240581754139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057208018642415336} + 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/TRCellCustList.lua + isNeedResetAtlase: 1 +--- !u!114 &2570989324121443772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057208018642415336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7084386452241072431} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 7084386452241072431} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 1, g: 1, b: 1, a: 1} + mPivot: 4 + mWidth: 1025 + mHeight: 325 + mDepth: 0 + autoResizeBoxCollider: 1 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 3.1538463 + 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 &3906990977458162960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057208018642415336} + 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 &2500474793020373124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057208018642415336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: +--- !u!1 &2500474791147327781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2500474791147327780} + - component: {fileID: 2500474791147327779} + - component: {fileID: 7578284198125486207} + m_Layer: 5 + m_Name: LabelCust + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2500474791147327780 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2500474791147327781} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -462, y: -96, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1489313068704294014} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2500474791147327779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2500474791147327781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1489313068704294014} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 4586775333025383884} + relative: 0 + absolute: -30 + 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: 714 + mHeight: 36 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 19.833334 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5173\u8054\u5BA2\u6237\uFF1A" + mFontSize: 36 + 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!114 &7578284198125486207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2500474791147327781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: lastFollowUpTime + formatValue: "\u5173\u8054\u5BA2\u6237\uFF1A{0}" + 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 &2805892645226342870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4288818464022388146} + - component: {fileID: 3737622368732541375} + - component: {fileID: 3112374823248772614} + - component: {fileID: 5397001602768543168} + m_Layer: 5 + m_Name: ButtonHeadList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4288818464022388146 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2805892645226342870} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 222, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1537191646614860457} + m_Father: {fileID: 1224924031667421051} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3737622368732541375 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2805892645226342870} + 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 &3112374823248772614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2805892645226342870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 3915372354749107677} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 1 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 3186475724049071352} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &5397001602768543168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2805892645226342870} + 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 &2870031368180318287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2703401422903623217} + - component: {fileID: 3668480365293626664} + - component: {fileID: 5180640649847022900} + - component: {fileID: 2162628604952687993} + - component: {fileID: 1266580751282384270} + m_Layer: 5 + m_Name: ButtonReset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2703401422903623217 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870031368180318287} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 643, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3626394024244750507} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3668480365293626664 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870031368180318287} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 90, y: 90, z: 0} + m_Center: {x: 0, y: -0.22070312, z: 0} +--- !u!114 &5180640649847022900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870031368180318287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 2870031368180318287} + 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 &2162628604952687993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870031368180318287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 3626394024244750507} + relative: 1 + absolute: -64 + rightAnchor: + target: {fileID: 3626394024244750507} + relative: 1 + absolute: -20 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 44 + mHeight: 44 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: login_log_no + mFillCenter: 1 + isGrayMode: 0 +--- !u!114 &1266580751282384270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2870031368180318287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce7ce3a27703447e98bd5b91307e34c8, type: 3} + m_Name: + m_EditorClassIdentifier: + input: {fileID: 6381322220925407996} +--- !u!1 &2945140851920920592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9118343692225302816} + - component: {fileID: 6161759580698569351} + m_Layer: 5 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9118343692225302816 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2945140851920920592} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 47, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3626394024244750507} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6161759580698569351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2945140851920920592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 3626394024244750507} + relative: 0 + absolute: 25 + rightAnchor: + target: {fileID: 3626394024244750507} + relative: 0 + absolute: 69 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 44 + mHeight: 44 + mDepth: 8 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_search + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &3186475724049071353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7084386452241072431} + - component: {fileID: 6674769838520235797} + - component: {fileID: 3186475724049071352} + m_Layer: 5 + m_Name: PanelOrderList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7084386452241072431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3186475724049071353} + 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: 4606707616943468765} + - {fileID: 2348614472774421403} + - {fileID: 1695612814791429998} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6674769838520235797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3186475724049071353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3000 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 0 + mClipRange: {x: 0, y: 0, z: 300, w: 200} + mClipSoftness: {x: 4, y: 4} + mDepth: 1 + mSortingOrder: 0 + mClipOffset: {x: 0, y: 0} +--- !u!114 &3186475724049071352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3186475724049071353} + 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/TRPOrderList.lua + isNeedBackplate: 1 + destroyWhenHide: 0 + isNeedResetAtlase: 1 + isNeedMask4Init: 0 + isNeedMask4InitOnlyOnce: 1 + isHideWithEffect: 1 + isRefeshContentWhenEffectFinish: 0 + EffectRoot: {fileID: 0} + effectType: 1 + EffectList: [] + frameName: Frame1 + frameObj: {fileID: 0} + titleKeyName: "\u5BA2\u6237\u7BA1\u7406" +--- !u!1 &3548334101062895408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3592938584915241295} + - component: {fileID: 8796507067764736209} + - component: {fileID: 5032767334997936555} + - component: {fileID: 8751693546856402152} + m_Layer: 5 + m_Name: ButtonAddCust + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3592938584915241295 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3548334101062895408} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 486, y: -66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1695612814791429998} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8796507067764736209 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3548334101062895408} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 150, y: 100, z: 0} + m_Center: {x: 0, y: -0.22070312, z: 0} +--- !u!114 &5032767334997936555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3548334101062895408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 3548334101062895408} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 1 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 3186475724049071352} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &8751693546856402152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3548334101062895408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 7084386452241072431} + relative: 1 + absolute: -100 + rightAnchor: + target: {fileID: 7084386452241072431} + relative: 1 + absolute: -50 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 4 + mWidth: 50 + mHeight: 50 + mDepth: 10 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 1 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: cust_add + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &3549210079222449859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 468043573361991343} + - component: {fileID: 617224445328194580} + m_Layer: 5 + m_Name: SpriteHeadIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &468043573361991343 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3549210079222449859} + 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: 5651383049230411697} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &617224445328194580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3549210079222449859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, 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: 85 + mHeight: 85 + mDepth: 6 + 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 + mRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + mTexture: {fileID: 0} + mMat: {fileID: 2100000, guid: 2ad608d4961f440808f08845745e5f23, type: 2} + mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3} + mBorder: {x: 0, y: 0, z: 0, w: 0} + mFixedAspect: 0 +--- !u!1 &3830149919282177538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8862091468917814419} + - component: {fileID: 7753265310439338236} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8862091468917814419 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3830149919282177538} + 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: 6918927727095567525} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7753265310439338236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3830149919282177538} + 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 &3915372354749107677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1537191646614860457} + - component: {fileID: 7498554337990692412} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1537191646614860457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3915372354749107677} + 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: 4288818464022388146} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7498554337990692412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3915372354749107677} + 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: "\u4E0B\u62C9\u5237\u65B0" + 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 &4585715569612274325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3227090592335820265} + - component: {fileID: 4090000082836771385} + m_Layer: 5 + m_Name: SpriteStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3227090592335820265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4585715569612274325} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -485, y: 96, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1489313068704294014} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4090000082836771385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4585715569612274325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1489313068704294014} + relative: 0 + absolute: 14 + rightAnchor: + target: {fileID: 1489313068704294014} + relative: 0 + absolute: 40 + 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: 26 + mHeight: 26 + mDepth: 3 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 1 + mType: 0 + mFillDirection: 4 + mFillAmount: 1 + mInvert: 0 + mFlip: 0 + centerType: 1 + leftType: 1 + rightType: 1 + bottomType: 1 + topType: 1 + atlasName: atlasAllReal + mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3} + mSpriteName: news_new2_unread + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &5817588012234845823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 778711461429309451} + - component: {fileID: 6687690756516295870} + - component: {fileID: 1944094596676718285} + m_Layer: 5 + m_Name: LabelMony + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &778711461429309451 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5817588012234845823} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -462, y: -20, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1489313068704294014} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6687690756516295870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5817588012234845823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1489313068704294014} + 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: 364 + mHeight: 36 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 9.111111 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u8BA2\u5355\u91D1\u989D\uFF1A\uFFE51200000" + mFontSize: 36 + 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!114 &1944094596676718285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5817588012234845823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: custName + formatValue: "\u8BA2\u5355\u91D1\u989D\uFF1A{0}" + 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 &6110561620815512205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3052868478539615215} + - component: {fileID: 4697343513614930441} + - component: {fileID: 2500474791723267983} + m_Layer: 5 + m_Name: LabelTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3052868478539615215 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110561620815512205} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -462, y: 96, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1489313068704294014} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4697343513614930441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110561620815512205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1489313068704294014} + relative: 0 + absolute: 50 + rightAnchor: + target: {fileID: 1489313068704294014} + relative: 1 + absolute: -252 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} + mPivot: 3 + mWidth: 723 + mHeight: 48 + mDepth: 1 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 15.0625 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5F88\u725Bx\u7684\u516C\u53F8" + 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: 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!114 &2500474791723267983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6110561620815512205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: _phoneNo + 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 &6191343702027490012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2052025255483942931} + - component: {fileID: 6734207682891899139} + - component: {fileID: 7827402999503755733} + - component: {fileID: 2309093091304110258} + - component: {fileID: 3739884938781008103} + m_Layer: 5 + m_Name: LabelStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2052025255483942931 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191343702027490012} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 371, y: 96, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1489313068704294014} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6734207682891899139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191343702027490012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1489313068704294014} + relative: 1 + absolute: -213 + rightAnchor: + target: {fileID: 1489313068704294014} + relative: 1 + absolute: -69 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 144 + mHeight: 72 + mDepth: 4 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 2 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u6B63\u5728\u8DDF\u8FDB" + mFontSize: 36 + 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!114 &7827402999503755733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191343702027490012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonKey: dealFlag + 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!114 &2309093091304110258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191343702027490012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3} + m_Name: + m_EditorClassIdentifier: + atlasName: + atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3} + fontName: + bitmapFont: {fileID: 0} + trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3} + fontSize: 46 + fontStyle: 0 + backgroundSprite: cust_star + highlightSprite: cust_star + 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: 6734207682891899139} + mMethodName: SetCurrentSelection + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 + mSelectedItem: + mPanel: {fileID: 0} + mChild: {fileID: 0} + mBackground: {fileID: 0} + mHighlight: {fileID: 0} + mHighlightedLabel: {fileID: 0} + mLabelList: [] + mBgBorder: 0 + eventReceiver: {fileID: 0} + functionName: + textScale: 0 + font: {fileID: 0} + textLabel: {fileID: 0} +--- !u!114 &3739884938781008103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191343702027490012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3} + m_Name: + m_EditorClassIdentifier: + onSelect: [] +--- !u!1 &6390505829037606625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1224924031667421051} + - component: {fileID: 4178963879953490704} + - component: {fileID: 3685050268686203528} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1224924031667421051 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6390505829037606625} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 347, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1489313068704294014} + - {fileID: 6918927727095567525} + - {fileID: 4288818464022388146} + m_Father: {fileID: 4606707616943468765} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4178963879953490704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6390505829037606625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3} + m_Name: + m_EditorClassIdentifier: + arrangement: 1 + sorting: 1 + pivot: 1 + maxPerLine: 0 + cellWidth: 0 + cellHeight: 360 + animateSmoothly: 0 + hideInactive: 1 + keepWithinPanel: 0 + sorted: 0 + oldParentPos: {x: 0, y: 0, z: 0} + oldParentClipOffset: {x: 0, y: 0} +--- !u!114 &3685050268686203528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6390505829037606625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3} + m_Name: + m_EditorClassIdentifier: + cellCount: 12 + isPlayTween: 0 + twType: 0 + tweenSpeed: 0.01 + twDuration: 0.5 + twMethod: 2 + itemList: [] + grid: {fileID: 0} + panel: {fileID: 0} + OnShowHeadListCallbacks: [] + OnHideHeadListCallbacks: [] + OnEndListCallbacks: [] +--- !u!1 &7495050911116850430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6918927727095567525} + - component: {fileID: 72949318785684904} + - component: {fileID: 8119911486605067715} + - component: {fileID: 2380545847163732287} + m_Layer: 5 + m_Name: ButtonEndList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6918927727095567525 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7495050911116850430} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -235, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8862091468917814419} + m_Father: {fileID: 1224924031667421051} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &72949318785684904 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7495050911116850430} + 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 &8119911486605067715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7495050911116850430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenTarget: {fileID: 3830149919282177538} + hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1} + pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + duration: 0.2 + skipColorEffect: 1 + dragHighlight: 0 + hoverSprite: + pressedSprite: + disabledSprite: + hoverSprite2D: {fileID: 0} + pressedSprite2D: {fileID: 0} + disabledSprite2D: {fileID: 0} + pixelSnap: 0 + onClick: + - mTarget: {fileID: 3186475724049071352} + mMethodName: uiEventDelegate + mParameters: + - obj: {fileID: 0} + field: + name: go + oneShot: 0 +--- !u!114 &2380545847163732287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7495050911116850430} + 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 &7873896675524645784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4586775333025383884} + - component: {fileID: 4206424963445455942} + m_Layer: 5 + m_Name: LabelServerNo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4586775333025383884 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873896675524645784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 372, y: -96, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1489313068704294014} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4206424963445455942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873896675524645784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1489313068704294014} + relative: 1 + absolute: -230 + rightAnchor: + target: {fileID: 1489313068704294014} + 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.6, g: 0.6, b: 0.6, a: 1} + mPivot: 4 + mWidth: 180 + mHeight: 36 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 5 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5BA2\u6237\u7684\u540D\u5B57" + mFontSize: 36 + 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 &8007719617964266529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5651383049230411697} + - component: {fileID: 7685047712836178546} + m_Layer: 5 + m_Name: SpriteHeadBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5651383049230411697 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8007719617964266529} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 370, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 468043573361991343} + m_Father: {fileID: 1489313068704294014} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7685047712836178546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8007719617964266529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 1489313068704294014} + relative: 1 + absolute: -184 + rightAnchor: + target: {fileID: 1489313068704294014} + relative: 1 + absolute: -100 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 0 + mColor: {r: 0.6666667, g: 0.6666667, b: 0.6666667, a: 1} + mPivot: 4 + mWidth: 84 + mHeight: 85 + mDepth: 5 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 0.9882353 + 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_bg + mFillCenter: 1 + isGrayMode: 0 +--- !u!1 &8164745204709552272 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1962085272342370106} + - component: {fileID: 4198452043058615357} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1962085272342370106 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8164745204709552272} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 80, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3626394024244750507} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4198452043058615357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8164745204709552272} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + mPivot: 3 + mWidth: 548 + mHeight: 48 + mDepth: 7 + autoResizeBoxCollider: 0 + hideIfOffScreen: 0 + keepAspectRatio: 0 + aspectRatio: 11.416667 + keepCrispWhenShrunk: 1 + mTrueTypeFont: {fileID: 0} + mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} + mText: "\u5BA2\u6237\u540D\u79F0/\u7535\u8BDD/\u516C\u53F8\u540D\u79F0" + mFontSize: 48 + mFontStyle: 0 + mAlignment: 0 + mEncoding: 0 + mMaxLineCount: 1 + mEffectStyle: 0 + mEffectColor: {r: 0, g: 0, b: 0, a: 1} + mSymbols: 1 + mEffectDistance: {x: 1, y: 1} + mOverflow: 0 + mMaterial: {fileID: 0} + mApplyGradient: 0 + mGradientTop: {r: 1, g: 1, b: 1, a: 1} + mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1} + mSpacingX: 0 + mSpacingY: 0 + mUseFloatSpacing: 0 + mFloatSpacingX: 0 + mFloatSpacingY: 0 + mShrinkToFit: 0 + mMaxLineWidth: 0 + mMaxLineHeight: 0 + mLineWidth: 0 + mMultiline: 1 + isAppendEndingString: 0 + AppendString: '...' + fontName: EmptyFont +--- !u!1 &9122938814926182784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4606707616943468765} + - component: {fileID: 1708396040612386763} + - component: {fileID: 3856082394838288088} + m_Layer: 5 + m_Name: PanelContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4606707616943468765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9122938814926182784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 76.845825, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1224924031667421051} + m_Father: {fileID: 7084386452241072431} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1708396040612386763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9122938814926182784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3} + m_Name: + m_EditorClassIdentifier: + leftAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + rightAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + bottomAnchor: + target: {fileID: 0} + relative: 0 + absolute: 0 + topAnchor: + target: {fileID: 0} + relative: 1 + absolute: 0 + updateAnchors: 1 + showInPanelTool: 1 + generateNormals: 0 + widgetsAreStatic: 0 + cullWhileDragging: 1 + alwaysOnScreen: 0 + anchorOffset: 0 + softBorderPadding: 1 + renderQueue: 0 + startingRenderQueue: 3008 + mClipTexture: {fileID: 0} + mAlpha: 1 + mClipping: 3 + mClipRange: {x: 0, y: 0, z: 1125, w: 2000} + mClipSoftness: {x: 4, y: 20} + mDepth: 2 + mSortingOrder: 0 + mClipOffset: {x: 0, y: -76.845825} +--- !u!114 &3856082394838288088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9122938814926182784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5c85efbbc1ec4b75939e6d7f077e68c, type: 3} + m_Name: + m_EditorClassIdentifier: + movement: 1 + dragEffect: 2 + restrictWithinPanel: 1 + disableDragIfFits: 0 + smoothDragStart: 1 + iOSDragEmulation: 1 + scrollWheelFactor: 0.25 + momentumAmount: 35 + dampenStrength: 9 + horizontalScrollBar: {fileID: 0} + verticalScrollBar: {fileID: 0} + showScrollBars: 1 + customMovement: {x: 0, y: 1} + contentPivot: 1 + scale: {x: 0, y: 0, z: 0} + relativePositionOnReset: {x: 0, y: 0} + centerOnChild: {fileID: 0} + loopGrid: {fileID: 3685050268686203528} + thresholDelta: {x: 0, y: -150} diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta new file mode 100644 index 0000000..78c5cc0 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 49fe736b733d94137a06e1dd4a8d5d5e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab index 05faf90..b4f47f5 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab @@ -1102,6 +1102,9 @@ MonoBehaviour: itemList: [] grid: {fileID: 0} panel: {fileID: 0} + OnShowHeadListCallbacks: [] + OnHideHeadListCallbacks: [] + OnEndListCallbacks: [] --- !u!1 &4260279069647208014 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab index 3de1943..b02edcd 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab @@ -555,7 +555,7 @@ MonoBehaviour: mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} mText: "\u9500\u552E\u76EE\u6807" mFontSize: 42 - mFontStyle: 0 + mFontStyle: 1 mAlignment: 0 mEncoding: 1 mMaxLineCount: 0 @@ -3402,7 +3402,7 @@ MonoBehaviour: mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} mText: "\u5BA2\u6237\u7C7B\u578B" mFontSize: 42 - mFontStyle: 0 + mFontStyle: 1 mAlignment: 0 mEncoding: 1 mMaxLineCount: 0 @@ -4601,13 +4601,13 @@ MonoBehaviour: autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 2 + aspectRatio: 4 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} mText: "\u8BA2\u5355\u6210\u4EA4" mFontSize: 42 - mFontStyle: 0 + mFontStyle: 1 mAlignment: 0 mEncoding: 1 mMaxLineCount: 0 diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab index feefc8b..23f0e9c 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab +++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab @@ -151,7 +151,7 @@ MonoBehaviour: mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1} mPivot: 4 mWidth: 800 - mHeight: 146 + mHeight: 152 mDepth: 0 autoResizeBoxCollider: 0 hideIfOffScreen: 0 @@ -373,7 +373,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8524572109241191192} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 54, y: 0, z: 0} + m_LocalPosition: {x: 39, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 576939815961468376} @@ -394,7 +394,7 @@ MonoBehaviour: leftAnchor: target: {fileID: 6505418891330252177} relative: 1 - absolute: 50 + absolute: 20 rightAnchor: target: {fileID: 576939815961468376} relative: 1 @@ -410,13 +410,13 @@ MonoBehaviour: updateAnchors: 1 mColor: {r: 1, g: 1, b: 1, a: 1} mPivot: 4 - mWidth: 592 - mHeight: 46 + mWidth: 622 + mHeight: 52 mDepth: 1 autoResizeBoxCollider: 0 hideIfOffScreen: 0 keepAspectRatio: 0 - aspectRatio: 12.869565 + aspectRatio: 12.307693 keepCrispWhenShrunk: 1 mTrueTypeFont: {fileID: 0} mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3} diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d new file mode 100644 index 0000000..f34a86c Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d.meta new file mode 100644 index 0000000..42b938b --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/512.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 173df25fed01c441eb9600fe63f880b3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d index 42cedbc..45a2697 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua index 3588bf7..e58a784 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/DBRoot.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua index a6ead5e..a7e9123 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/DBTextures.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua new file mode 100644 index 0000000..d642d53 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua.meta new file mode 100644 index 0000000..fc16293 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e67a54f6ee6eb48d3bdf508b7f49a8b8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua index 0f74d74..0a1be29 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/public/CLLInclude.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua index 2868581..ce47f97 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua index 32c3548..1b4352c 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua index 9bfa738..5c9d345 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua index 0300bf3..e7ec2c7 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua new file mode 100644 index 0000000..8282e07 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua.meta new file mode 100644 index 0000000..6f96c93 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 08f5bec5571c74aadad4c0252afdb3f9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua index b94ce71..e811e2d 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 a83c618..99f41cc 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/TRCellImage.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua new file mode 100644 index 0000000..a229956 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua.meta new file mode 100644 index 0000000..ac5b2a1 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd20c4f60b60c4bcbaddcb97b134e30f +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 3b78965..83a8a59 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/CSPMine.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua index 6310d8c..f02c43c 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.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 ed02ebb..e86ee3d 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/TRPAbout.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua new file mode 100644 index 0000000..5e8ca2d Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua.meta new file mode 100644 index 0000000..7d4115f --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2b282ef315c694029a0af5137981673f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua index ba368c5..4b7b9da 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua index 5d5ebb7..bfb2131 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua new file mode 100644 index 0000000..86dc5ad Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua.meta new file mode 100644 index 0000000..ffc11b9 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c603be048c08947f09c99a1be798ab15 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua new file mode 100644 index 0000000..bbe7432 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua.meta new file mode 100644 index 0000000..b4732be --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d03e52d07dd7a4c779114f2331e503d7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua index 531353a..80dca9f 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/TRPNewFollow.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua index 957cdb4..3e4c335 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua.meta index 748c1be..d38f7e3 100644 --- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua.meta +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 742df36fe37354743a58186541e8c2b4 +guid: ebc887b7984d94986bbe7880e09ef509 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua new file mode 100644 index 0000000..804fbdd Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta new file mode 100644 index 0000000..748c1be --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 742df36fe37354743a58186541e8c2b4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua new file mode 100644 index 0000000..d3d93cb Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua.meta new file mode 100644 index 0000000..fe90bb5 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8e3da4fe415d54af89d0699a61beea57 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua index 99205e0..51b6dac 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/TRPOrderList.lua b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua new file mode 100644 index 0000000..73dc503 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua.meta b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua.meta new file mode 100644 index 0000000..79b97ca --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ce3af19d2bcdb40db85eb4cb01b2d8ed +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d new file mode 100644 index 0000000..d47d962 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d.meta new file mode 100644 index 0000000..e9f73f3 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0dc4043b054c44f63966f0e4a14d2417 +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 a0b0be1..7fc902b 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 62926a6..ffa3090 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 4a61d9a..c541be7 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 31888d2..21c20f6 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 d07b8ab..66f4ab6 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/PanelAbout.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d new file mode 100644 index 0000000..be3bffc Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d.meta new file mode 100644 index 0000000..69cfdd8 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelAbout.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4e9d543de0e014f12842844607ec03fa +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d index 056fd77..543fd22 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d index 708f9c6..7b9c3ef 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/PanelCustDetail.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d index addcc53..12f9e20 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 2c53995..35709b6 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/PanelCustListProc.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d index ce06bd8..078109f 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d new file mode 100644 index 0000000..c1127a3 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d.meta new file mode 100644 index 0000000..59fa105 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 781262c40185d4991ab82e0aa1e7aa10 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d index 15d0a85..f65d19d 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d new file mode 100644 index 0000000..34c58f1 Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d.meta new file mode 100644 index 0000000..c163e7f --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 79e5e3d80263e44cba9306e6e7368046 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d index 46e1f66..85826b3 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d similarity index 78% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d index 7690b35..d2c73e1 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d.meta rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d.meta diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d new file mode 100644 index 0000000..f97328b Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d.meta new file mode 100644 index 0000000..a4df5a3 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4a45da331129c46b9b9d9a68160e3d38 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d index d79c93c..61acc44 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/PanelOrderList.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d new file mode 100644 index 0000000..18f1e6f Binary files /dev/null and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d.meta new file mode 100644 index 0000000..4646475 --- /dev/null +++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96de0639e94ed4ffca98aff0923ab798 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d index 589c439..e68ce5d 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d index 3fdfed1..e272540 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d index f101a0c..d4f7118 100644 Binary files a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d and b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d differ diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollow.unity3d b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d similarity index 100% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollow.unity3d rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d diff --git a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollow.unity3d.meta b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d.meta similarity index 100% rename from Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollow.unity3d.meta rename to Assets/trCRM/upgradeRes4Publish/priority/ui/panel/IOS/PanelNewFollowSimple.unity3d.meta diff --git a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver index 080c776..4931757 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,6f6aee971fe3160d6bfd5614dc84a5c28 %trCRM/resVer/Android/VerCtl/other.ver8,dc65aaee0c1df6fcd7279730917b98fe \ No newline at end of file +r8 (trCRM/resVer/Android/VerCtl/priority.ver8,8a5a410e6d655a4da481068f2a8cce498 %trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33 \ 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 6db1168..1ca8262 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 262b48d..201f53e 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