2020-07-08

Assets/CoolapeFrame/Editor/Inspectors/CLUIScrollViewWithEventEditor.cs

@@ -9,12 +9,12 @@ using UnityEditor;
 [CustomEditor(typeof(CLUIScrollViewWithEvent))]
 public class CLUIScrollViewWithEventEditor : UIScrollViewEditor
 {
-	public override void OnInspectorGUI ()
+    public override void OnInspectorGUI()
-	{
+    {
-		base.OnInspectorGUI();
+        base.OnInspectorGUI();
 
-
+        NGUIEditorTools.DrawProperty("Loop Grid", serializedObject, "loopGrid");
-	NGUIEditorTools.DrawProperty("Loop Grid", serializedObject, "loopGrid");
+        NGUIEditorTools.DrawProperty("Threshol Delta", serializedObject, "thresholDelta");
-	NGUIEditorTools.DrawProperty("Threshol Delta", serializedObject, "thresholDelta");
+        serializedObject.ApplyModifiedProperties();
-	}
+    }
 }

Assets/CoolapeFrame/Scripts/platform/Android/AndroidStatusBar.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fb672b74187ac4921bd4b4ab69fce0b4
+guid: 34a9c8c145d8743beb9904626ac96143
 timeCreated: 1512540705
 licenseType: Pro
 MonoImporter:

Assets/CoolapeFrame/Scripts/platform/Android/ApplicationChrome.cs

