mm

2020-08-04 21:58:27 +08:00
parent a7b47a6827
commit f913a2a0aa
91 changed files with 1671 additions and 965 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/serversCfg/servers.json
+++ b/Assets/trCRM/serversCfg/servers.json
@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29006, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29000, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29004, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29006, "androidVer":"4b673ccbca28edf447c48db26c8d845e", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29000, "androidVer":"4b673ccbca28edf447c48db26c8d845e", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"98fbfa34f30d30101e89598e35081564", "port":29004, "androidVer":"4b673ccbca28edf447c48db26c8d845e", "isDev":0}}}
--- a/Assets/trCRM/trCRM.code-workspace
+++ b/Assets/trCRM/trCRM.code-workspace
@@ -6,5 +6,13 @@
 		{
 			"path": "../../UnityAPI"
 		}
-	]
+	],
+	"settings": {
+		"files.exclude": {
+			"**/.prefab": true
+		},
+		"search.exclude": {
+			"**/*.prefab": true
+		}
+	}
 }
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua
@@ -25,13 +25,13 @@ end

 DBRoot.funcs = {
    [NetProto.cmds.announcement_query] = function(data) -- 公告
-        DBMessage.onGetMessage(DBMessage.MsgType.Sys, data.result)
+        DBMessage.onGetMessage(DBMessage.MsgType.Sys, data.result.data)
    end,
    [NetProto.cmds.booking_query] = function(data) -- 待跟进客户
-        DBMessage.onGetMessage(DBMessage.MsgType.Task4Cust, data.result)
+        DBMessage.onGetMessage(DBMessage.MsgType.Task4Cust, data.result.data)
    end,
    [NetProto.cmds.replenish_query] = function(data) -- 待跟进客户
-        DBMessage.onGetMessage(DBMessage.MsgType.Task4Support, data.result)
+        DBMessage.onGetMessage(DBMessage.MsgType.Task4Support, data.result.data)
    end,
    [NetProto.cmds.filter_customers] = function(data) -- 过滤条件
        DBCust.onGetFilter(data.result)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBStatistics.lua
@@ -6,8 +6,11 @@ local timeOut = 60 * 1000
 DBStatistics.clean = function()
 end

-DBStatistics.custtype_report = function(callback)
-    if db.custtype_report == nil or lastGetTime.custtype_report == nil or DateEx.nowMS - lastGetTime.custtype_report > 0 then
+DBStatistics.custtype_report = function(callback, force)
+    if
+        force or db.custtype_report == nil or lastGetTime.custtype_report == nil or
+            DateEx.nowMS - lastGetTime.custtype_report > 0
+     then
        lastGetTime.custtype_report = DateEx.nowMS + timeOut
        NetProto.send.custtype_report(
            nil,
@@ -23,8 +26,8 @@ DBStatistics.custtype_report = function(callback)
    end
 end

-DBStatistics.order_report = function(callback)
-    if db.order_report == nil or lastGetTime.order_report == nil or DateEx.nowMS - lastGetTime.order_report > 0 then
+DBStatistics.order_report = function(callback, force)
+    if force or db.order_report == nil or lastGetTime.order_report == nil or DateEx.nowMS - lastGetTime.order_report > 0 then
        lastGetTime.order_report = DateEx.nowMS + timeOut
        NetProto.send.order_report(
            nil,
@@ -40,8 +43,11 @@ DBStatistics.order_report = function(callback)
    end
 end

-DBStatistics.target_report = function(callback)
-    if db.target_report == nil or lastGetTime.target_report == nil or DateEx.nowMS - lastGetTime.target_report > 0 then
+DBStatistics.target_report = function(callback, force)
+    if
+        force or db.target_report == nil or lastGetTime.target_report == nil or
+            DateEx.nowMS - lastGetTime.target_report > 0
+     then
        lastGetTime.target_report = DateEx.nowMS + timeOut
        NetProto.send.target_report(
            nil,
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
@@ -66,7 +66,7 @@ end

 function DBUser.refreshUserInfor(loginNo, loginName)
    local infor = DBUser.getPopList(DBUser.FilterGroup.user)
-    for i, v in ipairs(infor.values) do
+    for i, v in ipairs(infor.values or {}) do
        if v == loginNo then
            infor.options[i] = loginName
            break
@@ -74,7 +74,7 @@ function DBUser.refreshUserInfor(loginNo, loginName)
    end

    local list = DBUser.getFilters(DBUser.FilterGroup.user)
-    for i, v in ipairs(list) do
+    for i, v in ipairs(list or {}) do
        if v.value == loginNo then
            v.name = loginNo
            break
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
@@ -5,8 +5,8 @@ MyUtl.init = function(panel)
    MyUtl.getUIContent(panel)
 end

-local _TopHeight_ = 132
-local _BottomHeight_ = 147
+MyUtl.defaultTopHeight = 132
+MyUtl.defaultBottomHeight = 147
 local _ContentRect
 local _sizeAdjust

@@ -17,8 +17,8 @@ MyUtl.getUIContent = function(panel, top, bottom, forceCal)
    -- end
    local sizeAdjust = UIRoot.GetPixelSizeAdjustment(panel.gameObject)
    local height = Screen.height * sizeAdjust
-    top = top or _TopHeight_
-    bottom = bottom or _BottomHeight_
+    top = top or MyUtl.defaultTopHeight
+    bottom = bottom or MyUtl.defaultBottomHeight
    local offsetRect = NGUITools.offsetRect
    top = top + offsetRect.y * height
    bottom = bottom + offsetRect.w * height
@@ -123,9 +123,9 @@ MyUtl.hidePhone = function(phone)
        return phone
    end
    if #phone > 8 then
-        return joinStr(string.sub(phone, 1, 4), "****", string.sub(phone, 9))
+        return joinStr(string.sub(phone, 1, 3), "****", string.sub(phone, 8))
    else
-        return joinStr(string.sub(phone, 1, 4), "****")
+        return joinStr(string.sub(phone, 1, 3), "****")
    end
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform1.lua
@@ -34,7 +34,8 @@ function _cell.show(go, data)
            if content.success then
                _cell.refreshContent(content.result)
            end
-        end
+        end,
+        data.forceRefresh or false
    )
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform2.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform2.lua
@@ -28,7 +28,8 @@ function _cell.show(go, data)
            if content.success then
                _cell.refreshContent(content.result)
            end
-        end
+        end,
+        data.forceRefresh or false
    )
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellReportform3.lua
@@ -50,7 +50,8 @@ function _cell.show(go, data)

                uiobjs.formRoot:setValue(mData)
            end
-        end
+        end,
+        data.forceRefresh or false
    )
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua
@@ -266,7 +266,6 @@ end

 --设置进度条
 function CLLPSplash.onProgress(...)
-    do return end
    local args = {...}
    local all = args[1] -- 总量
    local v = args[2] -- 当前值
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua
@@ -15,7 +15,7 @@ function CSPMine.init(csObj)
    CSPMine.contentRect = MyUtl.getUIContent(csSelf, nil, nil, true)

    objs.Content = getCC(transform, "PanelContent", "UIPanel")
-    MyUtl.setContentView(objs.Content, 147 + 370)
+    MyUtl.setContentView(objs.Content, MyUtl.defaultBottomHeight + 370)

    ---@type CLUIFormRoot
    objs.Top = getCC(transform, "Top", "CLUIFormRoot")
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua
@@ -1,13 +1,16 @@
 -- xx界面
 local CSPMsg = {}

+---@type Coolape.CLPanelLua
 local csSelf = nil
 local transform = nil
 CSPMsg.sizeAdjust = 1
 CSPMsg.contentRect = Vector4.zero
+local isShowdDragFrefresh = false
+local dragVal = Vector3.zero
 local objs = {}
 local defaulList = {
-    {icon="news_news_1", bgColor=0xfff1c40f,type=DBMessage.MsgType.Sys, name="公告"},
+    {icon = "news_news_1", bgColor = 0xfff1c40f, type = DBMessage.MsgType.Sys, name = "公告"}
    -- {icon="news_news_2", bgColor=0xff2990dc,type=DBMessage.MsgType.SysNotice, name="系统消息"},
    -- {icon="news_news_3", bgColor=0xff1abc9c,type=DBMessage.MsgType.Task, name="待办任务"},
 }
@@ -29,6 +32,9 @@ function CSPMsg.init(csObj)
    ---@type UITable
    objs.Table = getCC(objs.scrollView.transform, "Table", "UITable")
    objs.LoopGrid = getCC(objs.Table.transform, "msgList/Grid", "CLUILoopGrid")
+
+    objs.ButtonEndList = getChild(objs.Table.transform, "ButtonEndList")
+    objs.ButtonHeadList = getCC(objs.Table.transform, "ButtonHeadList", "UILabel")
 end

 -- 设置数据
@@ -37,9 +43,49 @@ end

 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function CSPMsg.show()
+    CSPMsg.setList()
+
+    objs.Content.onClipMove = CSPMsg.onClipMove
+    objs.scrollView.onDragStarted = CSPMsg.onDragStart
+    objs.scrollView.onDragFinished = CSPMsg.onDragEnd
+end
+
+function CSPMsg.setList()
    objs.LoopGrid:setList(defaulList, CSPMsg.initCell)
+
    objs.Table:Reposition()
    objs.scrollView:ResetPosition()
+    csSelf:invoke4Lua(CSPMsg.repositon, 0.1)
+end
+
+function CSPMsg.onClipMove(panel)
+    if (not isShowdDragFrefresh) and objs.ButtonHeadList.isVisible then
+        isShowdDragFrefresh = true
+        dragVal = objs.Content.transform.localPosition
+    end
+end
+
+function CSPMsg.onDragStart()
+    objs.ButtonHeadList.transform.localPosition = Vector3.up * 30
+    SetActive(objs.ButtonHeadList.gameObject, true)
+    dragVal = Vector3.zero
+    isShowdDragFrefresh = false
+end
+
+function CSPMsg.onDragEnd()
+    SetActive(objs.ButtonHeadList.gameObject, false)
+    local offset = objs.Content.transform.localPosition - dragVal
+    if offset.y < -50 then
+        -- 刷数据
+        NetProto.send.announcement_query()
+    end
+    if isShowdDragFrefresh then
+        CSPMsg.repositon()
+    end
+end
+
+function CSPMsg.repositon()
+    objs.scrollView:ResetPosition()
 end

 function CSPMsg.initCell(cell, data)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua
@@ -1,12 +1,15 @@
 -- xx界面
 local CSPTasks = {}

+---@type Coolape.CLPanelLua
 local csSelf = nil
 local transform = nil
 CSPTasks.sizeAdjust = 1
 CSPTasks.contentRect = Vector4.zero
 local uiobjs = {}
 local headData = {}
+local dragVal = Vector3.zero
+local isShowdDragFrefresh = false

 -- 初始化，只会调用一次
 function CSPTasks.init(csObj)
@@ -15,12 +18,16 @@ function CSPTasks.init(csObj)
    CSPTasks.setEventDelegate()
    CSPTasks.contentRect = MyUtl.getUIContent(csSelf, 360 + 220)

+    ---@type UIPanel
    uiobjs.Content = getCC(transform, "PanelContent", "UIPanel")
    uiobjs.Content.transform.localPosition = Vector3.zero
    uiobjs.Content.clipOffset = Vector2.zero
    uiobjs.Content.baseClipRegion = CSPTasks.contentRect

    uiobjs.TableContent = getCC(uiobjs.Content.transform, "Table", "UITable")
+    ---@type UILabel
+    uiobjs.LabelDragRefresh = getCC(uiobjs.TableContent.transform, "LabelDragRefresh", "UILabel")
+    SetActive(uiobjs.LabelDragRefresh.gameObject, false)

    ---@type UIGrid
    local CustManageGrid = getCC(uiobjs.TableContent.transform, "CustManage/grid", "UIGrid")
@@ -59,21 +66,32 @@ function CSPTasks.setData(paras)
    end

    -- 取得头像
+    CSPTasks.refreshData()
+end
+
+function CSPTasks.refreshData()
    NetProto.send.person_view_query()
    NetProto.send.sales_view_query()
+    if CSPTasks.reportform then
+        CSPTasks.reportform:init({forceRefresh = true}, nil)
+    end
 end

 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function CSPTasks.show()
-    local list = {}
-    for i = 1, 100 do
-        list[i] = i
-    end
-    -- uiobjs.TableTask:setList(list, nil)
-
    uiobjs.ToggleOrder:Set(true)
    CSPTasks.showReportform("reportform2")
    uiobjs.scrollView:ResetPosition()
+    csSelf:invoke4Lua(
+        function()
+            uiobjs.scrollView:ResetPosition()
+        end,
+        0.1
+    )
+
+    uiobjs.Content.onClipMove = CSPTasks.onClipMove
+    uiobjs.scrollView.onDragStarted = CSPTasks.onDragStart
+    uiobjs.scrollView.onDragFinished = CSPTasks.onDragEnd
 end

 function CSPTasks.onClickBottonBtn(cell)
@@ -94,8 +112,34 @@ function CSPTasks.setHeadInfor()
    )
 end

