mm

Assets/trCRM/serversCfg/servers.json

@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"e23d94501e73e162b6fa272c173ca973", "port":29006, "androidVer":"3395e596f57b806c18bb98680676ea2c", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"e23d94501e73e162b6fa272c173ca973", "port":29000, "androidVer":"3395e596f57b806c18bb98680676ea2c", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"e23d94501e73e162b6fa272c173ca973", "port":29004, "androidVer":"3395e596f57b806c18bb98680676ea2c", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29006, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29000, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29004, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":0}}}

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

@@ -14,6 +14,12 @@ DBUser.FilterGroup = {
     group = "group"
 }
 
+function DBUser.clean()
+    db = {}
+    poplist = {}
+    rolePermission = {}
+end
+
 function DBUser.onGetUsers(list, groupList, permissions)
     local options = ArrayList()
     local values = ArrayList()
@@ -66,14 +72,18 @@ end
 
 function DBUser.refreshUserInfor(loginNo, loginName)
     local infor = DBUser.getPopList(DBUser.FilterGroup.user)
-    for i, v in ipairs(infor.values or {}) do
-        if v == loginNo then
-            infor.options[i] = loginName
-            break
+    if infor and infor.values then
+        local count = infor.values.Count
+        for i = 0, count - 1 do
+            local v = infor.values[i]
+            if v == loginNo then
+                infor.options[i] = loginName
+                break
+            end
         end
     end
 
-    local list = DBUser.getFilters(DBUser.FilterGroup.user)
+    local list = DBUser.getFilters(DBUser.FilterGroup.user) or {}
     for i, v in ipairs(list or {}) do
         if v.value == loginNo then
             v.name = loginNo

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

@@ -13,7 +13,6 @@ local port = 29004
 local baseUrl = joinStr("http://", host, ":", port, "/open_api/")
 local socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
 
-
 NetProto.setSever = function(_host, _port)
     host = _host
     port = _port
@@ -84,12 +83,15 @@ local dispatch = function(content, params)
     for k, p in pairs(PanelListener) do
         ListenerQueue:enQueue(p)
     end
+    ---@type Coolape.CLPanelLua
     local p
     while (ListenerQueue:size() > 0) do
         ---@type coolape.Coolape.CLPanelBase
         p = ListenerQueue:deQueue()
-        if p then
+        if p and (not p:IsNull()) and p.gameObject.activeInHierarchy then
             p:procNetwork(cmd, code, msg, map)
+        else
+            NetProto.removePanelListener(p)
         end
     end
 end
@@ -212,14 +214,14 @@ end
 ---@param p Coolape.CLPanelBase
 function NetProto.addPanelListener(p)
     if p then
-        PanelListener[p] = p
+        PanelListener[p.name] = p
     end
 end
 
 ---@param p Coolape.CLPanelBase
 function NetProto.removePanelListener(p)
     if p then
-        PanelListener[p] = nil
+        PanelListener[p.name] = nil
     end
 end
 
@@ -300,7 +302,7 @@ NetProto.cmds = {
     updateUserInfo = "updateUserInfo", -- 更新用户信息
     updateUserPhone = "updateUserPhone", -- 更新用户手机号
     get_customerById = "get_customerById", -- 取得客户
-    readNotice = "readNotice", -- 已读公告
+    readNotice = "readNotice" -- 已读公告
 }
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
@@ -616,7 +618,7 @@ NetProto.send.selectProductInfo = function(searchKey, page, callback, timeOutSec
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
-NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec)
+NetProto.send.createWfInfo = function(workFlowInfo, wfOptions, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.createWfInfo
     local user = DBUser.getUserById(NetProto.loginNo)
@@ -625,6 +627,7 @@ NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec)
     content.loginNo = NetProto.loginNo
     content.groupId = NetProto.groupId
     content.workFlowInfo = workFlowInfo
+    content.wfOptions = wfOptions
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 

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

@@ -75,6 +75,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function CLLPPopList.hideSelfOnKeyBack()
+    if NetProto and csSelf then
+        NetProto.removePanelListener(csSelf)
+    end
     return true
 end
 

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

@@ -211,6 +211,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function CLLPPopTime.hideSelfOnKeyBack()
+    if NetProto and csSelf then
+        NetProto.removePanelListener(csSelf)
+    end
     return true
 end
 

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

@@ -93,6 +93,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function CLLPWebView.hideSelfOnKeyBack()
+    if NetProto and csSelf then
+        NetProto.removePanelListener(csSelf)
+    end
     return true
 end
 

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

