diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 534e6c1737..85cc74c2b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -714,7 +714,6 @@ function this.SingleHeroDataShow(_go, _heroData) PopupTipPanel.ShowTip(Language[10689]) return end - LogGreen("heroData.dynamicId:"..heroData.dynamicId) table.insert(this.choosedList, {heroId = heroData.dynamicId, position=this.GetPos()}) this.SetCardsData(this.choosedList) else diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index a096f7dba0..f51ea21749 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -144,6 +144,10 @@ function FourElementMonsterCampPanel:OnShow() local propertyId = SacredTreeManager.GetUnLockNewProperty(waves) if propertyId > 0 then UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId) + local power = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + if power - MonsterCampManager.oldpower > 0 then + UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = MonsterCampManager.oldpower,newValue = power}) + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 0b53c27d79..4269cbe567 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -10,6 +10,7 @@ local CampTowerConfig = ConfigManager.GetConfig(ConfigName.CampTowerConfig) local campTowerSetting = ConfigManager.GetConfig(ConfigName.CampTowerSetting) local gameSetting = ConfigManager.GetConfig(ConfigName.GameSetting) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) +this.oldpower = 0 --四灵试炼数据 this.fourMonsterData = {} this.CurOffsetIndex = -1 @@ -169,6 +170,8 @@ function this.GetMonsterTeamInfo(monsterGroupId) end function this.StraightBattle(id,type,func,curType) + this.oldpower = FormationManager.GetFormationPower(FormationManager.curFormationIndex) + LogGreen("oldpower:"..this.oldpower) this.curType = curType local fightId = ConfigManager.GetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"FloorId",id,"CampId",curType).Id NetManager.FourChallengeDoRequest(fightId,type,function(msg) @@ -339,7 +342,9 @@ function this.InitSingleTreasureData(_singleData) single.id=staticId single.idDyn=_singleData.id single.lv=_singleData.exp + LogGreen("single.lv:"..single.lv) single.refineLv=_singleData.rebuildLevel + LogGreen("single.refineLv:"..single.refineLv) single.maxLv=currJewel.Max[1] single.maxRefineLv=currJewel.Max[2] single.upHeroDid=""