diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 5c9982da16..3f8a4daf8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -240,11 +240,11 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) -- unlockIds=nil, -- isTraining=0, } -- end - LogError("heroData.id=="..heroData.dynamicId) - LogError("heroData.HeroTraining.attackExp=="..heroData.HeroTraining.attackExp) - LogError("heroData.HeroTraining.defenseExp=="..heroData.HeroTraining.defenseExp) - LogError("heroData.HeroTraining.hpExp=="..heroData.HeroTraining.hpExp) - LogError("heroData.HeroTraining.trainingLv=="..heroData.HeroTraining.trainingLv) + -- LogError("heroData.id=="..heroData.dynamicId) + -- LogError("heroData.HeroTraining.attackExp=="..heroData.HeroTraining.attackExp) + -- LogError("heroData.HeroTraining.defenseExp=="..heroData.HeroTraining.defenseExp) + -- LogError("heroData.HeroTraining.hpExp=="..heroData.HeroTraining.hpExp) + -- LogError("heroData.HeroTraining.trainingLv=="..heroData.HeroTraining.trainingLv) GodSoulManager.BindHeroDatas(_msgHeroData) end @@ -1710,10 +1710,10 @@ local function CalculateEquipTreaSureAddVal(_heroId) end end end - LogError("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111") - for k, v in pairs(addAllProVal) do - LogError("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111宝物 k====="..k.." v=="..v) - end + -- LogError("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111") + -- for k, v in pairs(addAllProVal) do + -- LogError("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111宝物 k====="..k.." v=="..v) + -- end return addAllProVal end @@ -2756,7 +2756,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star,star2) if star2 then aaa=star2 end - LogError("aaa=="..aaa) + --LogError("aaa=="..aaa) local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, sid) local heroRankUp = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",aaa) if curHeroConfig.OpenSkillRules then @@ -4038,7 +4038,7 @@ end function this.GetSoulPrintLoopUIMaxData(_heroData) --local d = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 37).Value, "#") --local d =#EquipSignSetting - LogError("#EquipSignSetting==============="..#EquipSignSetting) + --LogError("#EquipSignSetting==============="..#EquipSignSetting) local _d = {} local maxLv = 0 for k, v in ConfigPairs(EquipSignSetting) do @@ -4236,7 +4236,7 @@ function this.GetHeroPotencyAddByType(_dyn,_type) if heroDatas[_dyn] and heroDatas[_dyn].potential and heroDatas[_dyn].potential[_type] then local poten=heroDatas[_dyn].potential[_type] local allLv=poten.lv+poten.giftLv - LogError("poten.lv====="..poten.lv.." poten.giftLv=="..poten.giftLv) + --LogError("poten.lv====="..poten.lv.." poten.giftLv=="..poten.giftLv) local config=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",_type,"Level",allLv) if config then local pro=config.Attribute/10000 @@ -4948,7 +4948,7 @@ function this.GetHeroTrainingAddPro(_id) local trainingsetting=ConfigManager.GetAllConfigsDataByKey(ConfigName.TrainSetting,"PoolID",trainData.TrainSettingID) local datas={} for i=1,#trainingsetting do - LogError(trainingsetting[i].Level) + --LogError(trainingsetting[i].Level) if trainingsetting[i].Level< level then for j=1 ,#trainingsetting[i].AttackProperty do local tAttack=trainingsetting[i].AttackProperty[j] @@ -4975,7 +4975,7 @@ function this.GetHeroTrainingAddPro(_id) end end elseif trainingsetting[i].Level==level then - LogError("trainfinfo"..hero.HeroTraining.attackExp..trainingsetting[i].TrainExp1 ) + --LogError("trainfinfo"..hero.HeroTraining.attackExp..trainingsetting[i].TrainExp1 ) if hero.HeroTraining.attackExp>=trainingsetting[i].TrainExp1 then for j=1 ,#trainingsetting[i].AttackProperty do local tAttack=trainingsetting[i].AttackProperty[j] @@ -5017,7 +5017,7 @@ function this.CheckTrainingCanLevelUp(heroData,trainingData) end local lock=false local OtherCondition=trainingData.OtherCondition - local conditioncheckCount=0 + local conditioncheckCount={} if heroData.star>=trainingData.MyselfCondition then lock=true end @@ -5028,11 +5028,17 @@ function this.CheckTrainingCanLevelUp(heroData,trainingData) local t=OtherCondition[i] for j=1,#this.heroDataLists do if this.heroDataLists[j].id==t[1] and this.heroDataLists[j].HeroTraining.trainingLv>=t[2] and #this.heroDataLists[j].HeroTraining.unlockIds >=t[3] then - conditioncheckCount=conditioncheckCount+1 + if not conditioncheckCount[this.heroDataLists[j].id] then + conditioncheckCount[this.heroDataLists[j].id]=1 + end end end end - if conditioncheckCount==#OtherCondition then + local count=0 + for k, v in pairs(conditioncheckCount) do + count=count+1 + end + if count>=#OtherCondition then lock=true else lock=false