+function CSPTasks.onClipMove(panel)
+    if (not isShowdDragFrefresh) and uiobjs.LabelDragRefresh.isVisible then
+        isShowdDragFrefresh = true
+        dragVal = uiobjs.Content.transform.localPosition
+    end
+end
+
+function CSPTasks.onDragStart()
+    uiobjs.LabelDragRefresh.transform.localPosition = Vector3.zero
+    SetActive(uiobjs.LabelDragRefresh.gameObject, true)
+    dragVal = Vector3.zero
+    isShowdDragFrefresh = false
+end
+function CSPTasks.onDragEnd()
+    SetActive(uiobjs.LabelDragRefresh.gameObject, false)
+    local offset = uiobjs.Content.transform.localPosition - dragVal
+    if offset.y < -50 then
+        -- 刷数据
+        CSPTasks.refreshData()
+    end
+    if isShowdDragFrefresh then
+        uiobjs.scrollView:ResetPosition()
+    end
+end
+
 -- 关闭页面
 function CSPTasks.hide()
+    csSelf:cancelInvoke4Lua()
    if CSPTasks.reportform then
        CLUIOtherObjPool.returnObj(CSPTasks.reportform.gameObject)
        SetActive(CSPTasks.reportform.gameObject, false)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua
@@ -10,7 +10,7 @@ function TRPAbout:init(csObj)
    self:initFiledsAttr()
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 500, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 500, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    ---@type UITable
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPComFilter.lua
@@ -15,7 +15,7 @@ function TRPComFilter:init(csObj)
    TRPComFilter.super.init(self, csObj)
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 50, 190)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 50, 190)
    ---@type UIScrollView
    uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
