取消周末冲刺活动至少开服7天的时间限制

script/module/WeekendLoopActivity/WeekendLoopActManager.lua

@@ -247,19 +247,19 @@ function onZeroAll(funcID)
     local nNowTime = os.time()
     local tDate = os.date("*t",nNowTime)
     
-    local nOpenServerDay = CommonDB.getServerOpenDay()
-    if nOpenServerDay <= 7 then
-        return
-    end
+    -- local nOpenServerDay = CommonDB.getServerOpenDay()
+    -- if nOpenServerDay <= 7 then
+    --     return
+    -- end
 
     if WeekLoopActDef.WEEKACT_TIME ~= tDate.hour then
         return
     end
 
-    print("[WeekLoopACT_onZeroAll] 进入定时处理")
+    -- print("[WeekLoopACT_onZeroAll] 进入定时处理")
 
     if WeekLoopActDef.WEEKACT_OPENDAY == tDate.wday then
-        print("[WeekLoopACT_onZeroAll] 周末活动开始打印")
+        -- print("[WeekLoopACT_onZeroAll] 周末活动开始打印")
 
         tWeekActInfo = {}
         tWeekActInfo.isRun = true
@@ -279,7 +279,7 @@ function onZeroAll(funcID)
         -- 活动开始
         WeekLoopACT_Begin()
 
-        print("[WeekLoopACT_onZeroAll] 时间打印 nStartTime = ".. tWeekActInfo.nStartTime.." nEendTime = "..tWeekActInfo.nEendTime)
+        -- print("[WeekLoopACT_onZeroAll] 时间打印 nStartTime = ".. tWeekActInfo.nStartTime.." nEendTime = "..tWeekActInfo.nEendTime)
     elseif WeekLoopActDef.WEEKACT_ENDDAY == tDate.wday then
         print("[WeekLoopACT_onZeroAll] 周末活动结束打印")
  
@@ -298,12 +298,12 @@ function WeekLoopACT_Init()
     local nNowTime = os.time()
     local tDate = os.date("*t",nNowTime)
 
-    local nOpenServerDay = CommonDB.getServerOpenDay()
-    if nOpenServerDay < 7 then
-        return
-    end
+    -- local nOpenServerDay = CommonDB.getServerOpenDay()
+    -- if nOpenServerDay < 7 then
+    --     return
+    -- end
 
-    print("[WeekLoopACT_Init] 起服初始化 wday = "..tDate.wday.." m = "..tDate.month.." d = "..tDate.day.." h = "..tDate.hour)
+    -- print("[WeekLoopACT_Init] 起服初始化 wday = "..tDate.wday.." m = "..tDate.month.." d = "..tDate.day.." h = "..tDate.hour)
 
     -- 等于星期六 或者 小于星期三
     if WeekLoopActDef.WEEKACT_OPENDAY == tDate.wday or  WeekLoopActDef.WEEKACT_ENDDAY > tDate.wday then
@@ -329,7 +329,7 @@ function WeekLoopACT_Init()
             tWeekActInfo.nEendTime = os.time(tCalDate)
             tWeekActInfo.nCardBatch = WeekLoopACT_GetCardBatch()
 
-            print("[WeekLoopACT_Init] 时间打印 nStartTime = ".. tWeekActInfo.nStartTime.." nEendTime = "..tWeekActInfo.nEendTime)
+            -- print("[WeekLoopACT_Init] 时间打印 nStartTime = ".. tWeekActInfo.nStartTime.." nEendTime = "..tWeekActInfo.nEendTime)
         end
     end
 
@@ -366,17 +366,17 @@ function onLogin(human, funcID)
         return
     end
 
-    local nOpenServerDay = CommonDB.getServerOpenDay()
-    if nOpenServerDay < 7 then
-        print("[onLogin] 玩家登录，当前服务器开放时间不足，直接返回 nOpenServerDay = "..nOpenServerDay)
-        return
-    end
+    -- local nOpenServerDay = CommonDB.getServerOpenDay()
+    -- if nOpenServerDay < 7 then
+    --     print("[onLogin] 玩家登录，当前服务器开放时间不足，直接返回 nOpenServerDay = "..nOpenServerDay)
+    --     return
+    -- end
 
     local nLastEndTime = WeekLoopACT_GetHumanEndTime(human)
     local nState = WeekLoopACT_GetHumanEndMail(human)
 
     local nSendMail = nState and 1 or 0
-    print("[onLogin] 玩家登录 nSendMail = "..nSendMail)
+    -- print("[onLogin] 玩家登录 nSendMail = "..nSendMail)
 
     -- 未开始
     if false == WeekLoopACT_IsRun() then

script/module/drawCard/DrawCardLogic.lua

@@ -300,8 +300,8 @@ function fontDrawCardNet(net, id, human)
         Grid.makeItem(net.items[net.items[0]], config.item2[1], finalItemCnt )
     end
 
-    vipArg, itemCnt, finalItemCnt = 0, 0, 0
-
+    vipArg = 100
+    itemCnt, finalItemCnt = 0, 0
     if config.item3[1] and config.item3[2] then
         if id == DRAWCARD_ID2 then -- 目前只有高抽和精英两种模式有100抽
             vipArg = VipLogic.getPowerArgs(human, VipLogic.VIP_POWER23)
@@ -336,6 +336,7 @@ function fontDrawCardNet(net, id, human)
 
     if id == DRAWCARD_ID8 then
         net.zuanshi[2] = math.floor((net.zuanshi[2] / itemCnt) * finalItemCnt)
+        net.zuanshi[3] = math.floor((net.zuanshi[3] / itemCnt) * finalItemCnt)
     end
 
     net.isFirst = (getDraw2Cnt(human, id) < 1) and 1 or 0

script/module/vip/VipLogic.lua

@@ -46,8 +46,8 @@ VIP_POWER19 = 19	-- o
 VIP_POWER21 = 21	-- o抽卡 卷轴折扣特权
 VIP_POWER22 = 22    -- o抽卡 钻石特权
 
-VIP_POWER21 = 23	-- 100抽卡 卷轴折扣特权
-VIP_POWER22 = 24    -- 100抽卡 钻石特权
+VIP_POWER23 = 23	-- 100抽卡 卷轴折扣特权
+VIP_POWER24 = 24    -- 100抽卡 钻石特权
 -- 礼包状态
 local LIBAO_STATE_CANT = 0 		-- 不可购买
 local LIBAO_STATE_CAN = 1 		-- 可购买