up

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

@@ -51,13 +51,13 @@ CLLMainLua.init = function()
     Time.fixedDeltaTime = 0.5
 
     -- 设置是否测试环境
-    if (Prefs.getTestMode()) then
-        local url = Prefs.getTestModeUrl()
-        if (not isNilOrEmpty(url)) then
-            CLAlert.add("Test...", Color.red, -1, 1, false)
-            CLVerManager.self.baseUrl = url
-        end
-    end
+    -- if (Prefs.getTestMode()) then
+    --     local url = Prefs.getTestModeUrl()
+    --     if (not isNilOrEmpty(url)) then
+    --         CLAlert.add("Test...", Color.red, -1, 1, false)
+    --         CLVerManager.self.baseUrl = url
+    --     end
+    -- end
 
     local fps = CLMainBase.self:GetComponent("CLFPS")
     fps.displayRect = Rect(10, 200, 640, 40)

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

@@ -125,7 +125,7 @@ function CLLNet.dispatch(map)
 
     if (succ ~= NetSuccess) then
         retInfor.msg = Localization.Get(joinStr("Error_", succ))
-        CLAlert.add(retInfor.msg, Color.red, 1)
+        MyUtl.toastE(retInfor.msg)
         hideHotWheel()
     else
         -- success

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

@@ -8,13 +8,19 @@ NetProto.send = {}
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
+local host = "47.111.20.34"
+local port = 29004
+-- local host = "192.168.1.126"
+-- local port = 29000
 -- local baseUrl = "http://app.ttf-cti.com:29000/open_api/"
-local baseUrl = "http://47.111.20.34:29004/open_api/"
+local baseUrl = joinStr("http://", host, ":", port, "/open_api/")
 -- local baseUrl2 = "http://47.111.20.34:29004/open_api/"
 -- local socketUrl = "ws://app.ttf-cti.com:29000/tr_socket/websocket/"
-local socketUrl = "ws://47.111.20.34:29004/tr_socket/websocket/"
+-- local socketUrl = "ws://47.111.20.34:29004/tr_socket/websocket/"
+local socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
+
 ---@type Dist.SpringWebsocket.Client
-local socket = SocketClient.self
+local socket = Client4Stomp.self
 local appid = 2020158
 local appsecret = "ea042bc86428ca968756a6e47b10742d"
 local isDebug = true
@@ -62,7 +68,7 @@ local dispatch = function(content, params)
         printe(joinStr("cmd:[", cmd, "]code:[", code, "]msg:", msg))
         -- retInfor.msg = Localization.Get(joinStr("Error_", succ))
         if not isNilOrEmpty(msg) then
-            CLAlert.add(msg, Color.yellow, 1)
+            MyUtl.toastE(msg)
         end
         hideHotWheel()
     else
@@ -103,7 +109,7 @@ end
 
 NetProto.sendGet = function(cmd, map, callback, failedCallback, orgs, _baseUrl)
     if isNilOrEmpty(NetProto.sign) and (cmd ~= NetProto.cmds.getTokenForAPI) then
-        CLAlert.add("与服务器失去联络，请重试！", Color.yellow, 1)
+        CLAlert.add("与服务器失去联络，请重试！", Color.white, 1)
         NetProto.init()
         return
     end
@@ -146,12 +152,12 @@ function NetProto.init(callback)
                 onGetToken(data.result)
                 Utl.doCallback(callback, true)
             else
-                CLAlert.add(data.msg, Color.yellow, 1)
+                CLAlert.add(data.msg, Color.white, 1)
                 Utl.doCallback(callback, false)
             end
         end,
         function()
-            CLAlert.add("取得会话ID失败！", Color.yellow, 1)
+            CLAlert.add("取得会话ID失败！", Color.white, 1)
             Utl.doCallback(callback, false)
         end
     )
@@ -233,7 +239,7 @@ NetProto.cmds = {
     order_report = "order_report", -- 客户类型分布
     target_report = "target_report", -- 客户类型分布
     update_customer = "update_customer", -- 更新客户信息
-    save_customer = "save_customer", -- 新建客户
+    save_customer = "save_customer" -- 新建客户
 }
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
@@ -386,7 +392,7 @@ NetProto.sendSocket = function(content, callback, timeOutSec)
     content.companyId = NetProto.comanyId
     content.callbackId = setCallback(callback, content, timeOutSec)
     local contentStr = json.encode(content)
-    InvokeEx.invoke(NetProto.doSendMsg, contentStr, 0.1)
+    NetProto.doSendMsg(contentStr)
 end
 
 NetProto.doSendMsg = function(contentStr)

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

@@ -249,8 +249,8 @@ Uri = CS.System.Uri
 NativeGalleryUtl = CS.NativeGalleryUtl
 ---@type MyLocation
 MyLocation = CS.MyLocation
----@type Dist.SpringWebsocket.Client
-SocketClient = CS.Dist.SpringWebsocket.Client
+---@type Dist.SpringWebsocket.Client4Stomp
+Client4Stomp = CS.Client4Stomp
 ---@type Dist.SpringWebsocket.StompFrame
 StompFrame = CS.Dist.SpringWebsocket.StompFrame
 ---@type Dist.SpringWebsocket.StatusCodeEnum

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

@@ -140,7 +140,7 @@ bio2Long = BioUtl.bio2long
 long2Bio = BioUtl.long2bio
 bio2number = BioUtl.bio2number
 number2bio = BioUtl.number2bio
-net = Net.self
+-- net = Net.self
 NetSuccess = 1000 -- Net.SuccessCode
 
 LGet = Localization.Get

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