@@ -48,6 +48,10 @@ function CSPMain.setBottomBtns()
     CLUIUtl.resetList4Lua(objs.bottomGrid, objs.bottomCellPrefab, bottomBtns, CSPMain.initBottomBtn)
 end
 
+function CSPMain.refreshBtns()
+    CLUIUtl.resetList4Lua(objs.bottomGrid, objs.bottomCellPrefab, bottomBtns, CSPMain.initBottomBtn2)
+end
+
 function CSPMain.initBottomBtn(cell, data)
     data.width = objs.bottomGrid.cellWidth
     cell:init(data, CSPMain.onClickBottonBtn)
@@ -56,6 +60,10 @@ function CSPMain.initBottomBtn(cell, data)
     end
 end
 
+function CSPMain.initBottomBtn2(cell, data)
+    cell:init(data, CSPMain.onClickBottonBtn)
+end
+
 function CSPMain.onClickBottonBtn(cell, data)
     cell.luaTable.setSelected(true)
     objs.LabelTitle.text = data.name
@@ -77,13 +85,11 @@ end
 
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function CSPMain.procNetwork(cmd, succ, msg, paras)
-    --[[
-        if(succ == 1) then
-          if(cmd == "xxx") then
-            -- TODO:
-          end
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.readNotice then
+            CSPMain.refreshBtns()
         end
-        --]]
+    end
 end
 
 -- 处理ui上的事件，例如点击等

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

@@ -27,6 +27,9 @@ end
 
 -- 当按了返回键时，关闭自己（返值为true时关闭）
 function TRBasePanel:hideSelfOnKeyBack()
+    if NetProto and self.csSelf then
+        NetProto.removePanelListener(self.csSelf)
+    end
     return true
 end
 

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

@@ -38,6 +38,8 @@ function TRPCustDetailSimple:init(csObj)
     uiobjs.starGridPrefab2 = getChild(uiobjs.starGrid2.transform, "00000").gameObject
     uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua")
     uiobjs.SysRoot = getCC(uiobjs.Table.transform, "SysRoot", "CLCellLua")
+
+    uiobjs.ButtonGet = getChild(self.transform, "AnchorBottom/offset/ButtonGet").gameObject
 end
 
 function TRPCustDetailSimple:prepareMoreData()
@@ -107,8 +109,9 @@ end
 -- 设置数据
 ---@param paras _ParamTRPCustDetailSimple
 function TRPCustDetailSimple:setData(paras)
+    self.isShowButtonGet = paras.isShowButtonGet
     ---@type _DBCust
-    self.mdata = paras
+    self.mdata = paras.cust
     self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)
     if type(self.mdata.jsonStr) == "string" then
         self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
@@ -130,6 +133,12 @@ end
 
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPCustDetailSimple:show()
+    SetActive(uiobjs.ButtonGet, self.isShowButtonGet or false)
+    if self.isShowButtonGet then
+        MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 200)
+    else
+        MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 0)
+    end
     self.records = nil
     self.orders = nil
     local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)

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

@@ -307,6 +307,11 @@ function TRPMyInfor:onGetImage(path)
         function(content)
             hideHotWheel()
             if content and content.success then
+                local user = DBUser.getUserById(self.mdata.loginNo)
+                if user then
+                    user.imageUrl = joinStr("file://", path)
+                    self:setHeadInfor()
+                end
                 NetProto.send.personal_data_query()
                 MyUtl.toastS("头像更改成功")
             else

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

@@ -396,7 +396,7 @@ function TRPNewCust:setEventDelegate()
                 cust,
                 function(content)
                     if content.success then
-                        getPanelAsy("PanelCustDetail", onLoadedPanel, cust)
+                        getPanelAsy("PanelCustDetail", onLoadedPanel, content.result)
                     end
                     hideHotWheel()
                 end

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

@@ -24,6 +24,7 @@ function TRPNewFollow:init(csObj)
     uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
 
     uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
+    uiobjs.ButtonCustDetail = getChild(self.transform, "ButtonCustDetail")
 end
 
 ---public 当有通用背板显示时的回调
@@ -130,6 +131,18 @@ end
 
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPNewFollow:show()
+    if self.isNewFollow then
+        SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+    else
+        ---@type Coolape.CLPanelLua
+        local panel = CLPanelManager.getPanel("PanelCustDetail")
+        if panel and panel.gameObject.activeInHierarchy then
+            SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+        else
+            SetActive(uiobjs.ButtonCustDetail.gameObject, true)
+        end
+    end
+
     self:refreshContent()
     SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
 
