From a56d71c4f85d48d4613b7d7359c577606918075f Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 23 Mar 2021 15:25:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E3=80=91bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/Family_pb.lua | 13 ++++++- .../Transcript/GuildTranscriptManager.lua | 36 +++++++------------ .../~Lua/Modules/Net/NetManager.lua | 4 +-- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/Family_pb.lua b/Assets/ManagedResources/~Lua/Message/Family_pb.lua index 24b3035514..a75b0fb5d5 100644 --- a/Assets/ManagedResources/~Lua/Message/Family_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Family_pb.lua @@ -353,6 +353,7 @@ GUILDCHALLENGEINDICATION = protobuf.Descriptor(); GUILDCHALLENGEINDICATION_CURBOSS_FIELD = protobuf.FieldDescriptor(); GUILDCHALLENGEINDICATION_BLOOD_FIELD = protobuf.FieldDescriptor(); GUILDCHALLENGEINDICATION_ISKILL_FIELD = protobuf.FieldDescriptor(); +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD = protobuf.FieldDescriptor(); GUILDCHALLENGEBUYBUFFINDICATION = protobuf.Descriptor(); GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD = protobuf.FieldDescriptor(); GUILDCHALLENGEBUYBUFFINDICATION_BUFFTIME_FIELD = protobuf.FieldDescriptor(); @@ -3577,11 +3578,21 @@ GUILDCHALLENGEINDICATION_ISKILL_FIELD.default_value = 0 GUILDCHALLENGEINDICATION_ISKILL_FIELD.type = 5 GUILDCHALLENGEINDICATION_ISKILL_FIELD.cpp_type = 1 +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.name = "isRefresh" +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.full_name = ".rpc.protocols.GuildChallengeIndication.isRefresh" +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.number = 4 +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.index = 3 +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.label = 1 +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.has_default_value = false +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.default_value = 0 +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.type = 5 +GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.cpp_type = 1 + GUILDCHALLENGEINDICATION.name = "GuildChallengeIndication" GUILDCHALLENGEINDICATION.full_name = ".rpc.protocols.GuildChallengeIndication" GUILDCHALLENGEINDICATION.nested_types = {} GUILDCHALLENGEINDICATION.enum_types = {} -GUILDCHALLENGEINDICATION.fields = {GUILDCHALLENGEINDICATION_CURBOSS_FIELD, GUILDCHALLENGEINDICATION_BLOOD_FIELD, GUILDCHALLENGEINDICATION_ISKILL_FIELD} +GUILDCHALLENGEINDICATION.fields = {GUILDCHALLENGEINDICATION_CURBOSS_FIELD, GUILDCHALLENGEINDICATION_BLOOD_FIELD, GUILDCHALLENGEINDICATION_ISKILL_FIELD, GUILDCHALLENGEINDICATION_ISREFRESH_FIELD} GUILDCHALLENGEINDICATION.is_extendable = false GUILDCHALLENGEINDICATION.extensions = {} GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD.name = "buffCount" diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua index b56bed7f2f..5f7d6cc6d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua @@ -5,7 +5,6 @@ local allChapterConfigData = {} local curBoss = 1--当前bossId local blood = 0--剩余血量万分比 local canSweep = 0--是否能扫荡,今天是否挑战过这个boss -local isKill = 0 --当场战斗boss 是否击杀 local isKillShowTip = false --当场战斗boss 是否击杀 local buffCount = 0--当前buff到多少索引 local buffTime = 0--buff结束时间 @@ -13,7 +12,7 @@ local buffTime = 0--buff结束时间 this.damage = 0 this.drop = nil--当场战斗掉落 this.shopGoodId = 10031--公会副本挑战价格 -local refreshedBoss = {} +-- local refreshedBoss = {} local endBossId = 0 function this.Initialize() @@ -36,9 +35,9 @@ function this.GetGuildChallengeInfoRequest(fun) buffCount = msg.buffCount buffTime = msg.buffTime this.damage = msg.sweepDamage--上次挑战或扫荡的伤害 - for i = 1, #msg.refreshedBoss do - refreshedBoss[msg.refreshedBoss[i]] = msg.refreshedBoss[i] - end + -- for i = 1, #msg.refreshedBoss do + -- refreshedBoss[msg.refreshedBoss[i]] = msg.refreshedBoss[i] + -- end if msg.isRefresh == 1 then LogPink("公会副本刷新次数····················msg.isRefresh "..msg.isRefresh) PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013) @@ -80,28 +79,23 @@ function this.RefreshGuildTranscriptInfo(msg) oldBossId = curBoss curBoss = msg.curBoss--当前bossId blood = msg.blood--剩余血量万分比 - isKill = msg.isKill--是否击杀 isKillShowTip = false if msg.isKill == 1 then isKillShowTip = true if attackTypeShotTime == 1 and endBossId ~= oldBossId then local monsterData = this.GetMonsterConfigDataById(oldBossId) - PopupTipPanel.ShowTip( string.format(Language[11088],GetLanguageStrById(monsterData.ReadingName)) ) + PopupTipPanel.ShowTip( string.format(Language[11088],GetLanguageStrById(monsterData.ReadingName))) end end - LogPink("公会副本刷新次数····················oldBossId "..oldBossId.." msg.curBoss "..msg.curBoss.." msg.blood "..msg.blood.." msg.isKill "..msg.isKill) + -- LogRed("msg.isRefresh "..msg.isRefresh) + if msg.isRefresh == 1 then + -- LogPink("公会副本刷新次数····················msg.isRefresh "..msg.isRefresh) + PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013) + PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM) + PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM) + end if oldBossId ~= curBoss then--前后ID不等认为是击杀 canSweep = 0 - isKill = 1 - if not refreshedBoss[oldBossId] then - refreshedBoss[oldBossId] = oldBossId - LogPink("公会副本刷新次数····················endBossId "..endBossId.." oldBossId "..oldBossId) - if endBossId ~= oldBossId then - PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013) - PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM) - PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM) - end - end end Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript) end @@ -171,10 +165,4 @@ end function this.GetbuffCount() return buffCount end -function this.GetCurBattleIsSkillBoss() - return isKill == 1 -end -function this.GetRefreshedBoss() -return refreshedBoss -end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 4338db1af1..fbb5f80274 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4404,14 +4404,12 @@ function this.GuildChallengeRequest(bossId,type,func)--0为挑战 1为扫荡 data.bossId = bossId data.type = type local msg = data:SerializeToString() - -- if not GuildTranscriptManager.GetCurBattleIsSkillBoss() or (GuildTranscriptManager.GetCurBattleIsSkillBoss() and curPassBossId[bossId]) then--因为此时的indcaton RESPONSE 回来的还早 所以加特殊判断操作 PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权 - -- end Network:SendMessageWithCallBack(MessageTypeProto_pb.GUILD_CHALLENGE_REQUEST, MessageTypeProto_pb.GUILD_CHALLENGE_RESPONSE, msg, function(buffer) local data = buffer:DataByte() local msg = Family_pb.GuildChallengeResponse() msg:ParseFromString(data) - local curPassBossId = GuildTranscriptManager.GetRefreshedBoss() + -- local curPassBossId = GuildTranscriptManager.GetRefreshedBoss() if func then func(msg) end From c4c5bb10740e9ed44296cd051da628cb51ebeb55 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 23 Mar 2021 15:53:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=A5=9E=E5=B0=86=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8D=87=E7=BA=A7=E6=9D=90=E6=96=99=E4=BE=9D=E6=97=A7?= =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=B0=8F=E7=BA=A2=E7=82=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 12346cca2c..726a966323 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -263,6 +263,10 @@ function this:UpdateHeroUpLvAndBreakMaterialShow() else this.gongmingText:SetActive(false) end + --红点检测 + local upLvRedpoint = HeroManager.LvUpBtnRedPoint(curHeroData) + this.upLvBtnRedPoint:SetActive(upLvRedpoint) + parent:CheckRedPointType(1,upLvRedpoint) end --单个技能显示 @@ -395,9 +399,6 @@ function this:UpdateHeroUpLvAndBreakData() end end this:UpdateHeroUpLvAndBreakMaterialShow() - local upLvRedpoint = HeroManager.LvUpBtnRedPoint(curHeroData) - this.upLvBtnRedPoint:SetActive(upLvRedpoint) - parent:CheckRedPointType(1,upLvRedpoint) end function RoleInfoLayout:OnSortingOrderChange()