1.增加提示 2.增加新商业活动2协议

script/common/Lang.lua

@@ -793,4 +793,7 @@ JJCNEWLADDERNOOPEN = [[当前不在活动时间]]
 HELP_HERO_NOT_ACTIVATE = [[援军未激活]]
 POS_ERROR = [[位置错误]]
 HERO_SAME = [[已有相同英雄上阵]]
-NO_HERO = [[没有符合的英雄]]
+NO_HERO = [[没有符合的英雄]]
+
+MUST_SELECT_ONE = [["请至少选择一个材料"]]
+NUM_EXCEED = [["数量超出"]]

script/module/absAct/Proto.lua

@@ -1278,4 +1278,126 @@ GC_LOTTERYCARD_RESET = {
 -- CG_NEW_BUSONEACT_HERO_GET = {
 --     {"nLayers",     1,      "byte"},    -- 选择的层数
 --     {"nIndex",      1,      "byte"},    -- 选择的物品ID
--- }
+-- }
+
+
+---------------------------------新商业活动2-7日任务--------------------------------
+
+-- TASKINFO = {
+--     {"taskIdx",              1,      "int"},     -- 任务在配置中的索引
+--     {"taskDesc",             1,      "string"},  -- 任务描述
+--     {"taskState",            1,      "byte"},    -- 任务状态, 0-未完成, 1-可领取, 2-已领取
+--     {"taskNowProgress",      1,      "int"},     -- 当前进度
+--     {"taskCondProgress",     1,      "int"},     -- 任务条件进度
+--     {"taskRewardList",       3,      ItemData},  -- 奖励
+-- }
+
+-- EXTRAREWARDINFO = {
+--     {"condProgress",      1,      "int"},     -- 条件进度
+--     {"state",             1,      "byte"},    -- 状态, 0-未完成, 1-可领取, 2-已领取
+--     {"itemInfo",          1,      ItemData},  -- 奖励
+-- }
+
+
+-- -- 查询
+-- CG_CYCLESEVENDAYTASK_QUERY = {
+--     {"dayIdx",      1,      "byte"},    -- 查询第几天的任务
+-- }
+
+-- GC_CYCLESEVENDAYTASK_QUERY = {
+--     {"dayIdx",              1,      "byte"},            -- 查询第几天的任务
+--     {"taskList",            10,      TASKINFO},         -- 任务列表
+--     {"completeTaskNum",     1,      "int"},             -- 当前已完成任务数量
+--     {"extraRewardList",     5,      EXTRAREWARDINFO},   -- 额外奖励
+-- }
+
+-- --领奖
+-- CG_CYCLESEVENDAYTASK_GET_REWARD = {
+--     {"idx",             1,      "int"},     -- 当领取任务奖励时, idx为第几天
+--     {"rewardType",      1,      "byte"},    -- 奖励类型, 1-任务奖励, 2-额外奖励 
+-- }
+
+----------------------------------------------------------------------------------
+
+
+
+---------------------------------新商业活动2-英雄赠礼-------------------------------
+-- GIFT_INFO = {
+--     {"state",             1,      "byte"},    -- 状态, 0-未完成, 1-可领取, 2-已领取， 3-未解锁
+--     {"buyMsg",			  1,       BuyItem},  -- 购买项信息
+--     {"itemList",          2,      ItemData},  -- 奖励
+-- }
+
+-- -- 查询
+-- CG_CYCLHEROSENDGIFT_QUERY = {
+--     {"actId",                           1,      "int"},              -- 活动ID
+-- }
+
+-- GC_CYCLHEROSENDGIFT_QUERY = {
+--     {"gridList",                 21,      GIFT_INFO},
+-- }
+
+-- -- 领奖
+-- CG_CYCLHEROSENDGIFT_GET_REWARD = {
+--     {"actId",                           1,      "int"},              -- 活动ID
+-- }
+
+----------------------------------------------------------------------------------
+
+
+
+
+------------------------------------新商业活动2-6元闯关-------------------------------
+
+-- POSINFO = {
+--     {"rewardList",      3,      ItemData},  -- 奖励
+-- }
+
+-- -- 查询
+-- CG_CYCLEBREAKTHROUGH_QUERY = {
+--     {"actId",                           1,      "int"},              -- 活动ID
+-- }
+
+-- GC_CYCLEBREAKTHROUGH_QUERY = {
+--     {"state",                           1,      "byte"},              -- 状态, 0-不可参与, 1-可参与
+--     {"buyMsg",			                1,       BuyItem},            -- 购买项信息
+--     {"gridList",			            10,      POSINFO},            -- 格子数据
+-- }
+
+-- -- 随机
+-- CG_CYCLEBREAKTHROUGH_RAND = {
+--     {"actId",                           1,      "int"},              -- 活动ID
+-- }
+-- GC_CYCLEBREAKTHROUGH_RAND = {
+--     {"state",                           1,      "byte"},              -- 状态, 0-不可参与, 1-可
+--     {"randVal",                           1,      "byte"},              -- 随机结果
+-- }
+
+
+----------------------------------------------------------------------------------
+
+
+------------------------------------新商业活动2-烹饪嘉年华-------------------------------
+
+-- 查询
+-- CG_CYCLMAKEFOOD_QUERY = {
+--     {"actId",                           1,      "int"},              -- 活动ID
+-- }
+
+-- GC_CYCLMAKEFOOD_QUERY = {
+--     {"foodList",          9,            "string"},  -- 材料列表
+--     {"tagetFoodName",     1,            "string"},
+--     {"itemInfo",          1,            ItemData},  -- 消耗道具
+-- }
+
+-- -- 烹饪(合成食物)
+-- CG_CYCLMAKEFOOD_MAKEFOOD = {
+--     {"actId",                       1,      "int"},     -- 活动ID
+--     {"foodStr",                    1,      "string"},  -- 选择的材料, 格式: "材料编号, 材料编号"
+-- }
+
+-- GC_CYCLMAKEFOOD_MAKEFOOD = {
+--     {"stars",                        1,      "byte"},              -- 合成食物星级
+-- }
+
+-------------------------------------------------------------------------------------