From 400512d4b5ba31ab5b9e9f45470b098e5e5f3ec9 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 11:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E5=8A=A9=E6=88=98=E5=AE=9D?= =?UTF-8?q?=E5=99=A8=E4=BF=AE=E6=94=B9=E5=AE=9D=E5=99=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonsterCamp/MonsterCampManager.lua | 38 +++---------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index b645ae671c..68c6a90f1a 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -37,7 +37,6 @@ end function this.InitFourMonsterData(msg) for i = 1 , #msg.info do - LogGreen("type:"..msg.info[i].type.." currentFloor:"..msg.info[i].currentFloor.." msg.info[i].remainTimes:"..msg.info[i].remainTimes.." overTime:"..msg.info[i].overTime) local index = msg.info[i].type this.fourMonsterData[index].monsterWave = msg.info[i].currentFloor this.fourMonsterData[index].canFightTime = msg.info[i].remainTimes @@ -181,26 +180,11 @@ function this.StraightBattle(id,type,func,curType) func() end if result.result == 0 then - LogGreen(Language[10741]) elseif result.result == 1 then this.fourMonsterData[curType].monsterWave = id - -- LogGreen("前:".. this.fourMonsterData[curType].canFightTime) - -- this.fourMonsterData[curType].canFightTime = this.fourMonsterData[curType].canFightTime - 1 - -- LogGreen("后:".. this.fourMonsterData[curType].canFightTime) - -- this.SaveFormation(curType) - -- UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, BATTLE_TYPE.MONSTER_CAMP, result, true, true,function() - -- if this.fourMonsterData[curType].openState ~= 0 then - -- UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,curType) - -- else - -- UIManager.OpenPanel(UIName.MonsterCampMainPanel) - -- end - -- end) - -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() - -- end) end end) else - LogGreen(#msg.drop.itemlist) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() if func then func() @@ -252,13 +236,12 @@ end ------------------------------四灵试炼 助战--------------------------------------- --创建一个英雄信息 -function this.UpdateHeroDatas(_msgHeroData) +function this.UpdateHeroDatas(_msgHeroData,_msgPlayerData) local heroData = {} heroData.soulPrintList={} heroData.heroBackData=_msgHeroData heroData.dynamicId = _msgHeroData.id local _id = _msgHeroData.heroId - LogYellow("_id:".._id) heroData.id = _id heroData.star = _msgHeroData.star heroData.lv = _msgHeroData.level--30 @@ -288,7 +271,6 @@ function this.UpdateHeroDatas(_msgHeroData) heroData.heroViewConfig=heroViewConfig[_id] heroData.maxStar=_configData.MaxRank - --Log(heroData.heroViewConfig.ReadingName.." _msgHeroData.starBreakId ".._msgHeroData.starBreakId) local actionPowerRormula= gameSetting[1].ActionPowerRormula heroData.actionPower=heroData.heroViewConfig.ActionPower+math.floor(((actionPowerRormula[1] * math.pow(heroData.lv, 3) + actionPowerRormula[2] * math.pow(heroData.lv, 2) + actionPowerRormula[3] * heroData.lv + actionPowerRormula[4])))--_msgHeroData.actionPower heroData.equipIdList=_msgHeroData.equipIdList @@ -296,7 +278,7 @@ function this.UpdateHeroDatas(_msgHeroData) EquipManager.SetEquipUpHeroDid(heroData.equipIdList[i],heroData.dynamicId) end heroData.jewels=_msgHeroData.jewels - this.InitBaoDatas(heroData.jewels) + this.InitBaoDatas(_msgPlayerData.jewels) for i = 1 , #heroData.jewels do this.SetEquipTreasureUpHeroDid(heroData.jewels[i],heroData.dynamicId) end @@ -353,7 +335,6 @@ function this.InitSingleTreasureData(_singleData) end local single={} local staticId=_singleData.equipId - LogGreen(staticId) local currJewel=jewelConfig[staticId] single.id=staticId single.idDyn=_singleData.id @@ -379,7 +360,6 @@ function this.InitSingleTreasureData(_singleData) single.icon=GetResourcePath(itemConfig[staticId].ResourceID) single.strongConfig=this.GetCurrTreasureLvConfig(1,currJewel.LevelupPool,_singleData.exp) single.refineConfig=this.GetCurrTreasureLvConfig(2,currJewel.RankupPool,_singleData.rebuildLevel) - --LogGreen("天宫推送宝器 _singleData.id ".._singleData.id) this.allTreasures[_singleData.id]=single end local jewerLevelUpConfig = ConfigManager.GetConfig(ConfigName.JewelRankupConfig) @@ -397,7 +377,6 @@ function this.GetSingleTreasureByIdDyn(_idDyn) return nil end return this.allTreasures[_idDyn] - end --设置装备穿戴的英雄 @@ -417,8 +396,7 @@ function this.GetFriendHelpHeros(trailType,func) end local tempdata = {} tempdata.player = v - tempdata.hero = this.UpdateHeroDatas(v.hero) - LogGreen("好友的助战数据 v.trailType:"..v.trailType.." v.hero.id:"..v.hero.id .. " v.hero.dynamicId:" ..v.hero.id) + tempdata.hero = this.UpdateHeroDatas(v.hero,v) table.insert(this.friendHelpHeros[v.trailType],tempdata) end if func then @@ -436,14 +414,12 @@ end function this.SetFriendHelpHero(helpFightList,trailType) if not trailType then this.friendHelpHero = {} - --LogGreen("helpFightList"..#helpFightList) for k,v in ipairs(helpFightList) do - --LogGreen("this.friendHelpHero[v.trailType]".." trailType:"..tostring(v.trailType).." v.hero.dynamicId:" ..v.hero.id) if not this.friendHelpHero[v.trailType] then this.friendHelpHero[v.trailType] = {} end this.friendHelpHero[v.trailType].player = v - this.friendHelpHero[v.trailType].hero = this.UpdateHeroDatas(v.hero) + this.friendHelpHero[v.trailType].hero = this.UpdateHeroDatas(v.hero,v) end else if not this.friendHelpHero then @@ -455,7 +431,7 @@ function this.SetFriendHelpHero(helpFightList,trailType) end if helpFightList then this.friendHelpHero[trailType].player = helpFightList - this.friendHelpHero[trailType].hero = this.UpdateHeroDatas(helpFightList.hero) + this.friendHelpHero[trailType].hero = this.UpdateHeroDatas(helpFightList.hero,helpFightList) else this.friendHelpHero[trailType] = nil end @@ -490,7 +466,6 @@ function this.SetMyHelpHeroData(trail,_data,func) if not this.myHelpHeroData[v.trailType] then this.myHelpHeroData[v.trailType] = {} end - LogGreen("我的助战数据 v.trailType:"..v.trailType.." v.hero.id:"..v.hero.id) this.myHelpHeroData[v.trailType] = HeroManager.GetSingleHeroData(v.hero.id) end end @@ -522,7 +497,6 @@ end --获取我的助战 function this.GetMyHelpHero(trailType) if this.myHelpHeroData[trailType] then - --LogGreen(this.myHelpHeroData[trailType].dynamicId) return this.myHelpHeroData[trailType] end return nil @@ -626,11 +600,9 @@ function this.CheckHelpFightRedPoint(redType) end if this.fourMonsterData[4] and this.fourMonsterData[4].openState > 0 then if not this.GetMyHelpHero(4) then - LogGreen("道玄 红点开了") return true end end - LogGreen("道玄 红点关了") return false end end