@@ -245,6 +258,25 @@ function TRPNewFollow:setEventDelegate()
         end,
         InputTask = function()
             self:showExtentFiles(uiobjs.InputTask.value)
+        end,
+        ButtonCustDetail = function()
+            showHotWheel()
+            NetProto.send.get_customerById(
+                self.mdata.custId,
+                function(content)
+                    hideHotWheel()
+                    if content.success then
+                        local cust = content.result
+                        if cust then
+                            getPanelAsy(
+                                "PanelCustDetailSimple",
+                                onLoadedPanelTT,
+                                {cust = cust, isShowButtonGet = false}
+                            )
+                        end
+                    end
+                end
+            )
         end
     }
 end

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"), MyUtl.defaultTopHeight, 0)
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 190)
     ---@type UIScrollView
     uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
     uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -24,6 +24,7 @@ function TRPNewFollowTask:init(csObj)
     uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
 
     uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
+    uiobjs.ButtonCustDetail = getChild(self.transform, "ButtonCustDetail")
 end
 
 function TRPNewFollowTask:initFiledsAttr()
@@ -94,9 +95,20 @@ function TRPNewFollowTask:onShowFrame(cs)
     end
 end
 
-
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPNewFollowTask:show()
+    if self.isNewFollow then
+        SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+    else
+        ---@type Coolape.CLPanelLua
+        local panel = CLPanelManager.getPanel("PanelCustDetail")
+        if panel and panel.gameObject.activeInHierarchy then
+            SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+        else
+            SetActive(uiobjs.ButtonCustDetail.gameObject, true)
+        end
+    end
+
     self:refreshContent()
     SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
 
@@ -244,6 +256,25 @@ function TRPNewFollowTask:setEventDelegate()
                     end
                 end
             )
+        end,
+        ButtonCustDetail = function()
+            showHotWheel()
+            NetProto.send.get_customerById(
+                self.mdata.custId,
+                function(content)
+                    hideHotWheel()
+                    if content.success then
+                        local cust = content.result
+                        if cust then
+                            getPanelAsy(
+                                "PanelCustDetailSimple",
+                                onLoadedPanelTT,
+                                {cust = cust, isShowButtonGet = false}
+                            )
+                        end
+                    end
+                end
+            )
         end
     }
 end

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

@@ -576,16 +576,17 @@ function TRPNewOrder:setEventDelegate()
             order.wfType = "0" -- 0：正常工单，1：退货工单
 
             -- 附件
+            local wfOptions = {}
             if self.images and #(self.images) > 0 then
-                order.wfOptions = {}
                 for i, v in ipairs(self.images) do
-                    table.insert(order.wfOptions, v.uploadInfor)
+                    table.insert(wfOptions, v.uploadInfor)
                 end
             end
             -----------------------------------
             showHotWheel()
             NetProto.send.createWfInfo(
                 order,
+                wfOptions,
                 function(content)
                     if content.success then
                         MyUtl.toastS("订单创建成功")

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

@@ -9,7 +9,11 @@ function TRPOceanList:init(csObj)
     TRPOceanList.super.init(self, csObj)
     self:setEventDelegate()
     self:initFilters()
-    MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 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")
@@ -165,7 +169,7 @@ function TRPOceanList:onClickCell(cell, data)
             if content.success then
                 local cust = content.result
                 if cust then
-                    getPanelAsy("PanelCustDetailSimple", onLoadedPanelTT, cust)
+                    getPanelAsy("PanelCustDetailSimple", onLoadedPanelTT, {cust = cust, isShowButtonGet = true})
                 end
             end
         end

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

@@ -65,7 +65,8 @@ function TRPSelectProduct:initCell(cell, data)
 end
 
 function TRPSelectProduct:onClickCell(cell, data)
-    getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
+    -- getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
+    cell.luaTable.selected(not data.isSelected)
 end
 
 function TRPSelectProduct:onEndList(tail)

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

@@ -71,6 +71,9 @@ function TRPSetting:setEventDelegate()
                 function()
                     Prefs.setCurrGroup(Prefs.getUserName(), "")
                     Prefs.setUserPsd("")
+                    if DBUser then
+                        DBUser.clean()
+                    end
                     hideTopPanel(self.csSelf)
                     hideTopPanel()
                     hideTopPanel()
@@ -91,7 +94,10 @@ function TRPSetting:setEventDelegate()
                         pcall(releaseRes4GC, true)
                     end
                     --- 释放资源结束-------------------------------
-                    
+                    if DBUser then
+                        DBUser.clean()
+                    end
+
                     --//TODO: 还要把已经下载了的附件也删除掉
 
                     pcall(cleanRes)

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

@@ -91,15 +91,18 @@ 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
-                    self.uiobjs.LoopTable:refreshContentOnly()
+        if data.READFLAG == DBMessage.ReadFlag.unread then
+            -- 通知已读了
+            NetProto.send.readNotice(
+                data.ID,
+                function(content)
+                    if content.success then
+                        data.READFLAG = DBMessage.ReadFlag.readed
+                        self.uiobjs.LoopTable:refreshContentOnly()
+                    end
                 end
-            end
-        )
+            )
+        end
         getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
     elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
         getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)

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

