提交周任务和荣耀历程相关代码

script/core/ObjHuman.lua

@@ -856,22 +856,6 @@ function updateDaily(human, isGm)
 	RoleSystemLogic.onLogin(human)
 end
 
-
---周任务每周更新一次
-
-function updateWeek(human)
-	--每周一 0：0:0清空数据
-
-	local currentTime = os.time()
-    local dateTable = os.date("*t", currentTime)
-    if dateTable.wday == 2 and dateTable.hour == 0 and dateTable.min == 0 and dateTable.sec == 0 then
-        human.db.weekTask = nil  
-        print("Weekly data cleared at "..os.date("%Y-%m-%d %H:%M:%S"))
-        return true  
-    end
-    return false  
-end
-
 --- GM角色立即存库
 function GM_SaveDB(human)
 	if not human then

script/module/WeekendLoopActivity/WeekendLoopActManager.lua

@@ -27,7 +27,7 @@ local WeekLoopActGuYu = require("WeekendLoopActivity.WeekendLoopActUseGuYu")
 local weekLoopActCard = require("WeekendLoopActivity.WeekendLoopActCard")
 local weekLoopActRank = require("WeekendLoopActivity.WeekendLoopActRank")
 local CommonDB = require("common.CommonDB")
-local WeekTaskLogic = require("dailyTask.WeekTaskLogic")
+
 -- 活动信息
 tWeekActInfo = nil
 -- {
@@ -493,8 +493,6 @@ function onTMDrawCard(human, funcID, parameter, parameter2)
     print("[onDrawCard] 天命召唤回调 parameter = "..parameter)
 
     weekLoopActCard.WeekActCard_UseCard(human, parameter, WeekLoopActDef.WEEKACT_CARD_TYPE_TIANMING)
-    -- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_3, 1)
-
 end
 
 -- 寻星回调

script/module/bag/ItemDefine.lua

@@ -85,7 +85,8 @@ ITEM_XIANZHI_DUIHUAN_ID 	    = 126       -- 先知转轴[英雄兑换用]
 ITEM_HERO_CHONGSHENG_ID	        = 132       -- 重生果实
 ITEM_HERO_HUITUI_ID 	        = 133       -- 英雄回退用的道具
 ITEM_FUWEN_JINGHUA              = 134       -- 符文精华
-
+ITEM_WEEKTASK_ID				= 181		-- 周任务积分
+ITEM_HONOR_ID					= 182		-- 荣耀积分
 
 ITEM_MANGHE_ID                  = 535       -- 盲盒钥匙
 ITEM_DRAWCARD_JINGYING_ID       = 538       -- 精英召唤卷轴

script/module/chat/Gm.lua

@@ -2094,6 +2094,9 @@ function d3.weekHonorJourney(human)
 	local d= honor.HonorJourneyTaskQuery(human)
 end
 
+function d3.honorclear(human)
+	honor.HonorJourney_GMClear(human)
+end
 
 function d3.weekreward(human)
 	local d= week.weekTaskGetReward(human)
@@ -2108,6 +2111,10 @@ function d3.dayhuoyue(human)
 	local d= day.CG_DAILYTASK_GET_HUOYUEBOX(human)
 end
 
+function d3.honorcaddpoint(human, nAddNum)
+	honor.HonorJourney_GMAddPoint(human, nAddNum)
+end
+
 function d3.dayreward(human)
 
 	local d= day.dailyTaskGetReward(human)

script/module/copy/DragonNestLogic.lua

@@ -591,7 +591,7 @@ function onFightEnd(human, result, combatType, cbParam, combatInfo)
     end
 
     --周任务 -9
-    -- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_9, 1)
+    WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_9, 1)
 end
 
 

script/module/dailyTask/DailyTaskLogic.lua

@@ -380,6 +380,6 @@ function onLogin(human)
 	dailyTaskQuery(human, true)
 
 	--周任务和荣耀历程
-	-- WeekTaskLogic.onLogin(human)
-	-- HonorTaskLogic.onLogin(human)
+	WeekTaskLogic.onLogin(human)
+	HonorTaskLogic.onLogin(human)
 end

script/module/dailyTask/Handler.lua

@@ -44,34 +44,34 @@ end
 
 
 --查询每周任务
--- function CG_WEEKTASK_QUERY(human)
--- 	-- WeekTaskLogic.WeekTaskQuery(human)
--- end
+function CG_WEEKTASK_QUERY(human)
+	WeekTaskLogic.WeekTaskQuery(human)
+end
 
--- -- 领取每周任务奖励
--- function CG_WEEKTASK_GET_REWARD(human, msg)
--- 	print("111111111111111111111111当前进进入领取周奖励")
--- 	-- WeekTaskLogic.weekTaskGetReward(human, msg.taskID)
--- end
+-- 领取每周任务奖励
+function CG_WEEKTASK_GET_REWARD(human, msg)
+	print("111111111111111111111111当前进进入领取周奖励")
+	WeekTaskLogic.weekTaskGetReward(human, msg.taskID)
+end
 
--- function CG_WEEKTASK_GET_HUOYUEBOX(human,msg)
--- 	-- WeekTaskLogic.CG_WEEKTASK_GET_HUOYUEBOX(human,msg.boxID)
--- end
+function CG_WEEKTASK_GET_HUOYUEBOX(human,msg)
+	WeekTaskLogic.CG_WEEKTASK_GET_HUOYUEBOX(human,msg.boxID)
+end
 
