From 3b02c6296cd112a24d645271e3b6661ce8be90d6 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 29 Oct 2021 14:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=9D=E5=99=A8=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E3=80=91=E7=A9=BF=E6=88=B4=E5=AE=9D=E5=99=A8=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E9=80=80=E5=87=BA=E9=87=8D=E8=BF=9B=E5=AE=9D?= =?UTF-8?q?=E5=99=A8=E5=B1=9E=E6=80=A7=E6=B2=A1=E6=9C=89=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=88=98=E5=8A=9B=E5=80=BC=E4=B8=8B?= =?UTF-8?q?=E9=99=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Hero/HeroPropManager.lua | 9 +++++++++ .../Modules/MonsterCamp/MonsterCampManager.lua | 17 ++++++++++++----- .../QiJieShiLian/QiJieShiLianManager.lua | 1 - 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroPropManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroPropManager.lua index 8bc5e556b5..ead7153e03 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroPropManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroPropManager.lua @@ -435,6 +435,15 @@ function this.SetHeroDirty(dId) -- 战斗力需要重新计算 HeroPowerManager.SetPowerDirty(dId) end +-- 将个人某个数据置为脏数据 +function this.SetAllHeroDirtyByType(powerType) + for dId, data in pairs(this.IsHeroDirty) do + data[powerType] = true + data.isDirty = true + -- 战斗力需要重新计算 + HeroPowerManager.SetPowerDirty(dId) + end +end --=========================== 条件属性管理 ========================== diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index cbcfe22fa3..1034755c7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -72,6 +72,9 @@ function this.InitFourMonsterData(msg) this.GetTimeTip(index) end Game.GlobalEvent:DispatchEvent(GameEvent.FourEle.RefreshView) + + -- 四灵试炼层数变化会导致神将宝物属性变化 + HeroPropManager.SetAllHeroDirtyByType(Hero_Prop_Type.EquipTreasure) end --设置扫荡剩余次数 @@ -123,7 +126,7 @@ function this.GetFourElementMonstersInfo(curType,curWave) local tempData = this.GetFourElementMonsterInfoByWave(curType,i) if tempData then table.insert(monsterInfo,tempData) - end + end end return monsterInfo end @@ -231,6 +234,8 @@ function this.StraightBattle(id,type,func,curType,isQuick) UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, BATTLE_TYPE.FOURELEMENT, result, true, true,function() Game.GlobalEvent:DispatchEvent(GameEvent.FourEle.RefreshView) end) + -- 四灵试炼层数变化会导致神将宝物属性变化 + HeroPropManager.SetAllHeroDirtyByType(Hero_Prop_Type.EquipTreasure) end else if type == 0 then @@ -243,6 +248,8 @@ function this.StraightBattle(id,type,func,curType,isQuick) if result.result == 0 then elseif result.result == 1 then this.fourMonsterData[curType].monsterWave = id + -- 四灵试炼层数变化会导致神将宝物属性变化 + HeroPropManager.SetAllHeroDirtyByType(Hero_Prop_Type.EquipTreasure) end end) else @@ -980,10 +987,10 @@ function this.MonsterCampBattle(id,type,func) if func then func() end - if result.result == 0 then - elseif result.result == 1 then - this.fourMonsterData[curType].monsterWave = id - end + -- if result.result == 0 then + -- elseif result.result == 1 then + -- this.fourMonsterData[curType].monsterWave = id + -- end end) else UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index db5c4bca92..9b7370adee 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -366,7 +366,6 @@ function this.CheckQiJieRedPoint() end local bool1 = this.CheckQiJieTreasureRedPoint() local bool2 = PrivilegeManager.GetPrivilegeRemainValue(3201) > 0 and true or false - LogError("七界红点检测:(秘宝:)"..tostring(bool1).." (特权:)"..tostring(bool2)) return bool1 or bool2 -- end) end