更新

script/module/drawCard/DrawCardLogic.lua

@@ -168,19 +168,15 @@ function getDrawCurCnt(human, id)
     info.drawLV = info.drawLV or 0
     info.cntHero3 = info.cntHero3 or 0
 
-    Log.write(Log.LOGID_TEST, "getDrawCurCnt start")
-    Log.write(Log.LOGID_TEST, "drawLV" .. info.drawLV .. "cntHero3" .. info.cntHero3)
-
     if info.cntHero3 == 0 then return 0 end
 
     local drawCurCnt = 0
     local drawNextLvCnt = DrawLevelExcel[info.drawLV]
     if not drawNextLvCnt then
-        drawCurCnt =  (info.cntHero3 - 0)
+        drawCurCnt = (info.cntHero3 - 0)
     else
         drawCurCnt = (info.cntHero3 - drawNextLvCnt.need)
     end
-    Log.write(Log.LOGID_TEST, "drawCurCnt" .. drawCurCnt)
     return drawCurCnt
 end
 
@@ -192,9 +188,6 @@ function addDrawLv(human, id, cnt)
     info.drawLV = info.drawLV or 0
     info.cntHero3 = (info.cntHero3 or 0) + cnt
 
-    Log.write(Log.LOGID_TEST, "addDrawLv start")
-    Log.write(Log.LOGID_TEST, "drawLV" .. info.drawLV .. "cntHero3" .. info.cntHero3)
-
     if info.drawLV >= 15 then return end
 
     for lv, val in ipairs(DrawLevelExcel) do
@@ -202,8 +195,6 @@ function addDrawLv(human, id, cnt)
             info.drawLV = lv
         end
     end
-
-    Log.write(Log.LOGID_TEST, "addDrawLv end")
 end
 
 function getDrawNextLvCnt(human, id)
@@ -325,14 +316,27 @@ function query(human)
     msgRet.drawLv = getDrawLv(human, DRAWCARD_ID2)
     msgRet.drawNextLvCnt = getDrawNextLvCnt(human, DRAWCARD_ID2)
     msgRet.drawAdCnt = getResetAdCnt(human)
+    local drawCardRateConfs = DrawCardV2Excel
+
+    msgRet.drawCardRateList[0] = drawCardRateConfs and #drawCardRateConfs or 0
+    for i = 1, msgRet.drawCardRateList[0] do
+        msgRet.drawCardRateList[i] = msgRet.drawCardRateList[i] or {}
+        local drawCardRateConf = drawCardRateConfs[i] or {}
+
+        for rateIndex = 1, #drawCardRateConf.weight do
+            msgRet.drawCardRateList[i][rateIndex] = drawCardRateConf.weight[i]
+        end
+    end
+
+    Log.write(Log.LOGID_TEST, "msgRet = " .. Json.Encode(msgRet))
     Msg.send(msgRet, human.fd)
 end
 
 -- 获取剩余广告观看次数
 function getResetAdCnt(human)
-    human.db.adRewardCnt = human.db.adRewardCnt or 0
-    local diff = AD_RESET_FREECNT - (human.db.adRewardCnt or 0)
-	return math.max(diff, 0)
+    local adRewardCnt = human.db.adRewardCnt or 0
+    Log.write(Log.LOGID_TEST, "adRewardCnt " .. adRewardCnt)
+    return math.max(AD_RESET_FREECNT - adRewardCnt, 0)
 end
 
 -- 抽奖结果

script/module/drawCard/Proto.lua

@@ -3,52 +3,62 @@ local HeroNiceNet = require("hero.Proto").HeroNiceNet
 
 CG_DRAWCARD_QUERY = {}
 DrawCardNet = {
-	{"id",			1,		"byte"},
-	{"leftFreeTime",1,		"int"},	   -- 免费倒计时
-	{"leftFreeCnt",	1,		"int"},	   -- 剩余免费次数
-	{"items",		3,		ItemData}, -- {1次消耗道具,10次消耗道具}
-	{"zuanshi",		3,		"short"},  -- {1次消耗钻石，10次消耗钻石}0为不能用钻石
-	{"isFirst",		1,		"byte"},   -- 是否首次十连
-	{"canBuy",		1,		"byte"},   -- 可否购买
+    { "id",           1, "byte" },
+    { "leftFreeTime", 1, "int" },    -- 免费倒计时
+    { "leftFreeCnt",  1, "int" },    -- 剩余免费次数
+    { "items",        3, ItemData }, -- {1次消耗道具,10次消耗道具}
+    { "zuanshi",      3, "short" },  -- {1次消耗钻石，10次消耗钻石}0为不能用钻石
+    { "isFirst",      1, "byte" },   -- 是否首次十连
+    { "canBuy",       1, "byte" },   -- 可否购买
 }
 
 GC_DRAWCARD_QUERY = {
-	{"list",			3,		DrawCardNet},
-	{"jifen",			1,		"int"},     -- 当前积分 
-    {"qiyuan",			1,		ItemData},
-    {"skip",		    1,		"byte"},   -- 是否跳过
-    {"leftNoSRRCnt",    1,      "int"},    -- 还需高抽多少次，必出SSR
-    {"drawLv",    1,      "int"},    -- 抽卡等级
-    {"drawCurCnt",    1,      "int"},    -- 抽卡当前次数
-    {"drawNextLvCnt",    1,      "int"},    -- 抽卡等级下一级需要经验
-    {"drawAdCnt",    1,      "int"},    -- 每日广告剩余观看次数
+    { "list",             3,  DrawCardNet },
+    { "jifen",            1,  "int" },             -- 当前积分
+    { "qiyuan",           1,  ItemData },
+    { "skip",             1,  "byte" },            -- 是否跳过
+    { "leftNoSRRCnt",     1,  "int" },             -- 还需高抽多少次，必出SSR
+    { "drawLv",           1,  "int" },             -- 抽卡等级
+    { "drawCurCnt",       1,  "int" },             -- 抽卡当前次数
+    { "drawNextLvCnt",    1,  "int" },             -- 抽卡等级下一级需要经验
+    { "drawAdCnt",        1,  "int" },             -- 每日广告剩余观看次数
+    { "drawCardRateList", 15, DrawCardRateItems }, -- 每日广告剩余观看次数
+}
+
+DrawCardRateItems = {
+    { "drawCardRateItems", 7, DrawCardRateItem }
+}
+
+DrawCardRateItem = {
+    { "grade", 1, "int" },
+    { "rare",  1, "int" }
 }
 
 CG_DRAWCARD_OP = {
-	{"id",				1,		"byte"}, --1 基础召唤 2 高级召唤 3 友情召唤 0 积分召唤
-	{"op",				1,		"byte"}, --1 1次 2 10次
-    {"skip",		    1,		"byte"}, --是否跳过
-    {"isAct",           1,      "int"}, --是否选取up活动
+    { "id",    1, "byte" }, --1 基础召唤 2 高级召唤 3 友情召唤 0 积分召唤
+    { "op",    1, "byte" }, --1 1次 2 10次
+    { "skip",  1, "byte" }, --是否跳过
+    { "isAct", 1, "int" },  --是否选取up活动
 }
 
 DrawCardOpNet = {
-	{"id",				1,		"byte"},
-	{"op",				1,		"byte"},
-	{"heros",			10,		HeroNiceNet},	-- 召唤获得英雄
-    {"items",			10,		ItemData}, 		-- 自动分解获得道具
-	{"jifen",			1,		"int"},			-- 当前积分
+    { "id",    1,  "byte" },
+    { "op",    1,  "byte" },
+    { "heros", 10, HeroNiceNet }, -- 召唤获得英雄
+    { "items", 10, ItemData },    -- 自动分解获得道具
+    { "jifen", 1,  "int" },       -- 当前积分
 }
 
 GC_DRAWCARD_OP = {
-	{"data",			1,		DrawCardOpNet},
-	{"drawData",		1,		DrawCardNet},
-    {"leftNoSRRCnt",    1,      "int"},    -- 还需高抽多少次，必出SSR
-    {"isAct",           1,      "int"}, --是否选取up活动
-    {"drawLv",    1,      "int"},    -- 抽卡等级
-    {"drawCurCnt",    1,      "int"},    -- 抽卡当前次数
-    {"drawNextLvCnt",    1,      "int"},    -- 抽卡等级下一级需要经验
+    { "data",          1, DrawCardOpNet },
+    { "drawData",      1, DrawCardNet },
+    { "leftNoSRRCnt",  1, "int" }, -- 还需高抽多少次，必出SSR
+    { "isAct",         1, "int" }, --是否选取up活动
+    { "drawLv",        1, "int" }, -- 抽卡等级
+    { "drawCurCnt",    1, "int" }, -- 抽卡当前次数
+    { "drawNextLvCnt", 1, "int" }, -- 抽卡等级下一级需要经验
 }
 
 CG_DRAWCARD_SKIP_SET = {
-	{"skip",		    1,		"byte"},   -- 是否跳过
-}
+    { "skip", 1, "byte" }, -- 是否跳过
+}