@@ -11,7 +11,7 @@ function TRPCustDetail:init(csObj)
    self:prepareMoreData()
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 400 + 160 + 60, 200)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 160 + 60, 200)
    uiobjs.bottomGrid = getCC(self.transform, "AnchorBottom/offset/Grid", "UIGrid")
    local width = NumEx.getIntPart(CSPMain.contentRect.z / 4)
    uiobjs.bottomGrid.cellWidth = width
@@ -261,6 +261,12 @@ function TRPCustDetail:reposition()
    uiobjs.Table:Reposition()
    uiobjs.scrollView.disableDragIfFits = true
    uiobjs.scrollView:ResetPosition()
+    self.csSelf:invoke4Lua(
+        function()
+            uiobjs.scrollView:ResetPosition()
+        end,
+        0.1
+    )
 end

 ---public 显示扩展字段
@@ -358,7 +364,7 @@ function TRPCustDetail:showOrders()
    SetActive(uiobjs.Records.gameObject, false)
    SetActive(uiobjs.OrderRoot.gameObject, true)
    SetActive(uiobjs.MoreRoot.gameObject, false)
-    
+
    if self.orders == nil or #(self.orders.data) then
        SetActive(uiobjs.ButtonEndListOrder.gameObject, true)
    else
@@ -395,10 +401,10 @@ function TRPCustDetail:onOrderEndList(tail)
    printw("到最后了==" .. tail.name)
    if self.orders and self.orders.meta.current_page < self.orders.meta.total_pages then
        showHotWheel()
