diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index d0b1a379c8..690f2822fb 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -455,7 +455,7 @@ PanelType = { -- FriendShop = StoreTypeConfig[17].ResourcesBar, -- 友情商店 -- ChoasShop = StoreTypeConfig[19].ResourcesBar, -- 混沌商店 -- TopMatchShop = StoreTypeConfig[21].ResourcesBar, -- 巅峰赛商店 - MonsterCamp = { 14, 16}, -- 兽潮 + MonsterCamp = { 14, 16,124}, -- 兽潮 HeroReturn = { 14, 16}, -- 回溯{ 14, 16, 70}, LuckyTreasure = { 14, 16}, -- 幸运探宝 AdvancedTreasure = { 14, 16, 61}, -- 高级探宝 diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua index d6b08eb2e7..dccc214a4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua @@ -59,8 +59,8 @@ function this.SetHeroGift(id,list,type) elseif type==2 then table.removebyvalue(this.allHeroGifts[id],list[i]) end - end + HeroManager.ChangeHeroGift(id,this.allHeroGifts[id]) end --设置主角礼物 function this.SetPlayerGift(list) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index dade33f4c3..7118249d1c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -145,6 +145,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) heroData.soulPrintList = this.SetSoulPrint(_msgHeroData.soulPos,heroData.dynamicId) heroData.godPrintList = this.SetGodPrint(_msgHeroData.godSeals,heroData.dynamicId) GiftManager.InitHeroGift(_msgHeroData.id,_msgHeroData.giftEquipIds) + heroData.giftIds=_msgHeroData.giftEquipIds --heroData.equipStrongList=this.GetEquipStrongData(_msgHeroData.equipStrong,_msgHeroData.equipAdvanceLv) --heroData.equipAdvanceLv =_msgHeroData.equipAdvanceLv heroData.skillIdList = {} @@ -4045,6 +4046,14 @@ function this.GetIsShowTalismanRedPoint(curHeroData) return true end +--改变英雄礼物 +function this.ChangeHeroGift(_dyn,list) + if heroDatas[_dyn] then + heroDatas[_dyn].giftIds=list + end +end + + function this.ResetHero(dynamicloadId) if heroDatas[dynamicloadId] then heroDatas[dynamicloadId].lv = 1