@@ -0,0 +1,294 @@
+#if UNITY_ANDROID && !UNITY_EDITOR
+#define USE_ANDROID
+#endif
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+/**
+ * @author zeh fernando
+ */
+public class ApplicationChrome
+{
+
+    /**
+     * Manipulates the system application chrome to change the way the status bar and navigation bar work
+     *
+     * References:
+     * . http://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)
+     * . http://forum.unity3d.com/threads/calling-setsystemuivisibility.139445/#post-952946
+     * . http://developer.android.com/reference/android/view/WindowManager.LayoutParams.html#FLAG_LAYOUT_IN_SCREEN
+     **/
+
+    // Enums
+    public enum States
+    {
+        Unknown,
+        Visible,
+        VisibleOverContent,
+        TranslucentOverContent,
+        Hidden
+    }
+
+    // Constants
+    private const uint DEFAULT_BACKGROUND_COLOR = 0xff000000;
+
+#if USE_ANDROID
+        // Original Android flags
+        private const int VIEW_SYSTEM_UI_FLAG_VISIBLE = 0;					// Added in API 14 (Android 4.0.x): Status bar visible (the default)
+        private const int VIEW_SYSTEM_UI_FLAG_LOW_PROFILE = 1;				// Added in API 14 (Android 4.0.x): Low profile for games, book readers, and video players; the status bar and/or navigation icons are dimmed out (if visible)
+        private const int VIEW_SYSTEM_UI_FLAG_HIDE_NAVIGATION = 2;			// Added in API 14 (Android 4.0.x): Hides all navigation. Cleared when theres any user interaction.
+        private const int VIEW_SYSTEM_UI_FLAG_FULLSCREEN = 4;				// Added in API 16 (Android 4.1.x): Hides status bar. Does nothing in Unity (already hidden if "status bar hidden" is checked)
+        private const int VIEW_SYSTEM_UI_FLAG_LAYOUT_STABLE = 256;			// Added in API 16 (Android 4.1.x): ?
+        private const int VIEW_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION = 512;	// Added in API 16 (Android 4.1.x): like HIDE_NAVIGATION, but for layouts? it causes the layout to be drawn like that, even if the whole view isn't (to avoid artifacts in animation)
+        private const int VIEW_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN = 1024;		// Added in API 16 (Android 4.1.x): like FULLSCREEN, but for layouts? it causes the layout to be drawn like that, even if the whole view isn't (to avoid artifacts in animation)
+        private const int VIEW_SYSTEM_UI_FLAG_IMMERSIVE = 2048;				// Added in API 19 (Android 4.4): like HIDE_NAVIGATION, but interactive (it's a modifier for HIDE_NAVIGATION, needs to be used with it)
+        private const int VIEW_SYSTEM_UI_FLAG_IMMERSIVE_STICKY = 4096;		// Added in API 19 (Android 4.4): tells that HIDE_NAVIGATION and FULSCREEN are interactive (also just a modifier)
+
+        private static int WINDOW_FLAG_FULLSCREEN = 0x00000400;
+        private static int WINDOW_FLAG_FORCE_NOT_FULLSCREEN = 0x00000800;
+        private static int WINDOW_FLAG_LAYOUT_IN_SCREEN = 0x00000100;
+        private static int WINDOW_FLAG_TRANSLUCENT_STATUS = 0x04000000;
+        private static int WINDOW_FLAG_TRANSLUCENT_NAVIGATION = 0x08000000;
+        private static int WINDOW_FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS = -2147483648; // 0x80000000; // Added in API 21 (Android 5.0): tells the Window is responsible for drawing the background for the system bars. If set, the system bars are drawn with a transparent background and the corresponding areas in this window are filled with the colors specified in getStatusBarColor() and getNavigationBarColor()
+
+        // Current values
+        private static int systemUiVisibilityValue;
+        private static int flagsValue;
+#endif
+
+    // Properties
+    private static States _statusBarState;
+    private static States _navigationBarState;
+
+    private static uint _statusBarColor = DEFAULT_BACKGROUND_COLOR;
+    private static uint _navigationBarColor = DEFAULT_BACKGROUND_COLOR;
+
+    private static bool _isStatusBarTranslucent; // Just so we know whether its translucent when hidden or not
+    private static bool _isNavigationBarTranslucent;
+
+    private static bool _dimmed;
+
+
+    // ================================================================================================================
+    // INTERNAL INTERFACE ---------------------------------------------------------------------------------------------
+
+    static ApplicationChrome()
+    {
+        applyUIStates();
+        applyUIColors();
+    }
+
+    private static void applyUIStates()
+    {
+#if USE_ANDROID
+            applyUIStatesAndroid();
+#endif
+    }
+
+    private static void applyUIColors()
+    {
+#if USE_ANDROID
+            applyUIColorsAndroid();
+#endif
+    }
+
+#if USE_ANDROID
+
+        private static void applyUIStatesAndroid() {
+            int newFlagsValue = 0;
+            int newSystemUiVisibilityValue = 0;
+
+            // Apply dim values
+            if (_dimmed) newSystemUiVisibilityValue |= VIEW_SYSTEM_UI_FLAG_LOW_PROFILE;
+
+            // Apply color values
+            if (_navigationBarColor != DEFAULT_BACKGROUND_COLOR || _statusBarColor != DEFAULT_BACKGROUND_COLOR) newFlagsValue |= WINDOW_FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+
+            // Apply status bar values
+            switch (_statusBarState) {
+                case States.Visible:
+                    _isStatusBarTranslucent = false;
+                    newFlagsValue |= WINDOW_FLAG_FORCE_NOT_FULLSCREEN;
+                    break;
+                case States.VisibleOverContent:
+                    _isStatusBarTranslucent = false;
+                    newFlagsValue |= WINDOW_FLAG_FORCE_NOT_FULLSCREEN | WINDOW_FLAG_LAYOUT_IN_SCREEN;
+                    newSystemUiVisibilityValue |= VIEW_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+                    break;
+                case States.TranslucentOverContent:
+                    _isStatusBarTranslucent = true;
+                    newFlagsValue |= WINDOW_FLAG_FORCE_NOT_FULLSCREEN | WINDOW_FLAG_LAYOUT_IN_SCREEN | WINDOW_FLAG_TRANSLUCENT_STATUS;
+                    newSystemUiVisibilityValue |= VIEW_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+                    break;
+                case States.Hidden:
+                    newFlagsValue |= WINDOW_FLAG_FULLSCREEN | WINDOW_FLAG_LAYOUT_IN_SCREEN;
+                    if (_isStatusBarTranslucent) newFlagsValue |= WINDOW_FLAG_TRANSLUCENT_STATUS;
+                    break;
+            }
+
+            // Applies navigation values
+            switch (_navigationBarState) {
+                case States.Visible:
+                    _isNavigationBarTranslucent = false;
+                    newSystemUiVisibilityValue |= VIEW_SYSTEM_UI_FLAG_LAYOUT_STABLE;
+                    break;
+                case States.VisibleOverContent:
+                    // TODO: Side effect: forces status bar over content if set to VISIBLE
+                    _isNavigationBarTranslucent = false;
+                    newSystemUiVisibilityValue |= VIEW_SYSTEM_UI_FLAG_LAYOUT_STABLE | VIEW_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+                    break;
+                case States.TranslucentOverContent:
+                    // TODO: Side effect: forces status bar over content if set to VISIBLE
+                    _isNavigationBarTranslucent = true;
+                    newFlagsValue |= WINDOW_FLAG_TRANSLUCENT_NAVIGATION;
+                    newSystemUiVisibilityValue |= VIEW_SYSTEM_UI_FLAG_LAYOUT_STABLE | VIEW_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+                    break;
+                case States.Hidden:
+                    newSystemUiVisibilityValue |= VIEW_SYSTEM_UI_FLAG_FULLSCREEN | VIEW_SYSTEM_UI_FLAG_HIDE_NAVIGATION | VIEW_SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+                    if (_isNavigationBarTranslucent) newFlagsValue |= WINDOW_FLAG_TRANSLUCENT_NAVIGATION;
+                    break;
+            }
+
+            if (Screen.fullScreen) Screen.fullScreen = false;
+
+            // Applies everything natively
+            setFlags(newFlagsValue);
+            setSystemUiVisibility(newSystemUiVisibilityValue);
+        }
+
+        private static void runOnAndroidUiThread(Action target) {
+            using (var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) {
+                using (var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity")) {
+                    activity.Call("runOnUiThread", new AndroidJavaRunnable(target));
+                }
+            }
+        }
+
+        private static void setSystemUiVisibility(int value) {
+            if (systemUiVisibilityValue != value) {
+                systemUiVisibilityValue = value;
+                runOnAndroidUiThread(setSystemUiVisibilityInThread);
+            }
+        }
+
+        private static void setSystemUiVisibilityInThread() {
+            //Debug.Log("SYSTEM FLAGS: " + systemUiVisibilityValue);
+            using (var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) {
+                using (var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity")) {
+                    using (var window = activity.Call<AndroidJavaObject>("getWindow")) {
+                        using (var view = window.Call<AndroidJavaObject>("getDecorView")) {
+                            view.Call("setSystemUiVisibility", systemUiVisibilityValue);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void setFlags(int value) {
+            if (flagsValue != value) {
+                flagsValue = value;
+                runOnAndroidUiThread(setFlagsInThread);
+            }
+        }
+
+        private static void setFlagsInThread() {
+            //Debug.Log("FLAGS: " + flagsValue);
+            using (var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) {
+                using (var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity")) {
+                    using (var window = activity.Call<AndroidJavaObject>("getWindow")) {
+                        window.Call("setFlags", flagsValue, -1); // (int)0x7FFFFFFF
+                    }
+                }
+            }
+        }
+
+        private static void applyUIColorsAndroid() {
+            runOnAndroidUiThread(applyUIColorsAndroidInThread);
+        }
+
+        private static void applyUIColorsAndroidInThread() {
+            using (var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) {
+                using (var activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity")) {
+                    using (var window = activity.Call<AndroidJavaObject>("getWindow")) {
+                        //Debug.Log("Colors SET: " + _statusBarColor);
+                        window.Call("setStatusBarColor", unchecked((int)_statusBarColor));
+                        window.Call("setNavigationBarColor", unchecked((int)_navigationBarColor));
+                    }
+                }
+            }
+        }
+
+#endif
+
+    // ================================================================================================================
+    // ACCESSOR INTERFACE ---------------------------------------------------------------------------------------------
+
+    public static States navigationBarState
+    {
+        get { return _navigationBarState; }
+        set
+        {
+            if (_navigationBarState != value)
+            {
+                _navigationBarState = value;
+                applyUIStates();
+            }
+        }
+    }
+
+    public static States statusBarState
+    {
+        get { return _statusBarState; }
+        set
+        {
+            if (_statusBarState != value)
+            {
+                _statusBarState = value;
+                applyUIStates();
+            }
+        }
+    }
+
+    public static bool dimmed
+    {
+        get { return _dimmed; }
+        set
+        {
+            if (_dimmed != value)
+            {
+                _dimmed = value;
+                applyUIStates();
+            }
+        }
+    }
+
+    public static uint statusBarColor
+    {
+        get { return _statusBarColor; }
+        set
+        {
+            if (_statusBarColor != value)
+            {
+                _statusBarColor = value;
+                applyUIColors();
+                applyUIStates();
+            }
+        }
+    }
+
+    public static uint navigationBarColor
+    {
+        get { return _navigationBarColor; }
+        set
+        {
+            if (_navigationBarColor != value)
+            {
+                _navigationBarColor = value;
+                applyUIColors();
+                applyUIStates();
+            }
+        }
+    }
+}

Assets/CoolapeFrame/Scripts/platform/Android/ApplicationChrome.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8a393833afebf4bb98248eb57f1d84ed
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/CoolapeFrame/Scripts/ui/NguiExtend/CLUIScrollViewWithEvent.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using Coolape;
 
-[ExecuteInEditMode]
 public class CLUIScrollViewWithEvent : UIScrollView
 {
     public CLUILoopGrid loopGrid;
@@ -54,7 +53,6 @@ public class CLUIScrollViewWithEvent : UIScrollView
 
     public void onShowHeadList(GameObject go)
     {
-        Debug.LogError("onShowHeadList");
         isShowHead = true;
         if (isPress)
         {
@@ -63,7 +61,6 @@ public class CLUIScrollViewWithEvent : UIScrollView
     }
     public void onHideHeadList(GameObject go)
     {
-        Debug.LogError("onHideHeadList");
         isShowHead = false;
     }
 

Assets/CoolapeFrameData/cfg/publishChannel.cfg

@@ -1 +1 @@
-tBchannelMapq?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode
+tBchannelMapq?generalp'FmBuildLocation@iosBuildDmProductNameD添添办公CisThirdExitJmBundleVersionCode

Assets/CoolapeFrameData/verControl/.resModifyDate.v

@@ -100,6 +100,8 @@
 /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
@@ -185,6 +187,8 @@
 /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/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
@@ -216,12 +220,12 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132384076660000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132386011620000000
 /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,132375440630000000
+/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,132376375880000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua,132386002430000000
 /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
@@ -248,15 +252,15 @@
 /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,132383023560000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua,132385653220000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua.meta,132370178140000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua,132381612130000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua.meta,132368762790000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua,132383040540000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua,132384996020000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua.meta,132358701520000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua,132378178470000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua.meta,132378001360000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132383041800000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua,132384995900000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua.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
@@ -269,11 +273,11 @@
 /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,132382428450000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua,132385026240000000
 /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,132384004040000000
 /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,132358027610000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua,132385823640000000
 /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
@@ -298,7 +302,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132373597840000000
 /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,132383129280000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132385653070000000
 /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
@@ -324,7 +328,7 @@
 /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,132370303500000000
+/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
@@ -336,7 +340,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustStar.lua.meta,132376505230000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua,132382931420000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua.meta,132378658180000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132382187940000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,132385653070000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua.meta,132378223060000000
 /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
@@ -357,13 +361,15 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132381377770000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua.meta,132372977860000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua,132375229330000000
+/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,132289253670000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua,132385982680000000
 /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,132383039530000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua.meta,132289129800000000
@@ -383,11 +389,11 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua.meta,132355739310000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua,132383044670000000
 /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,132381611070000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132385653070000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua.meta,132372871250000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua,132381346090000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua.meta,132370233760000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132384076160000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132386004950000000
 /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
@@ -397,7 +403,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua.meta,132375465560000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua,132380867870000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMoreProc4Cust.lua.meta,132373063880000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132382926290000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua,132385992380000000
 /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/TRPPlaySoundRecord.lua,132381390070000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua.meta,132373879180000000
@@ -417,45 +423,45 @@
 /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,132360703720000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab,132385565600000000
 /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/Frame1.prefab,132383029630000000
+/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,132382924310000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab,132385747890000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab.meta,132378911310000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132382916880000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab,132385747810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab.meta,132378654680000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab,132382916880000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab,132385747810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab.meta,132378243900000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132382916890000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132385741920000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab.meta,132378243860000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132383015920000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132385741910000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab.meta,132378243880000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab,132381625760000000
+/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,132379494110000000
+/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/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,132381446090000000
 /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,132381360810000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab,132384738550000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132383005300000000
 /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,132383049240000000
 /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,132383051380000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab,132385938650000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab.meta,132370155540000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132384054550000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132386011620000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab.meta,132370116810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab,132372845470000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab.meta,132369515950000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab,132373723020000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab,132385938020000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab,132364419700000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab.meta,132355322410000000
@@ -465,19 +471,19 @@
 /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,132369238640000000
 /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,132380473890000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab,132385741910000000
 /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,132380869720000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab.meta,132373063990000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab,132384058150000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab.meta,132300379190000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab,132383015920000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab,132385971220000000
 /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/PanelPlaySoundRecord.prefab,132381390160000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab,132381361170000000
 /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,132381361170000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab,132384246170000000
 /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,132378181680000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab.meta,132357319780000000
@@ -499,7 +505,7 @@
 /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,132382128390000000
 /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,132383044020000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab,132385986680000000
 /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,132364419700000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelWWWProgress.prefab.meta,132289129800000000

Assets/CoolapeFrameData/verControl/android/ver4Publish.v

@@ -39,6 +39,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8
 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd
+trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -81,6 +82,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
+trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
@@ -93,9 +95,9 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d8148
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa
-trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,c1ae593534ca9992a08cd0b2dd9e9a70
+trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,c9fd1e96628c3b9093a812942d507254
-trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,4eb3274164c5597fd9c33f32efc75567
+trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f
-trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,2afc0a533110bffa9e6e76054510ec17
+trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,8df9523b1566cdc5d5025f2b7a51883c
 trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
 trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
 trCRM/upgradeRes4Publish/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f
@@ -103,20 +105,20 @@ 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,650b06f2519e753561d257cd3f0a63b4
+trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,9e09f434e175ae942801f2ab140f8a49
 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0
-trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,90bb4e550152956dc383a44ceaee4a59
+trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3
 trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969
-trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,521f0148bc335e67d33568bd7ba5142d
+trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,b29828bdf75c1313f28fc03d655ba812
 trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
 trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
 trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
 trCRM/upgradeRes4Publish/priority/lua/net/CLLNet.lua,a89815234ba1533aa6831bca56636505
 trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
-trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,369799dc07a034bc211bc612c04c623d
+trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,ecb6645f7ecb273af4d931c3b59fd516
 trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527
 trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua,66366550d23ed572c0e6f299801531c7
-trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,35fe7f9ef8374018e6b17e4efd9f9eea
+trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,a4f7c7a82b82a9926f58dd9e6ae66fe4
 trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
 trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,6d54c7ee137c4a745daa3ea35fcfd9f9
 trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,26e455763621e8f9a8b1c7eeea902ea8
@@ -128,7 +130,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7c
 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
 trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15
 trCRM/upgradeRes4Publish/priority/lua/toolkit/LuaUtl.lua,6036a0817eae528e45a5e36882a43573
-trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,e73df6d7030e43ae34fd0d9751172eb1
+trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,07c3bd926e7c3e2ac44a3855165677cc
 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5
 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29
@@ -140,13 +142,13 @@ trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096a
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,4459ba289c7af3023199f8a60d29dd72
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110b38e133b065f8f85
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,35ab67164fec969fe3513e00eff0b061
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f6862fccaa49ba2e67a39f2
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,e1fa6dffadf4b7671a1403bee0554a90
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,77fe50c4c113517c376dbfc1bbacfed9
@@ -160,8 +162,9 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua,79cfcdd1b744c25a0
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,93cdedf0292443159ba4981098b36a48
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,cab66bf202c61c1bc2d9c2b02f3bb5b9
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,832231a5af4da3f7c8b449fd7e2036ea
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,ee83701c37a6f2fc91691546a2e4fbe7
@@ -172,14 +175,14 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f78807
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,dd36cd49215cc0c7b524e8c2b78780a2
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,6f8be84948695dbb7b8f1677b0559395
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,3c1157bee5e84df48d3777bcb38b7281
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,d05ea7ede947b2b07768830f13ef1c1e
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,b6a24c9ba010a0a67952919d0e6d46f5
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua,1973dc8d949ed85e01b09aff328d1033
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,16321974e266491f5b18592f4518aa1c
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,1ee7e9c2a46b156e6d804b8a726d0ced
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,d3d9c7897e50214ca72e6d32de96595a
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,fe468903ab8fc883861ef69f99b5e14d
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5
@@ -188,38 +191,38 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,3339b54
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,4c599efe00496ae268bd385a16e34e66
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a
-trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,52fa6ebd08a9edc4a530cfd88d356ca1
+trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,04846782c4841e6cd418887457def22e
-trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,2e469a92c2fc31d8916fd0aa106b2bca
+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,bc12a0b0d3e78f5e3760d09232be872e
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,ab5f58b68264e6a53699f4bb58050d5e
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,8db309620ae685fd7256db3022f2a1dd
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,77bd9dfe20e7c03b4cc6fbda42fba5ec
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,678e4706af9b807ebb14f870c1cb41d5
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062
-trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,cfbcce6782913e99f2e2b2d7db89a9a8
+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,9ba8a3a70b50975405c9129bb227d57c
+trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBackplate.unity3d,861c2420c86f0da27dd58a6f73dfb942
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,2dfb99c1dd4d71fbe434075838e74e20
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,ffbfefc5c866fd8acd606623e5a9430c
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,ee2e556d67dde151fa8833cb357be2d7
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,2779ed6a1d88a75d9ae23d71d232c1cb
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,3015fc19845e1200952cc62acc89ac94
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,a41215fbc585d60f49b66358dd798690
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,91318240bac93d1e33fe51dee83519f4
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,fe91436dae9fcfb0b9fb4dc4353548e1
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,c1ea5284412c95722ce92c5804745ad9
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,fdf819bff61b0cecbeb489e5443fc6e0
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,283a025b3c9794aba4aacca516ae1cea
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,c2e0d30c5a556d4b29134313f7d8504e
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,6badf11fa5b679dea751004ec507c4c7
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,653ca09b27502a7670796bf7924f334d
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,462d7b1995685531a4628c24c1e89c42
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,cb75e55817036828325bfb30a2fd1630
@@ -230,7 +233,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSplash.unity3d,046863be6
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,99b7eaf8b2def868c353881982d688f4
 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,6dcc6c943b8f2df9342ea8827eb43786
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,d95770e52a99a02d02f9dce6725684f3
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,4fb60b2ce9256cf69814066a7ce97592
 trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136

Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v

@@ -8,32 +8,31 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be
 trCRM/upgradeRes/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc
 trCRM/upgradeRes/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,6c837c5717e2246a101874ca16bc45c9
-trCRM/upgradeRes/priority/lua/db/DBCust.lua,650b06f2519e753561d257cd3f0a63b4
+trCRM/upgradeRes/priority/lua/db/DBCust.lua,9e09f434e175ae942801f2ab140f8a49
 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,832231a5af4da3f7c8b449fd7e2036ea
 trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6
-trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,8db309620ae685fd7256db3022f2a1dd
+trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5
+trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b
 trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
-trCRM/upgradeRes/priority/lua/CLLMainLua.lua,2afc0a533110bffa9e6e76054510ec17
+trCRM/upgradeRes/priority/lua/CLLMainLua.lua,f300e0babf50a8a8bdf5155bc55aeaf8
 trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,4c599efe00496ae268bd385a16e34e66
-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,ee83701c37a6f2fc91691546a2e4fbe7
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
-trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,0ba23bf4649b7626a80efdd1711ebd71
+trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,d7474f8fe283c9d4204823a9cf2b5d64
 trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,4fb60b2ce9256cf69814066a7ce97592
 trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7
 trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,77fe50c4c113517c376dbfc1bbacfed9
-trCRM/upgradeRes/priority/lua/db/DBRoot.lua,90bb4e550152956dc383a44ceaee4a59
+trCRM/upgradeRes/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54
 trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,16321974e266491f5b18592f4518aa1c
 trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
@@ -41,7 +40,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,e5e9cb160e0ccd517b
 trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,6d54c7ee137c4a745daa3ea35fcfd9f9
 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,79cfcdd1b744c25a06b569c03c81389e
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,fdf819bff61b0cecbeb489e5443fc6e0
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_color.unity3d,043e8a3cdee29da6e5c909432f25d6f8
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
@@ -54,32 +53,32 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3dd
 trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,99b7eaf8b2def868c353881982d688f4
 trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,462d7b1995685531a4628c24c1e89c42
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,e1fa6dffadf4b7671a1403bee0554a90
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,7b9651232053e4001c15715461aa48a8
 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,cb75e55817036828325bfb30a2fd1630
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
-trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
 trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,ee2e556d67dde151fa8833cb357be2d7
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
-trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,e73df6d7030e43ae34fd0d9751172eb1
+trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,07c3bd926e7c3e2ac44a3855165677cc
 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/public/CLLIncludeBase.lua,35fe7f9ef8374018e6b17e4efd9f9eea
+trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,a4f7c7a82b82a9926f58dd9e6ae66fe4
 trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,4459ba289c7af3023199f8a60d29dd72
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
-trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,d3d9c7897e50214ca72e6d32de96595a
+trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,1561ce4056ffa950fe84b2dea3d95a9d
 trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,dd36cd49215cc0c7b524e8c2b78780a2
-trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140
+trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445
-trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,2e469a92c2fc31d8916fd0aa106b2bca
+trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062
-trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,678e4706af9b807ebb14f870c1cb41d5
 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
@@ -93,7 +92,7 @@ trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f6125
 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,b8810c5e5890ee6f44ae82d6c7f7f526
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSplash.unity3d,046863be6988cd304cf597822ebc146e
-trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,bc12a0b0d3e78f5e3760d09232be872e
+trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,35ab67164fec969fe3513e00eff0b061
 trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,c1ea5284412c95722ce92c5804745ad9
 trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3
@@ -104,27 +103,27 @@ trCRM/upgradeRes/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d3
 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/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513
+trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223
 trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527
 trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7
-trCRM/upgradeRes/priority/lua/db/DBUser.lua,521f0148bc335e67d33568bd7ba5142d
+trCRM/upgradeRes/priority/lua/db/DBUser.lua,b29828bdf75c1313f28fc03d655ba812
-trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
+trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3
 trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716
 trCRM/upgradeRes/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8
-trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,fe91436dae9fcfb0b9fb4dc4353548e1
+trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6
 trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7
+trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f
-trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
+trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1
-trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,283a025b3c9794aba4aacca516ae1cea
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,3a951bdbe3cc3dc7373f91f66fae568c
 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,bb4e1a1ce156f48fc0af330962865a62
-trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,ffbfefc5c866fd8acd606623e5a9430c
+trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23
 trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
 trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef
@@ -132,37 +131,37 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd
 trCRM/upgradeRes/other/uiAtlas/work/Android/icon_bg.unity3d,60926842e889a8a621443f4f646aa9e2
 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/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f6862fccaa49ba2e67a39f2
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
-trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,3015fc19845e1200952cc62acc89ac94
+trCRM/upgradeRes/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd
-trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,ab5f58b68264e6a53699f4bb58050d5e
+trCRM/upgradeRes/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01
 trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
-trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,653ca09b27502a7670796bf7924f334d
+trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgList.unity3d,b48b08a37217bb43ef7a94566f79fec0
 trCRM/upgradeRes/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5
 trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
 trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969
 trCRM/upgradeRes/priority/ui/other/Android/InputToggle.unity3d,4b8616c8acc8691a4b8510fdc103ec75
-trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b
+trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
-trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,93cdedf0292443159ba4981098b36a48
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,9bb8233233bd09778b367eb6462f72d7
 trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,1ee7e9c2a46b156e6d804b8a726d0ced
 trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
+trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990
 trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
-trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,77bd9dfe20e7c03b4cc6fbda42fba5ec
+trCRM/upgradeRes/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5
 trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
 trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
 trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,f4012bc5f0a6dcb0680961a6d2bcc6ca
 trCRM/upgradeRes/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
-trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,9ba8a3a70b50975405c9129bb227d57c
+trCRM/upgradeRes/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a
@@ -171,19 +170,19 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1ad
 trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustFilter.lua,3c1157bee5e84df48d3777bcb38b7281
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683
-trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,6dcc6c943b8f2df9342ea8827eb43786
+trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,f70e550a65c00f8d2d636f4274931bb4
-trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
+trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
 trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7
 trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d
-trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,52fa6ebd08a9edc4a530cfd88d356ca1
+trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,04846782c4841e6cd418887457def22e
-trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,a41215fbc585d60f49b66358dd798690
+trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,17afb8f5b7000803125b255d2460ed61
 trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
 trCRM/upgradeRes/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0
 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21
 trCRM/upgradeRes/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
-trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
+trCRM/upgradeRes/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5
 trCRM/upgradeRes/priority/lua/net/CLLNet.lua,a89815234ba1533aa6831bca56636505
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
@@ -204,6 +203,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/time.unity3d,38bf54e9fbf1c1d8af2cead
 trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7
 trCRM/upgradeRes/priority/lua/public/CLLInclude.lua,66366550d23ed572c0e6f299801531c7
 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
+trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,16af9ed096ad6b902a156f6e0a20021f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea
 trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171
@@ -211,29 +211,32 @@ trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_no.unity3d,2ee604556b4fff6186f2bad067ed8695
 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
-trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,c1ae593534ca9992a08cd0b2dd9e9a70
+trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,c9fd1e96628c3b9093a812942d507254
-trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,c2e0d30c5a556d4b29134313f7d8504e
+trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,6badf11fa5b679dea751004ec507c4c7
 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,3339b54f4948faeac62678747b4d6f59
-trCRM/upgradeRes/priority/lua/net/NetProto.lua,369799dc07a034bc211bc612c04c623d
+trCRM/upgradeRes/priority/lua/net/NetProto.lua,ecb6645f7ecb273af4d931c3b59fd516
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
-trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,6f8be84948695dbb7b8f1677b0559395
+trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66
+trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,2779ed6a1d88a75d9ae23d71d232c1cb
 trCRM/upgradeRes/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb
 trCRM/upgradeRes/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8
-trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
+trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
-trCRM/upgradeRes/priority/localization/Chinese.txt,4eb3274164c5597fd9c33f32efc75567
+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/priority/ui/panel/Android/PanelCustDetail.unity3d,2779ed6a1d88a75d9ae23d71d232c1cb
+trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,cb75e55817036828325bfb30a2fd1630
 trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
 trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab8900911e68fc8e0b46f6c1e0372
 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,cfbcce6782913e99f2e2b2d7db89a9a8
+trCRM/upgradeRes/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e
 trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6
+trCRM/upgradeRes/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b
 trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
-trCRM/upgradeRes/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5
+trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2

Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v

@@ -2,40 +2,42 @@ trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d0849189
 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd
 trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,26e455763621e8f9a8b1c7eeea902ea8
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work2.unity3d,eca0bd19a59ce72be19d7cdcbf9c5dac
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/add.unity3d,ceb10233c0fc59270d66e1cb5c93bb49
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,6c837c5717e2246a101874ca16bc45c9
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df37e59bdf7d5acf9cb9273
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/input.unity3d,44e1403bbf15c7313dff8cad78d39287
 trCRM/upgradeRes4Publish/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f16c2954984527
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,c2e0d30c5a556d4b29134313f7d8504e
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,6badf11fa5b679dea751004ec507c4c7
 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,832231a5af4da3f7c8b449fd7e2036ea
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,8db309620ae685fd7256db3022f2a1dd
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,78940d11a1467403fe99b0f45c190c5b
 trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
-trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,2afc0a533110bffa9e6e76054510ec17
+trCRM/upgradeRes4Publish/priority/lua/CLLMainLua.lua,f300e0babf50a8a8bdf5155bc55aeaf8
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca92255bb33e
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectCompany.lua,4c599efe00496ae268bd385a16e34e66
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame2.lua,e25ce84ca55cd643d527d09cedd6228a
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
 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,4c599efe00496ae268bd385a16e34e66
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,0ba23bf4649b7626a80efdd1711ebd71
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua,d7474f8fe283c9d4204823a9cf2b5d64
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,61bec7d5663d697efe04f80f0f055f4e
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,77fe50c4c113517c376dbfc1bbacfed9
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e
-trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,90bb4e550152956dc383a44ceaee4a59
+trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,49468afd86425e8a8c3195d8bf45b0f3
 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
 trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
@@ -43,7 +45,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,e5e9cb160e
 trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,6d54c7ee137c4a745daa3ea35fcfd9f9
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc97235
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua,79cfcdd1b744c25a06b569c03c81389e
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9
 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,2dfb99c1dd4d71fbe434075838e74e20
@@ -51,32 +53,33 @@ trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1c
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0
 trCRM/upgradeRes4Publish/priority/lua/bio/BioType.lua,4667e9def8191cbf2b9dc25e928bc23f
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3ddd6f65cf62f4a19
-trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,35fe7f9ef8374018e6b17e4efd9f9eea
+trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,a4f7c7a82b82a9926f58dd9e6ae66fe4
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,7f7a046c692932aea3ac8346203a4513
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,e1fa6dffadf4b7671a1403bee0554a90
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,7f8e7ec36a246e15bce7fb568ea36810
 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,7b9651232053e4001c15715461aa48a8
 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/TRPSysMsgDetail.lua,6266494c653deda1b5a391cc7f38a06a
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_3.unity3d,5f130cc66d813a2b339757e8a31cee8c
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,ee2e556d67dde151fa8833cb357be2d7
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
-trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,e73df6d7030e43ae34fd0d9751172eb1
+trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,07c3bd926e7c3e2ac44a3855165677cc
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/input.unity3d,b3ad3f57c51c02ff798a50a37d6c9cab
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMain.unity3d,e98480deb1039bdfee461ca100c37683
 trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,4459ba289c7af3023199f8a60d29dd72
+trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustFilter.lua,2fb22f9248e4af86ab42482151a5b141
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,d3d9c7897e50214ca72e6d32de96595a
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,1561ce4056ffa950fe84b2dea3d95a9d
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,dd36cd49215cc0c7b524e8c2b78780a2
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,bc12a0b0d3e78f5e3760d09232be872e
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,610be6a01539680fe565f6b969d20fa3
-trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,2e469a92c2fc31d8916fd0aa106b2bca
+trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445
 trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a03463952058ba795128
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e
@@ -101,7 +104,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_notice.unity3d,8ccab890
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d,fdf819bff61b0cecbeb489e5443fc6e0
 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc
-trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,650b06f2519e753561d257cd3f0a63b4
+trCRM/upgradeRes4Publish/priority/lua/db/DBCust.lua,9e09f434e175ae942801f2ab140f8a49
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustListProc.unity3d,b2dd2f01b5ffbfc4db73c670c2eb4646
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223
@@ -112,16 +115,16 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a
 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,ac475eab72569cc86cc098951c114716
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,fe91436dae9fcfb0b9fb4dc4353548e1
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelHotWheel.unity3d,4cd3b51592c3e769cd40525a0c4fc8e6
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMoreProc4Cust.unity3d,d7cc56af0e2920eaa9454516c3cdbf54
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,283a025b3c9794aba4aacca516ae1cea
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_1.unity3d,51120d82352e936df826b05696b89b19
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,3a951bdbe3cc3dc7373f91f66fae568c
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep1.lua,cc912be0fe9c81e228a057e2697e29e5
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_task.unity3d,bb4e1a1ce156f48fc0af330962865a62
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,ffbfefc5c866fd8acd606623e5a9430c
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,8b67c703c47a6c807b1ca22927461e23
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,462d7b1995685531a4628c24c1e89c42
 trCRM/upgradeRes4Publish/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef
@@ -131,6 +134,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,ee83701c37a6f2fc91691546a2e4fbe7
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,4fb60b2ce9256cf69814066a7ce97592
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
@@ -138,12 +142,12 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustFilter.lua,3c1157bee5e84df
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg.unity3d,b13e253b3a1689bf665ea7c3edecc519
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,0e6aca282f6862fccaa49ba2e67a39f2
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg.unity3d,3b42ecd8d30203eb5dcc65cb3a0ad815
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,3015fc19845e1200952cc62acc89ac94
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustFilter.unity3d,1de2b2262c6ded717226db77467c898d
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd
-trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,52fa6ebd08a9edc4a530cfd88d356ca1
+trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,04846782c4841e6cd418887457def22e
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,ab5f58b68264e6a53699f4bb58050d5e
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputDate.unity3d,01492264f7343238d1ffac1b62e29e01
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
+trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,653ca09b27502a7670796bf7924f334d
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,cb75e55817036828325bfb30a2fd1630
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button2.unity3d,1a48080b1d43367921fc09b430fffaf5
@@ -151,21 +155,20 @@ trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887b
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd1e08640243d
 trCRM/upgradeRes4Publish/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLFrame1.lua,1fd4e80adb13bd0d3cb0d7449922667b
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,93cdedf0292443159ba4981098b36a48
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,9bb8233233bd09778b367eb6462f72d7
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,1ee7e9c2a46b156e6d804b8a726d0ced
 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua,8a39819b2f7cd6f788077f706fb7d964
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/name.unity3d,f5b44185a57a97ce6971f20a4054d990
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,77bd9dfe20e7c03b4cc6fbda42fba5ec
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputPoplist.unity3d,193b730ff83212643d1582dfa819b6e5
 trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,f4012bc5f0a6dcb0680961a6d2bcc6ca
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21
-trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,9ba8a3a70b50975405c9129bb227d57c
+trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform3.unity3d,f0a5622c709a4d4ec6ac76c0c1e8abb5
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a
@@ -173,23 +176,23 @@ trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d23
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a6542404d8e5fb0b7d
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
 trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
-trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,521f0148bc335e67d33568bd7ba5142d
+trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,b29828bdf75c1313f28fc03d655ba812
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
 trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,6dcc6c943b8f2df9342ea8827eb43786
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,f70e550a65c00f8d2d636f4274931bb4
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/phone.unity3d,36e34519b910a11de3531994f607a140
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/peo.unity3d,939edcb747217aa4b0deb1d9a34f16b8
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,a41215fbc585d60f49b66358dd798690
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,17afb8f5b7000803125b255d2460ed61
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,04d61da969ffa87835209f7bc25369b0
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
 trCRM/upgradeRes4Publish/priority/lua/toolkit/KKLogListener.lua,341e17bfccad7217d30814868712ea15
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
+trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470facd5
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
-trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,678e4706af9b807ebb14f870c1cb41d5
+trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,3b3621f85affcea00bfa48463ef2b062
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLoginCoolape.unity3d,efb09b206c444d66d10720371645049b
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,99b7eaf8b2def868c353881982d688f4
@@ -213,16 +216,16 @@ 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,16321974e266491f5b18592f4518aa1c
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
-trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,c1ae593534ca9992a08cd0b2dd9e9a70
+trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,c9fd1e96628c3b9093a812942d507254
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/star.unity3d,f9684ea4b4e3a4206fc898bc6e4651ab
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,3339b54f4948faeac62678747b4d6f59
-trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,369799dc07a034bc211bc612c04c623d
+trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,ecb6645f7ecb273af4d931c3b59fd516
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMoreProc4Cust.lua,cc11fe3b2530891e91e2c649762d06f8
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,6f8be84948695dbb7b8f1677b0559395
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,0ed2b9e33472341cd87f8ddfd0966b66
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
-trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,4eb3274164c5597fd9c33f32efc75567
+trCRM/upgradeRes4Publish/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,2779ed6a1d88a75d9ae23d71d232c1cb
@@ -230,7 +233,7 @@ trCRM/upgradeRes4Publish/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_2.unity3d,802f5fec3b39fb208b1bd8a400801081
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_remind.unity3d,04a96d237c5e80ab044a54e7c063e368
-trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,cfbcce6782913e99f2e2b2d7db89a9a8
+trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6
 trCRM/upgradeRes4Publish/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve-families.png,d0b6b9b8a623a188aeae2fb688a8a0e5

Assets/trCRM/DistSpringWebsocketClient/Client.cs

@@ -104,11 +104,11 @@ namespace Dist.SpringWebsocket
                 {
                     if (result.MessageType == WebSocketMessageType.Text)
                     {
-                        //string msg = Encoding.UTF8.GetString(array, 0, result.Count);
+                        if (isDebug)
-                        //if (isDebug)
+                        {
-                        //{
+                            string msg = Encoding.UTF8.GetString(array, 0, result.Count);
-                        //    Debug.Log("receive:" + result.Count + "==\n" + msg);
+                            Debug.Log("receive:" + result.Count + "==\n" + msg);
-                        //}
+                        }
                         socket_MessageReceived(client, array, result.Count);
                     }
                     else if (result.MessageType == WebSocketMessageType.Close)
@@ -276,14 +276,14 @@ namespace Dist.SpringWebsocket
         }
         public void DisConnect()
         {
-            ArrayList list = new ArrayList();
+            //ArrayList list = new ArrayList();
-            list.AddRange(subscribes.Keys);
+            //list.AddRange(subscribes.Keys);
-            foreach (var key in list)
+            //foreach (var key in list)
-            {
+            //{
-                UnSubscribe(key.ToString());
+            //    UnSubscribe(key.ToString());
-            }
+            //}
-            this.callbacks.Clear();
+            //this.callbacks.Clear();
-            this.subscribes.Clear();
+            //this.subscribes.Clear();
             _send(StompCommandEnum.DISCONNECT.ToString() + LF + LF + NULL);
             this.connected = false;
             isSending = false;
@@ -406,6 +406,12 @@ namespace Dist.SpringWebsocket
                         frame.callback = callback;
                         queueCallback.Enqueue(frame);
                         break;
+                    case StatusCodeEnum.ERROR:
+                        socket.Abort();
+                        socket.Dispose();
+                        socket = null;
+                        Debug.LogWarning(frame.Code);
+                        break;
                     default:
                         Debug.LogError(frame.Code);
                         break;

Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab

@@ -46,7 +46,7 @@ MonoBehaviour:
   material: {fileID: 0}
   mSprites: []
   mPixelSize: 1
-  mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mReplacement: {fileID: 0}
   mCoordinates: 0
   sprites: []
   _isBorrowSpriteMode: 1

Assets/trCRM/Scripts/Main/MyMain.cs

@@ -5,25 +5,23 @@ using Coolape;
 public class MyMain : CLMainBase
 {
     [Tooltip("状态栏是否显示状态及通知")]
-    public bool statusBar = false;
+    public bool dimmed = false;
     [Tooltip("状态栏样式")]
-    public AndroidStatusBar.States statesBar = AndroidStatusBar.States.Visible;
+    public ApplicationChrome.States statusBarMode = ApplicationChrome.States.Visible;
-    public override void init()
-    {
-        string str = "qdkdkdkdkd";
-        Debug.Log(System.Text.RegularExpressions.Regex.Split(str, "d*").Length);
-        base.init();
 
+    public override void Start()
+    {
+        base.Start();
         if (Application.platform == RuntimePlatform.Android)
         {
-            if (statusBar)
+            ApplicationChrome.dimmed = dimmed;
-            {
+            ApplicationChrome.statusBarState = statusBarMode;
-                Screen.fullScreen = false;
-            }
-            //AndroidStatusBar.statusBarState = statesBar;
-            //AndroidStatusBar.dimmed = !statusBar;
         }
     }
+    public override void init()
+    {
+        base.init();
+    }
 
     public override void doOffline()
     {

Assets/trCRM/_scene/Main.unity

@@ -1531,8 +1531,8 @@ MonoBehaviour:
   canUpdateInvoke: 0
   frameCounter: 0
   firstPanel: PanelFirst
-  statusBar: 1
+  dimmed: 0
-  statesBar: 1
+  statusBarMode: 1
 --- !u!1 &1628026799
 GameObject:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: a83c5b360232d4cefa449cfddc1bf1d5
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 6dd378f39b8874395961bb8746f6b3ae
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab

@@ -1319,6 +1319,34 @@ MonoBehaviour:
     paddingTop: 0
     paddingBottom: 0
     path: trCRM/upgradeRes4Dev/other/uiAtlas/logo/logo2.png
+  - name: work_380bg
+    x: 0
+    y: 0
+    width: 380
+    height: 380
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/work/380bg.png
+  - name: hotwheel_loading
+    x: 0
+    y: 0
+    width: 115
+    height: 115
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png
   mPixelSize: 1
   mReplacement: {fileID: 0}
   mCoordinates: 0

Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt

@@ -11,7 +11,7 @@ DayBefore=天前
 HourBefore=小时前
 MinutesBefore=分钟前
 SecondBefore=秒前
-Loading=拼命加载中...
+Loading=加载中...
 Version=版本
 EnterGame=点击开始游戏
 Click4Select=点击切换

Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua

@@ -29,13 +29,26 @@ local mApplicationPauseDelegate = {}
 
 CLLMainLua.init = function()
     MyCfg.mode = GameMode.none
+    -- 日志logveiw
+    if ReporterMessageReceiver.self ~= nil then
+        ReporterMessageReceiver.self.gameObject:SetActive(true)
+        ReporterMessageReceiver.self.luaPath = "KOK/upgradeRes/priority/lua/toolkit/KKLogListener.lua"
+        ReporterMessageReceiver.self:setLua()
+    end
     -- 设置显示状态栏
-    AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
+    -- Screen.fullScreen = false
-    AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_WHITE_COLOR)
+    -- AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
+    -- AndroidStatusBar.statusBarState = AndroidStatusBar.States.Visible
+    -- AndroidStatusBar.dimmed = false
+    -- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
+
+    CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible
+    CS.ApplicationChrome.dimmed = false
+
     --设置帧率
     Application.targetFrameRate = 10
-    QualitySettings.SetQualityLevel(1, false)
+    -- QualitySettings.SetQualityLevel(1, false)
-    Time.fixedDeltaTime = 60
+    Time.fixedDeltaTime = 0.5
 
     -- 设置是否测试环境
     if (Prefs.getTestMode()) then
@@ -48,16 +61,11 @@ CLLMainLua.init = function()
 
     local fps = CLMainBase.self:GetComponent("CLFPS")
     fps.displayRect = Rect(10, 200, 640, 40)
+    fps.enabled = false
+    -- if Net.self.switchNetType == NetWorkType.publish then
+    --     fps.enabled = false
+    -- end
 
-    if Net.self.switchNetType == NetWorkType.publish then
-        fps.enabled = false
-    end
-
-    -- 日志logveiw
-    if ReporterMessageReceiver.self ~= nil then
-        ReporterMessageReceiver.self.luaPath = "KOK/upgradeRes/priority/lua/toolkit/KKLogListener.lua"
-        ReporterMessageReceiver.self:setLua()
-    end
 
     -- 统计sprite的使用情况
     if CLCfgBase.self.isEditMode and CLCfgBase.self.isContBorrowSpriteTimes then
@@ -161,7 +169,10 @@ function CLLMainLua.onCheckUpgrader(isHaveUpdated)
 end
 
 function CLLMainLua.begain()
-    pcall(CLLMainLua.init)
+    local success, msg = pcall(CLLMainLua.init)
+    if not success then
+        printe(msg)
+    end
 
     -- 处理开始
     if (CLCfgBase.self.isEditMode) then

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua

@@ -7,7 +7,7 @@
 ---@field taskId
 ---@field serviceNo
 ---@field companyid
----@field jsonstr
+---@field jsonStr
 ---@field dealflag
 ---@field custFrom
 ---@field customerLabel
@@ -57,8 +57,8 @@ DBCust.onGetFilter = function(data)
         db.filtersPopup[k].options = ArrayList()
         db.filtersPopup[k].values = ArrayList()
 
-        db.filtersPopup[k].options:Add("")
+        -- db.filtersPopup[k].options:Add("")
-        db.filtersPopup[k].values:Add("")
+        -- db.filtersPopup[k].values:Add("")
         for i, s in ipairs(cells) do
             db.filtersPopup[k].options:Add(s.name)
             db.filtersPopup[k].values:Add(tostring(s.value))

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua

@@ -17,7 +17,6 @@ DBRoot.clean = function()
     DBMessage.clean()
     DBCust.clean()
     DBStatistics.clean()
-    DBUser.clean()
 end
 
 DBRoot.funcs = {

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua

@@ -17,8 +17,4 @@ function DBUser.getUserById(loginNo)
     return db[loginNo]
 end
 
-function DBUser.clean()
-    db = {}
-end
-
 return DBUser

Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua

@@ -232,7 +232,8 @@ NetProto.cmds = {
     custtype_report = "custtype_report", -- 客户类型分布
     order_report = "order_report", -- 客户类型分布
     target_report = "target_report", -- 客户类型分布
-    update_customer = "update_customer" -- 更新客户信息
+    update_customer = "update_customer", -- 更新客户信息
+    save_customer = "save_customer", -- 新建客户
 }
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
@@ -381,7 +382,7 @@ NetProto.sendSocket = function(content, callback, timeOutSec)
         return
     end
     content.operator = NetProto.loginNo
-    content.loginno = content.loginno or NetProto.loginNo
+    content.loginNo = content.loginNo or NetProto.loginNo
     content.companyId = NetProto.comanyId
     content.callbackId = setCallback(callback, content, timeOutSec)
     local contentStr = json.encode(content)
@@ -437,7 +438,7 @@ end
 NetProto.send.person_view_query = function(callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.person_view_query
-    content.loginno = NetProto.loginNo
+    content.loginNo = NetProto.loginNo
     content.groupId = NetProto.groupId
     NetProto.sendSocket(content, callback, timeOutSec)
 end
@@ -455,8 +456,8 @@ NetProto.send.query_cust_calllog = function(phoneNo, loginNo, current_page, call
     local content = {}
     content.action = NetProto.cmds.query_cust_calllog
     content.groupId = NetProto.groupId
-    content.loginno = loginNo or NetProto.loginNo
+    content.loginNo = loginNo or NetProto.loginNo
-    content.phone = phoneNo
+    content.phoneNo = phoneNo
     content.current_page = current_page or 1
     NetProto.sendSocket(content, callback, timeOutSec)
 end
@@ -465,7 +466,7 @@ NetProto.send.sales_view_query = function(loginNo, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.sales_view_query
     content.groupId = NetProto.groupId
-    content.loginno = loginNo or NetProto.loginNo
+    content.loginNo = loginNo or NetProto.loginNo
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
@@ -474,7 +475,7 @@ NetProto.send.custtype_report = function(loginNo, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.custtype_report
     content.groupId = NetProto.groupId
-    content.loginno = loginNo or NetProto.loginNo
+    content.loginNo = loginNo or NetProto.loginNo
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
@@ -483,7 +484,7 @@ NetProto.send.order_report = function(loginNo, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.order_report
     content.groupId = NetProto.groupId
-    content.loginno = loginNo or NetProto.loginNo
+    content.loginNo = loginNo or NetProto.loginNo
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
@@ -492,7 +493,7 @@ NetProto.send.target_report = function(loginNo, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.target_report
     content.groupId = NetProto.groupId
-    content.loginno = loginNo or NetProto.loginNo
+    content.loginNo = loginNo or NetProto.loginNo
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
@@ -504,5 +505,14 @@ NetProto.send.update_customer = function(customer, callback, timeOutSec)
     content.customer = customer
     NetProto.sendSocket(content, callback, timeOutSec)
 end
+
+NetProto.send.save_customer = function(customer, callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.save_customer
+    content.loginNo = NetProto.loginNo
+    content.groupId = NetProto.groupId
+    content.customer = customer
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
 ------------------------------------------------------
 return NetProto

Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua

@@ -40,6 +40,8 @@ Directory = CS.System.IO.Directory
 MemoryStream = CS.System.IO.MemoryStream
 ---@type UnityEngine.Color
 Color = CS.UnityEngine.Color
+---@type UnityEngine.Screen
+Screen = CS.UnityEngine.Screen
 ---@type System.GC
 GC = CS.System.GC
 

Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua

@@ -36,17 +36,17 @@ end
 
 ---public 拨号
 MyUtl.callCust = function(cust)
-    if type(cust.jsonstr) == "string" then
+    if type(cust.jsonStr) == "string" then
-        cust.jsonstr = json.decode(cust.jsonstr)
+        cust.jsonStr = json.decode(cust.jsonStr)
     end
-    cust.jsonstr = cust.jsonstr or {}
+    cust.jsonStr = cust.jsonStr or {}
     local phones = ArrayList()
 
     local taskId = tostring(cust.taskId)
     local fields = DBCust.getFieldsByTask(taskId)
     for i, attr in ipairs(fields) do
         if attr.attrType == DBCust.FieldType.phone then
-            local phNo = cust.jsonstr[joinStr(attr.id, "_", attr.attrName)]
+            local phNo = cust.jsonStr[joinStr(attr.id, "_", attr.attrName)]
             if not isNilOrEmpty(phNo) then
                 phones:Add(joinStr(attr.attrName,": ", phNo))
             end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustFilter.lua

@@ -32,9 +32,9 @@ function _cell.setSelect(val)
     mData.selected = val
     if val then
         uiobjs.bg.color = ColorEx.getColor(0xff2990dc)
-        uiobjs.Label.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.Label.color = ColorEx.getColor(0xffffffff)
     else
-        uiobjs.bg.color = ColorEx.getColor(0xff999999)
+        uiobjs.bg.color = ColorEx.getColor(0xfff4f4f4)
         uiobjs.Label.color = ColorEx.getColor(0xff999999)
     end
 end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua

@@ -101,7 +101,7 @@ end
 function _cell.onFinisInitFields()
     isFieldLoading = false
     uiobjs.Table:Reposition()
-    uiobjs.formRoot:setValue(cust.jsonstr)
+    uiobjs.formRoot:setValue(cust.jsonStr)
     Utl.doCallback(mData.onFinish)
     hideHotWheel()
 end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua

@@ -86,8 +86,8 @@ do
             ButtonOK.localPosition = pos
             SetActive(Spriteline2.gameObject, false)
         else
-            ButtonCancel.localPosition = buttonOkOrgPositon
+            ButtonCancel.localPosition = buttonCancelOrgPositon
-            ButtonOK.localPosition = buttonCancelOrgPositon
+            ButtonOK.localPosition = buttonOkOrgPositon
             NGUITools.SetActive(ButtonCancel.gameObject, true)
             lbButtonCancel.text = lbbutton2
             SetActive(Spriteline2.gameObject, true)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua

@@ -0,0 +1,82 @@
+-- xx界面
+local CLLPPopList = {}
+
+---@type Coolape.CLPanelLua
+local csSelf = nil
+---@type UnityEngine.Transform
+local transform = nil
+local uiobjs = {}
+
+-- 初始化，只会调用一次
+function CLLPPopList.init(csObj)
+    csSelf = csObj
+    transform = csObj.transform
+    ---@type UISprite
+    uiobjs.SpriteBg = getCC(transform, "Bottom/offset/SpriteBg", "UISprite")
+    ---@type CLUIPopListPanel
+    uiobjs.popList = csSelf:GetComponent("CLUIPopListPanel")
+    uiobjs.list = getChild(transform, "Bottom/offset/List")
+end
+
+-- 设置数据
+function CLLPPopList.setData(paras)
+end
+
+--当有通用背板显示时的回调
+function CLLPPopList.onShowFrame()
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function CLLPPopList.show()
+    if uiobjs.popList.items.Count == 1 then
+        uiobjs.SpriteBg.height = 170
+        uiobjs.list.localPosition = Vector3(0, -340, 0)
+    elseif uiobjs.popList.items.Count == 2 then
+        uiobjs.SpriteBg.height = 340
+        uiobjs.list.localPosition = Vector3(0, -170, 0)
+    else
+        uiobjs.SpriteBg.height = 510
+        uiobjs.list.localPosition = Vector3.zero
+    end
+end
+
+-- 刷新
+function CLLPPopList.refresh()
+end
+
+-- 关闭页面
+function CLLPPopList.hide()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function CLLPPopList.procNetwork(cmd, succ, msg, paras)
+    --[[
+    if(succ == NetSuccess) then
+      if(cmd == "xxx") then
+        -- TODO:
+      end
+    end
+    --]]
+end
+
+-- 处理ui上的事件，例如点击等
+function CLLPPopList.uiEventDelegate(go)
+    local goName = go.name
+    --[[
+    if(goName == "xxx") then
+      --TODO:
+    end
+    --]]
+end
+
+-- 当顶层页面发生变化时回调
+function CLLPPopList.onTopPanelChange(topPanel)
+end
+
+-- 当按了返回键时，关闭自己（返值为true时关闭）
+function CLLPPopList.hideSelfOnKeyBack()
+    return true
+end
+
+--------------------------------------------
+return CLLPPopList

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1e471a865b3e54bffac09db464d469c4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua

@@ -143,9 +143,9 @@ do
                     CLLPSplash.upgradeGame(MapEx.getString(map, "url"))
                 end
                 if MapEx.getBool(map, "force") then
-                    CLUIUtl.showConfirm(LGet("MsgHadNewVerApp"), true, LGet("Update"), doUpgradeApp, "", nil)
+                    CLUIUtl.showConfirm(LGet("MsgHadNewVerApp"), true, "更新", doUpgradeApp, "", nil)
                 else
-                    CLUIUtl.showConfirm(LGet("MsgHadNewVerApp"), false, LGet("Update"), doUpgradeApp, LGet("UpdateLater"), CLLPSplash.updateRes)
+                    CLUIUtl.showConfirm(LGet("MsgHadNewVerApp"), false, "更新", doUpgradeApp, "忽略", CLLPSplash.updateRes)
                 end
             else
                 CLLPSplash.updateRes()
@@ -153,7 +153,7 @@ do
         end
 
         local onGetVerError = function(msg, orgs)
-            CLAlert.add(LGet("MsgCheckAppUpgradeFail"), Color.white, 1)
+            -- CLAlert.add(LGet("MsgCheckAppUpgradeFail"), Color.white, 1)
             CLLPSplash.updateRes()
         end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua

@@ -49,8 +49,8 @@ end
 ---@param paras _ParamTRPCustDetail
 function TRPCustDetail:setData(paras)
     self.mdata = paras
-    if type(self.mdata.jsonstr) == "string" then
+    if type(self.mdata.jsonStr) == "string" then
-        self.mdata.jsonstr = json.decode(self.mdata.jsonstr)
+        self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
     end
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua

@@ -59,7 +59,7 @@ end
 
 function TRPCustList:onShowRefreshFlg()
     -- printe("TRPCustList:onShowRefreshFlg")
-    uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0)
+    uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 300, 0)
     SetActive(uiobjs.ButtonHeadList.gameObject, true)
 end
 function TRPCustList:onhideRefreshFlg()
@@ -86,7 +86,7 @@ function TRPCustList:onEndList(tail)
         -- 取得下一页
         NetProto.send.list_customers(self.filterValue, queryKey, self.pageInfo.current_page + 1)
     else
-        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -270
+        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -300
         SetActive(uiobjs.ButtonEndList.gameObject, true)
     end
 end
@@ -141,6 +141,8 @@ function TRPCustList:procNetwork(cmd, succ, msg, paras)
             hideHotWheel()
         elseif cmd == NetProto.cmds.update_customer then
             uiobjs.Grid:refreshContentOnly()
+        elseif cmd == NetProto.cmds.save_customer then
+            self:refreshList()
         end
     end
 end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua

@@ -29,6 +29,8 @@ function TRPNewCust:init(csObj)
     uiobjs.starGridPrefab2 = getChild(uiobjs.starGrid2.transform, "00000").gameObject
 
     uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua")
+    ---@type CLUIFormRoot
+    uiobjs.ExtendFormRoot = uiobjs.ExtendRoot:GetComponent("CLUIFormRoot")
     uiobjs.elements = uiobjs.DetailRoot.gameObject:GetComponentsInChildren(typeof(CLUIElement), true)
     uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
 end
@@ -48,9 +50,10 @@ function TRPNewCust:setData(paras)
         self.mdata.serviceNo = NetProto.loginNo
         self.mdata.customerLabel = 1
     end
-    if type(self.mdata.jsonstr) == "string" then
+    if type(self.mdata.jsonStr) == "string" then
-        self.mdata.jsonstr = json.decode(self.mdata.jsonstr)
+        self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
     end
+    self.mdata.jsonStr = self.mdata.jsonStr or {}
 end
 
 ---public 当有通用背板显示时的回调
@@ -140,6 +143,9 @@ function TRPNewCust:onClickStar(cell, data)
             v.value = false
         end
     end
+    if self.isNewCust then
+        self.mdata.customerLabel = data.index
+    end
     CLUIUtl.resetList4Lua(uiobjs.starGrid2, uiobjs.starGridPrefab2, stars, self:wrapFunc(self.initStarCell))
     if (not self.isNewCust) and data.index ~= self.mdata.customerLabel then
         -- 说明更改了星级
@@ -169,12 +175,17 @@ function TRPNewCust:setElementMode(el)
     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.isNewCust) and (el.jsonKey == "taskId" or el.jsonKey == "phoneNo") then
         boxcollider.enabled = false
     else
         boxcollider.enabled = true
     end
+    
+    if ButtonReset then
+        ButtonReset.disabled = (not self.isNewCust)
+    end
     if input then
         if isPopList or isPopCheckbox then
             input.enabled = false
@@ -266,7 +277,7 @@ function TRPNewCust:sendModifymsg(key, val, isExtend)
     local content = {}
     content.id = self.mdata.custId
     if isExtend then
-        content.jsonstr = {[key] = val}
+        content.jsonStr = {[key] = val}
     else
         content[key] = val
     end
@@ -278,10 +289,11 @@ function TRPNewCust:sendModifymsg(key, val, isExtend)
             if result.success then
                 -- 更新本地数据
                 if isExtend then
-                    self.mdata.jsonstr[key] = val
+                    self.mdata.jsonStr[key] = val
                 else
                     self.mdata[key] = val
                 end
+                CLAlert.add("修改成功", Color.white, 1)
             end
         end
     )
@@ -295,7 +307,7 @@ function TRPNewCust:onPopupFieldValChg4Extend(go)
     local el = go:GetComponent("CLUIElement")
     if el then
         local err = el:checkValid()
-        if (not isNilOrEmpty(el.value)) and tostring(el.value) ~= tostring(self.mdata.jsonstr[el.jsonKey]) then
+        if (not isNilOrEmpty(el.value)) and tostring(el.value) ~= tostring(self.mdata.jsonStr[el.jsonKey]) then
             if isNilOrEmpty(err) then
                 -- 有修改，发送数据
                 self:sendModifymsg(el.jsonKey, el.value, true)
@@ -329,7 +341,7 @@ function TRPNewCust:onClickInputField4Extend(go)
 end
 
 function TRPNewCust:onFinishSetField4Extend(key, val)
-    if tostring(val) ~= tostring(self.mdata.jsonstr[key]) then
+    if tostring(val) ~= tostring(self.mdata.jsonStr[key]) then
         self:sendModifymsg(key, val, true)
     end
 end
@@ -337,6 +349,27 @@ end
 function TRPNewCust:setEventDelegate()
     self.EventDelegate = {
         ButtonSave = function()
+            local err = uiobjs.DetailRoot:checkValid()
+            err = joinStr(err, uiobjs.ExtendFormRoot:checkValid())
+            if not isNilOrEmpty(err) then
+                CLAlert.add(err, Color.yellow, 1)
+                return
+            end
+
+            local cust = uiobjs.DetailRoot:getValue(true)
+            cust.customerLabel = self.mdata.customerLabel
+            local jsonStr = uiobjs.ExtendFormRoot:getValue(true)
+            cust.jsonStr = jsonStr
+            showHotWheel()
+            NetProto.send.save_customer(
+                cust,
+                function(content)
+                    if content.success then
+                        getPanelAsy("PanelCustDetail", onLoadedPanel, cust)
+                    end
+                    hideHotWheel()
+                end
+            )
         end,
         InputTask = function()
             if self.isNewCust then

Assets/trCRM/upgradeRes4Dev/priority/ui/other/AlertRoot.prefab

@@ -48,7 +48,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   fontName: EmptyFont
   font: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  effect: 1
+  effect: 0
   inactiveWhenFinish: 0
   gradient: 0
   fontStyle: 0
@@ -180,7 +180,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3002
+  startingRenderQueue: 3000
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 0
@@ -204,7 +204,7 @@ MonoBehaviour:
   hudBackgroundSpriteName: login_log_bg
   hudBackgroundSpriteType: 1
   bgAnchorLeft: -5
-  bgAnchorBottom: -5
+  bgAnchorBottom: -50
-  bgAnchorTop: 5
+  bgAnchorTop: 50
   bgAnchorRight: 5
   hudBackgroundColor: {r: 0.21323532, g: 0.21323532, b: 0.21323532, a: 0.897}

Assets/trCRM/upgradeRes4Dev/priority/ui/other/Frame1.prefab

@@ -143,6 +143,7 @@ GameObject:
   - component: {fileID: 3778826698663624295}
   - component: {fileID: 5694506429957531626}
   - component: {fileID: 5008215346691190672}
+  - component: {fileID: 4340872375063363404}
   m_Layer: 5
   m_Name: top
   m_TagString: Untagged
@@ -251,6 +252,21 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1125, y: 132, z: 0}
   m_Center: {x: 0, y: -66, z: 0}
+--- !u!114 &4340872375063363404
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5452887780383457684}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 5694506429957531626}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &6514760866821866175
 GameObject:
   m_ObjectHideFlags: 0
@@ -295,7 +311,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 120, y: 100, z: 0}
+  m_Size: {x: 200, y: 120, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &4415921145653938434
 MonoBehaviour:

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab

@@ -301,7 +301,7 @@ MonoBehaviour:
   spriteBg: {fileID: 3135104635965478356}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
   isMultMode: 1
   onChange:
   - mTarget: {fileID: 3990162432079155172}

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab

@@ -357,7 +357,7 @@ MonoBehaviour:
   spriteBg: {fileID: 4462264015671642074}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &1723439637486485793
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab

@@ -612,6 +612,13 @@ MonoBehaviour:
       field: 
       name: go
     oneShot: 0
+  - mTarget: {fileID: 7894897217785059318}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
   mValue: 
 --- !u!114 &7894897217785059318
 MonoBehaviour:
@@ -636,7 +643,7 @@ MonoBehaviour:
   spriteBg: {fileID: 2839739815580303652}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &2201719010312833371
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab

@@ -160,7 +160,7 @@ MonoBehaviour:
   spriteBg: {fileID: 850321821054899805}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &5799184755667872995
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab

@@ -405,7 +405,14 @@ MonoBehaviour:
   caretColor: {r: 0, g: 0.23127818, b: 1, a: 0.8}
   selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
   onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 4818314150986197562}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
   mValue: 
 --- !u!114 &1657931634484404253
 MonoBehaviour:
@@ -483,7 +490,7 @@ MonoBehaviour:
   spriteBg: {fileID: 1657931634484404253}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &2270108241694216974
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform1.prefab

@@ -329,7 +329,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &2565127756708431313
@@ -392,7 +392,7 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 3
   mWidth: 100
   mHeight: 2
@@ -476,7 +476,7 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 3
   mWidth: 100
   mHeight: 2
@@ -719,7 +719,7 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 3
   mWidth: 100
   mHeight: 2
@@ -924,7 +924,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &4319487448922149741
@@ -1092,7 +1092,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &5490987535526166138
@@ -1317,7 +1317,7 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 3
   mWidth: 100
   mHeight: 2
@@ -1478,7 +1478,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &7814530028386079718

Assets/trCRM/upgradeRes4Dev/priority/ui/other/reportform3.prefab

@@ -206,7 +206,7 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.93333334, g: 0, b: 0, a: 1}
   mPivot: 4
-  mWidth: 166
+  mWidth: 180
   mHeight: 30
   mDepth: 5
   autoResizeBoxCollider: 0
@@ -281,6 +281,7 @@ MonoBehaviour:
   maxLen: 0
   spriteBg: {fileID: 0}
   valueIsNumber: 0
+  isPhoneNum: 0
   inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &2775252229165984769
 GameObject:
@@ -345,7 +346,7 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
   mPivot: 4
-  mWidth: 140
+  mWidth: 150
   mHeight: 56
   mDepth: 11
   autoResizeBoxCollider: 0
@@ -405,6 +406,7 @@ MonoBehaviour:
   maxLen: 0
   spriteBg: {fileID: 0}
   valueIsNumber: 0
+  isPhoneNum: 0
   inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &3432450386673070063
 GameObject:
@@ -470,7 +472,7 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
   mPivot: 4
-  mWidth: 196
+  mWidth: 210
   mHeight: 30
   mDepth: 5
   autoResizeBoxCollider: 0
@@ -545,6 +547,7 @@ MonoBehaviour:
   maxLen: 0
   spriteBg: {fileID: 0}
   valueIsNumber: 0
+  isPhoneNum: 0
   inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &4127901327117356546
 GameObject:
@@ -627,7 +630,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &6003287841620865763
@@ -759,7 +762,7 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 4
-  mWidth: 166
+  mWidth: 180
   mHeight: 30
   mDepth: 5
   autoResizeBoxCollider: 0
@@ -834,6 +837,7 @@ MonoBehaviour:
   maxLen: 0
   spriteBg: {fileID: 0}
   valueIsNumber: 0
+  isPhoneNum: 0
   inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &8684106509973965091
 GameObject:
@@ -916,6 +920,6 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: work_work_head_bg
+  mSpriteName: work_380bg
   mFillCenter: 1
   isGrayMode: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab

@@ -163,7 +163,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1112845515332026}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -200, y: -164, z: 0}
+  m_LocalPosition: {x: -200, y: -216, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4339528872407670}
@@ -182,7 +182,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 250, y: 100, z: 0}
+  m_Size: {x: 300, y: 120, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &114519516594473830
 MonoBehaviour:
@@ -245,17 +245,17 @@ MonoBehaviour:
   topAnchor:
     target: {fileID: 4918984189293466}
     relative: 0
-    absolute: -17
+    absolute: -50
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
   mWidth: 100
-  mHeight: 100
+  mHeight: 67
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 0.89285713
 --- !u!1 &1134352531475390
 GameObject:
   m_ObjectHideFlags: 0
@@ -318,8 +318,8 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
   mPivot: 4
-  mWidth: 200
+  mWidth: 100
-  mHeight: 46
+  mHeight: 50
   mDepth: 6
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -329,7 +329,7 @@ MonoBehaviour:
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u786E\u5B9A"
-  mFontSize: 45
+  mFontSize: 50
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -338,7 +338,7 @@ MonoBehaviour:
   mEffectColor: {r: 0, g: 0, b: 0, a: 1}
   mSymbols: 1
   mEffectDistance: {x: 1, y: 1}
-  mOverflow: 0
+  mOverflow: 2
   mMaterial: {fileID: 0}
   mApplyGradient: 0
   mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -426,7 +426,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7692307
+  aspectRatio: 80.5
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -509,7 +509,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1317192672435484}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 150, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 838591219146743202}
@@ -593,7 +593,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3005
+  startingRenderQueue: 3004
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -838,7 +838,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1773523788045064}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -96, z: 0}
+  m_LocalPosition: {x: -1, y: -131, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4006977121578436}
@@ -867,21 +867,21 @@ MonoBehaviour:
   bottomAnchor:
     target: {fileID: 4287639985245050}
     relative: 0
-    absolute: -67
+    absolute: -102
   topAnchor:
     target: {fileID: 4287639985245050}
     relative: 0
-    absolute: -65
+    absolute: -100
   updateAnchors: 1
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
-  mWidth: 745
+  mWidth: 825
   mHeight: 2
   mDepth: 4
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 372.5
+  aspectRatio: 412.5
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1030,7 +1030,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1848507256466840}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 200, y: -164, z: 0}
+  m_LocalPosition: {x: 200, y: -216, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4799862670645914}
@@ -1049,7 +1049,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 250, y: 100, z: 0}
+  m_Size: {x: 300, y: 120, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &114000131000435558
 MonoBehaviour:
@@ -1112,17 +1112,17 @@ MonoBehaviour:
   topAnchor:
     target: {fileID: 4918984189293466}
     relative: 0
-    absolute: -18
+    absolute: -50
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
   mWidth: 100
-  mHeight: 99
+  mHeight: 67
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.010101
+  aspectRatio: 0.89285713
 --- !u!1 &1958734661084766
 GameObject:
   m_ObjectHideFlags: 0
@@ -1185,18 +1185,18 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
   mPivot: 4
-  mWidth: 200
+  mWidth: 100
-  mHeight: 46
+  mHeight: 50
   mDepth: 6
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 4.347826
+  aspectRatio: 1.6666666
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u53D6\u6D88"
-  mFontSize: 45
+  mFontSize: 50
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -1205,7 +1205,7 @@ MonoBehaviour:
   mEffectColor: {r: 0, g: 0, b: 0, a: 1}
   mSymbols: 1
   mEffectDistance: {x: 1, y: 1}
-  mOverflow: 0
+  mOverflow: 2
   mMaterial: {fileID: 0}
   mApplyGradient: 0
   mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -1346,7 +1346,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2766493778587472692}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2, y: -113, z: 0}
+  m_LocalPosition: {x: -2, y: -152, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4006977121578436}
@@ -1375,21 +1375,21 @@ MonoBehaviour:
   bottomAnchor:
     target: {fileID: 4918984189293466}
     relative: 0
-    absolute: -106
+    absolute: -130
   topAnchor:
     target: {fileID: 4918984189293466}
     relative: 0
-    absolute: -16
+    absolute: -20
   updateAnchors: 1
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 1
   mWidth: 2
-  mHeight: 90
+  mHeight: 110
   mDepth: 4
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.022222223
+  aspectRatio: 0.015625
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1430,7 +1430,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3106899173612204433}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -24, z: 0}
+  m_LocalPosition: {x: -1, y: -55, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4006977121578436}
@@ -1451,15 +1451,15 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 4019535906442956}
     relative: 0
-    absolute: 190
+    absolute: 150
   rightAnchor:
     target: {fileID: 4019535906442956}
     relative: 1
-    absolute: -190
+    absolute: -150
   bottomAnchor:
     target: {fileID: 4918984189293466}
     relative: 0
-    absolute: -121
+    absolute: -150
   topAnchor:
     target: {fileID: 2628189625839598053}
     relative: 1
@@ -1467,13 +1467,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 745
+  mWidth: 825
-  mHeight: 388
+  mHeight: 453
   mDepth: 0
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.5111562
+  aspectRatio: 2.5943396
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1514,7 +1514,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4149562582349120115}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 103, z: 0}
+  m_LocalPosition: {x: 0, y: 104, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4006977121578436}

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustFilter.prefab

@@ -612,7 +612,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1361395155658230530}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 486, y: -25, z: 0}
+  m_LocalPosition: {x: 457, y: -25, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1611144160366652781}
@@ -632,13 +632,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 8585035547457419924}
+    target: {fileID: 8411829511229606282}
     relative: 1
-    absolute: -85
+    absolute: -105
   rightAnchor:
-    target: {fileID: 8585035547457419924}
+    target: {fileID: 8411829511229606282}
     relative: 1
-    absolute: -50
+    absolute: -70
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -656,7 +656,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 2.3611112
+  aspectRatio: 0.9722222
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1063,7 +1063,7 @@ MonoBehaviour:
   sorting: 1
   pivot: 0
   maxPerLine: 3
-  cellWidth: 350
+  cellWidth: 342
   cellHeight: 135
   animateSmoothly: 0
   hideInactive: 1
@@ -1374,6 +1374,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8411829511229606282}
   - component: {fileID: 57481834132150723}
+  - component: {fileID: 8892237662771014533}
+  - component: {fileID: 8168838377606256236}
   m_Layer: 5
   m_Name: 00000
   m_TagString: Untagged
@@ -1389,7 +1391,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5419392198895611480}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -9.25, y: -79.904205, z: 0}
+  m_LocalPosition: {x: 0.000061035156, y: -129.7792, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 894187409540540665}
@@ -1413,6 +1415,59 @@ MonoBehaviour:
   isPause: 0
   luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua
   isNeedResetAtlase: 1
