2020-07-08

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)
-                        //{
-                        //    Debug.Log("receive:" + result.Count + "==\n" + msg);
-                        //}
+                        if (isDebug)
+                        {
+                            string msg = Encoding.UTF8.GetString(array, 0, result.Count);
+                            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();
-            list.AddRange(subscribes.Keys);
-            foreach (var key in list)
-            {
-                UnSubscribe(key.ToString());
-            }
-            this.callbacks.Clear();
-            this.subscribes.Clear();
+            //ArrayList list = new ArrayList();
+            //list.AddRange(subscribes.Keys);
+            //foreach (var key in list)
+            //{
+            //    UnSubscribe(key.ToString());
+            //}
+            //this.callbacks.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 override void init()
-    {
-        string str = "qdkdkdkdkd";
-        Debug.Log(System.Text.RegularExpressions.Regex.Split(str, "d*").Length);
-        base.init();
+    public ApplicationChrome.States statusBarMode = ApplicationChrome.States.Visible;
 
+    public override void Start()
+    {
+        base.Start();
         if (Application.platform == RuntimePlatform.Android)
         {
-            if (statusBar)
-            {
-                Screen.fullScreen = false;
-            }
-            //AndroidStatusBar.statusBarState = statesBar;
-            //AndroidStatusBar.dimmed = !statusBar;
+            ApplicationChrome.dimmed = dimmed;
+            ApplicationChrome.statusBarState = statusBarMode;
         }
     }
+    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
-  statesBar: 1
+  dimmed: 0
+  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)
-    AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_WHITE_COLOR)
+    -- Screen.fullScreen = false
+    -- 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)
-    Time.fixedDeltaTime = 60
+    -- QualitySettings.SetQualityLevel(1, false)
+    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].values:Add("")
+        -- db.filtersPopup[k].options: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.phone = phoneNo
+    content.loginNo = loginNo or NetProto.loginNo
+    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
-        cust.jsonstr = json.decode(cust.jsonstr)
+    if type(cust.jsonStr) == "string" then
+        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
-            ButtonOK.localPosition = buttonCancelOrgPositon
+            ButtonCancel.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
-        self.mdata.jsonstr = json.decode(self.mdata.jsonstr)
+    if type(self.mdata.jsonStr) == "string" then
+        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
-        self.mdata.jsonstr = json.decode(self.mdata.jsonstr)
+    if type(self.mdata.jsonStr) == "string" then
+        self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
     end
+    self.mdata.jsonStr = self.mdata.jsonStr or {}
 end
 
 ---public 当有通用背板显示时的回调
@@ -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
-  bgAnchorTop: 5
+  bgAnchorBottom: -50
+  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
-  mHeight: 46
+  mWidth: 100
+  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
-  mHeight: 46
+  mWidth: 100
+  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
-  mHeight: 388
+  mWidth: 825
+  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
-  mHeight: 38
+  mWidth: 572
+  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
-  mHeight: 36
+  mWidth: 96
+  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
-  mHeight: 36
+  mWidth: 96
+  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
-  mHeight: 36
+  mWidth: 96
+  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
-  mHeight: 30
+  mWidth: 180
+  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
-  mHeight: 40
+  mWidth: 572
+  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
-  mHeight: 60
+  mWidth: 144
+  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
-  mHeight: 64
+  mWidth: 116
+  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
-  mHeight: 64
+  mWidth: 400
+  mHeight: 300
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1
-  mType: 0
+  aspectRatio: 1.3333334
+  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
-  mHeight: 40
-  mDepth: 0
+  mWidth: 286
+  mHeight: 50
+  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_Center: {x: 0, y: 1.4657822, z: 0}
+  m_Size: {x: 10, y: 488.1214, 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