|
|
@@ -63,8 +63,7 @@ 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 = 15 * 3600 + 15 * 60 --21.05开始本期活动 759000
|
|
|
+GODWAR_START_TIME = 21 * 3600 + 5 * 60 --21.05开始本期活动 759000
|
|
|
|
|
|
GODWAR_JIEDUAN_ZHUNBEI_TIME = 60 --准备阶段60s
|
|
|
GODWAR_JIEDUAN_JINGCAI_TIME = 60 --竞猜阶段60s
|
|
|
@@ -960,10 +959,11 @@ 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
|
|
|
+ if Config.IS_JJCGODWAR then
|
|
|
+ local info=Util.printTable(msgRet)
|
|
|
+ Log.write(Log.LOGID_JJC_GODWAR,"GC_JJCGODWAR_PAIWEI_QUERY=>"..info)
|
|
|
+ end
|
|
|
+
|
|
|
Msg.send(msgRet,human.fd)
|
|
|
end
|
|
|
|
|
|
@@ -1436,19 +1436,15 @@ function GC_JJCGODWAR_FINISH(human)
|
|
|
end
|
|
|
RoleLogic.makeRoleBase(rolebase, msgRet.roleBase[i])
|
|
|
msgRet.roleBase[i].chenghao = conf[i].chenghaoID
|
|
|
-
|
|
|
- if Config.IS_DEBUG then
|
|
|
- Log.write(Log.LOGID_DEBUG, "GC_JJCGODWAR_FINISH time:"..msgRet.actTime.." Current ranking:"..i.." rank2Uuid:"..uuid.." chenghao:"..msgRet.roleBase[i].chenghao)
|
|
|
- end
|
|
|
end
|
|
|
|
|
|
human.db.jjcGodWar = human.db.jjcGodWar or {}
|
|
|
human.db.jjcGodWar.finishTipTime = db.time
|
|
|
|
|
|
--Msg.trace(msgRet)
|
|
|
- if Config.IS_DEBUG then
|
|
|
+ if Config.IS_JJCGODWAR then
|
|
|
local info=Util.printTable(msgRet)
|
|
|
- Log.write(Log.LOGID_DEBUG,"GC_JJCGODWAR_FINISH=>"..info)
|
|
|
+ Log.write(Log.LOGID_JJC_GODWAR,"GC_JJCGODWAR_FINISH=>"..info)
|
|
|
end
|
|
|
|
|
|
Msg.send(msgRet,human.fd)
|