bug fix

2020-07-19 12:52:05 +08:00
parent 30d5701d96
commit d92ad2ecca
33 changed files with 1689 additions and 769 deletions
--- a/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
+++ b/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
@@ -46,7 +46,7 @@ MonoBehaviour:
  material: {fileID: 0}
  mSprites: []
  mPixelSize: 1
-  mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mReplacement: {fileID: 0}
  mCoordinates: 0
  sprites: []
  _isBorrowSpriteMode: 1
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua
@@ -66,6 +66,7 @@ end
 function _cell.uiEventDelegate(go)
    local goName = go.name
    if goName == "ButtonFollow" then
+        getPanelAsy("PanelNewFollow", onLoadedPanelTT, mData)
    elseif goName == "ButtonTask" then
        getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, mData)
    elseif goName == "ButtonContact" then
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua
@@ -132,14 +132,11 @@ function _cell.setElementMode(mode)
    local isPopCheckbox = uiobjs.checkbox
    ---@type UIInput
    local input = uiobjs.input
-    local inputOnGUI = csSelf:GetComponent("UIInputOnGUI")
    local boxcollider = uiobjs.boxCollider
    local ButtonReset = uiobjs.ButtonReset

    if mode == _FieldMode.inputOnly then
        _cell.enabeldObj(boxcollider, true)
-        _cell.enabeldObj(inputOnGUI, true)
-        _cell.enabeldObj(input, true)
        if uiobjs.Label2 then
            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
        end
@@ -154,16 +151,18 @@ function _cell.setElementMode(mode)
        end
        _cell.enabeldObj(uiobjs.Label4, true) -- multext
        if
-            attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or
-                attr.attrType == DBCust.FieldType.popuplist
+            attr.attrType == DBCust.FieldType.dateTime or 
+            attr.attrType == DBCust.FieldType.checkbox or
+            attr.attrType == DBCust.FieldType.popuplist
         then
+            _cell.enabeldObj(input, false)
            _cell.enabeldObj(uiobjs.SpriteRight, true)
        else
            _cell.enabeldObj(uiobjs.SpriteRight, false)
+            _cell.enabeldObj(input, true)
        end
    elseif mode == _FieldMode.showOnly then
        _cell.enabeldObj(boxcollider, false)
-        _cell.enabeldObj(inputOnGUI, false)
        _cell.enabeldObj(input, false)
        if uiobjs.Label2 then
            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
@@ -181,7 +180,6 @@ function _cell.setElementMode(mode)
        _cell.enabeldObj(uiobjs.SpriteRight, false)
    elseif mode == _FieldMode.modifyOnly then
        _cell.enabeldObj(boxcollider, true)
-        _cell.enabeldObj(inputOnGUI, false)
        _cell.enabeldObj(input, false)
        if uiobjs.Label2 then
            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
@@ -199,7 +197,6 @@ function _cell.setElementMode(mode)
        _cell.enabeldObj(uiobjs.SpriteRight, true)
    elseif mode == _FieldMode.showAndModify then
        _cell.enabeldObj(boxcollider, true)
-        _cell.enabeldObj(inputOnGUI, false)
        _cell.enabeldObj(input, false)
        if uiobjs.Label2 then
            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
@@ -217,7 +214,6 @@ function _cell.setElementMode(mode)
        _cell.enabeldObj(uiobjs.SpriteRight, true)
    elseif mode == _FieldMode.button then
        _cell.enabeldObj(boxcollider, true)
-        _cell.enabeldObj(inputOnGUI, false)
        _cell.enabeldObj(input, false)
        if uiobjs.Label2 then
            uiobjs.Label2.color = ColorEx.getColor(0xff363636)
@@ -237,8 +233,9 @@ function _cell.setElementMode(mode)

    -- 再次修正input
    if
-        attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or
-            attr.attrType == DBCust.FieldType.popuplist
+        attr.attrType == DBCust.FieldType.dateTime or 
+        attr.attrType == DBCust.FieldType.checkbox or
+        attr.attrType == DBCust.FieldType.popuplist
     then
        _cell.enabeldObj(input, false)
    end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua
@@ -13,7 +13,7 @@ function CSPTasks.init(csObj)
    csSelf = csObj
    transform = csObj.transform
    CSPTasks.setEventDelegate()
