Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-05-29 18:06:24 +08:00
commit ef4b272880
2 changed files with 8 additions and 2 deletions

View File

@ -409,6 +409,12 @@ function this.InitArmData()
if this.curFormationIndex == FormationTypeDef.EXPEDITION then-- 远征加圣物战力
this.formationPower = math.floor(this.formationPower * (1 + ExpeditionManager.CalculateallHolyWarPower()/10000))
-- Log("所有圣物战力万分比 "..ExpeditionManager.CalculateallHolyWarPower())
elseif this.curFormationIndex == FormationTypeDef.FORMATION_ENDLESS_MAP then-- 远征加圣物战力
local id,lv = EndLessMapManager.GetShiQiValue()
if lv > 0 then
local config = ConfigManager.GetConfigData(ConfigName.endlessMorale,id)
this.formationPower = math.floor(this.formationPower * (1 + config.FightUp/100))
end
end
end

View File

@ -57,10 +57,10 @@ function this.Show()
this.btnStart:GetComponent("Button").interactable = false
TrialMiniGameManager.GameOperate(0, function(msg)
--转起来
this.test(msg.drop.itemlist[1].itemId)
id = msg.drop.itemlist[1].itemId
num = msg.drop.itemlist[1].itemNum
LogYellow("掉落的Id:"..id.." 数量:"..num)
this.test(msg.drop.itemlist[1].itemId)
--4秒后显示掉落
-- Timer.New(function()
-- if TrialMiniGameManager.IsGameDone() then