chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade

Browse Source
This commit is contained in:
chenbin
2021-04-07 16:25:13 +08:00
parent 5a43e0d172
commit 5154e7d513
40 changed files with 870 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/trCRM/upgradeRes4Dev/other/Materials.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 56c42d3fd510e4971b5af24431d8d323
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/trCRM/upgradeRes4Dev/other/Textures.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: e2f7d25eee4e14b039f09947cfc1ff79
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/trCRM/upgradeRes4Dev/other/bullet.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: ec1df1efe62c44207bfd15283039dcd6
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/trCRM/upgradeRes4Dev/other/effect.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 8ca68eaa4427041b1b52f8eb546ba471
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

8
Assets/trCRM/upgradeRes4Dev/other/roles.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 048b2cb8354d746649768ed6ab646169
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/trCRM/upgradeRes4Dev/other/sound.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: f910205a28f1b42d19bc44a959056d42
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/trCRM/upgradeRes4Dev/other/things.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 32e2827f76cc6403aa14a5a882b6638b
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/trCRM/upgradeRes4Dev/priority/cfg.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 3f389e0b803d140978ae416f9f864988
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

9
Assets/trCRM/upgradeRes4Dev/priority/font.meta
View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 0f27f70c4415d449ab7b83167721b75f
folderAsset: yes
timeCreated: 1498220621
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

8
Assets/trCRM/upgradeRes4Dev/priority/lua/battle.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: a52b70505ac2042b794323c3d45cd60a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
View File

@@ -762,7 +762,7 @@ end
NetProto.send.wforder_cancel_reminder = function(id, callback, timeOutSec)
local content = {}
content.action = NetProto.cmds.readNotice
content.action = NetProto.cmds.wforder_cancel_reminder
content.orderId = id
content.groupId = NetProto.groupId
NetProto.sendSocket(content, callback, timeOutSec)

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua
View File

@@ -33,7 +33,7 @@ function _cell.show(go, data)
uiobjs.Background.spriteName = mData.Background
uiobjs.Checkmark.spriteName = mData.Checkmark
if mData.id == 1 then
local unreadNum = DBMessage.getUnreadNum(DBMessage.MsgType.Sys)
local unreadNum = DBMessage.getUnreadNum(DBMessage.MsgType.Sys) + DBMessage.getUnreadNum(DBMessage.MsgType.Timeout)
_cell.setReddotNum(unreadNum)
else
_cell.setReddotNum(0)

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua
View File

@@ -86,7 +86,7 @@ end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function CSPMain.procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
if cmd == NetProto.cmds.readNotice then
if cmd == NetProto.cmds.readNotice or cmd == NetProto.cmds.wforder_cancel_reminder then
CSPMain.refreshBtns()
end
end

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua
View File

@@ -79,6 +79,7 @@ function CSPMsg.onDragEnd()
if offset.y < -50 then
-- 刷数据
NetProto.send.announcement_query()
NetProto.send.wforder_expiry_reminder()
end
if isShowdDragFrefresh then
CSPMsg.repositon()
@@ -108,7 +109,7 @@ end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function CSPMsg.procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
if cmd == NetProto.cmds.readNotice then
if cmd == NetProto.cmds.readNotice or cmd == NetProto.cmds.wforder_cancel_reminder then
CSPMsg.setList()
end
end

7
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
View File

@@ -120,7 +120,12 @@ function TRPSysMsgList:onClickCell(cell, data)
end
end
)
getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
NetProto.send.workFlowQuery({wfId = data.wfId}, "", 1,
function(params)
if(params.result and params.result.data) then
getPanelAsy("PanelOrderDetail", onLoadedPanelTT, params.result.data[1])
end
end)
else
printw("没有处理该消息类型", data.NOTICETYPE)
end

2
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
View File

@@ -3611,7 +3611,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u5230\u671F\u65E5\u671F"
mText: "\u5F00\u59CB\u65E5\u671F"
mFontSize: 42
mFontStyle: 0
mAlignment: 0

2
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
View File

@@ -11160,7 +11160,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u5230\u671F\u65E5\u671F"
mText: "\u5F00\u59CB\u65E5\u671F"
mFontSize: 42
mFontStyle: 0
mAlignment: 0