-    CSPTasks.contentRect = MyUtl.getUIContent(csSelf, 360+220+60)
+    CSPTasks.contentRect = MyUtl.getUIContent(csSelf, 360+220)

    uiobjs.Content = getCC(transform, "PanelContent", "UIPanel")
    uiobjs.Content.transform.localPosition = Vector3.zero
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
@@ -244,6 +244,7 @@ function TRPCustDetail:setEventDelegate()
            self:showRecords()
        end,
        ButtonNewFollow = function()
+            getPanelAsy("PanelNewFollow", onLoadedPanelTT, self.mdata)
        end,
        ButtonNewTask = function()
            getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, self.mdata)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
@@ -0,0 +1,223 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPNewFollow:TRBasePanel 邮件列表
+local TRPNewFollow = class("TRPNewFollow", TRBasePanel)
+
+local uiobjs = {}
+
+local stars = {}
+-- 初始化，只会调用一次
+function TRPNewFollow:init(csObj)
+    TRPNewFollow.super.init(self, csObj)
+    self:initFiledsAttr()
+    self:setEventDelegate()
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    ---@type UIScrollView
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
+    ---@type UITable
+    uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable")
+    ---@type CLUIFormRoot
+    uiobjs.DetailFromRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLUIFormRoot")
+    uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLCellLua")
+    ---@type UITable
+    uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
+
+    uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
+end
+
+function TRPNewFollow:initFiledsAttr()
+    ---@type _ParamFieldAttr
+    local attr
+    self.baseFiledsAttr = {}
+
+    attr = {}
+    attr.attrName = "商机"
+    attr.id = ""
+    attr.attrType = DBCust.FieldType.popuplist
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    -- local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.followUpTypeList)
+    -- attr.popOptions = popInfor.options
+    -- attr.popValues = popInfor.values
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "跟进类型"
+    attr.id = "followUpType"
+    attr.attrType = DBCust.FieldType.popuplist
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.followUpTypeList)
+    attr.popOptions = popInfor.options
+    attr.popValues = popInfor.values
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "跟时时间"
+    attr.id = ""
+    attr.attrType = DBCust.FieldType.dateTime
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "客户名称"
+    attr.id = "custName"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "客户状态"
+    attr.id = "dealFlag"
+    attr.attrType = DBCust.FieldType.popuplist
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)
+    attr.popOptions = popInfor.options
+    attr.popValues = popInfor.values
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "跟进内容"
+    attr.id = "followUpContent"
+    attr.attrType = DBCust.FieldType.multext
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+end
+
+-- 设置数据
+---@param paras _ParamTRPNewFollow
+function TRPNewFollow:setData(paras)
+    self.mdata = {}
+    self.mdata.custId = paras.custId
+    self.mdata.taskId = paras.taskId
+    self.mdata.custName = paras.custName
+
+    self.isNewFollow = true
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPNewFollow:show()
+    self:refreshContent()
+    SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
+
+    uiobjs.scrollView:ResetPosition()
+end
+
+function TRPNewFollow:refreshContent()
+    self:showBaseFields()
+    self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1)
+end
+
+function TRPNewFollow:showBaseFields()
+    ---@type _ParamCellExtendFiledRoot
+    local param = {}
+    param.data = self.mdata or {}
+    param.onFinish = self:wrapFunc(self.reposition)
+    param.onLoadOneField = self:wrapFunc(self.onLoadOneField)
+    param.fields = {}
+    ---@type _ParamCellExtendFiled
+    local filedInfor
+
+    for i, v in ipairs(self.baseFiledsAttr) do
+        -- 工单模板
+        filedInfor = {}
+        filedInfor.attr = v
+        filedInfor.isEditMode = true
+        if filedInfor.attr.attrType == DBCust.FieldType.multext then
+            filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
+        end
+        filedInfor.onClick = nil
+        filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg)
+        table.insert(param.fields, filedInfor)
+    end
+
+    uiobjs.DetailRoot:init(param, nil)
+end
+
+function TRPNewFollow:onLoadOneField(cell)
+    local el = cell:GetComponent("CLUIElement")
+    if el and el.jsonKey == "followUpContent" then
+        uiobjs.followUpContent = el
+    end
+end
+
+function TRPNewFollow:onPopupFieldValChg(go)
+    ---@type CLUIElement
+    local el = go:GetComponent("CLUIElement")
+    if el.jsonKey == "dealFlag" then
+        if uiobjs.followUpContent and isNilOrEmpty(uiobjs.followUpContent.value) then
+            local popList = go:GetComponent("UIPopupList")
+            uiobjs.followUpContent.value = popList.selectedItem
+        end
+    end
+end
+
+function TRPNewFollow:reposition()
+    uiobjs.DetailRootTabel.repositionNow = true
+    uiobjs.Table.repositionNow = true
+end
+
+-- 刷新
+function TRPNewFollow:refresh()
+end
+
+-- 关闭页面
+function TRPNewFollow:hide()
+    if uiobjs.DetailRoot.luaTable then
+        uiobjs.DetailRoot.luaTable.release()
+    end
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPNewFollow:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.update_customer then
+            self:refreshContent()
+        end
+    end
+end
+
+function TRPNewFollow:setEventDelegate()
+    self.EventDelegate = {
+        ButtonSave = function()
+            local err = uiobjs.DetailFromRoot:checkValid()
+            if not isNilOrEmpty(err) then
+                MyUtl.toastW(err)
+                return
+            end
+            self.mdata = uiobjs.DetailFromRoot:getValue(self.mdata, true)
+            showHotWheel()
+            NetProto.send.create_followUp_record(
+                self.mdata,
+                function(content)
+                    hideHotWheel()
+                    if content.success then
+                        MyUtl.toastS("保存成功")
+                        hideTopPanel(self.csSelf)
+                    end
+                end
+            )
+        end,
+        InputTask = function()
+            self:showExtentFiles(uiobjs.InputTask.value)
+        end
+    }
+end
+-- 处理ui上的事件，例如点击等
+function TRPNewFollow:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPNewFollow:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPNewFollow
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c98e9d776c5a846e6af1289bdad59626
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
@@ -46,6 +46,9 @@ end

 function TRPSetting:setEventDelegate()
    self.EventDelegate = {
+        ButtonPersonInfor=function()
+            getPanelAsy("PanelMyInfor", onLoadedPanelTT)
+        end,
        ButtonPassword = function()
            getPanelAsy("PanelResetPasswordStep1", onLoadedPanelTT, {phone = Prefs.getUserName(), isModify = true})
        end,
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab
@@ -209,7 +209,7 @@ 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: 3
  mWidth: 216
@@ -2272,13 +2272,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 293
+    target: {fileID: 1626933637}
+    relative: 1
+    absolute: 44
  rightAnchor:
    target: {fileID: 0}
    relative: 0
-    absolute: 838
+    absolute: 0
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -2290,13 +2290,13 @@ MonoBehaviour:
  updateAnchors: 0
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 3
-  mWidth: 545
+  mWidth: 572
  mHeight: 36
  mDepth: 5
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 15.138889
+  aspectRatio: 15.25
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab
@@ -0,0 +1,649 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &892331021296762499
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8959323457515368671}
+  - component: {fileID: 5365037729377547425}
+  - component: {fileID: 4006864420758205446}
+  - component: {fileID: 3077299055825078045}
+  m_Layer: 5
+  m_Name: DetailRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8959323457515368671
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 892331021296762499}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1, y: -30, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8806942786345163243}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5365037729377547425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 892331021296762499}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  columns: 1
+  direction: 0
+  sorting: 0
+  pivot: 1
+  cellAlignment: 1
+  hideInactive: 1
+  keepWithinPanel: 0
+  padding: {x: 0, y: -1}
+--- !u!114 &4006864420758205446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 892331021296762499}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
+--- !u!114 &3077299055825078045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 892331021296762499}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+  isNeedResetAtlase: 1
+--- !u!1 &2995868542908713658
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 703582893891920782}
+  - component: {fileID: 4067808357013956449}
+  - component: {fileID: 1504390251094336990}
+  - component: {fileID: 6400533450649344254}
+  m_Layer: 5
+  m_Name: DragScroll
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &703582893891920782
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2995868542908713658}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1, y: -66, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5001673685575848814}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4067808357013956449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2995868542908713658}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 1
+    absolute: -132
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 2172
+  mDepth: 7
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.5179558
+--- !u!114 &1504390251094336990
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2995868542908713658}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 5804642261774301127}
+  draggablePanel: {fileID: 0}
+--- !u!65 &6400533450649344254
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2995868542908713658}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 2172, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &3811868574047077953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3811868574047077966}
+  - component: {fileID: 3811868574047077965}
+  - component: {fileID: 3811868574047077964}
+  - component: {fileID: 3811868574047077967}
+  m_Layer: 5
+  m_Name: ButtonSave
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3811868574047077966
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3811868574047077953}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 510, y: -66, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3811868574385527201}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3811868574047077965
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3811868574047077953}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 200, y: 100, z: 0}
+  m_Center: {x: -50, y: -0.22070312, z: 0}
+--- !u!114 &3811868574047077964
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3811868574047077953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 3811868574047077953}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 6602973367304329883}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &3811868574047077967
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3811868574047077953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 1
+    absolute: -163
+  rightAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 1
+    absolute: -51
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
+  mPivot: 5
+  mWidth: 112
+  mHeight: 56
+  mDepth: 1
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u4FDD\u5B58"
+  mFontSize: 56
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 2
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
+--- !u!1 &3811868574385527200
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3811868574385527201}
+  - component: {fileID: 3811868574385527214}
+  m_Layer: 5
+  m_Name: Top
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3811868574385527201
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3811868574385527200}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1152, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3811868574047077966}
+  m_Father: {fileID: 5001673685575848814}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3811868574385527214
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3811868574385527200}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uiCamera: {fileID: 0}
+  container: {fileID: 0}
+  side: 3
+  runOnlyOnce: 1
+  relativeOffset: {x: 0, y: 0}
+  pixelOffset: {x: 0, y: 0}
+  widgetContainer: {fileID: 0}
+--- !u!1 &6102090276801802862
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5001673685575848814}
+  - component: {fileID: 3093772623855813911}
+  - component: {fileID: 6602973367304329883}
+  m_Layer: 5
+  m_Name: PanelNewFollow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &5001673685575848814
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6102090276801802862}
+  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: 5093278721696270566}
+  - {fileID: 703582893891920782}
+  - {fileID: 3811868574385527201}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3093772623855813911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6102090276801802862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3000
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 0
+  mClipRange: {x: 0, y: 0, z: 300, w: 200}
+  mClipSoftness: {x: 4, y: 4}
+  mDepth: 1
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &6602973367304329883
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6102090276801802862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ff491def90b44724978eb9e0b2b558f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua
+  isNeedBackplate: 1
+  destroyWhenHide: 0
+  isNeedResetAtlase: 1
+  isNeedMask4Init: 0
+  isNeedMask4InitOnlyOnce: 1
+  isHideWithEffect: 1
+  isRefeshContentWhenEffectFinish: 0
+  EffectRoot: {fileID: 0}
+  effectType: 1
+  EffectList: []
+  frameName: Frame1
+  frameObj: {fileID: 0}
+  titleKeyName: "\u65B0\u5EFA\u8DDF\u8FDB"
+--- !u!1 &7224901118966550397
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8806942786345163243}
+  - component: {fileID: 6007508926977579986}
+  m_Layer: 5
+  m_Name: Table
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8806942786345163243
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7224901118966550397}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 937, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8959323457515368671}
+  m_Father: {fileID: 5093278721696270566}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6007508926977579986
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7224901118966550397}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  columns: 1
+  direction: 0
+  sorting: 0
+  pivot: 1
+  cellAlignment: 1
+  hideInactive: 1
+  keepWithinPanel: 0
+  padding: {x: 0, y: 30}
+--- !u!1 &8459369083141396275
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5093278721696270566}
+  - component: {fileID: 5357800581257752099}
+  - component: {fileID: 5804642261774301127}
+  m_Layer: 5
+  m_Name: PanelContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5093278721696270566
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8459369083141396275}
+  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: 8806942786345163243}
+  m_Father: {fileID: 5001673685575848814}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5357800581257752099
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8459369083141396275}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3001
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 3
+  mClipRange: {x: 0, y: 0, z: 1126, w: 2000}
+  mClipSoftness: {x: 4, y: 10}
+  mDepth: 2
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &5804642261774301127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8459369083141396275}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  movement: 1
+  dragEffect: 2
+  restrictWithinPanel: 1
+  disableDragIfFits: 1
+  smoothDragStart: 1
+  iOSDragEmulation: 1
+  scrollWheelFactor: 0.25
+  momentumAmount: 35
+  dampenStrength: 9
+  horizontalScrollBar: {fileID: 0}
+  verticalScrollBar: {fileID: 0}
+  showScrollBars: 1
+  customMovement: {x: 1, y: 0}
+  contentPivot: 1
+  scale: {x: 0, y: 0, z: 0}
+  relativePositionOnReset: {x: 0, y: 0}
+  centerOnChild: {fileID: 0}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollow.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 64ca0328d02744dfc8fb317b511c3dbd
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab
@@ -26,7 +26,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2039622863}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -597, z: 0}
+  m_LocalPosition: {x: -1, y: -512, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 2079010362}
@@ -421,7 +421,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 428542163589643225}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -414, y: -180, z: 0}
+  m_LocalPosition: {x: -414, y: -163, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 8257572729724756153}
@@ -1267,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: -342, y: 0, z: 0}
+  m_LocalPosition: {x: -340, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6408538999124103677}
@@ -1323,6 +1323,7 @@ GameObject:
  m_Component:
  - component: {fileID: 7548019791029906313}
  - component: {fileID: 80533903860256992}
+  - component: {fileID: 4315794307739012614}
  m_Layer: 5
  m_Name: SpriteBg2
  m_TagString: Untagged
@@ -1338,7 +1339,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1606320567603967605}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1, y: -360, z: 0}
+  m_LocalPosition: {x: -1, y: -311, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 2079010362}
@@ -1357,25 +1358,25 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 2039622864}
+    target: {fileID: 0}
    relative: 0
    absolute: 50
  rightAnchor:
-    target: {fileID: 2039622864}
+    target: {fileID: 0}
    relative: 1
    absolute: -50
  bottomAnchor:
-    target: {fileID: 6245682048333409472}
+    target: {fileID: 0}
    relative: 0
    absolute: -300
  topAnchor:
-    target: {fileID: 6245682048333409472}
-    relative: 0
+    target: {fileID: 0}
+    relative: 1
    absolute: -80
  updateAnchors: 1
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 1
-  mWidth: 1029
+  mWidth: 1025
  mHeight: 220
  mDepth: 1
  autoResizeBoxCollider: 0
@@ -1397,6 +1398,21 @@ MonoBehaviour:
  mSpriteName: work_work_bg_shadow
  mFillCenter: 1
  isGrayMode: 0
+--- !u!114 &4315794307739012614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1606320567603967605}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 80533903860256992}
+  offset: 50
+  sizeAdjust: 1
 --- !u!1 &1776223273951753645
 GameObject:
  m_ObjectHideFlags: 0
@@ -1423,7 +1439,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1776223273951753645}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -271, y: -151, z: 0}
+  m_LocalPosition: {x: -271, y: -134, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 2079010362}
@@ -1832,7 +1848,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2627781041010536112}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 406, y: -182, z: 0}
+  m_LocalPosition: {x: 406, y: -165, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3138439517586622980}
@@ -2735,7 +2751,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4359412390550565533}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -440, z: 0}
+  m_LocalPosition: {x: 0, y: -390.5, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6633121965301904038}
@@ -2769,19 +2785,19 @@ MonoBehaviour:
    relative: 0
    absolute: 0
  topAnchor:
-    target: {fileID: 7548019791029906313}
+    target: {fileID: 0}
    relative: 1
    absolute: -80
  updateAnchors: 1
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 1
  mWidth: 100
-  mHeight: 1998
+  mHeight: 1847
  mDepth: 0
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 12.5
+  aspectRatio: 0.054141853
 --- !u!114 &4454270940782324022
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -5076,7 +5092,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7313975369804211593}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 342, y: 0, z: 0}
+  m_LocalPosition: {x: 340, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6786339620859650700}
@@ -5668,7 +5684,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8373088910775864060}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -271, y: -244, z: 0}
+  m_LocalPosition: {x: -271, y: -227, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 2079010362}
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPTasks.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMine.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 814230e9f4c4a4eee87e98bd8d55fd64
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,9fa2159c6c0cc795c6ff005efa12916c8	%trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,cdf75ce3bff25ef5479dfe2b87de83aa8	%trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver