parent
78abf42e0d
commit
67f9c9e042
|
@ -240,11 +240,11 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
|
||||||
-- unlockIds=nil,
|
-- unlockIds=nil,
|
||||||
-- isTraining=0, }
|
-- isTraining=0, }
|
||||||
-- end
|
-- end
|
||||||
LogError("heroData.id=="..heroData.dynamicId)
|
-- LogError("heroData.id=="..heroData.dynamicId)
|
||||||
LogError("heroData.HeroTraining.attackExp=="..heroData.HeroTraining.attackExp)
|
-- LogError("heroData.HeroTraining.attackExp=="..heroData.HeroTraining.attackExp)
|
||||||
LogError("heroData.HeroTraining.defenseExp=="..heroData.HeroTraining.defenseExp)
|
-- LogError("heroData.HeroTraining.defenseExp=="..heroData.HeroTraining.defenseExp)
|
||||||
LogError("heroData.HeroTraining.hpExp=="..heroData.HeroTraining.hpExp)
|
-- LogError("heroData.HeroTraining.hpExp=="..heroData.HeroTraining.hpExp)
|
||||||
LogError("heroData.HeroTraining.trainingLv=="..heroData.HeroTraining.trainingLv)
|
-- LogError("heroData.HeroTraining.trainingLv=="..heroData.HeroTraining.trainingLv)
|
||||||
GodSoulManager.BindHeroDatas(_msgHeroData)
|
GodSoulManager.BindHeroDatas(_msgHeroData)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1710,10 +1710,10 @@ local function CalculateEquipTreaSureAddVal(_heroId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogError("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111")
|
-- LogError("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111")
|
||||||
for k, v in pairs(addAllProVal) do
|
-- for k, v in pairs(addAllProVal) do
|
||||||
LogError("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111宝物 k====="..k.." v=="..v)
|
-- LogError("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111宝物 k====="..k.." v=="..v)
|
||||||
end
|
-- end
|
||||||
return addAllProVal
|
return addAllProVal
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -2756,7 +2756,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star,star2)
|
||||||
if star2 then
|
if star2 then
|
||||||
aaa=star2
|
aaa=star2
|
||||||
end
|
end
|
||||||
LogError("aaa=="..aaa)
|
--LogError("aaa=="..aaa)
|
||||||
local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, sid)
|
local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, sid)
|
||||||
local heroRankUp = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",aaa)
|
local heroRankUp = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",aaa)
|
||||||
if curHeroConfig.OpenSkillRules then
|
if curHeroConfig.OpenSkillRules then
|
||||||
|
@ -4038,7 +4038,7 @@ end
|
||||||
function this.GetSoulPrintLoopUIMaxData(_heroData)
|
function this.GetSoulPrintLoopUIMaxData(_heroData)
|
||||||
--local d = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 37).Value, "#")
|
--local d = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 37).Value, "#")
|
||||||
--local d =#EquipSignSetting
|
--local d =#EquipSignSetting
|
||||||
LogError("#EquipSignSetting==============="..#EquipSignSetting)
|
--LogError("#EquipSignSetting==============="..#EquipSignSetting)
|
||||||
local _d = {}
|
local _d = {}
|
||||||
local maxLv = 0
|
local maxLv = 0
|
||||||
for k, v in ConfigPairs(EquipSignSetting) do
|
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
|
if heroDatas[_dyn] and heroDatas[_dyn].potential and heroDatas[_dyn].potential[_type] then
|
||||||
local poten=heroDatas[_dyn].potential[_type]
|
local poten=heroDatas[_dyn].potential[_type]
|
||||||
local allLv=poten.lv+poten.giftLv
|
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)
|
local config=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",_type,"Level",allLv)
|
||||||
if config then
|
if config then
|
||||||
local pro=config.Attribute/10000
|
local pro=config.Attribute/10000
|
||||||
|
@ -4948,7 +4948,7 @@ function this.GetHeroTrainingAddPro(_id)
|
||||||
local trainingsetting=ConfigManager.GetAllConfigsDataByKey(ConfigName.TrainSetting,"PoolID",trainData.TrainSettingID)
|
local trainingsetting=ConfigManager.GetAllConfigsDataByKey(ConfigName.TrainSetting,"PoolID",trainData.TrainSettingID)
|
||||||
local datas={}
|
local datas={}
|
||||||
for i=1,#trainingsetting do
|
for i=1,#trainingsetting do
|
||||||
LogError(trainingsetting[i].Level)
|
--LogError(trainingsetting[i].Level)
|
||||||
if trainingsetting[i].Level< level then
|
if trainingsetting[i].Level< level then
|
||||||
for j=1 ,#trainingsetting[i].AttackProperty do
|
for j=1 ,#trainingsetting[i].AttackProperty do
|
||||||
local tAttack=trainingsetting[i].AttackProperty[j]
|
local tAttack=trainingsetting[i].AttackProperty[j]
|
||||||
|
@ -4975,7 +4975,7 @@ function this.GetHeroTrainingAddPro(_id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif trainingsetting[i].Level==level then
|
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
|
if hero.HeroTraining.attackExp>=trainingsetting[i].TrainExp1 then
|
||||||
for j=1 ,#trainingsetting[i].AttackProperty do
|
for j=1 ,#trainingsetting[i].AttackProperty do
|
||||||
local tAttack=trainingsetting[i].AttackProperty[j]
|
local tAttack=trainingsetting[i].AttackProperty[j]
|
||||||
|
@ -5017,7 +5017,7 @@ function this.CheckTrainingCanLevelUp(heroData,trainingData)
|
||||||
end
|
end
|
||||||
local lock=false
|
local lock=false
|
||||||
local OtherCondition=trainingData.OtherCondition
|
local OtherCondition=trainingData.OtherCondition
|
||||||
local conditioncheckCount=0
|
local conditioncheckCount={}
|
||||||
if heroData.star>=trainingData.MyselfCondition then
|
if heroData.star>=trainingData.MyselfCondition then
|
||||||
lock=true
|
lock=true
|
||||||
end
|
end
|
||||||
|
@ -5028,11 +5028,17 @@ function this.CheckTrainingCanLevelUp(heroData,trainingData)
|
||||||
local t=OtherCondition[i]
|
local t=OtherCondition[i]
|
||||||
for j=1,#this.heroDataLists do
|
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
|
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
|
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
|
lock=true
|
||||||
else
|
else
|
||||||
lock=false
|
lock=false
|
||||||
|
|
Loading…
Reference in New Issue