From ffed262485a9c77962b5f3d5cbb01a7b064313e1 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 28 May 2021 13:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/ChatProto_pb.lua | 218 ++++++++++++++++++ .../~Lua/Message/PlayerInfoProto_pb.lua | 13 +- ...ightLevelInfoPopup_MainLevelBackBattle.lua | 12 +- .../MonsterCamp/MonsterCampNewPanel.lua | 16 +- .../~Lua/Modules/Popup/BattleWinPopup.lua | 2 +- .../~Lua/Modules/Popup/RewardItemPopup.lua | 3 +- 6 files changed, 248 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua index a16cb14aff..6e5cc9a845 100644 --- a/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua @@ -39,6 +39,26 @@ SENDCHATINFORESPONSE_CHATINFO_FIELD = protobuf.FieldDescriptor(); SENDCHATINFOINDICATION = protobuf.Descriptor(); SENDCHATINFOINDICATION_CHATINFO_FIELD = protobuf.FieldDescriptor(); SENDCHATINFOINDICATION_TYPE_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3 = protobuf.Descriptor(); +CHATUSERV3_PLAYERID_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_USERID_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_NICKNAME_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_LEVEL_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_VIPLEVEL_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_POWER_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_ZONEID_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_ZONENAME_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_EXTRA_FIELD = protobuf.FieldDescriptor(); +CHATUSERV3_SERVERID_FIELD = protobuf.FieldDescriptor(); +CHATV3 = protobuf.Descriptor(); +CHATV3_ID_FIELD = protobuf.FieldDescriptor(); +CHATV3_CHANNEL_FIELD = protobuf.FieldDescriptor(); +CHATV3_FROM_FIELD = protobuf.FieldDescriptor(); +CHATV3_TO_FIELD = protobuf.FieldDescriptor(); +CHATV3_CONTENT_FIELD = protobuf.FieldDescriptor(); +CHATV3_IP_FIELD = protobuf.FieldDescriptor(); +CHATV3_EXTRA_FIELD = protobuf.FieldDescriptor(); +CHATV3_STATUS_FIELD = protobuf.FieldDescriptor(); CHATINFO_SENDERID_FIELD.name = "senderId" CHATINFO_SENDERID_FIELD.full_name = ".rpc.protocols.ChatInfo.senderId" @@ -385,8 +405,206 @@ SENDCHATINFOINDICATION.enum_types = {} SENDCHATINFOINDICATION.fields = {SENDCHATINFOINDICATION_CHATINFO_FIELD, SENDCHATINFOINDICATION_TYPE_FIELD} SENDCHATINFOINDICATION.is_extendable = false SENDCHATINFOINDICATION.extensions = {} +CHATUSERV3_PLAYERID_FIELD.name = "playerId" +CHATUSERV3_PLAYERID_FIELD.full_name = ".rpc.protocols.ChatUserV3.playerId" +CHATUSERV3_PLAYERID_FIELD.number = 1 +CHATUSERV3_PLAYERID_FIELD.index = 0 +CHATUSERV3_PLAYERID_FIELD.label = 1 +CHATUSERV3_PLAYERID_FIELD.has_default_value = false +CHATUSERV3_PLAYERID_FIELD.default_value = "" +CHATUSERV3_PLAYERID_FIELD.type = 9 +CHATUSERV3_PLAYERID_FIELD.cpp_type = 9 + +CHATUSERV3_USERID_FIELD.name = "userId" +CHATUSERV3_USERID_FIELD.full_name = ".rpc.protocols.ChatUserV3.userId" +CHATUSERV3_USERID_FIELD.number = 2 +CHATUSERV3_USERID_FIELD.index = 1 +CHATUSERV3_USERID_FIELD.label = 1 +CHATUSERV3_USERID_FIELD.has_default_value = false +CHATUSERV3_USERID_FIELD.default_value = "" +CHATUSERV3_USERID_FIELD.type = 9 +CHATUSERV3_USERID_FIELD.cpp_type = 9 + +CHATUSERV3_NICKNAME_FIELD.name = "nickname" +CHATUSERV3_NICKNAME_FIELD.full_name = ".rpc.protocols.ChatUserV3.nickname" +CHATUSERV3_NICKNAME_FIELD.number = 3 +CHATUSERV3_NICKNAME_FIELD.index = 2 +CHATUSERV3_NICKNAME_FIELD.label = 1 +CHATUSERV3_NICKNAME_FIELD.has_default_value = false +CHATUSERV3_NICKNAME_FIELD.default_value = "" +CHATUSERV3_NICKNAME_FIELD.type = 9 +CHATUSERV3_NICKNAME_FIELD.cpp_type = 9 + +CHATUSERV3_LEVEL_FIELD.name = "level" +CHATUSERV3_LEVEL_FIELD.full_name = ".rpc.protocols.ChatUserV3.level" +CHATUSERV3_LEVEL_FIELD.number = 4 +CHATUSERV3_LEVEL_FIELD.index = 3 +CHATUSERV3_LEVEL_FIELD.label = 1 +CHATUSERV3_LEVEL_FIELD.has_default_value = false +CHATUSERV3_LEVEL_FIELD.default_value = 0 +CHATUSERV3_LEVEL_FIELD.type = 5 +CHATUSERV3_LEVEL_FIELD.cpp_type = 1 + +CHATUSERV3_VIPLEVEL_FIELD.name = "vipLevel" +CHATUSERV3_VIPLEVEL_FIELD.full_name = ".rpc.protocols.ChatUserV3.vipLevel" +CHATUSERV3_VIPLEVEL_FIELD.number = 5 +CHATUSERV3_VIPLEVEL_FIELD.index = 4 +CHATUSERV3_VIPLEVEL_FIELD.label = 1 +CHATUSERV3_VIPLEVEL_FIELD.has_default_value = false +CHATUSERV3_VIPLEVEL_FIELD.default_value = 0 +CHATUSERV3_VIPLEVEL_FIELD.type = 5 +CHATUSERV3_VIPLEVEL_FIELD.cpp_type = 1 + +CHATUSERV3_POWER_FIELD.name = "power" +CHATUSERV3_POWER_FIELD.full_name = ".rpc.protocols.ChatUserV3.power" +CHATUSERV3_POWER_FIELD.number = 6 +CHATUSERV3_POWER_FIELD.index = 5 +CHATUSERV3_POWER_FIELD.label = 1 +CHATUSERV3_POWER_FIELD.has_default_value = false +CHATUSERV3_POWER_FIELD.default_value = 0 +CHATUSERV3_POWER_FIELD.type = 3 +CHATUSERV3_POWER_FIELD.cpp_type = 2 + +CHATUSERV3_ZONEID_FIELD.name = "zoneId" +CHATUSERV3_ZONEID_FIELD.full_name = ".rpc.protocols.ChatUserV3.zoneId" +CHATUSERV3_ZONEID_FIELD.number = 7 +CHATUSERV3_ZONEID_FIELD.index = 6 +CHATUSERV3_ZONEID_FIELD.label = 1 +CHATUSERV3_ZONEID_FIELD.has_default_value = false +CHATUSERV3_ZONEID_FIELD.default_value = "" +CHATUSERV3_ZONEID_FIELD.type = 9 +CHATUSERV3_ZONEID_FIELD.cpp_type = 9 + +CHATUSERV3_ZONENAME_FIELD.name = "zoneName" +CHATUSERV3_ZONENAME_FIELD.full_name = ".rpc.protocols.ChatUserV3.zoneName" +CHATUSERV3_ZONENAME_FIELD.number = 8 +CHATUSERV3_ZONENAME_FIELD.index = 7 +CHATUSERV3_ZONENAME_FIELD.label = 1 +CHATUSERV3_ZONENAME_FIELD.has_default_value = false +CHATUSERV3_ZONENAME_FIELD.default_value = "" +CHATUSERV3_ZONENAME_FIELD.type = 9 +CHATUSERV3_ZONENAME_FIELD.cpp_type = 9 + +CHATUSERV3_EXTRA_FIELD.name = "extra" +CHATUSERV3_EXTRA_FIELD.full_name = ".rpc.protocols.ChatUserV3.extra" +CHATUSERV3_EXTRA_FIELD.number = 10 +CHATUSERV3_EXTRA_FIELD.index = 8 +CHATUSERV3_EXTRA_FIELD.label = 1 +CHATUSERV3_EXTRA_FIELD.has_default_value = false +CHATUSERV3_EXTRA_FIELD.default_value = "" +CHATUSERV3_EXTRA_FIELD.type = 9 +CHATUSERV3_EXTRA_FIELD.cpp_type = 9 + +CHATUSERV3_SERVERID_FIELD.name = "serverId" +CHATUSERV3_SERVERID_FIELD.full_name = ".rpc.protocols.ChatUserV3.serverId" +CHATUSERV3_SERVERID_FIELD.number = 11 +CHATUSERV3_SERVERID_FIELD.index = 9 +CHATUSERV3_SERVERID_FIELD.label = 1 +CHATUSERV3_SERVERID_FIELD.has_default_value = false +CHATUSERV3_SERVERID_FIELD.default_value = "" +CHATUSERV3_SERVERID_FIELD.type = 9 +CHATUSERV3_SERVERID_FIELD.cpp_type = 9 + +CHATUSERV3.name = "ChatUserV3" +CHATUSERV3.full_name = ".rpc.protocols.ChatUserV3" +CHATUSERV3.nested_types = {} +CHATUSERV3.enum_types = {} +CHATUSERV3.fields = {CHATUSERV3_PLAYERID_FIELD, CHATUSERV3_USERID_FIELD, CHATUSERV3_NICKNAME_FIELD, CHATUSERV3_LEVEL_FIELD, CHATUSERV3_VIPLEVEL_FIELD, CHATUSERV3_POWER_FIELD, CHATUSERV3_ZONEID_FIELD, CHATUSERV3_ZONENAME_FIELD, CHATUSERV3_EXTRA_FIELD, CHATUSERV3_SERVERID_FIELD} +CHATUSERV3.is_extendable = false +CHATUSERV3.extensions = {} +CHATV3_ID_FIELD.name = "id" +CHATV3_ID_FIELD.full_name = ".rpc.protocols.ChatV3.id" +CHATV3_ID_FIELD.number = 10 +CHATV3_ID_FIELD.index = 0 +CHATV3_ID_FIELD.label = 1 +CHATV3_ID_FIELD.has_default_value = false +CHATV3_ID_FIELD.default_value = "" +CHATV3_ID_FIELD.type = 9 +CHATV3_ID_FIELD.cpp_type = 9 + +CHATV3_CHANNEL_FIELD.name = "channel" +CHATV3_CHANNEL_FIELD.full_name = ".rpc.protocols.ChatV3.channel" +CHATV3_CHANNEL_FIELD.number = 1 +CHATV3_CHANNEL_FIELD.index = 1 +CHATV3_CHANNEL_FIELD.label = 1 +CHATV3_CHANNEL_FIELD.has_default_value = false +CHATV3_CHANNEL_FIELD.default_value = "" +CHATV3_CHANNEL_FIELD.type = 9 +CHATV3_CHANNEL_FIELD.cpp_type = 9 + +CHATV3_FROM_FIELD.name = "from" +CHATV3_FROM_FIELD.full_name = ".rpc.protocols.ChatV3.from" +CHATV3_FROM_FIELD.number = 2 +CHATV3_FROM_FIELD.index = 2 +CHATV3_FROM_FIELD.label = 1 +CHATV3_FROM_FIELD.has_default_value = false +CHATV3_FROM_FIELD.default_value = nil +CHATV3_FROM_FIELD.message_type = CHATUSERV3 +CHATV3_FROM_FIELD.type = 11 +CHATV3_FROM_FIELD.cpp_type = 10 + +CHATV3_TO_FIELD.name = "to" +CHATV3_TO_FIELD.full_name = ".rpc.protocols.ChatV3.to" +CHATV3_TO_FIELD.number = 3 +CHATV3_TO_FIELD.index = 3 +CHATV3_TO_FIELD.label = 1 +CHATV3_TO_FIELD.has_default_value = false +CHATV3_TO_FIELD.default_value = nil +CHATV3_TO_FIELD.message_type = CHATUSERV3 +CHATV3_TO_FIELD.type = 11 +CHATV3_TO_FIELD.cpp_type = 10 + +CHATV3_CONTENT_FIELD.name = "content" +CHATV3_CONTENT_FIELD.full_name = ".rpc.protocols.ChatV3.content" +CHATV3_CONTENT_FIELD.number = 4 +CHATV3_CONTENT_FIELD.index = 4 +CHATV3_CONTENT_FIELD.label = 1 +CHATV3_CONTENT_FIELD.has_default_value = false +CHATV3_CONTENT_FIELD.default_value = "" +CHATV3_CONTENT_FIELD.type = 9 +CHATV3_CONTENT_FIELD.cpp_type = 9 + +CHATV3_IP_FIELD.name = "ip" +CHATV3_IP_FIELD.full_name = ".rpc.protocols.ChatV3.ip" +CHATV3_IP_FIELD.number = 5 +CHATV3_IP_FIELD.index = 5 +CHATV3_IP_FIELD.label = 1 +CHATV3_IP_FIELD.has_default_value = false +CHATV3_IP_FIELD.default_value = "" +CHATV3_IP_FIELD.type = 9 +CHATV3_IP_FIELD.cpp_type = 9 + +CHATV3_EXTRA_FIELD.name = "extra" +CHATV3_EXTRA_FIELD.full_name = ".rpc.protocols.ChatV3.extra" +CHATV3_EXTRA_FIELD.number = 7 +CHATV3_EXTRA_FIELD.index = 6 +CHATV3_EXTRA_FIELD.label = 1 +CHATV3_EXTRA_FIELD.has_default_value = false +CHATV3_EXTRA_FIELD.default_value = "" +CHATV3_EXTRA_FIELD.type = 9 +CHATV3_EXTRA_FIELD.cpp_type = 9 + +CHATV3_STATUS_FIELD.name = "status" +CHATV3_STATUS_FIELD.full_name = ".rpc.protocols.ChatV3.status" +CHATV3_STATUS_FIELD.number = 8 +CHATV3_STATUS_FIELD.index = 7 +CHATV3_STATUS_FIELD.label = 1 +CHATV3_STATUS_FIELD.has_default_value = false +CHATV3_STATUS_FIELD.default_value = 0 +CHATV3_STATUS_FIELD.type = 5 +CHATV3_STATUS_FIELD.cpp_type = 1 + +CHATV3.name = "ChatV3" +CHATV3.full_name = ".rpc.protocols.ChatV3" +CHATV3.nested_types = {} +CHATV3.enum_types = {} +CHATV3.fields = {CHATV3_ID_FIELD, CHATV3_CHANNEL_FIELD, CHATV3_FROM_FIELD, CHATV3_TO_FIELD, CHATV3_CONTENT_FIELD, CHATV3_IP_FIELD, CHATV3_EXTRA_FIELD, CHATV3_STATUS_FIELD} +CHATV3.is_extendable = false +CHATV3.extensions = {} ChatInfo = protobuf.Message(CHATINFO) +ChatUserV3 = protobuf.Message(CHATUSERV3) +ChatV3 = protobuf.Message(CHATV3) GetChatMessageInfoRequest = protobuf.Message(GETCHATMESSAGEINFOREQUEST) GetChatMessageInfoResponse = protobuf.Message(GETCHATMESSAGEINFORESPONSE) SendChatInfoIndication = protobuf.Message(SENDCHATINFOINDICATION) diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua index ba8d430dcf..081b987d26 100644 --- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua @@ -522,6 +522,7 @@ HARDSTAGEFIGHTRESPONSE = protobuf.Descriptor(); HARDSTAGEFIGHTRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor(); HARDSTAGEFIGHTRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); HARDSTAGEFIGHTRESPONSE_STARS_FIELD = protobuf.FieldDescriptor(); +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD = protobuf.FieldDescriptor(); GETHARDSTAGECHAPTERREWARD = protobuf.Descriptor(); GETHARDSTAGECHAPTERREWARD_CHAPTERID_FIELD = protobuf.FieldDescriptor(); GETHARDSTAGECHAPTERREWARD_REWRADID_FIELD = protobuf.FieldDescriptor(); @@ -5295,11 +5296,21 @@ HARDSTAGEFIGHTRESPONSE_STARS_FIELD.default_value = 0 HARDSTAGEFIGHTRESPONSE_STARS_FIELD.type = 5 HARDSTAGEFIGHTRESPONSE_STARS_FIELD.cpp_type = 1 +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.name = "currentIsHonour" +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.full_name = ".rpc.protocols.HardStageFightResponse.currentIsHonour" +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.number = 4 +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.index = 3 +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.label = 1 +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.has_default_value = false +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.default_value = false +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.type = 8 +HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.cpp_type = 7 + HARDSTAGEFIGHTRESPONSE.name = "HardStageFightResponse" HARDSTAGEFIGHTRESPONSE.full_name = ".rpc.protocols.HardStageFightResponse" HARDSTAGEFIGHTRESPONSE.nested_types = {} HARDSTAGEFIGHTRESPONSE.enum_types = {} -HARDSTAGEFIGHTRESPONSE.fields = {HARDSTAGEFIGHTRESPONSE_FIGHTDATA_FIELD, HARDSTAGEFIGHTRESPONSE_DROP_FIELD, HARDSTAGEFIGHTRESPONSE_STARS_FIELD} +HARDSTAGEFIGHTRESPONSE.fields = {HARDSTAGEFIGHTRESPONSE_FIGHTDATA_FIELD, HARDSTAGEFIGHTRESPONSE_DROP_FIELD, HARDSTAGEFIGHTRESPONSE_STARS_FIELD, HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD} HARDSTAGEFIGHTRESPONSE.is_extendable = false HARDSTAGEFIGHTRESPONSE.extensions = {} GETHARDSTAGECHAPTERREWARD_CHAPTERID_FIELD.name = "chapterId" diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua index 38f1b225a6..d00bf6d059 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua @@ -72,17 +72,9 @@ function this.SetInfo(root,data,index) Util.GetGameObject(root,"name"):GetComponent("Text").text = PracticeManager.SetNameColor(data.userName,data.practiceLevel) --data.userName Util.GetGameObject(root,"warPower/Text"):GetComponent("Text").text = data.power if data.type == 1 then - if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then - Util.GetGameObject(root,"tip"):GetComponent("Text").text = "首次三星通关" - elseif fightLevelData.config.StageType == 3 then - Util.GetGameObject(root,"tip"):GetComponent("Text").text = "首次通关" - end + Util.GetGameObject(root,"tip"):GetComponent("Text").text = "首次通关" elseif data.type == 2 then - if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then - Util.GetGameObject(root,"tip"):GetComponent("Text").text = "最低战力三星通关" - elseif fightLevelData.config.StageType == 3 then - Util.GetGameObject(root,"tip"):GetComponent("Text").text = "最低战力通关" - end + Util.GetGameObject(root,"tip"):GetComponent("Text").text = "最低战力通关" end Util.AddOnceClick(Util.GetGameObject(root,"ClickBtn"), function() local _fightData = BattleManager.GetBattleServerData(data,0) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index 728f44a522..de27df4daf 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -106,15 +106,25 @@ function MonsterCampNewPanel:BindEvent() if BagManager.GetItemCountById(_itemId) < _costNum then PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name)) else - ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeDataId,moppingUpNum,function() - PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, moppingUpNum) + if moppingUpNum > 0 then + ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeDataId,moppingUpNum,function() + PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, moppingUpNum) + NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg) + UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function() + PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() ) + this.UpdatePrivilage() + end) + end) + end) + else NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg) UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function() PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() ) this.UpdatePrivilage() end) end) - end) + end + end end,"取消","确定") end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index fed5341723..dcb3091af3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -311,7 +311,7 @@ function this.ShowBattleResultByFightLevelType(drop) local HardStageFightResponseMsg = FightLevelManager.GetHardStageFightResponseMsg() local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData() local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId) - LogYellow("山河社稷图战斗获得星级 "..HardStageFightResponseMsg.stars.." curBattlefightLevelData.isFirst "..tostring(curBattlefightLevelData.isFirst)) + LogYellow("山河社稷图战斗获得星级 "..HardStageFightResponseMsg.stars.." curBattlefightLevelData.isFirst "..tostring(curBattlefightLevelData.isFirst).." HardStageFightResponseMsg.currentIsHonour "..tostring(HardStageFightResponseMsg.currentIsHonour)) -- if curBattlefightLevelData.isFirst then -- PopupTipPanel.ShowTip("荣耀三星!") -- end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 1ac5355044..cfcf629a59 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -315,10 +315,11 @@ function this.FightLevelShow() -- getStarImage:SetActive(FightLevelManager.GetCurLevelStarState(GetHardStageFightResponseMsg.stars,i)) -- Util.GetGameObject(this.FightLevelStarGos[i], "Text"):GetComponent("Text").text = i -- end + local HardStageFightResponseMsg = FightLevelManager.GetHardStageFightResponseMsg() local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData() local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId) local condition = curBattlefightLevelData.config.ConditionValue - this.isFirstEffect:SetActive(curBattlefightLevelData.isFirst) + this.isFirstEffect:SetActive(HardStageFightResponseMsg.currentIsHonour) if starListEffect and #starListEffect > 0 then for i=1,#starListEffect do -- Util.AddParticleSortLayer(starListEffect[i], this.sortingOrder - (sortingOrder - 1))