-        -- //TODO:取得下一页
+        -- 取得下一页
        NetProto.send.workFlowQuery({custId = self.mdata.custId}, "", self.orders.meta.current_page + 1)
    else
-        uiobjs.ButtonEndListOrder.localPosition = tail.transform.localPosition + Vector3.up * -270
+        uiobjs.ButtonEndListOrder.localPosition = tail.transform.localPosition + Vector3.up * -240
        SetActive(uiobjs.ButtonEndListOrder.gameObject, true)
    end
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetailSimple.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetailSimple.lua
@@ -11,7 +11,7 @@ function TRPCustDetailSimple:init(csObj)
    self:prepareMoreData()
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 400 + 40, 200)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 200)

    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
@@ -9,7 +9,7 @@ function TRPCustList:init(csObj)
    TRPCustList.super.init(self, csObj)
    self:setEventDelegate()
    self:initFilters()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
    uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
@@ -112,6 +112,11 @@ function TRPCustList:showList(list)
        self:wrapFunc(self.onEndList)
    )
    uiobjs.scrollView:ResetPosition()
+    self.csSelf:invoke4Lua(self.reposition, 0.1)
+end
+
+function TRPCustList:reposition()
+    uiobjs.scrollView:ResetPosition()
 end

 function TRPCustList:appList(list)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustListProc.lua
@@ -9,7 +9,7 @@ function TRPCustListProc:init(csObj)
    TRPCustListProc.super.init(self, csObj)
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 30, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 30, 0)
    ---@type UIScrollView
    uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowFilter.lua
@@ -14,7 +14,7 @@ function TRPFollowFilter:init(csObj)
    TRPFollowFilter.super.init(self, csObj)
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 50, 190)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 50, 190)
    ---@type UIScrollView
    uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua
@@ -9,7 +9,7 @@ function TRPFollowList:init(csObj)
    TRPFollowList.super.init(self, csObj)
    self:initFilters()
    self:setEventDelegate()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
    ---@type UIInput
    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
@@ -120,6 +120,11 @@ function TRPFollowList:showList(list)
        self:wrapFunc(self.onEndList)
    )
    uiobjs.scrollView:ResetPosition()
+    self.csSelf:invoke4Lua(self.repositon, 0.1)
+end
+
+function TRPFollowList:repositon()
+    uiobjs.scrollView:ResetPosition()
 end

 function TRPFollowList:appList(list)
@@ -137,7 +142,7 @@ function TRPFollowList:onShowRefreshFlg()
 end
 function TRPFollowList:onhideRefreshFlg()
    SetActive(uiobjs.ButtonHeadList.gameObject, false)
-    if uiobjs.Grid.list.Count  == 0 then
+    if uiobjs.Grid.list.Count == 0 then
        uiobjs.scrollView:ResetPosition()
    end
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua
@@ -10,7 +10,7 @@ function TRPMyInfor:init(csObj)
    self:initFiledsAttr()
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 40 + 300, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 40 + 300, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -177,10 +177,12 @@ function TRPMyInfor:onClickField(go)
    elseif el.jsonKey == "closeLog" then
        if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
            ReporterMessageReceiver.self.gameObject:SetActive(false)
+            MyUtl.toast("日志监听已关闭")
        end
    elseif el.jsonKey == "openLog" then
        if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
            ReporterMessageReceiver.self.gameObject:SetActive(true)
+            MyUtl.toast("日志监听已打开，画圈可查看")
        end
    else
        getPanelAsy(
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua
@@ -11,7 +11,7 @@ function TRPNewCust:init(csObj)
    TRPNewCust.super.init(self, csObj)

    self:setEventDelegate()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -39,7 +39,7 @@ end
 -- 设置数据
 ---@param paras _ParamTRPNewCust
 function TRPNewCust:setData(paras)
-    if paras and paras.custId > 0 then
+    if paras and paras.custId and paras.custId > 0 then
        self.isNewCust = false
        self.mdata = paras
        self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
@@ -11,7 +11,7 @@ function TRPNewFollow:init(csObj)
    TRPNewFollow.super.init(self, csObj)
    self:initFiledsAttr()
    self:setEventDelegate()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua
@@ -11,7 +11,7 @@ function TRPNewFollowSimple:init(csObj)
    TRPNewFollowSimple.super.init(self, csObj)
    self:initFiledsAttr()
    self:setEventDelegate()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua
@@ -11,7 +11,7 @@ function TRPNewFollowTask:init(csObj)
    TRPNewFollowTask.super.init(self, csObj)
    self:initFiledsAttr()
    self:setEventDelegate()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
@@ -11,7 +11,7 @@ function TRPNewOrder:init(csObj)
    TRPNewOrder.super.init(self, csObj)
    self:initFiledsAttr()
    self:setEventDelegate()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua
@@ -9,7 +9,7 @@ function TRPOceanList:init(csObj)
    TRPOceanList.super.init(self, csObj)
    self:setEventDelegate()
    self:initFilters()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
    uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
@@ -101,6 +101,11 @@ function TRPOceanList:showList(list)
        self:wrapFunc(self.onEndList)
    )
    uiobjs.scrollView:ResetPosition()
+    self.csSelf:invoke4Lua(self.reposition, 0.1)
+end
+
+function TRPOceanList:reposition()
+    uiobjs.scrollView:ResetPosition()
 end

 function TRPOceanList:appList(list)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
