|
|
@@ -40,6 +40,7 @@ local FilterUtil = require("common.FilterUtil")
|
|
|
local HeroGrowUp = require("absAct.HeroGrowUp")
|
|
|
local Log = require("common.Log")
|
|
|
local Config = require("Config")
|
|
|
+local Util = require("common.Util")
|
|
|
|
|
|
GODWAR_STATE_WAIT = 0 --尚未开启
|
|
|
GODWAR_STATE_XUANBA1 = 1 --选拔赛1
|
|
|
@@ -62,7 +63,8 @@ GODWAR_JIEDUAN_COMBAT = 3 --战斗阶段
|
|
|
GODWAR_START_DAY1 = 2 --竞技场每周擂台赛第二天
|
|
|
GODWAR_START_DAY2 = 5 --竞技场每周擂台赛第五天
|
|
|
|
|
|
-GODWAR_START_TIME = 21 * 3600 + 5 * 60 --21.05开始本期活动 759000
|
|
|
+--GODWAR_START_TIME = 21 * 3600 + 5 * 60 --21.05开始本期活动 759000
|
|
|
+GODWAR_START_TIME = 15 * 3600 + 15 * 60 --21.05开始本期活动 759000
|
|
|
|
|
|
GODWAR_JIEDUAN_ZHUNBEI_TIME = 60 --准备阶段60s
|
|
|
GODWAR_JIEDUAN_JINGCAI_TIME = 60 --竞猜阶段60s
|
|
|
@@ -958,6 +960,10 @@ function CG_JJCGODWAR_PAIWEI_QUERY(human,checkState,fenzuID)
|
|
|
end
|
|
|
end
|
|
|
--Msg.trace(msgRet)
|
|
|
+ if Config.IS_DEBUG then
|
|
|
+ local info=Util.printTable(msgRet)
|
|
|
+ Log.write(Log.LOGID_DEBUG,"GC_JJCGODWAR_PAIWEI_QUERY=>"..info)
|
|
|
+ end
|
|
|
Msg.send(msgRet,human.fd)
|
|
|
end
|
|
|
|
|
|
@@ -1246,7 +1252,7 @@ function onTimer()
|
|
|
end
|
|
|
--print("paiweiFenzu")
|
|
|
--排位赛完成对手匹配
|
|
|
- JjcGodWarDB.paiweiFenzu(state + 1)
|
|
|
+ JjcGodWarDB.paiweiFenzu(state + 1)
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
@@ -1440,6 +1446,11 @@ function GC_JJCGODWAR_FINISH(human)
|
|
|
human.db.jjcGodWar.finishTipTime = db.time
|
|
|
|
|
|
--Msg.trace(msgRet)
|
|
|
+ if Config.IS_DEBUG then
|
|
|
+ local info=Util.printTable(msgRet)
|
|
|
+ Log.write(Log.LOGID_DEBUG,"GC_JJCGODWAR_FINISH=>"..info)
|
|
|
+ end
|
|
|
+
|
|
|
Msg.send(msgRet,human.fd)
|
|
|
end
|
|
|
|