+--- !u!114 &8892237662771014533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5419392198895611480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 100
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 11.25
+--- !u!114 &8168838377606256236
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5419392198895611480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 8892237662771014533}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &5610153183364922714
 GameObject:
   m_ObjectHideFlags: 0
@@ -1529,15 +1584,15 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.95686275, g: 0.95686275, b: 0.95686275, a: 1}
   mPivot: 4
   mWidth: 305
-  mHeight: 90
+  mHeight: 100
   mDepth: 0
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.3888888
+  aspectRatio: 3.05
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1550,7 +1605,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: public_check
+  mSpriteName: news_news_bg
   mFillCenter: 1
   isGrayMode: 0
 --- !u!65 &2805670669420496006
@@ -1564,7 +1619,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 305, y: 90, z: 0}
+  m_Size: {x: 305, y: 100, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7292738418668681994
 MonoBehaviour:
@@ -1988,7 +2043,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7079680303500818210}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -491, y: -0, z: 0}
+  m_LocalPosition: {x: -492, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8411829511229606282}
@@ -2007,9 +2062,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 8411829511229606282}
     relative: 0
-    absolute: 0
+    absolute: 70
   rightAnchor:
     target: {fileID: 0}
     relative: 1
@@ -2022,16 +2077,16 @@ MonoBehaviour:
     target: {fileID: 0}
     relative: 1
     absolute: 0
