1.增加新商业化活动2协议号 2.增加新商业化活动2的日志标识

script/common/LogDefine.lua

@@ -291,6 +291,10 @@ DEFINE = {
 	ActCycleRechargeLogic	= 765,			-- 循环累计充值
 	battle_game				= 766,			-- 主线闯关小游戏
 	storageBox				= 767,			-- 月光宝盒
+	cycleAct_sevenDayTask	= 768,			-- 新商业化活动2 —— 7日任务
+	cycleAct_heroSendGift 	= 769,			-- 新商业化活动2 —— 英雄赠礼
+	cycleAct_breakThrough	= 770,			-- 新商业化活动2 —— 6元闯关
+	cycleAct_makeFood		= 771,			-- 新商业化活动2 —— 烹饪嘉年华
 }
 
 

script/common/ProtoID.lua

@@ -1549,8 +1549,6 @@ _ENV[1593]="GC_GUIDE_WENJUAN"
 _ENV[1594]="CG_GUIDE_WENJUAN_CHOSE"
 _ENV[1595]="GC_GUIDE_WENJUAN_JUMPOK"
 
-
--- 诸神圣域协议，预留5个位置
 _ENV[1598]="CG_GODSAREA_QUERY_RANKLIST"
 _ENV[1599]="GC_GODSAREA_QUERY_RANKLIST"
 _ENV[1600]="CG_GODSAREA_GET_PLAYER_INFO"
@@ -1568,3 +1566,20 @@ _ENV[1613]="GC_HERO_JUEXING_ONECLICK_DO"
 _ENV[1614]="CG_FUWEN_HECHENG_ONECLICK"
 _ENV[1615]="GC_FUWEN_HECHENG_ONECLICK"
 
+-- _ENV[1616]="CG_CYCLESEVENDAYTASK_QUERY"
+-- _ENV[1617]="GC_CYCLESEVENDAYTASK_QUERY"
+-- _ENV[1618]="CG_CYCLESEVENDAYTASK_GET_REWARD"
+
+-- _ENV[1618]="CG_CYCLHEROSENDGIFT_QUERY"
+-- _ENV[1619]="GC_CYCLHEROSENDGIFT_QUERY"
+-- _ENV[1620]="CG_CYCLHEROSENDGIFT_GET_REWARD"
+
+-- _ENV[1621]="CG_CYCLEBREAKTHROUGH_QUERY"
+-- _ENV[1622]="GC_CYCLEBREAKTHROUGH_QUERY"
+-- _ENV[1623]="CG_CYCLEBREAKTHROUGH_RAND"
+-- _ENV[1624]="GC_CYCLEBREAKTHROUGH_RAND"
+
+-- _ENV[1625]="CG_CYCLMAKEFOOD_QUERY"
+-- _ENV[1626]="GC_CYCLMAKEFOOD_QUERY"
+-- _ENV[1627]="CG_CYCLMAKEFOOD_MAKEFOOD"
+-- _ENV[1628]="GC_CYCLMAKEFOOD_MAKEFOOD"

script/module/absAct/Handler.lua

@@ -38,6 +38,12 @@ local BusOneActivityTask = require("absAct.BusOneActivityTask")
 local BusOneActivityBuy = require("absAct.BusOneActivityBuy")
 local BusOneActivityYuanZheng = require("absAct.BusOneActivityYuanZheng")
 local BusOneActivityHero = require("absAct.BusOneActivityHeroYuanZheng")
+-- local CycleSevenDayTask = require("absAct.CycleSevenDayTask")
+-- local CycleHeroSendGift = require("absAct.CycleHeroSendGift")
+-- local CycleBreakThrough = require("absAct.CycleBreakThrough")
+-- local CycleMakeFood = require("absAct.CycleMakeFood")
+
+
 
 function CG_ABS_ACT_DETAIL_QUERY(human, msg)
     AbsActLogic.actDetailQuery(human,msg.id)
@@ -351,4 +357,47 @@ end
 
 function CG_NEW_BUSONEACT_HERO_GET(human, msg)
     BusOneActivityHero.BusOneHeroYuanZheng_Get(human, msg.nLayers, msg.nIndex)
-end
+end
+
+
+----------------------------------------- 新商业化活动2 —— 7日任务--------------------------------------------
+
+-- function CG_CYCLESEVENDAYTASK_QUERY(human, msg)
+--     CycleSevenDayTask.Query(human, msg.dayIdx)
+-- end
+
+-- function CG_CYCLESEVENDAYTASK_GET_REWARD(human, msg)
+--     CycleSevenDayTask.GetReward(human, msg.idx, msg.rewardType)
+-- end
+
+
+----------------------------------------- 新商业化活动2 —— 英雄赠礼-------------------------------------------
+
+-- function CG_CYCLHEROSENDGIFT_QUERY(human, msg)
+--     CycleHeroSendGift.Query(human, msg.actId)
+-- end
+
+-- function CG_CYCLHEROSENDGIFT_GET_REWARD(human, msg)
+--     CycleHeroSendGift.GetReward(human, msg.actId)
+-- end
+
+
+----------------------------------------- 新商业化活动2 —— 6元闯关-------------------------------------------
+
+-- function CG_CYCLEBREAKTHROUGH_QUERY(human, msg)
+--     CycleBreakThrough.Query(human, msg.actId)
+-- end
+
+-- function CG_CYCLEBREAKTHROUGH_RAND(human, msg)
+--     CycleBreakThrough.RandPos(human, msg.actId)
+-- end
+
+----------------------------------------- 新商业化活动2 —— 烹饪嘉年华-------------------------------------------
+
+-- function CG_CYCLMAKEFOOD_QUERY(human, msg)
+--     CycleMakeFood.Query(human, msg.actId) 
+-- end
+
+-- function CG_CYCLMAKEFOOD_MAKEFOOD(human, msg)
+--     CycleMakeFood.MakeFood(human, msg.actId, msg.foodStr)
+-- end