--- --查询荣耀历程
--- function CG_HONORJOURNEY_QUERY(human)
--- 	-- HonorJourney.HonorJourneyTaskQuery(human)
--- end
+--查询荣耀历程
+function CG_HONORJOURNEY_QUERY(human)
+	HonorJourney.HonorJourneyTaskQuery(human)
+end
 
--- -- 领取荣耀任务奖励
--- function CG_HONORJOURNEY_GET_REWARD(human, msg)
--- 	print("[CG_HONORJOURNEY_GET_REWARD] 收到领取奖励请求")
--- 	-- HonorJourney.HonorJourneyTaskGetReward(human, msg.taskID)
--- end
+-- 领取荣耀任务奖励
+function CG_HONORJOURNEY_GET_REWARD(human, msg)
+	print("[CG_HONORJOURNEY_GET_REWARD] 收到领取奖励请求")
+	HonorJourney.HonorJourneyTaskGetReward(human, msg.taskID)
+end
 
--- function CG_HONORJOURNEY_GET_HUOYUEBOX(human,msg)
--- 	--HonorJourney.CG_HONORJOURNEYTASK_GET_HUOYUEBOX(human,msg.boxID)
--- end
+function CG_HONORJOURNEY_GET_HUOYUEBOX(human,msg)
+	HonorJourney.CG_HONORJOURNEYTASK_GET_HUOYUEBOX(human,msg.boxID)
+end
 
 -- function CG_MAINTASK_QUERY(human, msg)
 -- 	MainTask.TaskQuery(human)

script/module/dailyTask/HonorJourney.lua

@@ -46,7 +46,7 @@ local function HonorJourneyTask_CreateDB(human)
 
     local tTaskPrize = human.db.HonorJourney.TaskPrize
     local tConf = HonorJourneyExcel.HonorJourney
-    for nID, v in ipairs(tConf) do
+    for nID, v in pairs(tConf) do
         if not tTaskPrize[nID] then
             tTaskPrize[nID] = {
                 nFinishNum = 0,
@@ -84,6 +84,13 @@ local function HonorJourneyTask_AddTaskFinishNum(human, nID, nValue)
     tDBTaskPrize[nID].nFinishNum = tDBTaskPrize[nID].nFinishNum + nValue
 end
 
+-- 设置任务完成次数
+local function HonorJourneyTask_SetTaskFinishNum(human, nID, nValue)
+    local tDBTaskPrize = human.db.HonorJourney.TaskPrize
+
+    tDBTaskPrize[nID].nFinishNum = nValue
+end
+
 function HonorJourney_GetTaskCof()
     return HonorJourneyExcel
 end
@@ -100,6 +107,7 @@ end
 local function HonorJourney_GetTaskFinishNum(human, nID)
     local tDBData = HonorJourneyTask_GetTaskDB(human)
     if not tDBData.TaskPrize[nID] then
+        print("[HonorJourney_GetTaskFinishNum] 不存在对应的任务ID nID = "..nID)
         return 0
     end
 
@@ -109,7 +117,7 @@ end
 -- 获取任务状态
 local function HonorJourney_GetTaskStatus(human, nID)
     local tDBData = HonorJourneyTask_GetTaskDB(human)
-    if not tDBData.TaskPrize or not tDBData.TaskPrize[nID] or not tDBData.TaskPrize[nID].isget then
+    if not tDBData.TaskPrize or not tDBData.TaskPrize[nID] or not tDBData.TaskPrize[nID].nState then
         return CommonDefine.COMMON_PRIZE_STATE_NOGET
     end
 
@@ -156,10 +164,18 @@ end
 function HonorJourney_CheckTaskStatus(human,nID)
     local nNowFinishNum = HonorJourney_GetTaskFinishNum(human, nID)
     local tConf = HonorJourneyExcel.HonorJourney[nID]
+    print("[HonorJourney_CheckTaskStatus] nID = "..nID.." nNowFinishNum = "..nNowFinishNum.." taskProcess = "..tConf.taskProcess)
     if nNowFinishNum >= tConf.taskProcess then
+        print("[HonorJourney_CheckTaskStatus] 满足条件 nID = "..nID)
         local nState = HonorJourney_GetTaskStatus(human,  nID)
         if CommonDefine.COMMON_PRIZE_STATE_NOGET == nState then
+            print("[HonorJourney_CheckTaskStatus] 进行设置 nID = "..nID)
             HonorJourney_SetTaskStatus(human, nID, CommonDefine.COMMON_PRIZE_STATE_CANGET)
+
+            local msgRet = Msg.gc.GC_WEEKSHARE_SET
+            msgRet.type = 5
+            msgRet.desc = tConf.taskDesc
+            Msg.send(msgRet,human.fd)
         end
     end
 end
@@ -211,10 +227,29 @@ local function HonorJourney_Gettaskpre(id)
     return taskPre
 end
 
+local function HonorJourneyTask_CheckFinshTask(human)
+    if human.db.moshou and human.db.moshou.lv then
+        local nNowFengHuangLv = human.db.moshou.lv
+        print("[HonorJourneyTask_CheckFinshTask] 当前凤凰等级 nNowFengHuangLv = "..nNowFengHuangLv)
+        for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
+            if v.triggerType == TriggerDefine.FENGHUANGLV then
+                if nNowFengHuangLv >= v.taskProcess then
+                    print("[HonorJourneyTask_CheckFinshTask] 当前凤凰等级大于任务配置的等级 nNowFengHuangLv = "..nNowFengHuangLv.." taskProcess = "..v.taskProcess)
+
+                    HonorJourneyTask_SetTaskFinishNum(human, nID, nNowFengHuangLv)
+                    HonorJourney_CheckTaskStatus(human, nID)
+                end
+            end
+        end
+    else
+        print("[HonorJourneyTask_CheckFinshTask] 不存在对应的凤凰数据 name = "..human.db.name)
+    end
+end
+
 function HonorJourneyTaskQuery(human, isOnLogin)
     print("当前进入荣耀历程查询")
     local sendErr = isOnLogin == false and true or false
-	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_801, sendErr) ~= true then
+	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_803, sendErr) ~= true then
 		return
 	end
 