-  updateAnchors: 1
+  updateAnchors: 0
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 0
-  mWidth: 1002
+  mWidth: 242
   mHeight: 48
   mDepth: 0
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 20.875
+  aspectRatio: 5.0625
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -2045,7 +2100,7 @@ MonoBehaviour:
   mEffectColor: {r: 0, g: 0, b: 0, a: 1}
   mSymbols: 1
   mEffectDistance: {x: 1, y: 1}
-  mOverflow: 0
+  mOverflow: 2
   mMaterial: {fileID: 0}
   mApplyGradient: 0
   mGradientTop: {r: 1, g: 1, b: 1, a: 1}

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab

@@ -26,7 +26,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1680185994}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -462, y: 0, z: 0}
+  m_LocalPosition: {x: -462, y: -46, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3897974101900603345}
@@ -63,18 +63,18 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 3
-  mWidth: 508
+  mWidth: 572
-  mHeight: 38
+  mHeight: 42
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 13.368421
+  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: 38
+  mFontSize: 42
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -152,7 +152,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 307354104191689337}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -390, z: 0}
+  m_LocalPosition: {x: 0, y: -970, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4027989637601392902}
@@ -614,8 +614,8 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
-  mWidth: 72
+  mWidth: 96
-  mHeight: 36
+  mHeight: 48
   mDepth: 9
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -625,7 +625,7 @@ MonoBehaviour:
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u7535\u8BDD"
-  mFontSize: 36
+  mFontSize: 48
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -1215,8 +1215,8 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
-  mWidth: 72
+  mWidth: 96
-  mHeight: 36
+  mHeight: 48
   mDepth: 9
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -1226,7 +1226,7 @@ MonoBehaviour:
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u8DDF\u8FDB"
-  mFontSize: 36
+  mFontSize: 48
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -1281,7 +1281,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2831399258564446556}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -25, y: -120, z: 0}
+  m_LocalPosition: {x: -25, y: -135.75, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3423234776315785790}
@@ -1523,7 +1523,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 7.806818
+  aspectRatio: 29.931818
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1607,7 +1607,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 8.537879
+  aspectRatio: 23.287878
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1973,8 +1973,8 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
-  mWidth: 72
+  mWidth: 96
-  mHeight: 36
+  mHeight: 48
   mDepth: 9
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -1984,7 +1984,7 @@ MonoBehaviour:
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u4EFB\u52A1"
-  mFontSize: 36
+  mFontSize: 48
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -2165,7 +2165,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1025, y: 365, z: 0}
+  m_Size: {x: 1025, y: 450, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3975246978893821620
 MonoBehaviour:
@@ -2214,12 +2214,12 @@ MonoBehaviour:
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
   mWidth: 1025
-  mHeight: 365
+  mHeight: 450
   mDepth: 0
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 2.8082192
+  aspectRatio: 6.6044445
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -2280,7 +2280,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4807452480724246282
 Transform:
   m_ObjectHideFlags: 0
@@ -2289,7 +2289,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5382009932270026577}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -390, z: 0}
+  m_LocalPosition: {x: 0, y: -485, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6363306652445179708}
@@ -2382,7 +2382,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5589629059365445518}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 402, y: 26, z: 0}
+  m_LocalPosition: {x: 370, y: 26, z: 0}
   m_LocalScale: {x: 0.57, y: 0.57, z: 1}
   m_Children:
   - {fileID: 2651964549563356416}