@@ -1,5 +1,255 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &434944184094226890
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6682180655267840600}
+  - component: {fileID: 3830175393093446653}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6682180655267840600
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 434944184094226890}
+  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: 4819853030377762302}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3830175393093446653
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 434944184094226890}
+  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: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 50
+  mDepth: 9
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u5BA2\u6237\u8BE6\u60C5"
+  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 &830934663996654735
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4819853030377762302}
+  - component: {fileID: 3033119408603187193}
+  - component: {fileID: 8172204838477360270}
+  - component: {fileID: 709341874417829216}
+  - component: {fileID: 946006603145748808}
+  m_Layer: 5
+  m_Name: ButtonCustDetail
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4819853030377762302
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -1042, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6682180655267840600}
+  m_Father: {fileID: 5001673685575848814}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3033119408603187193
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1025, y: 160, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8172204838477360270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 830934663996654735}
+  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 &709341874417829216
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 0
+    absolute: 30
+  topAnchor:
+    target: {fileID: 5001673685575848814}
+    relative: 0
+    absolute: 190
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1025
+  mHeight: 160
+  mDepth: 8
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 6.40625
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: public_button
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &946006603145748808
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830934663996654735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 709341874417829216}
+  offset: 50
+  sizeAdjust: 1
 --- !u!1 &892331021296762499
 GameObject:
   m_ObjectHideFlags: 0
@@ -411,6 +661,7 @@ Transform:
   - {fileID: 5093278721696270566}
   - {fileID: 703582893891920782}
   - {fileID: 3811868574385527201}
+  - {fileID: 4819853030377762302}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -609,7 +860,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3001
+  startingRenderQueue: 3003
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

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

@@ -179,6 +179,106 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1125, y: 2172, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4315722042513260696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5950202487608235859}
+  - component: {fileID: 1207288853966562064}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5950202487608235859
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4315722042513260696}
+  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: 7490712211079302417}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1207288853966562064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4315722042513260696}
+  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: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 50
+  mDepth: 9
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u5BA2\u6237\u8BE6\u60C5"
+  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 &4329241472409898578
 GameObject:
   m_ObjectHideFlags: 0
@@ -379,6 +479,156 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
+--- !u!1 &5113059414826645774
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7490712211079302417}
+  - component: {fileID: 7487699256290532919}
+  - component: {fileID: 1283151448246207708}
+  - component: {fileID: 3696125885157695568}
+  - component: {fileID: 4144100815855023860}
+  m_Layer: 5
+  m_Name: ButtonCustDetail
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7490712211079302417
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -1042, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5950202487608235859}
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &7487699256290532919
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1025, y: 160, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1283151448246207708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  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: 0
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 6003453472346918249}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &3696125885157695568
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 30
+  topAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 190
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1025
+  mHeight: 160
+  mDepth: 8
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 6.40625
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: public_button
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &4144100815855023860
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5113059414826645774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 3696125885157695568}
+  offset: 50
+  sizeAdjust: 1
 --- !u!1 &6655210489690858908
 GameObject:
   m_ObjectHideFlags: 0
@@ -411,6 +661,7 @@ Transform:
   - {fileID: 5646390679247249172}
   - {fileID: 85942781782062204}
   - {fileID: 4329241472409898579}
+  - {fileID: 7490712211079302417}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -609,7 +860,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3001
+  startingRenderQueue: 3003
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

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

@@ -2062,7 +2062,7 @@ MonoBehaviour:
   EffectList: []
   frameName: Frame1
   frameObj: {fileID: 0}
-  titleKeyName: "\u9884\u7EA6\u7BA1\u7406"
+  titleKeyName: "\u9884\u7EA6\u8BB0\u5F55"
 --- !u!1 &5119801468621564870
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,f3cf33ada5db65fe7234fd990379ee638	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,b1f7521d5a7aa1c234d530bec1ec77bf8	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee