diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index e2f2bbcc8e..a5e2c797de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -20,7 +20,8 @@ local _CHANNEL = { this.SYS_MSG_TYPE = { [0] = {name = Language[10350]}, [1] = {name = Language[10351]}, - [2] = {name = Language[10352]} + [2] = {name = Language[10352]}, + [9] = {name = Language[10352]} } -- 聊天中要显示时间的时间间隔(毫秒) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index ce2e4489e7..70c9e0409d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -141,21 +141,13 @@ function RewardItemPopup:OnOpen(...) if args[4] then - compShowType = args[4] + compShowType = args[4] or 0 end if args[7] then showHero = false else showHero = true end - if compShowType == CompShowType.fourElement then - this.ScrollView.gameObject:SetActive(false) - this.dropPrefab.gameObject:SetActive(false) - this.ScrollView2.gameObject:SetActive(false) - this.shenying.gameObject:SetActive(true) - this.ShengYingShow(args[8]) - return - end this.shenying.gameObject:SetActive(false) local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) @@ -186,6 +178,15 @@ function RewardItemPopup:OnOpen(...) if compShowType == 6 then this.GuildTranscriptShow() end + + if compShowType == CompShowType.fourElement then + this.ScrollView.gameObject:SetActive(false) + this.dropPrefab.gameObject:SetActive(false) + this.ScrollView2.gameObject:SetActive(false) + this.shenying.gameObject:SetActive(true) + this.ShengYingShow(args[8]) + return + end local starItemDataList=BagManager.GetItemListFromTempBag(drop) -- LogError("获取宝物的数量:".. LengthOfTable(starItemDataList)) --做装备叠加特殊组拼数据 diff --git a/Assets/ManagedResources/~Lua/View/ChatTipView.lua b/Assets/ManagedResources/~Lua/View/ChatTipView.lua index eef1b2a65a..bc7afa09bb 100644 --- a/Assets/ManagedResources/~Lua/View/ChatTipView.lua +++ b/Assets/ManagedResources/~Lua/View/ChatTipView.lua @@ -3,7 +3,8 @@ local SYS_MSG_TYPE = { [0] = {name = Language[10350]}, [1] = {name = Language[10351]}, - [2] = {name = Language[10352]} + [2] = {name = Language[10352]}, + [9] = {name = Language[10352]} } local VIEW_TYPE = {