@@ -2404,11 +2404,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 3897974101900603345}
     relative: 1
-    absolute: -182
+    absolute: -214
   rightAnchor:
     target: {fileID: 3897974101900603345}
     relative: 1
-    absolute: -38
+    absolute: -70
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -2470,7 +2470,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5627082769273778953}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 333, y: -120, z: 0}
+  m_LocalPosition: {x: 333, y: -136, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2882638549938090530}
@@ -2617,7 +2617,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5762016920945874999}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 402, y: -42, z: 0}
+  m_LocalPosition: {x: 372, y: -46, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3897974101900603345}
@@ -2638,11 +2638,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 3897974101900603345}
     relative: 1
-    absolute: -185
+    absolute: -230
   rightAnchor:
     target: {fileID: 3897974101900603345}
     relative: 1
-    absolute: -35
+    absolute: -50
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -2654,8 +2654,8 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
-  mWidth: 150
+  mWidth: 180
-  mHeight: 30
+  mHeight: 36
   mDepth: 7
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -2665,7 +2665,7 @@ MonoBehaviour:
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u5BA2\u6237\u7684\u540D\u5B57"
-  mFontSize: 30
+  mFontSize: 36
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -2674,7 +2674,7 @@ MonoBehaviour:
   mEffectColor: {r: 0, g: 0, b: 0, a: 1}
   mSymbols: 1
   mEffectDistance: {x: 1, y: 1}
-  mOverflow: 0
+  mOverflow: 2
   mMaterial: {fileID: 0}
   mApplyGradient: 0
   mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -2842,7 +2842,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6640636915241325103}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 76.845825, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3624471334851081428}
@@ -2894,7 +2894,7 @@ MonoBehaviour:
   mClipSoftness: {x: 4, y: 20}
   mDepth: 2
   mSortingOrder: 0
-  mClipOffset: {x: 0, y: 0}
+  mClipOffset: {x: 0, y: -76.845825}
 --- !u!114 &1671106021289561463
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2925,7 +2925,7 @@ MonoBehaviour:
   relativePositionOnReset: {x: 0, y: 0}
   centerOnChild: {fileID: 0}
   loopGrid: {fileID: 1265675470708273447}
-  thresholDelta: {x: 0, y: -100}
+  thresholDelta: {x: 0, y: -150}
 --- !u!1 &8147424317762133719
 GameObject:
   m_ObjectHideFlags: 0
@@ -2954,7 +2954,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8147424317762133719}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -430, y: -120, z: 0}
+  m_LocalPosition: {x: -430, y: -136, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 889148009588387556}
@@ -3101,7 +3101,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8218860318568637904}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -462, y: 59, z: 0}
+  m_LocalPosition: {x: -462, y: 43, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3897974101900603345}
@@ -3138,18 +3138,18 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 3
-  mWidth: 536
+  mWidth: 572
-  mHeight: 40
+  mHeight: 42
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 13.4
+  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: 40
+  mFontSize: 42
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -3264,17 +3264,17 @@ MonoBehaviour:
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 3
   mWidth: 723
-  mHeight: 42
+  mHeight: 48
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 17.214285
+  aspectRatio: 15.0625
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u5F88\u725Bx\u7684\u516C\u53F8"
-  mFontSize: 46
+  mFontSize: 48
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -3353,7 +3353,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8601711290549868915}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 402, y: 124, z: 0}
+  m_LocalPosition: {x: 371, y: 124, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3897974101900603345}
@@ -3374,11 +3374,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 3897974101900603345}
     relative: 1
-    absolute: -170
+    absolute: -213
   rightAnchor:
     target: {fileID: 3897974101900603345}
     relative: 1
-    absolute: -50
+    absolute: -69
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -3390,18 +3390,18 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
-  mWidth: 120
+  mWidth: 144
-  mHeight: 60
+  mHeight: 36
   mDepth: 4
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 4
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u6B63\u5728\u8DDF\u8FDB"
-  mFontSize: 30
+  mFontSize: 36
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -3543,7 +3543,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8799149260921359694}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 678, z: 0}
+  m_LocalPosition: {x: 0, y: 347, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3897974101900603345}
@@ -3569,7 +3569,7 @@ MonoBehaviour:
   pivot: 1
   maxPerLine: 0
   cellWidth: 0
-  cellHeight: 390
+  cellHeight: 485
   animateSmoothly: 0
   hideInactive: 1
   keepWithinPanel: 0
@@ -3588,7 +3588,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cellCount: 12
+  cellCount: 9
   isPlayTween: 0
   twType: 0
   tweenSpeed: 0.01

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelHotWheel.prefab

@@ -26,7 +26,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1074882999282432}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 50, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4775181055594792}
@@ -63,8 +63,8 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 64
+  mWidth: 116
-  mHeight: 64
+  mHeight: 116
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -82,7 +82,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: hotwheel_hotWheel_prog
+  mSpriteName: hotwheel_loading
   mFillCenter: 1
   isGrayMode: 0
 --- !u!114 &114880967518055250
@@ -282,7 +282,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1125343093923812}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 26, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4094946543296570}
@@ -318,16 +318,16 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 4
-  mWidth: 64
+  mWidth: 400
-  mHeight: 64
+  mHeight: 300
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 1.3333334
-  mType: 0
+  mType: 1
   mFillDirection: 4
   mFillAmount: 1
   mInvert: 0
@@ -339,7 +339,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: hotwheel_hotWheel_bg
+  mSpriteName: public_button2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &1143679377029560
@@ -368,7 +368,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1143679377029560}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -60, z: 0}
+  m_LocalPosition: {x: 0, y: -70, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4779066332775106}
@@ -405,23 +405,23 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 260
+  mWidth: 286
-  mHeight: 40
+  mHeight: 50
-  mDepth: 0
+  mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 6.5
+  aspectRatio: 5.72
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u6B7B\u547D\u52A0\u8F7D\u4E2D..."
-  mFontSize: 40
+  mFontSize: 50
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
   mMaxLineCount: 0
-  mEffectStyle: 1
+  mEffectStyle: 0
   mEffectColor: {r: 0, g: 0, b: 0, a: 1}
   mSymbols: 1
   mEffectDistance: {x: 1, y: 1}

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab

@@ -168,17 +168,17 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
   mPivot: 4
-  mWidth: 200
+  mWidth: 100
   mHeight: 50
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3
+  aspectRatio: 1
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u4FEE\u6539"
+  mText: "\u4FDD\u5B58"
   mFontSize: 50
   mFontStyle: 0
   mAlignment: 0
@@ -231,7 +231,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2179697659840441988}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 512, y: -57, z: 0}
+  m_LocalPosition: {x: 482, y: -57, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1683461306368091200}
@@ -256,7 +256,7 @@ MonoBehaviour:
   rightAnchor:
     target: {fileID: 1683461306368091200}
     relative: 1
-    absolute: -50
+    absolute: -80
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -266,19 +266,19 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 0
-  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: 2
-  mWidth: 739
+  mWidth: 709
   mHeight: 52
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.622549
+  aspectRatio: 7.409091
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u70B9\u51FB\u586B\u5199"
+  mText: "\u586B\u5199"
   mFontSize: 46
   mFontStyle: 0
   mAlignment: 0
@@ -456,6 +456,146 @@ MonoBehaviour:
   widget: {fileID: 3413289893354422432}
   offset: 0
   sizeAdjust: 1
+--- !u!1 &4476806515245165190
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6685523097503563342}
+  - component: {fileID: 5492282355755450671}
+  - component: {fileID: 7289972596597100950}
+  - component: {fileID: 7691472322374076242}
+  - component: {fileID: 5348005097758382780}
+  m_Layer: 5
+  m_Name: ButtonReset
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6685523097503563342
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4476806515245165190}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 520, y: -80, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1683461306368091200}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &5492282355755450671
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4476806515245165190}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 100, y: 160, z: 0}
+  m_Center: {x: 0, y: -0.4083004, z: 0}
+--- !u!114 &7289972596597100950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4476806515245165190}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 4476806515245165190}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 0
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick: []
+--- !u!114 &7691472322374076242
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4476806515245165190}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 1683461306368091200}
+    relative: 1
+    absolute: -64
+  rightAnchor:
+    target: {fileID: 1683461306368091200}
+    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: 2
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.045454547
+  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 &5348005097758382780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4476806515245165190}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce7ce3a27703447e98bd5b91307e34c8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  input: {fileID: 0}
 --- !u!1 &5107750880464652119
 GameObject:
   m_ObjectHideFlags: 0
@@ -571,7 +711,7 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
   mPivot: 3
-  mWidth: 24
+  mWidth: 22
   mHeight: 46
   mDepth: 1
   autoResizeBoxCollider: 0
@@ -657,6 +797,7 @@ Transform:
   - {fileID: 4419566366449430050}
   - {fileID: 4211057903758131807}
   - {fileID: 8108763908410476651}
+  - {fileID: 6685523097503563342}
   m_Father: {fileID: 9125718433609781645}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -699,7 +840,14 @@ MonoBehaviour:
   caretColor: {r: 1, g: 1, b: 1, a: 0.8}
   selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
   onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 3747768411737643890}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
   mValue: 
 --- !u!114 &7439225763898652023
 MonoBehaviour:
@@ -738,7 +886,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 7.03125
+  aspectRatio: 6.7771087
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -777,7 +925,7 @@ MonoBehaviour:
   spriteBg: {fileID: 7439225763898652023}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &565169808295371521
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab

@@ -595,7 +595,7 @@ MonoBehaviour:
   spriteBg: {fileID: 7485745447928115911}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &7706136121568805155
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1990,7 +1990,7 @@ MonoBehaviour:
   spriteBg: {fileID: 0}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &6151024843126350017
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2798,7 +2798,14 @@ MonoBehaviour:
   caretColor: {r: 1, g: 1, b: 1, a: 0.8}
   selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
   onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 1960657344210492585}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
   mValue: 
 --- !u!114 &5204943988176868982
 MonoBehaviour:
@@ -2876,7 +2883,7 @@ MonoBehaviour:
   spriteBg: {fileID: 5204943988176868982}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &2642849941954706633
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3027,7 +3034,14 @@ MonoBehaviour:
   caretColor: {r: 1, g: 1, b: 1, a: 0.8}
   selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
   onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 8393547907697916291}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
   mValue: 
 --- !u!114 &5317470512156664014
 MonoBehaviour:
@@ -3105,7 +3119,7 @@ MonoBehaviour:
   spriteBg: {fileID: 5317470512156664014}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &3442074063099736304
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3787,7 +3801,7 @@ MonoBehaviour:
   spriteBg: {fileID: 4461445022272531444}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &3779740137265617817
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4139,7 +4153,7 @@ MonoBehaviour:
   spriteBg: {fileID: 3178760614527804315}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &1928108954818559889
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5003,7 +5017,14 @@ MonoBehaviour:
   caretColor: {r: 1, g: 1, b: 1, a: 0.8}
   selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
   onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 6282768485822603575}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
   mValue: 
 --- !u!114 &4652420088761833118
 MonoBehaviour:
@@ -5081,7 +5102,7 @@ MonoBehaviour:
   spriteBg: {fileID: 4652420088761833118}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &6926062387165721849
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5717,7 +5738,7 @@ MonoBehaviour:
   label: {fileID: 744354361481419164}
   inputType: 0
   onReturnKey: 0
-  keyboardType: 0
+  keyboardType: 5
   hideInput: 0
   alertModeKeybaord: 0
   validation: 0
@@ -5728,7 +5749,14 @@ MonoBehaviour:
   caretColor: {r: 1, g: 1, b: 1, a: 0.8}
   selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
   onSubmit: []
-  onChange: []
+  onChange:
+  - mTarget: {fileID: 7832941425523701714}
+    mMethodName: OnValueChg
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
   mValue: 
 --- !u!114 &1887686282152667400
 MonoBehaviour:
@@ -5806,7 +5834,7 @@ MonoBehaviour:
   spriteBg: {fileID: 1887686282152667400}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &1855318636350357415
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6336,7 +6364,7 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 5
-  mWidth: 92
+  mWidth: 769
   mHeight: 46
   mDepth: 1
   autoResizeBoxCollider: 0
@@ -6710,7 +6738,7 @@ MonoBehaviour:
   spriteBg: {fileID: 3008590252310527452}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &1690646414248708626
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7351,7 +7379,14 @@ MonoBehaviour:
   pressedSprite2D: {fileID: 0}
   disabledSprite2D: {fileID: 0}
   pixelSnap: 0
-  onClick: []
+  onClick:
+  - mTarget: {fileID: 647293506326030677}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
 --- !u!114 &7475875381862331777
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7618,7 +7653,7 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 5
-  mWidth: 92
+  mWidth: 769
   mHeight: 46
   mDepth: 1
   autoResizeBoxCollider: 0
@@ -7816,7 +7851,7 @@ MonoBehaviour:
   spriteBg: {fileID: 7877533708768156687}
   valueIsNumber: 0
   isPhoneNum: 0
-  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  inValidColor: {r: 1, g: 1, b: 0.9019608, a: 1}
 --- !u!114 &5729265047817619174
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab

@@ -26,7 +26,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1128426009982095526}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8153878865689013803}
@@ -53,23 +53,23 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   bottomAnchor:
-    target: {fileID: 0}
+    target: {fileID: 6009505243420807037}
     relative: 0
-    absolute: 0
+    absolute: 10
   topAnchor:
-    target: {fileID: 0}
+    target: {fileID: 6009505243420807037}
     relative: 1
-    absolute: 0
+    absolute: -10
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 0}
   mPivot: 4
   mWidth: 10
-  mHeight: 500
+  mHeight: 491
   mDepth: 2
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.02
+  aspectRatio: 0.020366598
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -96,8 +96,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 10, y: 497.06842, z: 0}
+  m_Size: {x: 10, y: 488.1214, z: 0}
-  m_Center: {x: 0, y: 1.4657822, z: 0}
+  m_Center: {x: 0, y: 1.4392929, z: 0}
 --- !u!1 &1811486554228407836
 GameObject:
   m_ObjectHideFlags: 0
@@ -124,7 +124,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1811486554228407836}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8153878865689013803}
@@ -151,23 +151,23 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   bottomAnchor:
-    target: {fileID: 0}
+    target: {fileID: 6009505243420807037}
     relative: 0
-    absolute: 0
+    absolute: 10
   topAnchor:
-    target: {fileID: 0}
+    target: {fileID: 6009505243420807037}
     relative: 1
-    absolute: 0
+    absolute: -10
   updateAnchors: 1
   mColor: {r: 0.7607843, g: 0.7607843, b: 0.7607843, a: 1}
   mPivot: 4
   mWidth: 10
-  mHeight: 500
+  mHeight: 491
   mDepth: 1
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.02
+  aspectRatio: 0.020366598
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -194,7 +194,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 10, y: 500, z: 0}
+  m_Size: {x: 10, y: 491, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &2821560482880363833
 GameObject:
@@ -224,7 +224,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 6009505243420805787}
+  - {fileID: 5308206755643940410}
   - {fileID: 6009505243420807037}
   - {fileID: 1238255866617982197}
   - {fileID: 8153878865689013803}
@@ -306,7 +306,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3920714121603821296}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1152, z: 0}
+  m_LocalPosition: {x: 0, y: 9999, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5163088768227076857}
@@ -332,6 +332,37 @@ MonoBehaviour:
   relativeOffset: {x: 0, y: 0}
   pixelOffset: {x: 0, y: 0}
   widgetContainer: {fileID: 0}
+--- !u!1 &4268521125941508890
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5308206755643940410}
+  m_Layer: 5
+  m_Name: List
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5308206755643940410
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4268521125941508890}
+  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: 6009505243420805787}
+  m_Father: {fileID: 5163088768227076857}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5687096809462733321
 GameObject:
   m_ObjectHideFlags: 0
@@ -644,6 +675,9 @@ MonoBehaviour:
   itemList: []
   grid: {fileID: 0}
   panel: {fileID: 0}
+  OnShowHeadListCallbacks: []
+  OnHideHeadListCallbacks: []
+  OnEndListCallbacks: []
 --- !u!1 &6009505243421021105
 GameObject:
   m_ObjectHideFlags: 0
@@ -689,7 +723,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 3000, y: 170, z: 0}
+  m_Size: {x: 925, y: 170, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &6009505243410744091
 MonoBehaviour:
@@ -800,7 +834,7 @@ GameObject:
   - component: {fileID: 6009505243420807037}
   - component: {fileID: 6009505243410848229}
   m_Layer: 5
-  m_Name: Sprite
+  m_Name: SpriteBg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -814,7 +848,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6009505243421048191}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1, y: 502, z: 0}
+  m_LocalPosition: {x: -1, y: 248, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5163088768227076857}
@@ -850,7 +884,7 @@ MonoBehaviour:
     absolute: 0
   updateAnchors: 0
   mColor: {r: 1, g: 1, b: 1, a: 1}
-  mPivot: 4
+  mPivot: 7
   mWidth: 1025
   mHeight: 510
   mDepth: -1
@@ -966,7 +1000,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isPause: 0
-  luaPath: 
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua
   isNeedBackplate: 0
   destroyWhenHide: 0
   isNeedResetAtlase: 1
@@ -1142,11 +1176,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6009505243421135641}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 410.10706, z: 0}
+  m_LocalPosition: {x: 0, y: 410, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6009505243420811003}
-  m_Father: {fileID: 5163088768227076857}
+  m_Father: {fileID: 5308206755643940410}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6009505243410838209
@@ -1315,10 +1349,10 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 5
-  mWidth: 100
+  mWidth: 563
   mHeight: 100
   mDepth: 0
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 5.63

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab

@@ -1781,7 +1781,7 @@ MonoBehaviour:
     target: {fileID: 0}
     relative: 1
     absolute: 0
-  updateAnchors: 0
+  updateAnchors: 1
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 4
   mWidth: 24
@@ -1790,7 +1790,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.5
+  aspectRatio: 0.6
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -3387,7 +3387,7 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 4
-  mWidth: 84
+  mWidth: 168
   mHeight: 42
   mDepth: 5
   autoResizeBoxCollider: 0
@@ -3397,7 +3397,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u8BA2\u5355"
+  mText: "\u8BA2\u5355\u6210\u4EA4"
   mFontSize: 42
   mFontStyle: 0
   mAlignment: 0
@@ -4453,7 +4453,7 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
   mPivot: 4
-  mWidth: 84
+  mWidth: 168
   mHeight: 42
   mDepth: 6
   autoResizeBoxCollider: 0
@@ -4463,7 +4463,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u8BA2\u5355"
+  mText: "\u8BA2\u5355\u6210\u4EA4"
   mFontSize: 42
   mFontStyle: 0
   mAlignment: 0

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e90704f9b614847d1b9f8c3cf9bf66e0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f56061be2e88745709fee0fe38af0054
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/localization/Chinese.txt

@@ -11,7 +11,7 @@ DayBefore=天前
 HourBefore=小时前
 MinutesBefore=分钟前
 SecondBefore=秒前
-Loading=拼命加载中...
+Loading=加载中...
 Version=版本
 EnterGame=点击开始游戏
 Click4Select=点击切换

Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 42755029531dc440a9ec6fb968c61f40
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,fd3cafdbd4d3308b3c5777830a0247a38	%trCRM/resVer/Android/VerCtl/other.ver8,5d7652a6e041f6c69527bca78bcfb166
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,2de8c2d801ea63e972b8f7ec3b8b63798	%trCRM/resVer/Android/VerCtl/other.ver8,a0ae422d5465689aa97c50da2ca98180