@@ -3,7 +3,7 @@
 --
 
 require("public.class")
----@class CLLQueue
+---@class CLLQueue :ClassBase
 CLLQueue = class("CLLQueue")
 
 local insert = table.insert;

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

@@ -440,7 +440,7 @@ function procOffLine()
         return
     end
 
-    -- CLAlert.add(LGet("MsgOffline"), Color.yellow, 1)
+    -- CLAlert.add(LGet("MsgOffline"), Color.white, 1)
     printe(LGet("MsgOffline"))
     InvokeEx.cancelInvoke() -- 放在前面，后面马上就要用到invoke
     local ok, result = pcall(doReleaseAllRes)
@@ -476,9 +476,9 @@ function doReleaseAllRes()
         CLLNet.stop()
     end
 
-    if Net.self.netGameDataQueue then
-        Net.self.netGameDataQueue:Clear()
-    end
+    -- if Net.self and Net.self.netGameDataQueue then
+    --     Net.self.netGameDataQueue:Clear()
+    -- end
 
     -- 页面处理
     CLPanelManager.hideAllPanel()
@@ -512,7 +512,7 @@ function doSomethingBeforeRestart()
     if not ok then
         printe(result)
     end
-    Net.self:clean()
+    -- Net.self:clean()
     ---@type Coolape.CLBaseLua
     local worldmap = getCC(MyMain.self.transform, "worldmap", "CLBaseLua")
     worldmap:destoryLua()

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

@@ -41,6 +41,7 @@ MyUtl.callCust = function(cust)
     end
     cust.jsonStr = cust.jsonStr or {}
     local phones = ArrayList()
+    local phonesVal = ArrayList()
 
     local taskId = tostring(cust.taskId)
     local fields = DBCust.getFieldsByTask(taskId)
@@ -48,15 +49,17 @@ MyUtl.callCust = function(cust)
         if attr.attrType == DBCust.FieldType.phone then
             local phNo = cust.jsonStr[joinStr(attr.id, "_", attr.attrName)]
             if not isNilOrEmpty(phNo) then
-                phones:Add(joinStr(attr.attrName,": ", phNo))
+                phones:Add(joinStr(attr.attrName, ": ", phNo))
+                phonesVal:Add(phNo)
             end
         end
     end
     if phones.Count > 0 then
-        phones:Insert(0, joinStr("默认: ",cust.phoneNo))
+        phones:Insert(0, joinStr("默认: ", cust.phoneNo))
+        phonesVal:Insert(0, cust.phoneNo)
         CLUIPopListPanel.show(
             phones,
-            phones,
+            phonesVal,
             function(val, selectedItem)
                 if val then
                     MyUtl.doCall(cust.custId, val)
@@ -83,4 +86,18 @@ MyUtl.doCall = function(custId, phoneNo)
     )
 end
 
+MyUtl.toast = function(msg, staySec)
+    CLToastRoot.toast(msg, CLToastRoot.Type.normal, staySec)
+end
+MyUtl.toastS = function(msg, staySec)
+    CLToastRoot.toast(msg, CLToastRoot.Type.success, staySec)
+end
+MyUtl.toastW = function(msg, staySec)
+    CLToastRoot.toast(msg, CLToastRoot.Type.warning, staySec)
+end
+
+MyUtl.toastE = function(msg, staySec)
+    CLToastRoot.toast(msg, CLToastRoot.Type.error, staySec)
+end
+
 return MyUtl

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

@@ -0,0 +1,52 @@
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+local mData = nil
+local uiobjs = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    ---@type TweenAlpha
+    uiobjs.tweenAlpha = csSelf:GetComponent("TweenAlpha")
+    uiobjs.Label = getCC(transform, "Label", "UILabel")
+    uiobjs.SpriteIcon = getCC(transform, "SpriteIcon", "UISprite")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    uiobjs.Label.text = trim(data.msg)
+    local spriteName = ""
+    local colorIcon
+    if mData.type == CLToastRoot.Type.success then
+        spriteName = "cust_suc"
+        colorIcon = Color.green
+    elseif mData.type == CLToastRoot.Type.warning then
+        spriteName = "cust_suc"
+        colorIcon = Color.yellow
+    elseif mData.type == CLToastRoot.Type.error then
+        spriteName = "cust_suc"
+        colorIcon = Color.red
+    else
+        spriteName = "cust_suc"
+        colorIcon = Color.white
+    end
+    uiobjs.SpriteIcon.color = colorIcon
+    uiobjs.SpriteIcon.spriteName = spriteName
+    uiobjs.tweenAlpha.delay = mData.staySec or 1
+    uiobjs.tweenAlpha:ResetToBeginning()
+    uiobjs.tweenAlpha:Play(true)
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua.meta

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

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

@@ -0,0 +1,70 @@
+-- xx界面
+CLToastRoot = {}
+
+---@type Coolape.CLPanelLua
+local csSelf = nil
+---@type UnityEngine.Transform
+local transform = nil
+local uiobjs = {}
+local queue = CLLQueue.new()
+local index = 0
+
+CLToastRoot.Type = {
+    normal = 0,
+    success = 1,
+    warning = 2,
+    error = 3
+}
+-- 初始化，只会调用一次
+function CLToastRoot.init(csObj)
+    csSelf = csObj
+    transform = csObj.transform
+    ---@type UITable
+    uiobjs.Table = getCC(transform, "offset", "UITable")
+    uiobjs.prefab = getCC(uiobjs.Table.transform, "00000", "CLCellLua")
+    SetActive(uiobjs.prefab.gameObject, false)
+end
+
+-- 关闭页面
+function CLToastRoot.show()
+end
+-- 关闭页面
+function CLToastRoot.hide()
+end
+
+function CLToastRoot.borrow()
+    local cell
+    if queue:size() == 0 then
+        local go = GameObject.Instantiate(uiobjs.prefab.gameObject, uiobjs.Table.transform)
+        cell = go:GetComponent("CLCellLua")
+    else
+        cell = queue:deQueue()
+    end
+    cell.name = tostring(index)
+    index = index + 1
+    return cell
+end
+
+function CLToastRoot.returnToast(cell)
+    SetActive(cell.gameObject, false)
+    queue:enQueue(cell)
+end
+
+function CLToastRoot.toast(msg, type, staySec)
+    local cell = CLToastRoot.borrow()
+    SetActive(cell.gameObject, true)
+    cell:init({msg = msg, type = type, staySec = staySec}, nil)
+    uiobjs.Table:Reposition()
+end
+
+-- 处理ui上的事件，例如点击等
+function CLToastRoot.uiEventDelegate(go)
+    local cell = go:GetComponent("CLCellLua")
+    if cell then
+        SetActive(go, false)
+        csSelf:invoke4Lua(CLToastRoot.returnToast, cell, 0.1)
+    end
+end
+
+--------------------------------------------
+return CLToastRoot

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua.meta

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

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

@@ -31,7 +31,7 @@ function _cell.show(go, data)
     local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)
     uiobjs.LabelStatus:refreshItems(optionInfor.options, optionInfor.values)
     uiobjs.formRoot:setValue(mData)
-    if tostring(mData.dealflag) == "0" then
+    if tostring(mData.dealFlag) == "0" then
         SetActive(uiobjs.SpriteStatus.gameObject, true)
     else
         SetActive(uiobjs.SpriteStatus.gameObject, false)

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

@@ -87,16 +87,18 @@ do
 
     -- 加载hud alert
     function CLLPSplash.addAlertHud()
-        local onGetObj = function(name, AlertRoot, orgs)
-            AlertRoot.transform.parent = CLUIInit.self.uiPublicRoot
-            AlertRoot.transform.localPosition = Vector3.zero
-            AlertRoot.transform.localScale = Vector3.one
-            NGUITools.SetActive(AlertRoot, true)
-        end
-        CLUIOtherObjPool.borrowObjAsyn("AlertRoot", onGetObj)
+        -- local onGetObj = function(name, AlertRoot, orgs)
+        --     AlertRoot.transform.parent = CLUIInit.self.uiPublicRoot
+        --     AlertRoot.transform.localPosition = Vector3.zero
+        --     AlertRoot.transform.localScale = Vector3.one
+        --     NGUITools.SetActive(AlertRoot, true)
+        -- end
+        -- CLUIOtherObjPool.borrowObjAsyn("ToastRoot", onGetObj)
+        getPanelAsy("ToastRoot", doShowPanel)
     end
 
     function CLLPSplash.hideFirstPanel()
+        do return end
         ---@type Coolape.CLPanelLua
         local p = CLPanelManager.getPanel(MyMain.self.firstPanel)
         if (p ~= nil and p.gameObject.activeInHierarchy) then

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

@@ -209,7 +209,7 @@ function CLLPStart.doEnterGame()
                             end
                         end
                         if useOldCurrGroup then
-                            getPanelAsy("PanelConnect", onLoadedPanel)
+                            getPanelAsy("PanelConnect", onLoadedPanelTT)
                         else
                             ---@type _ParamTRPSelectGroup
                             local d = {}

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

@@ -105,7 +105,7 @@ function CSPMine.onGetLocation(locInfor)
         )
         getPanelAsy("PanelWebView", onLoadedPanelTT, {url = url})
     else
-        CLAlert.add(location.msg, Color.yellow, 1)
+        CLAlert.add(location.msg, Color.white, 1)
         if code == 8 or code == 9 or code == 5 then
             -- 打开gps
             MyLocation.self:guidSwitchGps()

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

@@ -82,7 +82,7 @@ function TRPConnect.getDataFromServer()
         end,
         5
     )
-    -- NetProto.send.announcement_query()
+    NetProto.send.announcement_query()
     -- NetProto.send.booking_query()
     -- NetProto.send.replenish_query()
 end

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

@@ -37,6 +37,7 @@ function TRPCustList:show()
     uiobjs.InputSeachKey.value = ""
     self:refreshFilterBtnStatus()
     self:showList({})
+    showHotWheel()
     NetProto.send.list_customers(self.filterValue, "", 1)
 end
 
@@ -196,11 +197,11 @@ function TRPCustList:onSetFilter(filters, queryKey)
     queryKey = trim(queryKey)
     showHotWheel()
     self.filterValue = self:getFilterStr()
-    -- if oldqueryKey == queryKey then
-    NetProto.send.list_customers(self.filterValue, queryKey, 1)
-    -- else
-    -- 会触发input的onChange事件
-    -- end
+    if oldqueryKey == queryKey then
+        NetProto.send.list_customers(self.filterValue, queryKey, 1)
+    else
+        -- 会触发input的onChange事件
+    end
 end
 
 -- 处理ui上的事件，例如点击等

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

@@ -113,7 +113,7 @@ function TRPLogin:setEventDelegate()
                     end
                 end,
                 function()
-                    CLAlert.add("登录失败，请确保网络通畅！", Color.yellow, 1)
+                    CLAlert.add("登录失败，请确保网络通畅！", Color.white, 1)
                 end
             )
         end,

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

@@ -59,7 +59,7 @@ function TRPModifyFiled:setEventDelegate()
         ButtonOkay = function()
             local err = uiobjs.element:checkValid()
             if not isNilOrEmpty(err) then
-                CLAlert.add(err, Color.yellow, 1)
+                CLAlert.add(err, Color.white, 1)
                 return
             end
             Utl.doCallback(self.mdata.callback, self.mdata.key, uiobjs.Input.value)

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

@@ -44,7 +44,7 @@ function TRPNewCust:setData(paras)
     else
         self.isNewCust = true
         self.mdata = {}
-        self.mdata.dealflag = "0"
+        self.mdata.dealFlag = "0"
         self.mdata.custType = "0"
         self.mdata.custFrom = "0"
         self.mdata.serviceNo = NetProto.loginNo
@@ -240,7 +240,7 @@ function TRPNewCust:onPopupFieldValChg(go)
             if isNilOrEmpty(err) then
                 self:sendModifymsg(el.jsonKey, el.value, false)
             else
-                CLAlert.add(err, Color.yellow, 1)
+                MyUtl.toastW(err)
             end
         end
     end
@@ -293,7 +293,7 @@ function TRPNewCust:sendModifymsg(key, val, isExtend)
                 else
                     self.mdata[key] = val
                 end
-                CLAlert.add("修改成功", Color.white, 1)
+                MyUtl.toastS("修改成功")
             end
         end
     )
@@ -312,7 +312,7 @@ function TRPNewCust:onPopupFieldValChg4Extend(go)
                 -- 有修改，发送数据
                 self:sendModifymsg(el.jsonKey, el.value, true)
             else
-                CLAlert.add(err, Color.yellow, 1)
+                MyUtl.toastE(err)
             end
         end
     end
@@ -352,7 +352,7 @@ function TRPNewCust:setEventDelegate()
             local err = uiobjs.DetailRoot:checkValid()
             err = joinStr(err, uiobjs.ExtendFormRoot:checkValid())
             if not isNilOrEmpty(err) then
-                CLAlert.add(err, Color.yellow, 1)
+                MyUtl.toastE(err)
                 return
             end
 

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

@@ -62,7 +62,7 @@ end
 function TRPResetPasswordStep3:procNetwork(cmd, succ, msg, paras)
     if (succ == NetSuccess) then
         if cmd == NetProto.cmds.updateLoginNoPwd then
-            CLAlert.add("密码修改成功", Color.green, 1)
+            CLAlert.add("密码修改成功", Color.green, 0)
             hideTopPanel()
             hideTopPanel()
             hideTopPanel()

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

@@ -92,7 +92,7 @@ function TRPSelectCompany:setEventDelegate()
     self.EventDelegate = {
         ButtonRight = function()
             if selectedCompany == nil then
-                CLAlert.add("请选择要进入的公司", Color.white, 1)
+                CLAlert.add("请选择要进入的公司", Color.white, 0)
                 return
             end
             -- 缓存一下，下次进来后就不用再先公司了

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

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4633328138033448
 Transform:
   m_ObjectHideFlags: 0
@@ -57,7 +57,7 @@ MonoBehaviour:
   needQueue: 1
   scaleOffset: 1
   speed: 1
-  hightOffset: 0
+  hightOffset: 100
   scaleCurve:
     serializedVersion: 2
     m_Curve:
@@ -87,22 +87,22 @@ MonoBehaviour:
     m_Curve:
     - serializedVersion: 3
       time: 0
-      value: 0
+      value: 1
       inSlope: 0
       outSlope: 0
-      tangentMode: 0
+      tangentMode: 34
       weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
+      inWeight: 0
+      outWeight: 0
     - serializedVersion: 3
-      time: 3
-      value: 40
+      time: 1
+      value: 1
       inSlope: 0
       outSlope: 0
-      tangentMode: 0
+      tangentMode: 34
       weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
+      inWeight: 0
+      outWeight: 0
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
@@ -205,6 +205,7 @@ MonoBehaviour:
   hudBackgroundSpriteType: 1
   bgAnchorLeft: -5
   bgAnchorBottom: -50
-  bgAnchorTop: 50
+  bgAnchorTop: 100
   bgAnchorRight: 5
-  hudBackgroundColor: {r: 0.21323532, g: 0.21323532, b: 0.21323532, a: 0.897}
+  hudBackgroundColor: {r: 0.21323532, g: 0.21323532, b: 0.21323532, a: 1}
+  SpriteIconName: 

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

@@ -101,96 +101,6 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
---- !u!1 &1476071030485278202
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 79491107310787917}
-  - component: {fileID: 6553172910865527971}
-  m_Layer: 5
-  m_Name: TextureLogo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &79491107310787917
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1476071030485278202}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 515.24994, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 3276146319859659945}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6553172910865527971
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1476071030485278202}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  bottomAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 1}
-  mPivot: 4
-  mWidth: 512
-  mHeight: 336
-  mDepth: 2
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 1.5238096
-  mType: 0
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  mRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  mTexture: {fileID: 2800000, guid: 7d375a44ac80b455d944039beb4acab6, type: 3}
-  mMat: {fileID: 0}
-  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
-  mBorder: {x: 0, y: 0, z: 0, w: 0}
-  mFixedAspect: 0
 --- !u!1 &2528687515838085996
 GameObject:
   m_ObjectHideFlags: 0
@@ -222,7 +132,6 @@ Transform:
   m_Children:
   - {fileID: 63480084012170021}
   - {fileID: 5232087136787169813}
-  - {fileID: 79491107310787917}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -286,7 +195,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isPause: 0
   luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua
-  isNeedBackplate: 1
+  isNeedBackplate: 0
   destroyWhenHide: 0
   isNeedResetAtlase: 1
   isNeedMask4Init: 0
@@ -408,8 +317,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 63480084012170021}
-  - component: {fileID: 5724872824464319249}
   - component: {fileID: 153267471462748870}
+  - component: {fileID: 3731861232631018634}
   m_Layer: 5
   m_Name: Sprite
   m_TagString: Untagged
@@ -431,59 +340,6 @@ Transform:
   m_Father: {fileID: 3276146319859659945}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5724872824464319249
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7309178494531336136}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 3276146319859659945}
-    relative: 0
-    absolute: -1
-  rightAnchor:
-    target: {fileID: 3276146319859659945}
-    relative: 1
-    absolute: 1
-  bottomAnchor:
-    target: {fileID: 3276146319859659945}
-    relative: 0
-    absolute: -1
-  topAnchor:
-    target: {fileID: 3276146319859659945}
-    relative: 1
-    absolute: 1
-  updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 1}
-  mPivot: 4
-  mWidth: 1127
-  mHeight: 2306
-  mDepth: -1
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 0.48893708
-  mType: 1
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  atlasName: atlasAllReal
-  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: public__empty
-  mFillCenter: 1
-  isGrayMode: 0
 --- !u!65 &153267471462748870
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -497,3 +353,41 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &3731861232631018634
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7309178494531336136}
+  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: 2304
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.48828125

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

@@ -79,6 +79,9 @@ MonoBehaviour:
   itemList: []
   grid: {fileID: 0}
   panel: {fileID: 0}
+  OnShowHeadListCallbacks: []
+  OnHideHeadListCallbacks: []
+  OnEndListCallbacks: []
 --- !u!1 &1299023305
 GameObject:
   m_ObjectHideFlags: 0
@@ -6868,7 +6871,7 @@ 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: 3
   mWidth: 184
   mHeight: 46
@@ -7706,7 +7709,7 @@ 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: 3
   mWidth: 184
   mHeight: 46
@@ -10234,7 +10237,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: dealflag
+  jsonKey: dealFlag
   formatValue: 
   labeName: {fileID: 4958842016371277412}
   defaultName: 

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

@@ -1370,7 +1370,7 @@ 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: 3
   mWidth: 184
   mHeight: 46
@@ -2593,7 +2593,7 @@ 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: 3
   mWidth: 184
   mHeight: 46
@@ -3790,7 +3790,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: dealflag
+  jsonKey: dealFlag
   formatValue: 
   labeName: {fileID: 2288242403628458129}
   defaultName: 

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

@@ -473,7 +473,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 8.166667
+  aspectRatio: 0.33333334
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -538,7 +538,6 @@ Transform:
   - {fileID: 4098723856805998}
   - {fileID: 4525616215859032}
   - {fileID: 223460704660280301}
-  - {fileID: 1710183414717688058}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -579,7 +578,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3000
+  startingRenderQueue: 3004
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 0
@@ -871,8 +870,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4525616215859032}
-  - component: {fileID: 114607865143906456}
   - component: {fileID: 65202051437322874}
+  - component: {fileID: 7518167786723604769}
   m_Layer: 5
   m_Name: SpriteBg
   m_TagString: Untagged
@@ -894,7 +893,20 @@ Transform:
   m_Father: {fileID: 4228491702010106}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114607865143906456
+--- !u!65 &65202051437322874
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1732686224483064}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 2304, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7518167786723604769
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -903,7 +915,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1732686224483064}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
@@ -928,38 +940,10 @@ MonoBehaviour:
   mWidth: 1125
   mHeight: 2304
   mDepth: 0
-  autoResizeBoxCollider: 1
+  autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 0.48828125
-  mType: 0
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  atlasName: EmptyAtlas
-  mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
-  mSpriteName: public__empty
-  mFillCenter: 1
-  isGrayMode: 0
---- !u!65 &65202051437322874
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1732686224483064}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1125, y: 2304, z: 0}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1742139874857112
 GameObject:
   m_ObjectHideFlags: 0
@@ -1201,7 +1185,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 9.45
+  aspectRatio: 9.25
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1233,96 +1217,6 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
---- !u!1 &2890645277124195841
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1710183414717688058}
-  - component: {fileID: 8236808463385616414}
-  m_Layer: 5
-  m_Name: TextureLogo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1710183414717688058
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2890645277124195841}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 515.24994, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 4228491702010106}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8236808463385616414
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2890645277124195841}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  bottomAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 1}
-  mPivot: 4
-  mWidth: 512
-  mHeight: 336
-  mDepth: 2
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 1.5238096
-  mType: 0
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  mRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  mTexture: {fileID: 2800000, guid: 7d375a44ac80b455d944039beb4acab6, type: 3}
-  mMat: {fileID: 0}
-  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
-  mBorder: {x: 0, y: 0, z: 0, w: 0}
-  mFixedAspect: 0
 --- !u!1 &5670893069891110169
 GameObject:
   m_ObjectHideFlags: 0
@@ -1392,7 +1286,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 13.2
+  aspectRatio: 4.1555557
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}

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

@@ -70,7 +70,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3000
+  startingRenderQueue: 3004
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 0
@@ -114,8 +114,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4591316619094274}
-  - component: {fileID: 114758386050120584}
   - component: {fileID: 65108771840678642}
+  - component: {fileID: 1289559788752481157}
   m_Layer: 5
   m_Name: SpriteBg
   m_TagString: Untagged
@@ -137,59 +137,6 @@ Transform:
   m_Father: {fileID: 4381103782368060}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114758386050120584
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1191465752211838}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 4381103782368060}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 4381103782368060}
-    relative: 1
-    absolute: 0
-  bottomAnchor:
-    target: {fileID: 4381103782368060}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 4381103782368060}
-    relative: 1
-    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 0.003921569}
-  mPivot: 4
-  mWidth: 1125
-  mHeight: 2304
-  mDepth: 0
-  autoResizeBoxCollider: 1
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 0.48828125
-  mType: 0
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  atlasName: EmptyAtlas
-  mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
-  mSpriteName: public__empty
-  mFillCenter: 1
-  isGrayMode: 0
 --- !u!65 &65108771840678642
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -203,3 +150,41 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1125, y: 2304, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1289559788752481157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1191465752211838}
+  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: 2304
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.48828125

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

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2039622864}
   - component: {fileID: 2039622865}
+  - component: {fileID: 1752085698921141497}
   m_Layer: 5
   m_Name: Spritebg
   m_TagString: Untagged
@@ -44,13 +45,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 0}
     relative: 0
-    absolute: -1
-  rightAnchor:
-    target: {fileID: 2972147043370464305}
-    relative: 1
     absolute: 1
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -62,13 +63,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 1
-  mWidth: 1127
+  mWidth: 1129
   mHeight: 720
   mDepth: 0
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.5652778
+  aspectRatio: 1.5680555
   mType: 4
   mFillDirection: 4
   mFillAmount: 1
@@ -84,6 +85,21 @@ MonoBehaviour:
   mSpriteName: work_work_bg
   mFillCenter: 1
   isGrayMode: 0
+--- !u!114 &1752085698921141497
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039622863}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 2039622865}
+  offset: -2
+  sizeAdjust: 1
 --- !u!1 &2079010361
 GameObject:
   m_ObjectHideFlags: 0
@@ -775,6 +791,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8843266203698922333}
   - component: {fileID: 1270337521464514563}
+  - component: {fileID: 5942794785149386743}
   m_Layer: 5
   m_Name: Statistics
   m_TagString: Untagged
@@ -813,20 +830,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043450604830}
+    target: {fileID: 0}
     relative: 0
     absolute: 0
   rightAnchor:
-    target: {fileID: 2972147043450604830}
+    target: {fileID: 0}
     relative: 1
     absolute: 0
   bottomAnchor:
     target: {fileID: 0}
-    relative: 0.5
+    relative: 0
     absolute: 112
   topAnchor:
     target: {fileID: 0}
-    relative: 0.5
+    relative: 1
     absolute: 213
   updateAnchors: 0
   mColor: {r: 1, g: 1, b: 1, a: 1}
@@ -838,6 +855,21 @@ MonoBehaviour:
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 562.5
+--- !u!114 &5942794785149386743
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1177300157851115119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 1270337521464514563}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &1265221955037360746
 GameObject:
   m_ObjectHideFlags: 0
@@ -848,6 +880,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8808936561438781430}
   - component: {fileID: 7435333877463623657}
+  - component: {fileID: 2805906063732153075}
   m_Layer: 5
   m_Name: SellManage
   m_TagString: Untagged
@@ -885,20 +918,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043450604830}
+    target: {fileID: 0}
     relative: 0
     absolute: 0
   rightAnchor:
-    target: {fileID: 2972147043450604830}
+    target: {fileID: 0}
     relative: 1
     absolute: 0
   bottomAnchor:
     target: {fileID: 0}
-    relative: 0.5
+    relative: 0
     absolute: 112
   topAnchor:
     target: {fileID: 0}
-    relative: 0.5
+    relative: 1
     absolute: 213
   updateAnchors: 0
   mColor: {r: 1, g: 1, b: 1, a: 1}
@@ -910,6 +943,21 @@ MonoBehaviour:
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 562.5
+--- !u!114 &2805906063732153075
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1265221955037360746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 7435333877463623657}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &1312718127137622680
 GameObject:
   m_ObjectHideFlags: 0
@@ -935,7 +983,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1312718127137622680}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -200, z: 0}
+  m_LocalPosition: {x: 0, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8808936561438781430}
@@ -954,11 +1002,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 8808936561438781430}
     relative: 0
     absolute: 60
   rightAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 8808936561438781430}
     relative: 1
     absolute: -60
   bottomAnchor:
@@ -978,7 +1026,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.35
+  aspectRatio: 3.53
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1203,6 +1251,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6633121965301904038}
+  - component: {fileID: 317861118083485608}
   m_Layer: 5
   m_Name: 00000
   m_TagString: Untagged
@@ -1218,7 +1267,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1376936709712484390}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -340, y: -0, z: 0}
+  m_LocalPosition: {x: -342, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6408538999124103677}
@@ -1226,6 +1275,44 @@ Transform:
   m_Father: {fileID: 3005383018921883240}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &317861118083485608
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1376936709712484390}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 7548019791029906313}
+    relative: 0
+    absolute: 124
+  rightAnchor:
+    target: {fileID: 7548019791029906313}
+    relative: 0
+    absolute: 223
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 99
+  mHeight: 100
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.99
 --- !u!1 &1606320567603967605
 GameObject:
   m_ObjectHideFlags: 0
@@ -1270,11 +1357,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 2039622864}
     relative: 0
     absolute: 50
   rightAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 2039622864}
     relative: 1
     absolute: -50
   bottomAnchor:
@@ -1288,7 +1375,7 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 1
-  mWidth: 1025
+  mWidth: 1029
   mHeight: 220
   mDepth: 1
   autoResizeBoxCollider: 0