@@ -227,27 +262,30 @@ function HonorJourneyTaskQuery(human, isOnLogin)
     local cnt = 0
     for nID, value in pairs(HonorJourneyConfig) do 
         local nPreTaskID = HonorJourney_Gettaskpre(nID)
-        -- 临时测试代码,解决老号问题
-        if not human.db.HonorJourney.TaskPrize or not human.db.HonorJourney.TaskPrize[nID] or not human.db.HonorJourney.TaskPrize[nID].nState then
-            HonorJourneyTask_CreateDB(human)
-        end
-
         local nState = HonorJourney_GetTaskStatus(human, nID)
         local nFinishNum = HonorJourney_GetTaskFinishNum(human, nID)
-        print("[HonorJourneyTaskQuery] nID = "..nID.." nState = "..nState.." nFinishNum = "..nFinishNum.." maxCnt = "..value.taskProcess)
+        --print("[HonorJourneyTaskQuery] nID = "..nID.." nState = "..nState.." nFinishNum = "..nFinishNum.." maxCnt = "..value.taskProcess)
         if CommonDefine.COMMON_PRIZE_STATE_GET ~= nState then
-            local bSow = true
+            local bSow = value.isVisiable == HONORJOURNEY_SHOWTASK and true or false
+
             -- 获取前置任务状态
             if nPreTaskID then
                 local nPreTaskState = HonorJourney_GetTaskStatus(human, nPreTaskID)
-                print("[HonorJourneyTaskQuery] 存在前置任务 nID = "..nID.." nPreTaskID = "..nPreTaskID.." nPreTaskState = "..nPreTaskState)
-                if CommonDefine.COMMON_PRIZE_STATE_NOGET == nPreTaskState then
-                    bSow = false
+                --print("[HonorJourneyTaskQuery] 存在前置任务 nID = "..nID.." nPreTaskID = "..nPreTaskID.." nPreTaskState = "..nPreTaskState)
+                if CommonDefine.COMMON_PRIZE_STATE_NOGET ~= nPreTaskState then
+                    print("[HonorJourneyTaskQuery] 当前任务显示 nID = "..nID)
+                    bSow = true
                 end
             end
 
+            -- 能领取了都要显示出来
+            if CommonDefine.COMMON_PRIZE_STATE_CANGET == nState then
+                bSow = true
+            end
+
             -- 显示才下发
-            if value.isVisiable == HONORJOURNEY_SHOWTASK or true == bSow then
+            if true == bSow then
+                print("[HonorJourneyTaskQuery] 判断通过的任务 ID  = "..nID)
                 cnt = cnt + 1
                 msgRet.list[cnt].taskID = nID
                 msgRet.list[cnt].desc = value.taskDesc
@@ -264,7 +302,7 @@ function HonorJourneyTaskQuery(human, isOnLogin)
                 msgRet.list[cnt].jump = value.panelID or 0
 
                 msgRet.list[cnt].finishCnt = HonorJourney_GetTaskFinishNum(human, nID)
-                msgRet.list[cnt].isGet = (nState == CommonDefine.COMMON_PRIZE_STATE_CANGET) and 1 or 0
+                msgRet.list[cnt].isGet = (nState == CommonDefine.COMMON_PRIZE_STATE_GET) and 1 or 0
             end
         end
     end
@@ -278,15 +316,18 @@ function HonorJourneyTaskQuery(human, isOnLogin)
     -- 初始化box数据结构
     for nID, v in ipairs(HonorJourneyExcel.Reward) do
         local nState = HonorJourney_GetTaskPointPrize(human, nID)
+        print("[HonorJourneyTaskQuery] nID = "..nID .." nState = "..nState)
         if nState ~= CommonDefine.COMMON_PRIZE_STATE_GET then
             msgRet.huoYueBox[ret].boxID = nID
             msgRet.huoYueBox[ret].needHuoYue = v.needcnt
-            msgRet.huoYueBox[ret].items[0] = 1  -- 现在每个box只有1个奖励
-            local itemID = v.reward[1]
-            local itemCnt = v.reward[2]
+            msgRet.huoYueBox[ret].items[0] = #v.reward
+            for nIndex, tGoods in ipairs(v.reward) do
+                local itemID = tGoods[1]
+                local itemCnt = tGoods[2]
+                
+                Grid.makeItem(msgRet.huoYueBox[ret].items[nIndex], itemID, itemCnt)
+            end
             
-            Grid.makeItem(msgRet.huoYueBox[ret].items[1], itemID, itemCnt)
-
             msgRet.huoYueBox[ret].isGet = 0
             break
         end
@@ -322,7 +363,7 @@ local function calcReward(human, awardCfg)
 end
 
 function HonorJourneyTaskGetReward(human)
-    if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_801) ~= true then
+    if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_803) ~= true then
         print("[HonorJourneyTaskGetReward] 未开启直接返回")
 		return
 	end
@@ -337,12 +378,17 @@ function HonorJourneyTaskGetReward(human)
             for _, tGoods in ipairs(v.reward) do
                 local nGoodsID = tGoods[1]
                 local nGoodsNum = tGoods[2]
-                if not tAddItem[nGoodsID] then
+                if not tAddItem[nGoodsID] and nGoodsID ~= ItemDefine.ITEM_HONOR_ID then
                     tAddItem[nGoodsID] = 0
                 end
-                tAddItem[nGoodsID] = tAddItem[nGoodsID] + nGoodsNum
+                
+                if nGoodsID ~= ItemDefine.ITEM_HONOR_ID then
+                    tAddItem[nGoodsID] = tAddItem[nGoodsID] + nGoodsNum
+                else 
+                    nAddPoint = nAddPoint + nGoodsNum
+                end
             end
-            nAddPoint = nAddPoint + v.taskCnt
+            -- nAddPoint = nAddPoint + v.taskCnt
         end
     end
 
@@ -363,7 +409,7 @@ function HonorJourneyTaskGetReward(human)
         HonorJourney_CheckTaskPointStatus(human)
 
 		HonorJourneyTaskQuery(human)
-		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
 	end
 end
 
@@ -400,19 +446,17 @@ function CG_HONORJOURNEYTASK_GET_HUOYUEBOX(human, nBoxID)
     end
 
     HonorJourney_SetTaskPointPrize(human, nBoxID, CommonDefine.COMMON_PRIZE_STATE_GET)
-    local tAddItem = 
-    {
-        {tConfig.reward[1], tConfig.reward[2],}
-    }
-    BagLogic.addItemList(human, tAddItem, "honorjourney")
+
+    BagLogic.addItemList(human, tConfig.reward, "honorjourney")
     HonorJourneyTaskQuery(human)
-    RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+    RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
 end
 
 
 function isDot(human)
 	-- 主界面的任务包含2个标签 每日任务/成就
-	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_801) ~= true then
+	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_803) ~= true then
+        print("[HonorJourney_isDot] 当前系统未开放直接返回false")
 		return false
 	end
 
@@ -439,14 +483,14 @@ end
 local tEventHandler = nil
 -- 起服处理
 local function HonorJourneyTask_EvnentCommon(nEventType, uuid, nValue, nArgumentType)
-    print("当前进入荣耀历程增加次数..............................",nArgumentType)
+    print("当前进入荣耀历程增加次数..............................",nEventType, nArgumentType)
     local human = ObjHuman.onlineUuid[uuid]
     if not human then
         print("[HonorJourneyTask_EvnentCommon] 玩家不在线了？ nEventType = "..nEventType)
         return
     end
 
-    local tTaskID = getIDbyEventAndArgumentType(nEventType,nArgumentType)
+    local tTaskID = getIDbyEventAndArgumentType(nEventType, nArgumentType)
     if nil ~= _G.next(tTaskID) then
         for _, nID in ipairs(tTaskID) do
             HonorJourneyTask_AddTaskFinishNum(human,nID, nValue)
@@ -458,15 +502,16 @@ end
 local function HonorJourney_EvnentGetHero(nEventType, uuid, nValue1, nValue2)
     local human = ObjHuman.onlineUuid[uuid]
     if not human then
+        print("[HonorJourney_EvnentGetHero] 不存在对应的人物直接返回 nEventType = "..nEventType.." uuid = "..uuid)
         return
     end
+
     local nNum = nValue1
     local nStar = nValue2
     print("[HonorJourney_EvnentGetHero] nEventType = "..nEventType.." nNum = "..nNum.." nStar = "..nStar.." name = "..human.db.name)
 
     local bCheck, nTaskID = false, 0
-    local tConf = HonorJourney_GetTaskCof()
-    for nID, v in ipairs(tConf) do
+    for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
         if v.triggerType == nEventType then
             if not v.taskArgument or v.taskArgument == "" then
                 print("[HonorJourney_EvnentGetHero] 获得英雄但是没有获取到对应的配置参数要求")
@@ -512,11 +557,13 @@ local function HonorJourney_PowerChange(nEventType, uuid, nValue1, nValue2)
 
     if tTaksID and nil ~= _G.next(tTaksID) then
         for _, nID in pairs(tTaksID) do
-            HonorJourneyTask_AddTaskFinishNum(human, nID, nValue1)
-            HonorJourney_SetTaskStatus(human, nID, CommonDefine.COMMON_PRIZE_STATE_CANGET)
+            HonorJourneyTask_SetTaskFinishNum(human, nID, nValue1)
+            HonorJourney_CheckTaskStatus(human, nID)
+
+            -- HonorJourney_SetTaskStatus(human, nID, CommonDefine.COMMON_PRIZE_STATE_CANGET)
         end
 