@@ -25,7 +25,7 @@ function TRPOrderDetail:init(csObj)
    ---@type UIToggle
    uiobjs.ToggleDetail = getCC(uiobjs.ToggleGrid.transform, "ToggleDetail", "UIToggle")

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 160 + 30, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 160 + 30, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -215,6 +215,12 @@ function TRPOrderDetail:reposition()
    uiobjs.Table:Reposition()
    uiobjs.scrollView.disableDragIfFits = true
    uiobjs.scrollView:ResetPosition()
+    self.csSelf:invoke4Lua(
+        function()
+            uiobjs.scrollView:ResetPosition()
+        end,
+        0.1
+    )
 end

 function TRPOrderDetail:showBaseFileds()
@@ -432,7 +438,8 @@ function TRPOrderDetail:setEventDelegate()
            self.currToggle = 5
            self:showSubOrders()
        end,
-        ButtonAddAttachment = function()
+        ButtonAddAttachment = function(go)
+            self:addAttachment(go)
        end,
        ButtonAddMoney = function()
        end,
@@ -442,11 +449,65 @@ function TRPOrderDetail:setEventDelegate()
        end
    }
 end
+
+function TRPOrderDetail:addAttachment(go)
+    -- 添加附件
+    ---@type UIPopupList
+    local popList = go:GetComponent("UIPopupList")
+    if popList.value == "1" then
+        -- 相机
+        local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage))
+        if permission ~= NativeCamera.Permission.Granted then
+            if permission == NativeCamera.Permission.ShouldAsk then
+                NativeCamera.RequestPermission()
+            else
+                CLUIUtl.showConfirm(
+                    "没有使用相机的权限，打开设置允许使用相机",
+                    function()
+                        if not MyCamera.openSetting() then
+                            MyUtl.toastW("打开权限设置失败")
+                        end
+                    end,
+                    nil
+                )
+            end
+        end
+    elseif popList.value == "2" then
+        local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage))
+        if permission ~= NativeGallery.Permission.Granted then
+            if permission == NativeGallery.Permission.ShouldAsk then
+                NativeGallery.RequestPermission()
+            else
+                CLUIUtl.showConfirm(
+                    "没有使用相册的权限，打开设置允许使用相册",
+                    function()
+                        if not MyGallery.openSetting() then
+                            MyUtl.toastW("打开权限设置失败")
+                        end
+                    end,
+                    nil
+                )
+            end
+            NativeCamera.RequestPermission()
+        end
+    end
+end
+
+
+function TRPOrderDetail:onGetImage(path)
+    if isNilOrEmpty(path) then
+        return
+    end
+    -- table.insert(self.images, {path = path, onDelete = self:wrapFunc(self.onDelImage)})
+    --//TODO:
+    MyUtl.toastW("接口要修改")
+end
+
 -- 处理ui上的事件，例如点击等
 function TRPOrderDetail:uiEventDelegate(go)
    local func = self.EventDelegate[go.name]
    if func then
-        func()
+        func(go)
    end
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
@@ -9,7 +9,7 @@ function TRPOrderList:init(csObj)
    TRPOrderList.super.init(self, csObj)
    self:setEventDelegate()
    self:initFilters()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
    uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
@@ -123,6 +123,13 @@ function TRPOrderList:showList(list)
        self:wrapFunc(self.onHeadList),
        self:wrapFunc(self.onEndList)
    )
+    
+    self:reposition()
+    self.csSelf:invoke4Lua(self.reposition, 0.1)
+end
+
+
+function TRPOrderList:reposition()
    uiobjs.scrollView:ResetPosition()
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductDetail.lua
@@ -10,7 +10,7 @@ function TRPProductDetail:init(csObj)
    self:initFiledsAttr()
    self:setEventDelegate()

-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPProductList.lua
@@ -31,7 +31,7 @@ end
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPProductList:show()
    uiobjs.InputSeachKey.value = ""
-    showHotWheel()
+    -- showHotWheel()
    NetProto.send.selectProductInfo(uiobjs.InputSeachKey.value, 1)
    self:showList({})
 end
@@ -47,8 +47,14 @@ function TRPProductList:showList(products)
        SetActive(uiobjs.ButtonEndList.gameObject, true)
    end
    uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList))
+    self:reposition()
+    self.csSelf:invoke4Lua(self.reposition, 0.1)
+end
+
+function TRPProductList:reposition()
    uiobjs.scrollView:ResetPosition()
 end
+
 function TRPProductList:appList(products)
    local list = {}
    for i, v in ipairs(products or {}) do
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua
@@ -48,8 +48,13 @@ function TRPSelectProduct:showList(products)
        table.insert(list, {data = v, isSelected = selectedMap[v.id] and true or false})
    end
    uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList))
+    self.csSelf:invoke4Lua(self.reposition, 0.1)
+end
+
+function TRPSelectProduct:reposition()
    uiobjs.scrollView:ResetPosition()
 end
+
 function TRPSelectProduct:appList(list)
    SetActive(uiobjs.ButtonEndList.gameObject, false)
    uiobjs.Grid:appendList(list)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
@@ -91,6 +91,9 @@ function TRPSetting:setEventDelegate()
                        pcall(releaseRes4GC, true)
                    end
                    --- 释放资源结束-------------------------------
+                    
+                    --//TODO: 还要把已经下载了的附件也删除掉
+
                    pcall(cleanRes)
                    local panel = CLPanelManager.getPanel(CLMainBase.self.firstPanel)
                    if panel then
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua
@@ -13,7 +13,7 @@ function TRPSysMsgDetail:init(csObj)
    ---@type UIScrollView
    self.uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    self.uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
-    MyUtl.setContentView(self.uiobjs.scrollView, 132 + 100 + 56 + 25 + 30 + 45, 0)
+    MyUtl.setContentView(self.uiobjs.scrollView, MyUtl.defaultTopHeight + 100 + 56 + 25 + 30 + 45, 0)
    self.uiobjs.LabelContent = getCC(self.uiobjs.scrollView.transform, "LabelContent", "UILabel")
    self.uiobjs.LabelTitle = getCC(self.transform, "Top/LabelTitle", "UILabel")
    self.uiobjs.LabelTime = getCC(self.transform, "Top/LabelTime", "UILabel")
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
@@ -9,7 +9,7 @@ function TRPSysMsgList:init(csObj)
    self:setEventDelegate()
    self.uiobjs = {}
    self.uiobjs.PanelContent = getCC(self.transform, "PanelContent", "UIPanel")
-    MyUtl.setContentView(self.uiobjs.PanelContent, nil, 0)
+    MyUtl.setContentView(self.uiobjs.PanelContent, MyUtl.defaultTopHeight + 30, 0)
    ---@type UIScrollView
    self.uiobjs.scrollView = self.uiobjs.PanelContent:GetComponent("UIScrollView")
    self.uiobjs.Table = getCC(self.uiobjs.PanelContent.transform, "Table", "UITable")
@@ -91,11 +91,15 @@ end
 ---@param data _DBMessage
 function TRPSysMsgList:onClickCell(cell, data)
    if data.NOTICETYPE == DBMessage.MsgType.Sys then
-        NetProto.send.readNotice(data.ID, function(content)
-            if content.success then
-                data.READFLAG = DBMessage.ReadFlag.readed
+        NetProto.send.readNotice(
+            data.ID,
+            function(content)
+                if content.success then
+                    data.READFLAG = DBMessage.ReadFlag.readed
+                    self.uiobjs.LoopTable:refreshContentOnly()
+                end
            end
-        end)
+        )
        getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
    elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
        getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPTaskList.lua
@@ -9,7 +9,7 @@ function TRPTaskList:init(csObj)
    TRPTaskList.super.init(self, csObj)
    self:setEventDelegate()
    self:initFilters()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
    uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
@@ -135,6 +135,11 @@ function TRPTaskList:showList(list)
        self:wrapFunc(self.onHeadList),
        self:wrapFunc(self.onEndList)
    )
+    self:reposition()
+    self.csSelf:invoke4Lua(self.reposition, 0.1)
+end
+
+function TRPTaskList:reposition()
    uiobjs.scrollView:ResetPosition()
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
@@ -1172,6 +1172,7 @@ GameObject:
  - component: {fileID: 6102102815046021231}
  - component: {fileID: 1757157169552089458}
  - component: {fileID: 7285716023077109019}
+  - component: {fileID: 7012387384596937387}
  m_Layer: 5
  m_Name: 000000
  m_TagString: Untagged
@@ -1308,6 +1309,21 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  jsonKey: 
+--- !u!114 &7012387384596937387
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 384054098155761993}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 6102102815046021231}
+  offset: 50
+  sizeAdjust: 1
 --- !u!1 &433861596741914714
 GameObject:
  m_ObjectHideFlags: 0
@@ -3332,7 +3348,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: money
+  jsonKey: salePrice
  formatValue: "\u8BA2\u5355\u91D1\u989D\uFF1A{0}"
  labeName: {fileID: 0}
  defaultName: 
@@ -5331,7 +5347,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3335925071625191991}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 110, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 7066844989434100784}
@@ -10389,7 +10405,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6507410882875161292}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -817, z: 0}
+  m_LocalPosition: {x: 0, y: -953.1, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 8625017959052448412}
@@ -13524,12 +13540,12 @@ MonoBehaviour:
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 4
  mWidth: 180
-  mHeight: 36
+  mHeight: 72
  mDepth: 7
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 5
+  aspectRatio: 2.5
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -13543,7 +13559,7 @@ MonoBehaviour:
  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
  mSymbols: 1
  mEffectDistance: {x: 1, y: 1}
-  mOverflow: 2
+  mOverflow: 0
  mMaterial: {fileID: 0}
  mApplyGradient: 0
  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab
@@ -147,12 +147,12 @@ MonoBehaviour:
  mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
  mPivot: 4
  mWidth: 44
-  mHeight: 43
+  mHeight: 44
  mDepth: 3
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.0232558
+  aspectRatio: 1
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -647,7 +647,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3433090576014742667}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -440, y: 0, z: 0}
+  m_LocalPosition: {x: -440, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 115906781541627961}
@@ -686,12 +686,12 @@ MonoBehaviour:
  mColor: {r: 0.94509804, g: 0.76862746, b: 0.05882353, a: 1}
  mPivot: 4
  mWidth: 143
-  mHeight: 145
+  mHeight: 144
  mDepth: 1
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.99310344
+  aspectRatio: 0.9930556
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -788,6 +788,94 @@ MonoBehaviour:
  OnShowHeadListCallbacks: []
  OnHideHeadListCallbacks: []
  OnEndListCallbacks: []
+--- !u!1 &3880385944865881628
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6043606001102860164}
+  - component: {fileID: 4663210212859776047}
+  - component: {fileID: 8111949300693443825}
+  - component: {fileID: 1146093707276046720}
+  m_Layer: 5
+  m_Name: ButtonEndList
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &6043606001102860164
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880385944865881628}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.000061035156, y: -339.15424, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6824730079511602782}
+  m_Father: {fileID: 7559427024191909535}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4663210212859776047
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880385944865881628}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 87.74999, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8111949300693443825
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880385944865881628}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 7417440583944426218}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick: []
+--- !u!114 &1146093707276046720
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880385944865881628}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 0}
+  draggablePanel: {fileID: 0}
 --- !u!1 &4440088906197307186
 GameObject:
  m_ObjectHideFlags: 0
@@ -846,7 +934,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  scrollView: {fileID: 0}
+  scrollView: {fileID: 3722797921129174865}
  draggablePanel: {fileID: 0}
 --- !u!114 &5936379021244286420
 MonoBehaviour:
@@ -1054,7 +1142,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1.5
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1154,7 +1242,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.04761905
+  aspectRatio: 16.357143
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1286,6 +1374,163 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!1 &6713830457336055895
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3784162148691699609}
+  - component: {fileID: 8837570472974794998}
+  - component: {fileID: 2012938702108678750}
+  - component: {fileID: 8465575509868255547}
+  - component: {fileID: 4324701237407708404}
+  m_Layer: 5
+  m_Name: ButtonHeadList
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &3784162148691699609
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6713830457336055895}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.000061035156, y: -34.65422, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7559427024191909535}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &8837570472974794998
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6713830457336055895}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 87.74999, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2012938702108678750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6713830457336055895}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 0}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick: []
+--- !u!114 &8465575509868255547
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6713830457336055895}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 0}
+  draggablePanel: {fileID: 0}
+--- !u!114 &4324701237407708404
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6713830457336055895}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 50
+  mDepth: 11
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 22.5
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u4E0B\u62C9\u5237\u65B0"
+  mFontSize: 46
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 0
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
 --- !u!1 &6904648129028073836
 GameObject:
  m_ObjectHideFlags: 0
@@ -1311,12 +1556,12 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6904648129028073836}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2, y: -118, z: 0}
+  m_LocalPosition: {x: -2, y: -187, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3557982717651279387}
  m_Father: {fileID: 7559427024191909535}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4461323368321500846
 MonoBehaviour:
@@ -1356,6 +1601,106 @@ MonoBehaviour:
  hideIfOffScreen: 0
  keepAspectRatio: 0
  aspectRatio: 11.25
+--- !u!1 &7417440583944426218
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6824730079511602782}
+  - component: {fileID: 5473991566102628421}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6824730079511602782
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7417440583944426218}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6043606001102860164}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5473991566102628421
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7417440583944426218}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 50
+  mDepth: 11
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 22.5
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u65E0\u66F4\u591A\u4FE1\u606F"
+  mFontSize: 46
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 0
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
 --- !u!1 &7559427024191909528
 GameObject:
  m_ObjectHideFlags: 0
@@ -1384,8 +1729,10 @@ Transform:
  m_LocalPosition: {x: 0, y: -226.46, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 3784162148691699609}
  - {fileID: 4952826910999883875}
  - {fileID: 5526176270147194935}
+  - {fileID: 6043606001102860164}
  m_Father: {fileID: 7559427025382814600}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1609,7 +1956,7 @@ MonoBehaviour:
  movement: 1
  dragEffect: 2
  restrictWithinPanel: 1
-  disableDragIfFits: 1
+  disableDragIfFits: 0
  smoothDragStart: 1
  iOSDragEmulation: 1
  scrollWheelFactor: 0.25
@@ -1752,7 +2099,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 9025999471674548422}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1, y: -85, z: 0}
+  m_LocalPosition: {x: -2479, y: -85, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4089383056281043756}
@@ -1760,7 +2107,7 @@ Transform:
  - {fileID: 848496764181751289}
  - {fileID: 7572607641653716598}
  m_Father: {fileID: 7559427024191909535}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &7825856739466353785
 BoxCollider:
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
@@ -12752,11 +12752,11 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 7192762038683279864}
-  - component: {fileID: 7391624919638342989}
  - component: {fileID: 4817941406756770796}
  - component: {fileID: 1598720523563585989}
  - component: {fileID: 2520617879880372827}
-  - component: {fileID: 602889232740327463}
+  - component: {fileID: 1960237429817037261}
+  - component: {fileID: 7061102315160850978}
  m_Layer: 5
  m_Name: ButtonAddAttachment
  m_TagString: Untagged
@@ -12780,21 +12780,6 @@ Transform:
  m_Father: {fileID: 4713050183387073493}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7391624919638342989
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8804607366196574388}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua
-  isNeedResetAtlase: 1
 --- !u!114 &4817941406756770796
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -12875,7 +12860,7 @@ MonoBehaviour:
  mSpriteName: news_news_bg
  mFillCenter: 1
  isGrayMode: 0
--- !u!114 &602889232740327463
+--- !u!114 &1960237429817037261
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -12884,30 +12869,66 @@ MonoBehaviour:
  m_GameObject: {fileID: 8804607366196574388}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 8804607366196574388}
