zhanwencai 1 год назад
Родитель
Сommit
8b99942c24

+ 12 - 0
script/module/drawCard/DrawCardLogic.lua

@@ -159,6 +159,12 @@ function getDrawLv(human, id)
     return info.drawLV or 0
 end
 
+function getDrawV2Cnt(human, id)
+    local info = getDrawInfo(human, id)
+    if not info then return 0 end
+    return info.cntHero3 or 0
+end
+
 function addDrawLv(human, id, cnt)
     local info = getDrawInfo(human, id)
 
@@ -278,6 +284,9 @@ function query(human)
     local needItemID = ItemDefine.ITEM_XIANZHI_BAOZHU_ID
     Grid.makeItem(msgRet.qiyuan, needItemID, 1)
     msgRet.skip = human.db.drawCard.skip or 0
+    -- 高级召唤v2需要返回
+    msgRet.drawCnt = getDraw2Cnt(human,DRAWCARD_ID2)
+    msgRet.drawLv = getDrawLv(human,DRAWCARD_ID2)
     Msg.send(msgRet, human.fd)
 end
 
@@ -758,6 +767,9 @@ local function drawV2(human, id, op, actConfig, skip, isAct)
         --更新抽卡等级
         addDrawLv(human, id, 1)
 
+        --更新抽卡等级 需要返回
+        query(human)
+
         LiLianLogic.onCallback(human, LiLianLogic.LILIAN_OUTID27, 1, star)
     end
 

+ 2 - 0
script/module/drawCard/Proto.lua

@@ -18,6 +18,8 @@ GC_DRAWCARD_QUERY = {
     {"qiyuan",			1,		ItemData},
     {"skip",		    1,		"byte"},   -- 是否跳过
     {"leftNoSRRCnt",    1,      "int"},    -- 还需高抽多少次,必出SSR
+    {"drawLv",    1,      "int"},    -- 抽卡等级
+    {"drawCnt",    1,      "int"},    -- 抽卡次数
 }
 
 CG_DRAWCARD_OP = {

+ 6 - 6
script/module/present/LimitPerpleHeroLogic.lua

@@ -35,7 +35,7 @@ function initAfterHot()
         local time2 =  config.openEnd * oneDay + oepenTime
         local startTime = Util.getDayStartTime(time)
         local endTime = Util.getDayStartTime(time2) - 1
-        -- 如果是当天就结束的活动
+        -- 锟斤拷锟斤拷堑锟斤拷锟酵斤拷锟斤拷锟侥活动
         if config.openStart == config.openEnd then
             endTime = startTime + oneDay - 1
         end
@@ -54,7 +54,7 @@ function initDB(human)
     local config = getConfigByActID()
     if human.db.limitPerpleHero then
         if human.db.limitPerpleHero.endTime ~= config.endTime then
-            -- 结算
+            -- 锟斤拷锟斤拷
 
             human.db.limitPerpleHero = {}
             human.db.limitPerpleHero.endTime = config.endTime
@@ -95,7 +95,7 @@ function getLeftTime(human, YYInfo, funcConfig)
     return 0
 end
 
--- 返回活动数据
+-- 锟斤拷锟截活动锟斤拷锟斤拷
 function getAndSendMsg(human, param)
     local config = OpenActExcel.limitPerpleHero[param]
     if not config then return end
@@ -103,7 +103,7 @@ function getAndSendMsg(human, param)
     if now < config.startTime and now > config.endTime then
         return 
     end 
-    -- 发送数据
+    -- 锟斤拷锟斤拷锟斤拷锟斤拷
     local msgRet = Msg.gc.GC_OA_LIMIT_PERPLEHERO_QUERY
     msgRet.startTime = config.startTime
     msgRet.endTime   = config.endTime
@@ -128,7 +128,7 @@ function getAndSendMsg(human, param)
 
 end
 
--- 设置心仪英雄
+-- 锟斤拷锟斤拷锟斤拷锟斤拷英锟斤拷
 function setPerpleHero(human, heroID, param)
     local config = OpenActExcel.limitPerpleHero[param]
     if not config then return end
@@ -168,7 +168,7 @@ function onDrawCardActive(human, id, op, actConfig, skip,isAct)
     
     end
 
-    -- 没有活动数据
+    -- 没锟叫活动锟斤拷锟斤拷
     if not state then
         return
     end