Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
c93b9e3f04
|
@ -2394,6 +2394,7 @@ GENERAL_POPUP_TYPE={
|
||||||
GemOneKey = 60, --命石一键合成
|
GemOneKey = 60, --命石一键合成
|
||||||
GemMoreCom = 61, --命石批量合成
|
GemMoreCom = 61, --命石批量合成
|
||||||
HomeLandEquip = 65,--家园装备升级
|
HomeLandEquip = 65,--家园装备升级
|
||||||
|
ChangeHeroPro = 66,--改变英雄阵营
|
||||||
|
|
||||||
--大号通用弹窗
|
--大号通用弹窗
|
||||||
YiJingBaoKu = 30,--易经宝库
|
YiJingBaoKu = 30,--易经宝库
|
||||||
|
|
|
@ -284,7 +284,7 @@ function BattleUtil.GetMaxTargetNum(chooseId)
|
||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
function BattleUtil.ChooseTarget(role, chooseId)
|
function BattleUtil.ChooseTarget(role, chooseId,queryType)
|
||||||
local chooseType = floor(chooseId / 100000) % 10
|
local chooseType = floor(chooseId / 100000) % 10
|
||||||
local chooseLimit = floor(chooseId / 10000) % 10
|
local chooseLimit = floor(chooseId / 10000) % 10
|
||||||
local chooseWeight = floor(chooseId / 100) % 100
|
local chooseWeight = floor(chooseId / 100) % 100
|
||||||
|
@ -293,7 +293,11 @@ function BattleUtil.ChooseTarget(role, chooseId)
|
||||||
local arr
|
local arr
|
||||||
-- 选择类型
|
-- 选择类型
|
||||||
if chooseType == 1 then
|
if chooseType == 1 then
|
||||||
arr = RoleManager.Query(function (r) return r.camp == role.camp end)
|
if queryType and queryType==1 then
|
||||||
|
arr = RoleManager.QueryNoDead(function (r) return r.camp == role.camp end)
|
||||||
|
else
|
||||||
|
arr = RoleManager.Query(function (r) return r.camp == role.camp end)
|
||||||
|
end
|
||||||
elseif chooseType == 2 then
|
elseif chooseType == 2 then
|
||||||
if role.lockTarget and not role.lockTarget:IsRealDead() and not role.lockTarget.isExile and num == 1 then --嘲讽时对单个敌军生效
|
if role.lockTarget and not role.lockTarget:IsRealDead() and not role.lockTarget.isExile and num == 1 then --嘲讽时对单个敌军生效
|
||||||
return {role.lockTarget}
|
return {role.lockTarget}
|
||||||
|
|
|
@ -315,6 +315,7 @@ function this.GetFormationPower(formationId)
|
||||||
power2 = power2 + HeroPowerManager.GetHeroPower(formationList.teamHeroInfos[i].heroId, formationId)
|
power2 = power2 + HeroPowerManager.GetHeroPower(formationList.teamHeroInfos[i].heroId, formationId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
power2=power2+PracticeManager.GetPracticeAddPower()
|
||||||
-- LogGreen("新方式战斗力:"..power2)
|
-- LogGreen("新方式战斗力:"..power2)
|
||||||
|
|
||||||
-- 主线编队战斗力
|
-- 主线编队战斗力
|
||||||
|
|
|
@ -473,6 +473,7 @@ function this.InitArmData()
|
||||||
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,nil,this.choosedList,#this.choosedList)
|
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,nil,this.choosedList,#this.choosedList)
|
||||||
end, 0.5)
|
end, 0.5)
|
||||||
end
|
end
|
||||||
|
this.formationPower=this.formationPower+PracticeManager.GetPracticeAddPower()
|
||||||
if this.curFormationIndex == FormationTypeDef.EXPEDITION then-- 远征加圣物战力
|
if this.curFormationIndex == FormationTypeDef.EXPEDITION then-- 远征加圣物战力
|
||||||
this.formationPower = math.floor(this.formationPower * (1 + ExpeditionManager.CalculateallHolyWarPower()/10000))
|
this.formationPower = math.floor(this.formationPower * (1 + ExpeditionManager.CalculateallHolyWarPower()/10000))
|
||||||
-- Log("所有圣物战力万分比 "..ExpeditionManager.CalculateallHolyWarPower())
|
-- Log("所有圣物战力万分比 "..ExpeditionManager.CalculateallHolyWarPower())
|
||||||
|
|
|
@ -37,6 +37,18 @@ function this.UpdataPlayerSkill(msg)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
--获取修行技能添加的战斗
|
||||||
|
function this.GetPracticeAddPower()
|
||||||
|
local addPower=0
|
||||||
|
for key, value in pairs(this.playerSkillList) do
|
||||||
|
local lvConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PlayerSkill,"SkillID",key,"Level",value)
|
||||||
|
if lvConfig then
|
||||||
|
addPower=addPower+lvConfig.Fight
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return addPower
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
--设置角色技能等级
|
--设置角色技能等级
|
||||||
function this.SetPlayerSkill(id,lv)
|
function this.SetPlayerSkill(id,lv)
|
||||||
|
|
|
@ -37,8 +37,18 @@ function PracticeSkillInfoPanel:BindEvent()
|
||||||
LogError("point skillId=="..skillId)
|
LogError("point skillId=="..skillId)
|
||||||
PopupTipPanel.ShowTip("技能升级成功!")
|
PopupTipPanel.ShowTip("技能升级成功!")
|
||||||
if nextData then
|
if nextData then
|
||||||
|
local oldPower=PlayerManager.maxForce
|
||||||
PracticeSkillInfoPanel:RefreshShow(skillId,skillLv+1)
|
PracticeSkillInfoPanel:RefreshShow(skillId,skillLv+1)
|
||||||
PracticeManager.SetPlayerSkill(skillId,skillLv)
|
PracticeManager.SetPlayerSkill(skillId,skillLv)
|
||||||
|
local newPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
if newPower>oldPower then
|
||||||
|
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL,function()
|
||||||
|
PlayerManager.maxForce=newPower
|
||||||
|
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldPower,newValue = newPower})
|
||||||
|
end)
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
elseif btnState==5 then
|
elseif btnState==5 then
|
||||||
|
|
Loading…
Reference in New Issue