-  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
-  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
-  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  duration: 0.2
-  skipColorEffect: 1
-  dragHighlight: 0
-  hoverSprite: 
-  pressedSprite: 
-  disabledSprite: 
-  hoverSprite2D: {fileID: 0}
-  pressedSprite2D: {fileID: 0}
-  disabledSprite2D: {fileID: 0}
-  pixelSnap: 0
-  onClick:
+  atlasName: 
+  atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
+  fontName: 
+  bitmapFont: {fileID: 0}
+  trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
+  fontSize: 46
+  fontStyle: 0
+  backgroundSprite: mine_me_opinion
+  highlightSprite: mine_me_opinion
+  position: 0
+  alignment: 1
+  items:
+  - "\u76F8\u673A"
+  - "\u4ECE\u76F8\u518C\u9009\u62E9"
+  valueItems:
+  - 1
+  - 2
+  padding: {x: 4, y: 4}
+  textColor: {r: 1, g: 1, b: 1, a: 1}
+  backgroundColor: {r: 1, g: 1, b: 1, a: 1}
+  highlightColor: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  isAnimated: 1
+  isLocalized: 0
+  openOn: 0
+  onChange: []
+  mSelectedItem: "\u76F8\u673A"
+  mPanel: {fileID: 0}
+  mChild: {fileID: 0}
+  mBackground: {fileID: 0}
+  mHighlight: {fileID: 0}
+  mHighlightedLabel: {fileID: 0}
+  mLabelList: []
+  mBgBorder: 0
+  eventReceiver: {fileID: 0}
+  functionName: OnSelectionChange
+  textScale: 0
+  font: {fileID: 0}
+  textLabel: {fileID: 0}
+--- !u!114 &7061102315160850978
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8804607366196574388}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onSelect:
  - mTarget: {fileID: 5860156637446539259}
    mMethodName: uiEventDelegate
    mParameters:
    - obj: {fileID: 0}
      field: 
-      name: go
+      name: 
    oneShot: 0
 --- !u!1 &8829601327712278063
 GameObject:
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab
@@ -2385,16 +2385,16 @@ MonoBehaviour:
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 4
  mWidth: 180
-  mHeight: 36
+  mHeight: 72
  mDepth: 7
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 5
+  aspectRatio: 2.5
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u5BA2\u6237\u7684\u540D\u5B57"
+  mText: "\u5BA2\u6237\u7684\u540D\u5B57\u5BA2\u6237\u7684\u540D\u5B57"
  mFontSize: 36
  mFontStyle: 0
  mAlignment: 0
@@ -2404,7 +2404,7 @@ MonoBehaviour:
  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
  mSymbols: 1
  mEffectDistance: {x: 1, y: 1}
-  mOverflow: 2
+  mOverflow: 0
  mMaterial: {fileID: 0}
  mApplyGradient: 0
  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -2471,7 +2471,7 @@ MonoBehaviour:
  mLabelList: []
  mBgBorder: 0
  eventReceiver: {fileID: 0}
-  functionName: OnSelectionChange
+  functionName: 
  textScale: 0
  font: {fileID: 0}
  textLabel: {fileID: 0}
@@ -2767,7 +2767,7 @@ MonoBehaviour:
  anchorOffset: 0
  softBorderPadding: 1
  renderQueue: 0
-  startingRenderQueue: 3008
+  startingRenderQueue: 3007
  mClipTexture: {fileID: 0}
  mAlpha: 1
  mClipping: 3
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab
@@ -891,7 +891,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1177300157851115119}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3.75, y: -1020.7793, z: 0}
+  m_LocalPosition: {x: 0, y: -1171.9043, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6055523243253628620}
@@ -899,7 +899,7 @@ Transform:
  - {fileID: 867552299179297213}
  - {fileID: 3299771093228243413}
  m_Father: {fileID: 2972147044405579785}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1270337521464514563
 MonoBehaviour:
@@ -980,14 +980,14 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1265221955037360746}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -547.65424, z: 0}
+  m_LocalPosition: {x: 0, y: -698.0293, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 8514462368567531946}
  - {fileID: 5963455614962161935}
  - {fileID: 4757940232671147693}
  m_Father: {fileID: 2972147044405579785}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &7435333877463623657
 MonoBehaviour:
@@ -2407,6 +2407,7 @@ Transform:
  m_LocalPosition: {x: 0, y: -142.2, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 7842026390970306112}
  - {fileID: 2414056310727233539}
  - {fileID: 8808936561438781430}
  - {fileID: 8843266203698922333}
@@ -2665,14 +2666,14 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3398351578709515305}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -74.15427, z: 0}
+  m_LocalPosition: {x: 0, y: -224.02927, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5687123867571877963}
  - {fileID: 184360130306287280}
  - {fileID: 7740471187378746629}
  m_Father: {fileID: 2972147044405579785}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4689739255238786590
 MonoBehaviour:
@@ -3372,7 +3373,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 250
+  aspectRatio: 502.5
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -3758,6 +3759,106 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
+--- !u!1 &5598247988735069751
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7842026390970306112}
+  - component: {fileID: 7186500816148371164}
+  m_Layer: 5
+  m_Name: LabelDragRefresh
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &7842026390970306112
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5598247988735069751}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2972147044405579785}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7186500816148371164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5598247988735069751}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 50
+  mDepth: 6
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u4E0B\u62C9\u5237\u65B0"
+  mFontSize: 50
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 2
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
 --- !u!1 &5636350171229174243
 GameObject:
  m_ObjectHideFlags: 0
@@ -5937,7 +6038,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8146871752058326566}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -481, y: 0, z: 0}
+  m_LocalPosition: {x: -478, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4695632568452137690}
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform1.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.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/TRPAbout.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.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/TRPCustDetailSimple.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetailSimple.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustListProc.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowFilter.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.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/TRPNewFollowSimple.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOceanList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectProduct.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/lua/ui/panel/TRPSysMsgDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d
--- 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,f866c7edbc8b45c009428cc94deb176e8	%trCRM/resVer/Android/VerCtl/other.ver8,2eefe052e318b31f1af603804a16c317
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,f4d7fbdcc98d7915aaaa949f686a5d698	%trCRM/resVer/Android/VerCtl/other.ver8,2eefe052e318b31f1af603804a16c317
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver