提交荣耀历程新增人物

script/module/dailyTask/HonorJourney.lua

@@ -233,7 +233,8 @@ local function HonorJourneyTask_CheckFinshTask(human)
         print("[HonorJourneyTask_CheckFinshTask] 当前凤凰等级 nNowFengHuangLv = "..nNowFengHuangLv)
         for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
             if v.triggerType == TriggerDefine.FENGHUANGLV then
-                if nNowFengHuangLv >= v.taskProcess then
+                local nState = HonorJourney_GetTaskStatus(human,  nID)
+                if nNowFengHuangLv >= v.taskProcess and nState == CommonDefine.COMMON_PRIZE_STATE_NOGET then
                     print("[HonorJourneyTask_CheckFinshTask] 当前凤凰等级大于任务配置的等级 nNowFengHuangLv = "..nNowFengHuangLv.." taskProcess = "..v.taskProcess)
 
                     HonorJourneyTask_SetTaskFinishNum(human, nID, nNowFengHuangLv)
@@ -244,6 +245,17 @@ local function HonorJourneyTask_CheckFinshTask(human)
     else
         print("[HonorJourneyTask_CheckFinshTask] 不存在对应的凤凰数据 name = "..human.db.name)
     end
+
+    -- 检查新加的任务
+    local tTaskPrize = human.db.HonorJourney.TaskPrize
+    for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
+        if not tTaskPrize[nID] then
+            tTaskPrize[nID] = {
+                nFinishNum = 0,
+                nState = CommonDefine.COMMON_PRIZE_STATE_NOGET
+            }
+        end
+    end
 end
 
 function HonorJourneyTaskQuery(human, isOnLogin)
@@ -253,7 +265,7 @@ function HonorJourneyTaskQuery(human, isOnLogin)
 		return
 	end
 
-    print("1111111111111111111111111111111")
+    -- print("1111111111111111111111111111111")
 	local HonorJourneyConfig = HonorJourneyExcel.HonorJourney
 	if not HonorJourneyConfig then return end
 	
@@ -273,7 +285,7 @@ function HonorJourneyTaskQuery(human, isOnLogin)
                 local nPreTaskState = HonorJourney_GetTaskStatus(human, nPreTaskID)
                 --print("[HonorJourneyTaskQuery] 存在前置任务 nID = "..nID.." nPreTaskID = "..nPreTaskID.." nPreTaskState = "..nPreTaskState)
                 if CommonDefine.COMMON_PRIZE_STATE_NOGET ~= nPreTaskState then
-                    print("[HonorJourneyTaskQuery] 当前任务显示 nID = "..nID)
+                    -- print("[HonorJourneyTaskQuery] 当前任务显示 nID = "..nID)
                     bSow = true
                 end
             end
@@ -285,7 +297,7 @@ function HonorJourneyTaskQuery(human, isOnLogin)
 
             -- 显示才下发
             if true == bSow then
-                print("[HonorJourneyTaskQuery] 判断通过的任务 ID  = "..nID)
+                -- print("[HonorJourneyTaskQuery] 判断通过的任务 ID  = "..nID)
                 cnt = cnt + 1
                 msgRet.list[cnt].taskID = nID
                 msgRet.list[cnt].desc = value.taskDesc
@@ -333,10 +345,10 @@ function HonorJourneyTaskQuery(human, isOnLogin)
         end
     end
     -- table.print_lua_table(msgRet)
-	print("荣耀历程数据查询成功!")
+	-- print("荣耀历程数据查询成功!")
 	--Msg.trace(msgRet)
 	Msg.send(msgRet, human.fd)
-    print("协议下发成功!")
+    -- print("协议下发成功!")
 end
 
 function onHonorJourneyTaskHuoYue(human,sum)
@@ -368,11 +380,11 @@ function HonorJourneyTaskGetReward(human)
 		return
 	end
 
-    print("[HonorJourneyTaskGetReward] 1111111")
+    -- print("[HonorJourneyTaskGetReward] 1111111")
     local tAddItem, nAddPoint = {}, 0
 	for nID, v in pairs(HonorJourneyExcel.HonorJourney) do
         local nState = HonorJourney_GetTaskStatus(human, nID)
-        print("[HonorJourneyTaskGetReward] nID = "..nID.." nState = "..nState)
+        -- print("[HonorJourneyTaskGetReward] nID = "..nID.." nState = "..nState)
         if CommonDefine.COMMON_PRIZE_STATE_CANGET == nState then
             HonorJourney_SetTaskStatus(human, nID, CommonDefine.COMMON_PRIZE_STATE_GET)
             for _, tGoods in ipairs(v.reward) do
@@ -392,11 +404,7 @@ function HonorJourneyTaskGetReward(human)
         end
     end
 
-    print("[HonorJourneyTaskGetReward] 22222")
-
 	if nil ~= _G.next(tAddItem) then
-        print("[HonorJourneyTaskGetReward] 333333")
-
 		local tAddGoods = {}
         for nGoodsID, nGoodsNum in pairs(tAddItem) do
             table.insert(tAddGoods, {nGoodsID, nGoodsNum})
@@ -493,8 +501,11 @@ local function HonorJourneyTask_EvnentCommon(nEventType, uuid, nValue, nArgument
     local tTaskID = getIDbyEventAndArgumentType(nEventType, nArgumentType)
     if nil ~= _G.next(tTaskID) then
         for _, nID in ipairs(tTaskID) do
-            HonorJourneyTask_AddTaskFinishNum(human,nID, nValue)
-            HonorJourney_CheckTaskStatus(human, nID)
+            local nStatus = HonorJourney_GetTaskStatus(human, nID)
+            if nStatus == CommonDefine.COMMON_PRIZE_STATE_NOGET then
+                HonorJourneyTask_AddTaskFinishNum(human,nID, nValue)
+                HonorJourney_CheckTaskStatus(human, nID)
+            end
         end
         RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_803)
     end
@@ -523,9 +534,12 @@ local function HonorJourney_EvnentGetHero(nEventType, uuid, nValue1, nValue2)
                     print("[HonorJourneyTask_EvnentGetHero] 获取的任务 参数数量不正确")
                 else
                     if nNum >= tonumber(tTaskArgument[1]) and nStar == tonumber(tTaskArgument[2]) then
-                        HonorJourneyTask_AddTaskFinishNum(human, nID, 1)
-                        bCheck = true
-                        nTaskID = nID
+                        local nStatus = HonorJourney_GetTaskStatus(human, nID)
+                        if nStatus == CommonDefine.COMMON_PRIZE_STATE_NOGET then
+                            HonorJourneyTask_AddTaskFinishNum(human, nID, 1)
+                            bCheck = true
+                            nTaskID = nID
+                        end
                         break
                     end
                 end
@@ -610,7 +624,6 @@ 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
@@ -618,18 +631,9 @@ 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_803)

script/module/serverCommerce/ServerCommerceManager.lua

@@ -535,11 +535,8 @@ function CommerceAct_GetActTime(tData)
     local tCommerceInfo = CommonDB.GetCommerceActInfo()
     local nNowTime = os.time()
     if nNowTime < tCommerceInfo.nEndTime then
-       -- table.print_lua_table(tCommerceInfo)
         local bLater = nQueryOperate == ServerCommerceActDefine.COMMERCEACT_ZERO and true or false
         CommerceAct_CreateCacheInfo(1, bLater)
-        -- print("\n")
-        -- table.print_lua_table(tCommerceActInfo)
         ServerCommerceActRank.CommercerActRank_InitServerQueryRank()
     else
         tCommerceActInfo = {}

script/module/voucher/VoucherShopLogic.lua

@@ -204,7 +204,7 @@ function VoucherShop_OnBuyVoucher(human, nBuyID)
     end
 
     VoucherShop_WriteLog(human, "[VoucherShop_OnBuyVoucher]", "玩家购买代金券回调记录结束 "..sztext)
-    TriggerLogic.PublishEvent(TriggerDefine.VOUCHER_BUY_NUM, human.db._id, 1)
+    TriggerLogic.PublishEvent(TriggerDefine.VOUCHER_BUY_NUM, human.db._id, nAddNum)
     
 end