Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
1fc0a0a4d3
|
@ -486,7 +486,6 @@ function BattleLogic.Update()
|
|||
BattleLogic.BattleEnd(0)
|
||||
return
|
||||
end
|
||||
print("===================type==============="..BattleLogic.Type)
|
||||
if CurRound > MaxRound then
|
||||
if BattleLogic.Type == BATTLE_SERVER_TYPE.TOPFight -- 巅峰赛
|
||||
or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend
|
||||
|
|
|
@ -98,6 +98,7 @@ public interface ActivityType {
|
|||
|
||||
int SEVEN_WORLD_TREASURE = 83;//七界秘宝
|
||||
int RIDING_SWARD = 84;//御剑飞行
|
||||
int CONTINUOUS_GIFT = 85;//连续礼包
|
||||
int SPECIAL_MONSTER_RANDOM_ACTIVITY = 100;//灵兽宝阁活动
|
||||
int SPECIAL_MONSTER_GIFT_ACTIVITY = 101;//灵兽礼包
|
||||
|
||||
|
|
|
@ -89,6 +89,7 @@ public enum ActivityTypeEnum {
|
|||
RIDING_SWARD(ActivityType.RIDING_SWARD,RidingSwardActivity::new),
|
||||
ITEMS_STORE_NEW(ActivityType.ITEMS_STORE_NEW,SuperBoxActivity::new),
|
||||
TRUMP_GACHA_ACTIVITY(ActivityType.TRUMP_GACHA_ACTIVITY,LimitRandomCardActivity::new),
|
||||
CONTINUOUS_GIFT(ActivityType.CONTINUOUS_GIFT,SuperBoxActivity::new),//连续礼包
|
||||
;
|
||||
|
||||
private int type;
|
||||
|
|
Loading…
Reference in New Issue