@@ -1660,7 +1747,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2563700189057441671}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -51, z: 0}
+  m_LocalPosition: {x: 0, y: -51, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8843266203698922333}
@@ -1679,11 +1766,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 8843266203698922333}
     relative: 0
     absolute: 60
   rightAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 8843266203698922333}
     relative: 1
     absolute: -60
   bottomAnchor:
@@ -1703,7 +1790,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.25625
+  aspectRatio: 1.32375
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -2428,6 +2515,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2414056310727233539}
   - component: {fileID: 4689739255238786590}
+  - component: {fileID: 2586501286444486790}
   m_Layer: 5
   m_Name: CustManage
   m_TagString: Untagged
@@ -2465,20 +2553,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043450604830}
+    target: {fileID: 0}
     relative: 0
     absolute: 0
   rightAnchor:
-    target: {fileID: 2972147043450604830}
+    target: {fileID: 0}
     relative: 1
     absolute: 0
   bottomAnchor:
     target: {fileID: 0}
-    relative: 0.5
+    relative: 0
     absolute: 112
   topAnchor:
     target: {fileID: 0}
-    relative: 0.5
+    relative: 1
     absolute: 213
   updateAnchors: 0
   mColor: {r: 1, g: 1, b: 1, a: 1}
@@ -2490,6 +2578,21 @@ MonoBehaviour:
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 562.5
+--- !u!114 &2586501286444486790
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398351578709515305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 4689739255238786590}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &3907044503309431328
 GameObject:
   m_ObjectHideFlags: 0
@@ -2912,7 +3015,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4698305356577432478}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -180, z: 0}
+  m_LocalPosition: {x: 0, y: -180, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8843266203698922333}
@@ -3166,7 +3269,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5101786850079158507}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -200, z: 0}
+  m_LocalPosition: {x: 0, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2414056310727233539}
@@ -3185,11 +3288,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 2414056310727233539}
     relative: 0
     absolute: 60
   rightAnchor:
-    target: {fileID: 2972147043370464305}
+    target: {fileID: 2414056310727233539}
     relative: 1
     absolute: -60
   bottomAnchor:
@@ -3209,7 +3312,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.35
+  aspectRatio: 3.53
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -3488,7 +3591,7 @@ MonoBehaviour:
     target: {fileID: 184360130306287280}
     relative: 0.5
     absolute: 30
-  updateAnchors: 1
+  updateAnchors: 0
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 1
   mWidth: 100
@@ -3660,6 +3763,7 @@ GameObject:
   - component: {fileID: 8871384784583152631}
   - component: {fileID: 3505395860212291755}
   - component: {fileID: 2417181810739007179}
+  - component: {fileID: 4840971384966898373}
   m_Layer: 5
   m_Name: ToggleCust
   m_TagString: Untagged
@@ -3769,6 +3873,44 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   scrollView: {fileID: 0}
   draggablePanel: {fileID: 0}
+--- !u!114 &4840971384966898373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5846833866571528727}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 8843266203698922333}
+    relative: 0
+    absolute: 58
+  rightAnchor:
+    target: {fileID: 8843266203698922333}
+    relative: 0
+    absolute: 387
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 329
+  mHeight: 140
+  mDepth: 3
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2.35
 --- !u!1 &5974299618771039062
 GameObject:
   m_ObjectHideFlags: 0
@@ -4022,7 +4164,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6299542647304838506}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -340, y: -0, z: 0}
+  m_LocalPosition: {x: -340, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 477956135615331881}
@@ -4104,13 +4246,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 8808936561438781430}
     relative: 0
-    absolute: 0
+    absolute: 157
   rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
+    target: {fileID: 8808936561438781430}
+    relative: 0
+    absolute: 287
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -4119,7 +4261,7 @@ MonoBehaviour:
     target: {fileID: 0}
     relative: 1
     absolute: 0
-  updateAnchors: 1
+  updateAnchors: 0
   mColor: {r: 0.9607843, g: 0.3529412, b: 0.2901961, a: 1}
   mPivot: 4
   mWidth: 130
@@ -4918,6 +5060,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 9154699958124946560}
+  - component: {fileID: 3048563153676107493}
   m_Layer: 5
   m_Name: 00002
   m_TagString: Untagged
@@ -4933,7 +5076,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7313975369804211593}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 340, y: -0, z: 0}
+  m_LocalPosition: {x: 342, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6786339620859650700}
@@ -4941,6 +5084,44 @@ Transform:
   m_Father: {fileID: 3005383018921883240}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3048563153676107493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7313975369804211593}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 7548019791029906313}
+    relative: 1
+    absolute: -221
+  rightAnchor:
+    target: {fileID: 7548019791029906313}
+    relative: 1
+    absolute: -121
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 100
+  mHeight: 100
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
 --- !u!1 &7424158087773476799
 GameObject:
   m_ObjectHideFlags: 0
@@ -5038,6 +5219,7 @@ GameObject:
   - component: {fileID: 161530148761703730}
   - component: {fileID: 5316131782456026253}
   - component: {fileID: 9050258334435518319}
+  - component: {fileID: 2399303767399438135}
   m_Layer: 5
   m_Name: ToggleTarget
   m_TagString: Untagged
@@ -5147,6 +5329,44 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   scrollView: {fileID: 0}
   draggablePanel: {fileID: 0}
+--- !u!114 &2399303767399438135
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7632109351959244590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 8843266203698922333}
+    relative: 1
+    absolute: -387
+  rightAnchor:
+    target: {fileID: 8843266203698922333}
+    relative: 1
+    absolute: -57
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 330
+  mHeight: 140
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2.357143
 --- !u!1 &7939168389415059685
 GameObject:
   m_ObjectHideFlags: 0
@@ -5828,7 +6048,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8650110074927021137}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 340, y: -0, z: 0}
+  m_LocalPosition: {x: 340, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6311147765132337020}
@@ -5910,22 +6130,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 0}
+    target: {fileID: 2414056310727233539}
     relative: 1
-    absolute: 0
+    absolute: -287
+  rightAnchor:
+    target: {fileID: 2414056310727233539}
+    relative: 1
+    absolute: -157
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
-    absolute: 0
+    absolute: -234
   topAnchor:
     target: {fileID: 0}
     relative: 1
     absolute: 0
-  updateAnchors: 1
+  updateAnchors: 0
   mColor: {r: 0.9529412, g: 0.6117647, b: 0.07058824, a: 1}
   mPivot: 4
   mWidth: 130
@@ -6176,7 +6396,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9068346992573566134}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -340, y: -0, z: 0}
+  m_LocalPosition: {x: -340, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 518898425368036847}
@@ -6258,13 +6478,13 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 2414056310727233539}
     relative: 0
-    absolute: 0
+    absolute: 157
   rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
+    target: {fileID: 2414056310727233539}
+    relative: 0
+    absolute: 287
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -6273,7 +6493,7 @@ MonoBehaviour:
     target: {fileID: 0}
     relative: 1
     absolute: 0
-  updateAnchors: 1
+  updateAnchors: 0
   mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
   mPivot: 4
   mWidth: 130

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

@@ -0,0 +1,502 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &255939452351598133
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6505418891330252177}
+  - component: {fileID: 6702083326952666549}
+  m_Layer: 5
+  m_Name: SpriteIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6505418891330252177
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 255939452351598133}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -327, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 576939815961468376}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6702083326952666549
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 255939452351598133}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0, g: 0.9811321, b: 0, a: 1}
+  mPivot: 4
+  mWidth: 70
+  mHeight: 70
+  mDepth: 2
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: cust_suc
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!1 &6066299811477227774
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 576939815961468376}
+  - component: {fileID: 1815130623340806415}
+  - component: {fileID: 6678844353282610334}
+  - component: {fileID: 4555802906859514250}
+  m_Layer: 5
+  m_Name: 00000
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &576939815961468376
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6066299811477227774}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 147, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7349639423668621009}
+  - {fileID: 6505418891330252177}
+  m_Father: {fileID: 8977716292024140002}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1815130623340806415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6066299811477227774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 7349639423668621009}
+    relative: 0
+    absolute: -50
+  topAnchor:
+    target: {fileID: 7349639423668621009}
+    relative: 1
+    absolute: 50
+  updateAnchors: 1
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mPivot: 4
+  mWidth: 800
+  mHeight: 146
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 5.479452
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: news_new2_bg_20
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &6678844353282610334
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6066299811477227774}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9e2747e3775af504da1a4d5a46c5a1ce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  exeOrder: 0
+  method: 3
+  style: 0
+  animationCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 1
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 1
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  ignoreTimeScale: 1
+  delay: 0
+  duration: 0.5
+  steeperCurves: 0
+  tweenGroup: 0
+  onFinished:
+  - mTarget: {fileID: 8577448108595907381}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  eventReceiver: {fileID: 0}
+  callWhenFinished: 
+  from: 1
+  to: 0
+--- !u!114 &4555802906859514250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6066299811477227774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua
+  isNeedResetAtlase: 1
+--- !u!1 &6074382964014384579
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6077680079705231081}
+  - component: {fileID: 6187347357562668377}
+  - component: {fileID: 8577448108595907381}
+  m_Layer: 5
+  m_Name: ToastRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &6077680079705231081
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6074382964014384579}
+  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: 8977716292024140002}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6187347357562668377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6074382964014384579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3000
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 0
+  mClipRange: {x: 0, y: 0, z: 300, w: 200}
+  mClipSoftness: {x: 4, y: 4}
+  mDepth: 10100
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &8577448108595907381
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6074382964014384579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce565306cacc248a1b24bd45ee10228c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua
+  isNeedBackplate: 0
+  destroyWhenHide: 0
+  isNeedResetAtlase: 1
+  isNeedMask4Init: 0
+  isNeedMask4InitOnlyOnce: 1
+  isHideWithEffect: 0
+  isRefeshContentWhenEffectFinish: 0
+  EffectRoot: {fileID: 0}
+  effectType: 1
+  EffectList: []
+  frameName: 
+  frameObj: {fileID: 0}
+--- !u!1 &8524572109241191192
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7349639423668621009}
+  - component: {fileID: 4521961059761662379}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7349639423668621009
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8524572109241191192}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 54, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 576939815961468376}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4521961059761662379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8524572109241191192}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 6505418891330252177}
+    relative: 1
+    absolute: 50
+  rightAnchor:
+    target: {fileID: 576939815961468376}
+    relative: 1
+    absolute: -50
+  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: 592
+  mHeight: 46
+  mDepth: 1
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 12.869565
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: 0
+  mFontSize: 46
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 3
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 5
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
+--- !u!1 &8697333400712526718
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8977716292024140002}
+  - component: {fileID: 3535807598831156432}
+  m_Layer: 5
+  m_Name: offset
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8977716292024140002
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8697333400712526718}
+  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: 576939815961468376}
+  m_Father: {fileID: 6077680079705231081}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3535807598831156432
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8697333400712526718}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  columns: 1
+  direction: 0
+  sorting: 1
+  pivot: 7
+  cellAlignment: 4
+  hideInactive: 1
+  keepWithinPanel: 0
+  padding: {x: 0, y: 2}

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 96bef8493000142c19e13d1fc2757b12
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: