提交新的荣耀任务，部分天梯赛修改，战力冲刺协议长度修改

script/common/InnerProtoID.lua

@@ -64,9 +64,24 @@ _ENV[48] = 'WL_UPDATE_BAN_INFO'
 -- _ENV[64] = 'WL_JJC_NEWLADDER_CANCEL_FIGHT_END_C2O'
 -- _ENV[65] = 'LW_JJC_NEWLADDER_SEND_MAIL_D2C'
 -- _ENV[66] = 'WL_JJC_NEWLADDER_SEND_MAIL_C2O'
+-- _ENV[67] = 'LW_JJC_NEWLADDER_REFRESH_O2C'
+-- _ENV[68] = 'WL_JJC_NEWLADDER_REFRESH_C2D'
+-- _ENV[69] = 'LW_JJC_NEWLADDER_REFRESH_D2C'
 
 _ENV[70] = 'LW_REBATE_QUERY'
 _ENV[71] = 'WL_REBATE_OK'
 
-
-
+-- _ENV[72] = 'WL_JJC_NEWLADDER_REFRESH_C2O'
+-- _ENV[73] = 'LW_JJC_NEWLADDER_LAST3RANK_O2C'
+-- _ENV[74] = 'WL_JJC_NEWLADDER_LAST3RANK_C2D'
+-- _ENV[75] = 'LW_JJC_NEWLADDER_LAST3RANK_D2O'
+-- _ENV[76] = 'WL_JJC_NEWLADDER_LAST3RANK_C2O'
+-- _ENV[77] = 'LW_JJC_NEWLADDER_SEND_WORSHIP_O2C'
+-- _ENV[78] = 'WL_JJC_NEWLADDER_SEND_WORSHIP_C2D'
+-- _ENV[79] = 'LW_JJC_NEWLADDER_SEND_WORSHIP_D2C'
+-- _ENV[80] = 'WL_JJC_NEWLADDER_SEND_WORSHIP_C2O'
+-- _ENV[81] = 'WL_JJC_NEWLADDER_WORSHIP_CHANGE_C2D'
+-- _ENV[82] = 'LW_JJC_NEWLADDER_WORSHIP_CHANGE_D2C'
+-- _ENV[83] = 'WL_JJC_NEWLADDER_WORSHIP_UPDATE_D2C'
+-- _ENV[84] = 'LW_JJC_NEWLADDER_SEND_RANK_PRIZE_D2C'
+-- _ENV[85] = 'WL_JJC_NEWLADDER_SEND_RANK_PRIZE_C2O'

script/core/ObjHuman.lua

@@ -471,6 +471,7 @@ function onLvUpCB(human, oldLv, newLv)
     end
 
 	MainDianLogic.MaiDian_Begin(human, MaiDianDefine.MAIDIAN_TYPE_LV, {nValue = newLv})
+	TriggerLogic.PublishEvent(TriggerDefine.HUMAN_LV_UP, human.db._id, 1, newLv)
 	
 	--升级日志
 	--Log.write(Log.LOGID_OSS_LEVELUP, human.db._id, human.db.account, human.db.name, oldLv, newLv)

script/module/dailyTask/HonorJourney.lua

@@ -310,21 +310,25 @@ function HonorJourneyTaskQuery(human, isOnLogin)
         local nPreTaskID = HonorJourney_Gettaskpre(nID)
         local nState = HonorJourney_GetTaskStatus(human, nID)
         nSendLen = nSendLen + 1
+        --print("[HonorJourneyTaskQuery] nID = "..nID.." nState = "..nState.."\n")
         if CommonDefine.COMMON_PRIZE_STATE_GET ~= nState then
             local bSow = value.isVisiable == HONORJOURNEY_SHOWTASK and true or false
 
             -- 获取前置任务状态
             if nPreTaskID then
                 local nPreTaskState = HonorJourney_GetTaskStatus(human, nPreTaskID)
-                if CommonDefine.COMMON_PRIZE_STATE_NOGET ~= nPreTaskState then
+                if CommonDefine.COMMON_PRIZE_STATE_GET == nPreTaskState then
                     bSow = true
+                else
+                    bSow = false
                 end
             end
 
+            --print("[HonorJourneyTaskQuery] nID = "..nID.." bSow = "..(bSow == true and 1 or 0))
             -- 能领取了都要显示出来
-            if CommonDefine.COMMON_PRIZE_STATE_CANGET == nState then
-                bSow = true
-            end
+            -- if CommonDefine.COMMON_PRIZE_STATE_CANGET == nState then
+            --     bSow = true
+            -- end
 
             -- 显示才下发
             if true == bSow then
@@ -359,13 +363,13 @@ function HonorJourneyTaskQuery(human, isOnLogin)
         end
     end
 
-    if cnt > 0 then
-        msgRet.list[0] = cnt
-        msgRet.nFirst = nFirst
-        msgRet.nEnd = 1
-        print("[HonorJourneyTaskQuery] 最后一次发送数据 cnt = "..cnt.." nFirst = "..nFirst.." nSendLen = "..nSendLen)
-        Msg.send(msgRet, human.fd)
-    end
+    print("[HonorJourneyTaskQuery] 循环遍历结束 cnt = "..cnt.." nFirst = "..nFirst.." nSendLen = "..nSendLen)
+
+    msgRet.list[0] = cnt
+    msgRet.nFirst = nFirst
+    msgRet.nEnd = 1
+    print("[HonorJourneyTaskQuery] 最后一次发送数据 cnt = "..cnt.." nFirst = "..nFirst.." nSendLen = "..nSendLen)
+    Msg.send(msgRet, human.fd)
 end
 
 function onHonorJourneyTaskHuoYue(human,sum)
@@ -688,6 +692,96 @@ local function HonorJourneyTask_GetEquiporFuWen(nEventType, uuid, nQuality, nNum
     end
 end
 
+-- 秘宝或者遗物激活
+local function HonorJourneyTask_ItemActivate(nEventType, uuid, nItemID, nItemNum)
+    local human = ObjHuman.onlineUuid[uuid]
+    if not human then
+        return
+    end
+
+    print("[HonorJourneyTask_ItemActivate] nEventType = "..nEventType.." nItemID = "..nItemID.." nItemNum = "..nItemNum)
+
+    local tTaksID = {}
+    for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
+        if v.triggerType == nEventType then
+            local nState = HonorJourney_GetTaskStatus(human, nID)
+            if nItemID == v.taskArgument and nState == CommonDefine.COMMON_PRIZE_STATE_NOGET then
+                table.insert(tTaksID, nID)
+            end
+        end
+    end
+
+    if tTaksID and nil ~= _G.next(tTaksID) then
+        for _, nID in pairs(tTaksID) do
+            -- print("[HonorJourneyTask_ItemActivate] 进行判断的任务ID = "..nID)
+            HonorJourneyTask_AddTaskFinishNum(human, nID, nItemNum)
+            HonorJourney_CheckTaskStatus(human, nID)
+        end
+
+        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
+    end
+end
+
+-- 等级改变
+local function HonorJourneyTask_LvChange(nEventType, uuid, nValue1, nValue2)
+    local human = ObjHuman.onlineUuid[uuid]
+    if not human then
+        return
+    end
+
+    print("[HonorJourneyTask_LvChange] nEventType = "..nEventType.." nValue1 = "..nValue1.." nValue2 = "..nValue2)
+
+    local tTaksID = {}
+    for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
+        if v.triggerType == nEventType then
+            local nState = HonorJourney_GetTaskStatus(human, nID)
+            if nValue2 >= v.taskProcess and nState == CommonDefine.COMMON_PRIZE_STATE_NOGET then
+                table.insert(tTaksID, nID)
+            end
+        end
+    end
+
+    if tTaksID and nil ~= _G.next(tTaksID) then
+        for _, nID in pairs(tTaksID) do
+            --  print("[HonorJourneyTask_ItemActivate] 进行判断的任务ID = "..nID)
+            HonorJourneyTask_SetTaskFinishNum(human, nID, nValue2)
+            HonorJourney_CheckTaskStatus(human, nID)
+        end
+
+        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
+    end
+end
+
+-- 境界提升
+local function HonorJourneyTask_JingjieLvChange(nEventType, uuid, nValue1, nValue2)
+    local human = ObjHuman.onlineUuid[uuid]
+    if not human then
+        return
+    end
+
+    print("[HonorJourneyTask_JingjieLvChange] nEventType = "..nEventType.." nValue1 = "..nValue1.." nValue2 = "..nValue2)
+
+    local tTaksID = {}
+    for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
+        if v.triggerType == nEventType then
+            local nState = HonorJourney_GetTaskStatus(human, nID)
+            if nValue2 >= v.taskArgument and nState == CommonDefine.COMMON_PRIZE_STATE_NOGET then
+                table.insert(tTaksID, nID)
+            end
+        end
+    end
+
+    if tTaksID and nil ~= _G.next(tTaksID) then
+        for _, nID in pairs(tTaksID) do
+            print("[HonorJourneyTask_JingjieLvChange] 进行判断的任务ID = "..nID)
+            HonorJourneyTask_SetTaskFinishNum(human, nID, 1)
+            HonorJourney_CheckTaskStatus(human, nID)
+        end
+
+        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
+    end
+end
+
 function Init()
     tEventHandler = {
         [TriggerDefine.CHAT_TIMES] = HonorJourneyTask_EvnentCommon,
@@ -711,6 +805,16 @@ function Init()
         [TriggerDefine.EVENT_TYPE_SWEEP] = HonorJourneyTask_EvnentCommon,
         [TriggerDefine.FUWEN_GETQUALITY] = HonorJourneyTask_GetEquiporFuWen,
         [TriggerDefine.EQUIP_GETQUALITY] = HonorJourneyTask_GetEquiporFuWen,
+        [TriggerDefine.FUWEN_RESET] = HonorJourneyTask_EvnentCommon,
+        [TriggerDefine.EQUIP_REFINEMENT] = HonorJourneyTask_EvnentCommon,
+        [TriggerDefine.HUMAN_LV_UP] = HonorJourneyTask_LvChange,
+        [TriggerDefine.REALM_UPGRADE] = HonorJourneyTask_JingjieLvChange,
+        [TriggerDefine.YJTREASURE_PASS_LEVEL] = HonorJourneyTask_ItemActivate,
+        [TriggerDefine.MIBAO_ACTIVATE] = HonorJourneyTask_ItemActivate,
+        [TriggerDefine.YIWU_ACTIVATE] = HonorJourneyTask_ItemActivate,
+        [TriggerDefine.ZHONGZU_LEVEL] = HonorJourneyTask_ItemActivate,
+        [TriggerDefine.MIBAO_ALLSTAR] = HonorJourneyTask_EvnentCommon,
+        [TriggerDefine.YIWU_ALLSTAR] = HonorJourneyTask_EvnentCommon,
     }
 end
 
@@ -748,6 +852,26 @@ local function HonorJourney_OnLoginSubEvent(human)
     HonorJourney_SubEvent(uuid, TriggerDefine.FUWEN_GETQUALITY)
     HonorJourney_SubEvent(uuid, TriggerDefine.EQUIP_GETQUALITY)
     HonorJourney_SubEvent(uuid, TriggerDefine.EVENT_TYPE_SWEEP)
+    -- 符文重铸次数
+    HonorJourney_SubEvent(uuid, TriggerDefine.FUWEN_RESET)
+    -- 装备洗练
+    HonorJourney_SubEvent(uuid, TriggerDefine.EQUIP_REFINEMENT)
+    -- 境界提升
+    HonorJourney_SubEvent(uuid, TriggerDefine.REALM_UPGRADE)
+    -- 遗迹探险层数
+    HonorJourney_SubEvent(uuid, TriggerDefine.YJTREASURE_PASS_LEVEL)
+    -- 秘宝激活
+    HonorJourney_SubEvent(uuid, TriggerDefine.MIBAO_ACTIVATE)
+    -- 遗物激活
+    HonorJourney_SubEvent(uuid, TriggerDefine.YIWU_ACTIVATE)
+    -- 种族试炼
+    HonorJourney_SubEvent(uuid, TriggerDefine.ZHONGZU_LEVEL)
+    -- 等级提升
+    HonorJourney_SubEvent(uuid, TriggerDefine.HUMAN_LV_UP)
+    HonorJourney_SubEvent(uuid, TriggerDefine.MIBAO_ALLSTAR)
+    HonorJourney_SubEvent(uuid, TriggerDefine.YIWU_ALLSTAR)
+
+    
 end
 
 -- 回调，增加次数

script/module/jjc/JjcActLogic.lua

@@ -32,6 +32,10 @@ local function initActInfo(list, configs)
 			moduleFn = load("return require(\""..cf.moduleFn.."\")")()		
 		end
 
+		if moduleFn and moduleFn.Init then
+			moduleFn.Init()
+		end
+
 		local actInfo = {}
 		actInfo.id = id 
 		actInfo.config = cf

script/module/jjcnewladder/Handler.lua

@@ -1,46 +1,47 @@
--- local JjcNewLadderLogic = require("jjcnewladder.jjcNewLadderLogic")
-
--- -- 请求天梯赛信息
--- function CG_JJC_NEW_LADDER_QUERY(human, msg)
--- 	JjcNewLadderLogic.JjcNewLadderLogic_Query(human)
--- end
-
--- -- 天梯赛对战记录查询
--- function CG_JJC_NEW_LADDER_RECORD_QUERY(human, msg)
--- 	JjcNewLadderLogic.JjcNewLadderLogic_RecordQuery(human)
--- end
-
--- -- 天梯赛对手查询
--- function CG_JJC_NEW_LADDER_TARGET_FIND(human, msg)
--- 	JjcNewLadderLogic.JjcNewLadderLogic_TargetFind(human)
--- end
-
--- -- 膜拜
--- function CG_JJC_NEW_LADDER_CHAMPION_WORSHIP(human, msg)
--- 	JjcNewLadderLogic.JjcNewLadderLogic_Worship(human, msg.uuid)
--- end
-
--- -- 排行榜查询
--- function CG_JJC_NEW_LADDER_RANK_QUERY(human, msg)
--- 	JjcNewLadderLogic.JjcNewLadderLogic_RankQuery(human)
--- end
-
--- -- 请求一键挑战 -- 直接获取奖励
--- function CG_JJC_NEW_LADDER_ONECLICK_CHANGE(human,msg)
--- 	JjcNewLadderLogic.JjcNewLadderLogic_OneClickChange(human)
--- end
-
--- -- 请求天梯赛上一轮排名前三
--- function CG_JJC_NEW_LADDER_QUERY_LAST_RANK(human,msg)
--- 	JjcNewLadderLogic.JjcNewLadderLogic_LastRankQuery(human)
--- end
-
--- -- 请求天梯赛排名奖励信息
--- function CG_JJC_NEW_LADDER_QUERY_RANKPRIZE(human, msg)
---     JjcNewLadderLogic.JjcNewLadderLogic_RankPrizeQuery(human)
--- end
+local JjcNewLadderLogic = require("jjcnewladder.jjcNewLadderLogic")
+
+-- 请求天梯赛信息
+function CG_JJC_NEW_LADDER_QUERY(human, msg)
+	JjcNewLadderLogic.JjcNewLadderLogic_Query(human)
+end
+
+-- 天梯赛对战记录查询
+function CG_JJC_NEW_LADDER_RECORD_QUERY(human, msg)
+	JjcNewLadderLogic.JjcNewLadderLogic_RecordQuery(human)
+end
+
+-- 天梯赛对手查询
+function CG_JJC_NEW_LADDER_TARGET_FIND(human, msg)
+	JjcNewLadderLogic.JjcNewLadderLogic_TargetFind(human)
+end
+
+-- 膜拜
+function CG_JJC_NEW_LADDER_CHAMPION_WORSHIP(human, msg)
+	JjcNewLadderLogic.JjcNewLadderLogic_Worship(human, msg.uuid)
+end
+
+-- 排行榜查询
+function CG_JJC_NEW_LADDER_RANK_QUERY(human, msg)
+	JjcNewLadderLogic.JjcNewLadderLogic_RankQuery(human)
+end
+
+-- 请求一键挑战 -- 直接获取奖励
+function CG_JJC_NEW_LADDER_ONECLICK_CHANGE(human,msg)
+	JjcNewLadderLogic.JjcNewLadderLogic_OneClickChange(human)
+end
+
+-- 请求天梯赛上一轮排名前三
+function CG_JJC_NEW_LADDER_QUERY_LAST_RANK(human,msg)
+	JjcNewLadderLogic.JjcNewLadderLogic_LastRankQuery(human)
+    
+end
+
+-- 请求天梯赛排名奖励信息
+function CG_JJC_NEW_LADDER_QUERY_RANKPRIZE(human, msg)
+    JjcNewLadderLogic.JjcNewLadderLogic_RankPrizeQuery(human)
+end
 
 -- 请求人物所有信息
--- function JjcNewLadderLogic_RankPrizeQuery(human, msg)
---     JjcNewLadderLogic.JjcNewLadderLogic_QueryAllInfo(human, msg.uuid, msg.nType)
--- end
+function CG_JJC_NEW_LADDER_QUERY_ALLINFO(human, msg)
+    JjcNewLadderLogic.JjcNewLadderLogic_QueryAllInfo(human, msg.uuid, msg.nType)
+end

script/module/jjcnewladder/jjcNewLadderDB.lua

@@ -45,9 +45,11 @@ end
 -- 判断是否是战区所属的第一个服
 local function JjcNewLadderDB_IsFirstServer(nServerID)
     local nServerIDConf = JjcNewLadderDB_TrueServerID2ConfServerID(nServerID)
-    
+    print("[JjcNewLadderDB_IsFirstServer] nServerIDConf = "..nServerIDConf)
+
     local bRet = false
-    for _, v in pairs(WarZoneConf) do
+    for _, v in ipairs(WarZoneConf.group) do
+        print("[JjcNewLadderDB_IsFirstServer] nMinServerID = "..v.nMinServerID)
         if v.nMinServerID == nServerIDConf then
             bRet = true
             break
@@ -114,6 +116,7 @@ local function JjcNewLadderDB_AddNpc(tNpcConfig, nID)
 	if #JJCNEWLADDERDB_ROBOT_RANK < JjcNewLadderDefine.JJC_NEWLADDER_ROBOT_NUM then
 		JJCNEWLADDERDB_ROBOT_RANK[#JJCNEWLADDERDB_ROBOT_RANK + 1] = jjcData
 	end
+    print("[JjcNewLadderDB_AddNpc] 初始化机器人成功 nID = "..nID)
 end
 
 -- 初始化机器人数据
@@ -122,9 +125,10 @@ local function JjcNewLadderDB_InitRobot()
         return
     end
 
+    print("[JjcNewLadderDB_InitRobot] 初始化机器人数据开始")
     -- 生成NPC数据
+    local nID = 1
     for _, npcConfig in ipairs(JjcExcel.skyladdernpc) do
-        local nID = 1
         for i = 1, npcConfig.cnt do
             JjcNewLadderDB_AddNpc(npcConfig, nID)
             nID = nID + 1
@@ -145,6 +149,7 @@ local function JjcNewLadderDB_SortRank()
 		table.sort(JJCNEWLADDERDB_ALL_RANK, JjcNewLadderDB_ownCmp)
 	end
 
+    print("[JjcNewLadderDB_SortRank] 排序结束")
 	for rank = 1, #JJCNEWLADDERDB_ALL_RANK do
 		local uuid = JJCNEWLADDERDB_ALL_RANK[rank].uuid
 		UUID_2_RANK[uuid] = rank
@@ -170,6 +175,7 @@ local function JjcNewLadderDB_FirstServerRest(nOperate)
     -- 
     -- 初始化机器人
     if true == nOperate then
+        print("[JjcNewLadderDB_FirstServerRest] 初始化机器人数据")
         JjcNewLadderDB_InitRobot()
     end
 
@@ -177,6 +183,30 @@ local function JjcNewLadderDB_FirstServerRest(nOperate)
     JjcNewLadderDB_SortRank()
 end
 
+-- 根据 uuid从db中取data
+local function JjcNewLadderDB_GetDBDataByUid(uuid)
+    -- MiddleRankQueryForData = {nRankType = 1, nRankSubType = 1, nServerKey = 1 ,uuid = 1}
+   
+    Jjc_QueryByUuid.uuid = uuid
+
+    local data = {}
+    LuaMongo.find(DB.db_jjcLadder, Jjc_QueryByUuid)
+    return LuaMongo.next(data) and data
+end
+
+-- 更新DB数据
+local function JjcNewLadderDB_UpdateDBData(data)
+    local oldData = JjcNewLadderDB_GetDBDataByUid(data.uuid)
+    if oldData then
+        Jjc_QueryByUuid.uuid = data.uuid
+        LuaMongo.update(DB.db_jjcLadder, Jjc_QueryByUuid, data)
+        print("[JjcNewLadderDB_UpdateDBData] 存在旧数据进行更新")
+    else
+        LuaMongo.insert(DB.db_jjcLadder, data)
+        print("[JjcNewLadderDB_UpdateDBData] 不存在旧数据直接进行插入")
+    end
+end
+
 -- 初始化数据
 function JjcNewLadderDB_Init()
     if JjcNewLadderDB_IsFirstServer(Config.SVR_INDEX) then
@@ -209,21 +239,25 @@ local function JjcNewLadderDB_LoadData()
 
     	if data.point then
     		JJCNEWLADDERDB_ALL_RANK[#JJCNEWLADDERDB_ALL_RANK + 1] = data
-    	else
-    		return
+        else
+            print("[JjcNewLadderDB_LoadData] 居然存在没有积分的 数据 uuid = "..data.uuid)
     	end
     end
 
+    print("[JjcNewLadderDB_LoadData] 加载数据完成，共加载 "..#JJCNEWLADDERDB_ALL_RANK)
+
     -- 加载完排序
     JjcNewLadderDB_SortRank()
 
+    print("[JjcNewLadderDB_LoadData] 排序完成")
+
     for i = 1, #JJCNEWLADDERDB_ALL_RANK do
     	if #JJCNEWLADDERDB_ROBOT_RANK >= JjcNewLadderDefine.JJC_NEWLADDER_ROBOT_NUM then
     		break
     	end
 
     	local tRankData = JJCNEWLADDERDB_ALL_RANK[i]
-    	if isNpc(tRankData) then
+    	if tRankData.nIsHuman == 1 then
 			JJCNEWLADDERDB_ROBOT_RANK[#JJCNEWLADDERDB_ROBOT_RANK + 1] = tRankData   		
     	end
     end
@@ -232,17 +266,24 @@ end
 -- 起服操作
 function JjcNewLadderDB_initAfterStart()
     if _G.is_middle == true then 
-        return 
+        return
     end
 
+    print("[JjcNewLadderDB_initAfterStart] DB数据开始初始化")
     if true == JjcNewLadderDB_IsFirstServer(Config.SVR_INDEX) then
+        print("[JjcNewLadderDB_initAfterStart] 是首个服进行DB数据操作")
+        
         if true == JjcNewLadderDB_isEmpty() then
+            print("[JjcNewLadderDB_initAfterStart] DB数据为空进行初始化机器人数据")
+
             JjcNewLadderDB_Init()
         else
+            print("[JjcNewLadderDB_initAfterStart] DB数据不为空进行加载DB数据")
+
             JjcNewLadderDB_LoadData()
         end
     else
-
+        print("[JjcNewLadderDB_initAfterStart] 不是首个服返回")
     end
 end
 
@@ -405,6 +446,8 @@ function JjcNewLadderDB_AddPoint(uuid, nAddPointNum)
     local tRankData = JjcNewLadderDB_GetDBDataByuid(uuid)
     if tRankData then
         tRankData.point = tRankData.point + nAddPointNum
+        -- 更新DB数据
+        JjcNewLadderDB_UpdateDBData(tRankData)
         JjcNewLadderDB_SortRank()
     end
 end

script/module/jjcnewladder/jjcNewLadderLogic.lua

@@ -19,9 +19,18 @@ local ItemDefine = require("bag.ItemDefine")
 local Grid = require("bag.Grid")
 local CombatVideo = require("combat.CombatVideo")
 local RoleLogic = require("role.RoleLogic")
--- local JjcNewLadderDefine = require("jjcnewladder.JjcNewLadderDefine")
--- local JjcNewLadderMiddle = require("jjcnewladder.jjcNewLadderMiddle")
--- local JjcNewLadderDB = require("jjcnewladder.jjcNewLadderDB")
+local JjcNewLadderDefine = require("jjcnewladder.jjcNewLadderDefine")
+local JjcNewLadderMiddle = require("jjcnewladder.jjcNewLadderMiddle")
+local JjcNewLadderDB = require("jjcnewladder.jjcNewLadderDB")
+local BagLogic = require("bag.BagLogic")
+local MiddleCommonLogic = require("middle.MiddleCommonLogic")
+local CombatDefine = require("combat.CombatDefine")
+local Broadcast = require("broadcast.Broadcast")
+local CombatLogic = require("combat.CombatLogic")
+local WarReportLogic = require("warReport.WarReportLogic")
+local MailManager = require("mail.MailManager")
+local Timer = require("core.Timer")
+local JjcActLogic = require("jjc.JjcActLogic")
 
 
 -- 请求加入天梯赛的玩家
@@ -49,6 +58,7 @@ local tCacheQueryRankPlaeyer = {}
 local function JjcNewLadderLogic_CheckIsOpen()
     local nNowTime = os.time()
     local nEndTime = CommonDB.GetJjcLadderEndTime()
+    print("[JjcNewLadderLogic_CheckIsOpen] nNowTime = "..nNowTime.." nEndTime = "..nEndTime)
     if 0 >= nEndTime then
         local tDate = os.date("*t",nNowTime)
         if tDate.wday >= JjcNewLadderDefine.JJC_NEWLADDER_OPENDAY and JjcNewLadderDefine.JJC_NEWLADDER_OPENDAY <= tDate.wday then
@@ -1334,4 +1344,62 @@ function onLogin(human)
             end
         end
     end
+end
+
+-- 获取活动状态
+function getActState()
+    local bRet = JjcNewLadderLogic_CheckIsOpen()
+    if false == bRet then
+        return JjcActLogic.STATE_NOOPEN, 0
+    end
+
+    return JjcActLogic.STATE_START, JjcNewLadder_GetLeftTime()
+end
+
+function isActRed(human)
+    if human.db.lv < 50 then
+        return false
+    end
+
+    if false == JjcNewLadderLogic_CheckIsOpen() then
+        return false
+    end
+   
+    if not human.db.JjcNewLadder then
+        JjcNewLadderLogic_CreatDB(human)
+    end
+
+    local nFreeNum = JjcNewLadder_GetHumanFreeNum(human)
+    if nFreeNum > 0 then
+        return true
+    end
+
+    local nPayNum = JjcNewLadder_GetHumanPayNum(human)
+    if nPayNum > 0 then
+        return true
+    end
+
+    return false
+end
+
+function Init()
+    print("[JjcNewLadderLogic_Init] 起服操作开始")
+    -- if true == JjcNewLadderLogic_CheckIsOpen() then
+        local nEndTime = CommonDB.GetJjcLadderEndTime()
+        if 0 >= nEndTime then
+            local nNowTime = os.time()
+            local tDate = os.date("*t",nNowTime)
+            tDate.wday = JjcNewLadderDefine.JJC_NEWLADDER_ENDDAY
+            tDate.hour = 23
+            tDate.min = 0
+            tDate.sec = 0
+            nEndTime = os.time(tDate)
+            CommonDB.SetJjcLadderEndTime(nEndTime)
+            print("[JjcNewLadderLogic_Init] 设置了结束时间 nEndTime = "..nEndTime)
+        end
+
+        JjcNewLadderDB.JjcNewLadderDB_initAfterStart()
+    -- else
+    --     print("[JjcNewLadderLogic_Init] 当前不在时间内直接返回 ")
+    -- end
 end

script/module/platform/QQBigShot.lua

@@ -65,6 +65,10 @@ end
 -- 设置玩家大咖等级
 local function QQBigShot_SetLv(human, nLv)
     human.db.qqBigShot.nQQLv = nLv
+    if not human.db.yellow then
+        human.db.yellow = {}
+    end
+    human.db.yellow.lv = nLv
 end
 
 -- 获取玩家大咖等级

script/module/present/Proto.lua

@@ -934,7 +934,7 @@ CG_PRESENT_OPEN_POWERUP_QUERY = {}
 -- 请求开服活动-战力冲刺信息 回包
 GC_PRESENT_OPEN_POWERUP_QUERY = {
     {"nNowPower",   1,  "int"},
-    {"list",        15,  PowerPrize},
+    {"list",        25,  PowerPrize},
 }
 
 -- 请求领取战力冲刺奖励

script/module/racialTrial/RacialTrialLogic.lua

@@ -26,6 +26,8 @@ local MonsterGrid = require("monster.MonsterGrid")
 local Lang = require("common.Lang")
 local Broadcast = require("broadcast.Broadcast")
 local RoleSystemDefine = require("roleSystem.RoleSystemDefine")
+local TriggerDefine = require("trigger.TriggerDefine")
+local TriggerLogic = require("trigger.TriggerLogic")
 
 --开启玩法的等级要求
 local openCondLevel =  0
@@ -466,6 +468,8 @@ function onFightEnd(human, result, combatType, param1, combatInfo)
         combatInfo.rewardItem[i] = {itemID, itemCnt}
         BagLogic.addItem(human, itemID, itemCnt, RACIALTRIALLOG)
     end
+
+   TriggerLogic.PublishEvent(TriggerDefine.ZHONGZU_LEVEL, human.db._id, camp, 1)
 end
 
 --------------------------------------------------Respone------------------------------------

script/module/talisman/Proto.lua

@@ -22,6 +22,7 @@ CG_TALISMAN_QUERY = {
 }
 
 GC_TALISMAN_QUERY = {
+	{"nAllStar",			1,			"int"},				-- 总星数
 	{"type",      			1,   		"byte"},			--秘宝类型
 	{"talismanVec", 		10, 		TALISMAN_INFO}		--当前类型的所有秘宝数据
 }

script/module/talisman/TalismanLogic.lua

@@ -20,7 +20,8 @@ local HeroConfig = require("excel.hero").hero
 local HuanJingTowerLogic = require("huanjingTower.HuanjingTowerLogic")
 local RoleSystemLogic = require("roleSystem.RoleSystemLogic")
 local RoleSystemDefine = require("roleSystem.RoleSystemDefine")
-
+local TriggerDefine = require("trigger.TriggerDefine")
+local TriggerLogic = require("trigger.TriggerLogic")
 
 local LOGTYPE = "talisman"
 local COND_TOWER_LEVEL = 100 --开启本系统需要通关恶魔之塔的层数
@@ -118,6 +119,22 @@ local function dotJudgment(human, cfgHtbl)
     return false
 end
 
+-- 获取秘宝总星数
+local function talismanLogic_GetAllStar(human)
+    local nAllStar = 0
+    if not human.db.talismanData then
+        return nAllStar
+    end
+
+    for id, _ in pairs(talismanConfig) do
+        if human.db.talismanData[id] then
+            nAllStar = nAllStar + human.db.talismanData[id]
+        end
+    end
+
+    return nAllStar
+end
+
 --GM命令, 设置秘宝等级
 function GmSetlevel(human, id, level)
     local config = talismanConfig[id]
@@ -238,6 +255,7 @@ function Query(human, type_m)
     end
 
     local msgRet = Msg.gc.GC_TALISMAN_QUERY
+    msgRet.nAllStar = talismanLogic_GetAllStar(human)
     msgRet.type = type_m
     local talismanVec = msgRet.talismanVec
 
@@ -301,6 +319,14 @@ function UpGrade(human, id)
     RoleAttr.doCalc(human)
     ObjHuman.sendAttr(human, RoleDefine.ZHANDOULI)
 
+    if nLevel == 1 then
+        -- 激活
+        TriggerLogic.PublishEvent(TriggerDefine.MIBAO_ACTIVATE, human.db._id, id, 1)
+    end
+
+    -- 总星数
+    TriggerLogic.PublishEvent(TriggerDefine.MIBAO_ALLSTAR, human.db._id, 1)
+
     --刷新红点
     nLevel = nLevel + 1
     costItemCnt = math.ceil(nLevel/3)
@@ -322,4 +348,5 @@ function UpGrade(human, id)
         RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2006)
     end
 
+    Query(human, type)
 end

script/module/trigger/TriggerDefine.lua

@@ -55,6 +55,12 @@ LOSTTEMPLE_PASS_LAYER      = 48          --  失落神庙通关某层
 SET_TITLE                  = 49          --  设置称号
 FUWEN_GETQUALITY           = 50          --  符文获取(参数:品质、数量)
 EQUIP_GETQUALITY           = 51          --  装备获取(参数:品质、数量)
+HUMAN_LV_UP                = 52          --  人物等级提升
+MIBAO_ACTIVATE             = 53          --  秘宝激活
+YIWU_ACTIVATE              = 54          --  遗物激活
+ZHONGZU_LEVEL              = 55          --  种族试炼
+MIBAO_ALLSTAR              = 56          --  秘宝总星数
+YIWU_ALLSTAR               = 57          --  遗物总星数             
 
 
 --触发事件后, 新值与旧值相加

script/module/winnerRelic/Proto.lua

@@ -27,7 +27,7 @@ CG_SACRED_RELIC_QUERY = {
 
 -- 服务端返回遗物列表
 GC_SACRED_RELIC_QUERY = {
-    
+    {"nAllStar",			1,			"int"},				-- 总星数
     {"SacredRelicConfigs", 20, SacredRelicNet},-- 星级配置
 }
 

script/module/winnerRelic/WinnerRelicLogic.lua

@@ -14,6 +14,9 @@ local RoleSystemDefine = require("roleSystem.RoleSystemDefine")
 local HeroLogic = require("hero.HeroLogic")
 local RoleSystemLogic = require("roleSystem.RoleSystemLogic")
 local Util = require("common.Util")
+local TriggerDefine = require("trigger.TriggerDefine")
+local TriggerLogic = require("trigger.TriggerLogic")
+
 local LOGTYPE = "WinnerRelic"
 local relicUpgradeConfig = relicModule.RelicUpgrade  -- 获取升级配置表
 local relicDataConfig = relicModule.RelicData       -- 获取遗物数据表
@@ -102,11 +105,30 @@ local function AddTableAttr2(tNode, tConfig, tConfig2)
     tNode[4].value = tConfig2.nSpeed
 end
 
+-- 获取所有圣遗物的总星级
+local function WinnerRelic_GetAllStar(human)
+    local nAllStar = 0
+    if not human.db.relicListData or not human.db.relicListData.status then
+        return nAllStar
+    end
+
+    local tDBData = human.db.relicListData.status
+    for relicId, _ in pairs(relicDataConfig) do
+        if tDBData[relicId] then
+            nAllStar = nAllStar + tDBData[relicId]
+        end
+    end
+
+    return nAllStar
+end
+
 function Listofrelics(human)
     -- if not isOpen(human) then
     --     return Broadcast.sendErr(human, Lang.COMMON_NOT_OPEN)
     -- end
 	local tMsgData = Msg.gc.GC_SACRED_RELIC_QUERY
+    tMsgData.nAllStar = WinnerRelic_GetAllStar(human)
+    
 	local RelicConfigs = tMsgData.SacredRelicConfigs
     local relicData = human.db.relicListData or {}  --数据库
     relicData.status = relicData.status or {}
@@ -247,6 +269,14 @@ function ActiveandUpgrade(human,relicId)
         RelicData.heroIdx[0] = 0
     end
 
+    if nextStar == 1 then
+        -- 激活
+        TriggerLogic.PublishEvent(TriggerDefine.YIWU_ACTIVATE, human.db._id, relicId, 1)
+    end
+    
+    -- 总星数
+    TriggerLogic.PublishEvent(TriggerDefine.YIWU_ALLSTAR, human.db._id, 1)
+
     --更新英雄身上穿的遗物的星级
 
     -- tMsgData = relicData
@@ -271,6 +301,8 @@ function ActiveandUpgrade(human,relicId)
         --刷新入口处
         RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2021)
     end
+
+    Listofrelics(human)
 end
 
 function putmsg(human,RelicData,relicCfg,oldid,isexist)