-        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
     end
 end
 
@@ -539,16 +586,18 @@ local function HonorJourney_FengHuangLv(nEventType, uuid, nValue1, nValue2)
 
     if tTaksID and nil ~= _G.next(tTaksID) then
         for _, nID in pairs(tTaksID) do
-            HonorJourneyTask_AddTaskFinishNum(human, nID, nValue1)
-            HonorJourney_SetTaskStatus(human, nID, CommonDefine.COMMON_PRIZE_STATE_CANGET)
+            HonorJourneyTask_SetTaskFinishNum(human, nID, nValue1)
+            -- HonorJourney_SetTaskStatus(human, nID, CommonDefine.COMMON_PRIZE_STATE_CANGET)
+            HonorJourney_CheckTaskStatus(human, nID)
         end
 
-        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
     end
 end
 
 -- 打开宝箱
 local function HonorJourney_OpenBox(nEventType, uuid, nValue1, nBoxType)
+    print("[HonorJourney_OpenBox] 进入打开宝箱回调 nValue1 = "..nValue1.." nBoxType = "..nBoxType)
     local human = ObjHuman.onlineUuid[uuid]
     if not human then
         return
@@ -559,6 +608,7 @@ local function HonorJourney_OpenBox(nEventType, uuid, nValue1, nBoxType)
         if v.triggerType == nEventType then
             local nNeedBoxType = v.taskArgument
             local nState = HonorJourney_GetTaskStatus(human, nID)
+            print("[HonorJourney_OpenBox] ", nID, nNeedBoxType, nState)
             if nBoxType == nNeedBoxType and nState == CommonDefine.COMMON_PRIZE_STATE_NOGET then
                 table.insert(tTaksID, nID)
             end
@@ -566,12 +616,23 @@ local function HonorJourney_OpenBox(nEventType, uuid, nValue1, nBoxType)
     end
 
     if tTaksID and nil ~= _G.next(tTaksID) then
+        table.print_lua_table(tTaksID)
         for _, nID in pairs(tTaksID) do
+            local nOldNum = HonorJourney_GetTaskFinishNum(human, nID)
+            local nOldStaus = HonorJourney_GetTaskStatus(human, nID)
+            print("[HonorJourney_OpenBox] 久数据 nOldNum = "..nOldNum.." nOldStaus = "..nOldStaus)
+
             HonorJourneyTask_AddTaskFinishNum(human, nID, nValue1)
             HonorJourney_CheckTaskStatus(human, nID)
+
+            local nNewNum = HonorJourney_GetTaskFinishNum(human, nID)
+            local nNewStaus = HonorJourney_GetTaskStatus(human, nID)
+            print("[HonorJourney_OpenBox] 新数据 nNewNum = "..nNewNum.." nNewStaus = "..nNewStaus)
         end
 
-        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+        RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
+    else
+        print("[HonorJourney_OpenBox] 不存在满足条件的任务")
     end
 end
 
@@ -633,25 +694,37 @@ end
 
 -- 回调，增加次数
 function HonorJourneyTask_EventCallBack(nEventType, uuid, nValue1, nValue2)
-    -- if not tEventHandler then
-    --     Init()
-    -- end
-    -- if not tEventHandler or not tEventHandler[nEventType] then
-    --     print("当前已经返回",nEventType)
-    --     return
-    -- end
-    -- pcall(tEventHandler[nEventType], nEventType, uuid, nValue1, nValue2)
+    if not tEventHandler then
+        Init()
+    end
+    if not tEventHandler or not tEventHandler[nEventType] then
+        print("当前已经返回",nEventType)
+        return
+    end
+
+    print("[HonorJourneyTask_EventCallBack] 触发事件回调 nEventType = "..nEventType.." nValue1 = "..nValue1)
+    pcall(tEventHandler[nEventType], nEventType, uuid, nValue1, nValue2)
+    print("[HonorJourneyTask_EventCallBack] 触发事件回调 处理结束 ")
 end
 
 function onLogin(human)	
     print("当前进入荣耀历程登录")
 
-    -- HonorJourneyTask_CheckCreateDB(human)
+    HonorJourneyTask_CheckCreateDB(human)
+
+    HonorJourneyTask_CheckFinshTask(human)
 
-    -- HonorJourney_OnLoginSubEvent(human)
+    HonorJourney_OnLoginSubEvent(human)
 
 	-- HonorJourneyTaskQuery(human, true)
 end
 
+function HonorJourney_GMClear(human)
+    HonorJourneyTask_CreateDB(human)
+    print("[HonorJourney_GMClear] 重置数据成功")
+end
 
-
+function HonorJourney_GMAddPoint(human, nAddPoint)
+    HonorJourney_AddTaskPoint(human, nAddPoint)
+    HonorJourney_CheckTaskPointStatus(human)
+end

script/module/dailyTask/Proto.lua

@@ -6,8 +6,8 @@ CG_DAILYTASK_QUERY = {}
 DailyTaskData = {
 	{"taskID",            1,       "int"},
 	{"desc",              1,       "string"},
-	{"finishCnt",         1,       "short"},
-	{"maxCnt",            1,       "short"},
+	{"finishCnt",         1,       "int"},
+	{"maxCnt",            1,       "int"},
 	{"itemData",          5,       ItemData},
 	{"isGet",             1,       "byte"},  -- 1已领奖  0未领奖
 	{"jump",              1,       "int"},    -- 跳转板子
@@ -16,8 +16,8 @@ DailyTaskData = {
 DailyShareData = {
 	{"taskID",            1,       "int"},
 	{"desc",              1,       "string"},
-	{"finishCnt",         1,       "short"},
-	{"maxCnt",            1,       "short"},
+	{"finishCnt",         1,       "int"},
+	{"maxCnt",            1,       "int"},
 	{"itemData",          10,       ItemData},
 	{"isGet",             1,       "byte"},  -- 1已领奖  0未领奖
 }
@@ -43,7 +43,7 @@ CG_DAILYTASK_GET_REWARD = {
 
 -- 完成任务
 GC_DAILYSHARE_SET = {
-    {"type",1,"byte"},      -- 1 日常 2 成就 3 历练
+    {"type",1,"byte"},      -- 1 日常 2 成就 3 历练 4 周任务 5 荣耀历程
     {"desc",1,"string"}
 }
 
@@ -122,61 +122,61 @@ CG_LILIAN_SHRE = {
 
 -- 查询每周任务
 
--- CG_WEEKTASK_QUERY ={}
+CG_WEEKTASK_QUERY ={}
 
--- GC_WEEKTASK_QUERY ={
--- 	{"nextRefreshTime",         1,          "int"},
--- 	{"list",                    20,         DailyTaskData},
--- 	{"huoYueBox",			    5,		    DailyTaskHuoYueBox},
--- 	{"nowHuoYue",			    1,		    "short"}, --当前活跃值
--- }
+GC_WEEKTASK_QUERY ={
+	{"nextRefreshTime",         1,          "int"},
+	{"list",                    20,         DailyTaskData},
+	{"huoYueBox",			    5,		    DailyTaskHuoYueBox},
+	{"nowHuoYue",			    1,		    "short"}, --当前活跃值
+}
 
--- -- 领取每周任务奖励
--- CG_WEEKTASK_GET_REWARD = {
--- 	{"taskID",            1,       "int"},
--- }
+-- 领取每周任务奖励
+CG_WEEKTASK_GET_REWARD = {
+	{"taskID",            1,       "int"},
+}
 
 
--- GC_WEEKSHARE_SET = {
--- 	{"type",1,"byte"},      -- 1 日常 2 成就 3 历练
---     {"desc",1,"string"}
--- }
--- -- 领取每周任务活跃宝箱
--- CG_WEEKTASK_GET_HUOYUEBOX = {
--- 	{"boxID",			  1,		"short"},
--- }
--- GC_WEEKTASK_GET_HUOYUEBOX = {
--- 	{"boxID",			  1,		"short"},
---     {"double",			  1,		"byte"},
--- }
+GC_WEEKSHARE_SET = {
+	{"type",1,"byte"},      -- 1 日常 2 成就 3 历练
+    {"desc",1,"string"}
+}
+-- 领取每周任务活跃宝箱
+CG_WEEKTASK_GET_HUOYUEBOX = {
+	{"boxID",			  1,		"short"},
+}
+GC_WEEKTASK_GET_HUOYUEBOX = {
+	{"boxID",			  1,		"short"},
+    {"double",			  1,		"byte"},
+}
 
 
--- -- 荣耀历程
+-- 荣耀历程
 
--- CG_HONORJOURNEY_QUERY = {
+CG_HONORJOURNEY_QUERY = {
 
--- }
+}
 
 
--- GC_HONORJOURNEY_QUERY = {
--- 	{"list",                    60,         DailyTaskData},
--- 	{"huoYueBox",			    5,		    DailyTaskHuoYueBox},
--- 	{"nowHuoYue",			    1,		    "short"},
--- }
+GC_HONORJOURNEY_QUERY = {
+	{"list",                    60,         DailyTaskData},
+	{"huoYueBox",			    5,		    DailyTaskHuoYueBox},
+	{"nowHuoYue",			    1,		    "short"},
+}
 
--- -- 领取荣耀任务奖励
--- CG_HONORJOURNEY_GET_REWARD = {
--- 	{"taskID",            1,       "int"},
--- }
+-- 领取荣耀任务奖励
+CG_HONORJOURNEY_GET_REWARD = {
+	{"taskID",            1,       "int"},
+}
 
--- CG_HONORJOURNEY_GET_HUOYUEBOX = {
--- 	{"boxID",			  1,		"short"},
--- }
+CG_HONORJOURNEY_GET_HUOYUEBOX = {
+	{"boxID",			  1,		"short"},
+}
 
--- GC_HONORJOURNEY_GET_HUOYUEBOX = {
--- 	{"boxID",			  1,		"short"},
---     {"double",			  1,		"byte"},
--- }
+GC_HONORJOURNEY_GET_HUOYUEBOX = {
+	{"boxID",			  1,		"short"},
+    {"double",			  1,		"byte"},
+}
 
 --------------------------------------主线任务流-----------------------------------------
 --查询

script/module/dailyTask/WeekTaskLogic.lua

@@ -37,7 +37,7 @@ WEEK_TASK_ID_10 = 10 --魔王珠玑跳转7次 o
 function WeekTaskQuery(human, isOnLogin)
 	-- print("当前进入周任务查询")
 	local sendErr = isOnLogin == false and true or false
-	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_801, sendErr) ~= true then
+	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_802, sendErr) ~= true then
 		return
 	end
 
@@ -102,8 +102,8 @@ function WeekTaskQuery(human, isOnLogin)
 
 	msgRet.list[0] = cnt
 	-- table.print_lua_table(msgRet)
-	-- print("周任务查询成功!")
-	-- Msg.send(msgRet, human.fd)
+	print("周任务查询成功!")
+	Msg.send(msgRet, human.fd)
 end
 
 --统计奖励
@@ -111,7 +111,7 @@ local function calcReward(human, awardCfg)
 	for i = 1, #awardCfg do
 		local itemId = awardCfg[i][1]
 		local itemCnt = awardCfg[i][2]
-        if itemId == ItemDefine.ITME_HUOYUE_ID then
+        if itemId == ItemDefine.ITEM_WEEKTASK_ID then
             onWeekTaskHuoYue(human,itemCnt)
         else
 			local newCnt = math.ceil(itemCnt)
@@ -123,7 +123,7 @@ end
 -- 领取每周任务奖励
 function weekTaskGetReward(human, taskID)
 	print("当前进入领取每周奖励")
-	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_801) ~= true then
+	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_802) ~= true then
 		return
 	end
 	print("当前进入领取每周奖励1111111111111111111111111111")
@@ -148,7 +148,7 @@ function weekTaskGetReward(human, taskID)
 				end
 				
 				calcReward(human, weekTaskConfig.reward)
-				onWeekTaskHuoYue(human,10)
+				-- onWeekTaskHuoYue(human,10)
 				data.isGet = true
 			end
 		end
@@ -157,7 +157,7 @@ function weekTaskGetReward(human, taskID)
 	if isClean then
 		BagLogic.addMomentItemList(human, "week_task")
 		WeekTaskQuery(human)
-		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_802)
 	end
 
 	print("每周奖励领取完毕")
@@ -185,14 +185,14 @@ function recordWeekTaskFinishCnt(human, taskID, addCnt, noSend)
 		print("[WeekTaskLogic-recordWeekTaskFinishCnt].3333333333333333333333333333333333",addCnt)
 		human.db.weekTask.task[taskID].finishCnt = weekTaskConfig.taskProgress
 		human.db.weekTask.task[taskID].state = 1
-		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_802)
 
         ChengjiuLogic.onCallback(human,ChengjiuDefine.CJ_TASK_TYPE_12,1)
 
         local msgRet = Msg.gc.GC_WEEKSHARE_SET
-        msgRet.type = 1
+        msgRet.type = 4
         msgRet.desc = weekTaskConfig.taskDesc
-        -- Msg.send(msgRet,human.fd)
+        Msg.send(msgRet,human.fd)
 
 	end
 	print("[WeekTaskLogic-recordWeekTaskFinishCnt].44444444444444444444444444444444444",addCnt)
@@ -234,7 +234,7 @@ function CG_WEEKTASK_GET_HUOYUEBOX(human,boxID)
 	end
 
 
-	local double = RoleSystemLogic.isDouble(human, RoleSystemDefine.ROLE_SYS_ID_801)
+	local double = RoleSystemLogic.isDouble(human, RoleSystemDefine.ROLE_SYS_ID_802)
     local rewardCnt = double and 2 or 1
     local cjPrivilege = ChengjiuLogic.checkPrivilege(human,ChengjiuDefine.PRIVILEGE_TYPE_2)
 
@@ -272,19 +272,19 @@ function CG_WEEKTASK_GET_HUOYUEBOX(human,boxID)
 			msgRet.double = double and 1 or 0
 			print("当前周活跃奖励领取完毕")
 			print("当前下发周活跃奖励")
-			--Msg.send(msgRet,human.fd)
+			Msg.send(msgRet,human.fd)
 		end
 	end
 
 	if len > 0 then
 		BagLogic.addItemList(human, awardList, "week_task")
-		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_801)
+		RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_802)
 	end
 end
 
 function isDot(human)
 	-- 主界面的任务包含2个标签 每日任务/成就
-	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_801) ~= true then
+	if RoleSystemLogic.isOpen(human, RoleSystemDefine.ROLE_SYS_ID_802) ~= true then
 		return false
 	end
 	
@@ -294,16 +294,18 @@ function isDot(human)
 				local weekTaskConfig = WeekTaskExcel.weekTask[k]
 				if weekTaskConfig then
 					local cnt = v.finishCnt or 0
-					if cnt >= weekTaskConfig.taskProcess then
+					if cnt >= weekTaskConfig.taskProgress then
 						return true
 					end
 				end
-			end		
+			end
 		end	
 	end
 
 	for i=1,#WeekTaskExcel.huoYueBox do
-		if huoYueBoxCanGet(human,i) then return true end
+		if huoYueBoxCanGet(human,i) then 
+			return true 
+		end
 	end
 	
 	return false
@@ -316,7 +318,25 @@ function onWeekTaskHuoYue(human,sum)
 
     YunYingLogic.onCallBack(human, "onDailyTask",sum)   
 end
+
+function WeekTaskLogic_Refsh(human)
+	if not human.db.weekTask then
+		human.db.weekTask = {}
+		human.db.weekTask.nTime = os.time()
+	else
+		if not human.db.weekTask.nTime then
+			human.db.weekTask.nTime = os.time()
+		end
+		
+		local nLastTime = human.db.weekTask.nTime
+		local bIsWeek = Util.isSameWeek(nLastTime, os.time())
+		if false == bIsWeek then
+			human.db.weekTask = {}
+			human.db.weekTask.nTime = os.time()
+		end
+	end
+end
+
 function onLogin(human)	
-	-- recordWeekTaskFinishCnt(human, DAILY_TASK_ID_1, 1, true)
-	-- WeekTaskQuery(human, true)	
+	WeekTaskLogic_Refsh(human)
 end

script/module/drawCard/DrawCardLogic.lua

@@ -724,7 +724,7 @@ local function draw(human, id, op, actConfig, skip,isAct)
         print("[draw] 高级召唤回调开始 222")
 
         --高级召唤周任务
-        -- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_2, heroCnt)
+        WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_2, heroCnt)
     end
 
     sendDrawOp(human, id, op, heroList, fenjielist, heroNewList,heroIndexList,isAct)

script/module/drill/DrillLogic.lua

@@ -1541,7 +1541,7 @@ function onFightEnd(human, result, combatType, cbParam, combatInfo)
 	onFightWinCallback(human,result, diff,cbParam.drillId)
     YunYingLogic.onCallBack(human, "onDrill",1)   
 	--周任务 -8
-	-- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_8, 1)
+	WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_8, 1)
 end
 
 --[[

script/module/mozhu/MoZhuLogic.lua

@@ -874,7 +874,7 @@ function onFightEnd(human,result, combatType, cbParam , combatInfo)
 
     YunYingLogic.onCallBack(human, "MoZhuCombat", 1)
     
-    -- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_10, 1)
+    WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_10, 1)
     TriggerLogic.PublishEvent(TriggerDefine.MOZHU_CHALLENGE, human.db._id, 1)
 end
 

script/module/shop/ShopLogic.lua

@@ -398,8 +398,9 @@ function buy(human, shopType, itemID, itemIndex, buyCnt)
 	    HeroGrowUp.onCallback(human, HeroGrowUp.TASKTYPE10, 1)
         YunYingLogic.onCallBack(human, "onShopBuy",1)  
 	    TriggerLogic.PublishEvent(TriggerDefine.EVENT_TYPE_SHOPBUY, human.db._id, 1)
-        -- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_7, 1)
     end
+    
+    WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_7, 1)
 end
 
 

script/module/treasurechest/TreasureChestLogic.lua

@@ -397,7 +397,7 @@ function TreasureChestLogic_Open(human, nBoxType, nBoxNum)
     TriggerLogic.PublishEvent(TriggerDefine.EVENT_TYPE_OPENBOX, human.db._id, nBoxNum,nBoxType)
     print("TreasureChestLogic..当前已经进入商业活动注册事件",nBoxType)
     --周任务开启宝箱
-    -- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_5, 1)
+    WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_5, 1)
     TreasureChestLogic_Query(human)
 end
 

script/module/union/UnionEctypeLogic.lua

@@ -771,7 +771,7 @@ function onFightEnd(human, result, combatType, bossData, combatInfo)
     YunYingLogic.onCallBack(human, "onUnionEctypeFight",1)
 
     ---周任务公会boss挑战次数
-    -- WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_4, 1)
+    WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_4, 1)
 end
 
 
@@ -907,6 +907,7 @@ function saodang(human, level, touch)
     RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_1001)
     local WarOrder = require("shop.WarOrder")
     WarOrder.trigger(human,CLAN_ORDER_TYPE,killCnt or 1)
+    WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_4, killCnt or 1)
     YunYingLogic.onCallBack(human, "onUnionEctypeFight", killCnt or 0)
 end
 

script/module/xianzhi/XianzhiLogic.lua

@@ -24,6 +24,7 @@ local HeroGrowUp = require("absAct.HeroGrowUp")
 local YunYingLogic = require("yunying.YunYingLogic")
 local TriggerDefine = require("trigger.TriggerDefine")
 local TriggerLogic = require("trigger.TriggerLogic")
+local WeekTaskLogic = require("dailyTask.WeekTaskLogic")
 
 local xianzhiOutPutId = 126
 local xianzhiDelitem_Normal = 100
@@ -151,6 +152,7 @@ function zhaohuanDo(human, camp, cnt, skip)
     
     HeroGrowUp.onCallback(human, HeroGrowUp.TASKTYPE2, cnt)
     YunYingLogic.onCallBack(human, "onTMDrawCard", cnt)   
+	WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_3, cnt)
 
     TriggerLogic.PublishEvent(TriggerDefine.EVENT_TYPE_FATESUMMON, human.db._id, cnt)
 end

script/module/zhuanpan/ZhuanpanLogic.lua

@@ -427,12 +427,9 @@ function getReward(human, mainType, cnt)
 
     YunYingLogic.onCallBack(human, "onFindStar", cnt)
 
-	print("[寻星事件回调] 11111")
 	TriggerLogic.PublishEvent(TriggerDefine.EVENT_TYPE_FINDSTAR, human.db._id, cnt)
-	print("[寻星事件回调] 2222222")
     --周任务，寻星
-	-- WeekTaskLogic.recordDailyTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_1, 1)
-	
+	WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_1, cnt)
 end
 
 -- 购买许愿珠