【战斗】============战斗超时pvp类型检测添加类型
parent
9fe1e610ca
commit
f67006e041
|
@ -488,7 +488,11 @@ function BattleLogic.Update()
|
||||||
end
|
end
|
||||||
if CurRound > MaxRound then
|
if CurRound > MaxRound then
|
||||||
if BattleLogic.Type == BATTLE_SERVER_TYPE.TOPFight -- 巅峰赛
|
if BattleLogic.Type == BATTLE_SERVER_TYPE.TOPFight -- 巅峰赛
|
||||||
or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend then -- 好友切磋
|
or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend
|
||||||
|
or BattleLogic.Type == BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight
|
||||||
|
or BattleLogic.Type == BATTLE_SERVER_TYPE.LINGMAIMIJING
|
||||||
|
or BattleLogic.Type == BATTLE_SERVER_TYPE.CarPersonFight
|
||||||
|
or BattleLogic.Type == BATTLE_SERVER_TYPE.NewArenaFight then -- 好友切磋
|
||||||
if allHeroDamage>allEnemyDamage then
|
if allHeroDamage>allEnemyDamage then
|
||||||
BattleLogic.BattleEnd(1)
|
BattleLogic.BattleEnd(1)
|
||||||
else
|
else
|
||||||
|
|
|
@ -6,7 +6,7 @@ end
|
||||||
|
|
||||||
|
|
||||||
BATTLE_SERVER_TYPE = {
|
BATTLE_SERVER_TYPE = {
|
||||||
NewArenaFight = 0, --本地测试竞技场值
|
NewArenaFight = 0, --本地测试竞技场值/罗浮争锋
|
||||||
StoryFight = 1, --故事副本
|
StoryFight = 1, --故事副本
|
||||||
MapExploreFight = 2, -- 地图探索
|
MapExploreFight = 2, -- 地图探索
|
||||||
ArenaFight = 3, --竞技场
|
ArenaFight = 3, --竞技场
|
||||||
|
|
|
@ -398,6 +398,7 @@ function this.InitBattleData()
|
||||||
--BattleLogic.IsOpenBattleRecord = true
|
--BattleLogic.IsOpenBattleRecord = true
|
||||||
BattleLogic.Init(this.fightData, {uid = PlayerManager.uid, fightId = this.fightId}, this.maxRound)
|
BattleLogic.Init(this.fightData, {uid = PlayerManager.uid, fightId = this.fightId}, this.maxRound)
|
||||||
BattleLogic.Type = this.battleType
|
BattleLogic.Type = this.battleType
|
||||||
|
LogError("battle type=="..BattleLogic.Type)
|
||||||
this.InitBattleEvent()
|
this.InitBattleEvent()
|
||||||
|
|
||||||
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, posY)
|
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, posY)
|
||||||
|
|
Loading…
Reference in New Issue