Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 18100f8b c9c0150d
Showing 6 changed files with 79 additions and 37 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/StoreAction.lua
src/adv/Adv.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -630,12 +630,15 @@ function _M.startBattleRpc(agent, data)
 		local bi = actData[id]
 		local star = bi["star"] or 0
 		local award = battleCfg.item_clear:toNumMap()
-		if getStarCount(battleCfg, star) == 3 then
-			local aw = battleCfg.perfect_reward:toNumMap()
-			for k, v in pairs(aw) do
-				award[k] = (award[k] or 0) + v
-			end
-		end
+
+		if battleCfg.rank ~= 0 then
+            if getStarCount(battleCfg, star) == 3 then
+                local aw = battleCfg.perfect_reward:toNumMap()
+                for k, v in pairs(aw) do
+                    award[k] = (award[k] or 0) + v
+                end
+            end
+        end
 		for k, v in pairs(award) do
 			award[k] = v * count
 		end
@@ -24,7 +24,7 @@ function _M.rechargeRpc(agent , data)
 	skynet.timeout(10, function ()
 		role:handlePurchase({
 			order = partnerOrderId,
-			amount = dataSet.rmb * 100,
+			amount = dataSet.rmb * 100 / globalCsv.QArecharge,
 			game_money = dataSet.diamond,
 			product_id = dataSet.productId,
 			pay_time = skynet.timex(),
@@ -1713,7 +1713,7 @@ local function clickTrader(self, room, block, params)
 	local goodsData = csvdb["event_trader_goodsCsv"][block.event.shop[buyId][1]]
 	if not goodsData then return false, 5 end
-	local costCount = math.ceil(goodsData.price * (1 - (block.event.shop[buyId][2] or 100) / 100))
+	local costCount = math.ceil(goodsData.price * (1 - (block.event.shop[buyId][2] or 0) / 100))
 	if not self:cost({[goodsData.currency] = costCount}, {log = {desc = "clickTrader", int1 = block.event.id}}) then return false, 6 end --不够
 	self:backCost({[goodsData.currency] = costCount})
 	self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}}, {})
@@ -2342,7 +2342,7 @@ function RolePlugin.bind(Role)
 		end
 		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= tonumber(params.amount)) then
+		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and ((rechargeData.rmb * 100) / globalCsv.QArecharge) ~= tonumber(params.amount)) then
 			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
@@ -2377,7 +2377,7 @@ function RolePlugin.bind(Role)
 			return 1
 		end
-		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) then
+		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) and rechargeData.shop ~= 2 then
 			return 2
 		end
@@ -697,7 +697,7 @@ function RoleTask.bind(Role)
 								for _, hero in pairs(self.heros) do
 									local unitData = csvdb["unitCsv"][hero:getProperty("type")]
 									if unitData then
-										if cfg.condition2 <= unitData.rare then
+										if cfg.condition2 == unitData.rare then
 											count = count + 1
 										end
 									end
@@ -758,11 +758,14 @@ function RoleTask.bind(Role)
 								end
 							elseif cfg.type == 15 then -- 通关关卡
 								if (calTask[id] or 0) == 0 then
-									local hangPass = self:getProperty("hangPass")
-									local diff = math.floor(cfg.condition2 / 10000)
-									if (hangPass[diff] or 0) >= cfg.condition1 then
+                                    if self:checkHangPass(cfg.condition2) then
 										calTask[id] = 1
-									end
+                                    end
+									--local hangPass = self:getProperty("hangPass")
+									--local diff = math.floor(cfg.condition2 / 10000)
+									--if (hangPass[diff] or 0) >= cfg.condition2 then
+									--	calTask[id] = 1
+									--end
 								end
 							elseif cfg.type == 22 then	-- 电台任务出勤人数
 								calTask[id] = (calTask[id] or 0) + (param1 or 0)
@@ -98,37 +98,67 @@ local SuperMonthCard = {}
 SuperMonthCard["buy"] = function(self, id)
     local smonthCards = self:getProperty("smonthCards") or {}
+    local buyLimitFunc = function(buylimit)
+        for k, v in pairs(buylimit) do
+            if k == 1 then
+                if v == 101 then
+                    if self:isMonthCardExpire() then
+                        skynet.error("月卡过期")
+                        return false
+                    end
+                else
+                    if smonthCards[v] == nil then
+                        skynet.error("没有购买增刊里的条件, %d", v)
+                        return false
+                    end
+                end
+            elseif k == 2 then
+                if smonthCards[v] == nil and v ~= 101 then
+                    skynet.error("没有购买增刊里的条件, %d", v)
+                    return false
+                end
+                if SuperMonthCard["isExpired"](self, v) == false and v ~= 101 then
+                    skynet.error("上期特刊奖励没有领取完")
+                    return false
+                end
+            end
+        end
+        return true
+    end
+
     local BuyMonthCard = {}
     BuyMonthCard["renewal"]= function()
         --续刊
-        if self:isMonthCardExpire() then return false end
+        local card = csvdb["shop_cardCsv"][id] or {}
+        if card["buyLimit"] and card["buyLimit"] ~= "" then
+            if buyLimitFunc(card["buyLimit"]:toNumMap()) == false then
+                skynet.error("不满足购买条件")
+                return false
+            end
+        end
         local smonthCard = smonthCards[id] or {}
         if next(smonthCard) then
-
             smonthCard["buyCount"] = (smonthCard["buyCount"] or 0) + 1
-
-            local card = csvdb["shop_cardCsv"][id] or {}
-            local periods = SuperMonthCard["periods"](self, id) + (card["cardPlusPeriods"] or 30)
+            local periods = SuperMonthCard["periods"](self, id) + (card["amount"] or 30)
             smonthCard["periods"] = periods
-            self:updateProperty({filed = "smonthCards", value = smonthCards})
+            self:updateProperty({field = "smonthCards", value = smonthCards})
             return true
         end
     end
     BuyMonthCard["order"] = function()
         --增刊条件
         local card = csvdb["shop_cardCsv"][id] or {}
-        --判断是否购买过增刊条件里的特刊
-        local cardId = card["cardPlusCondition"] or 0
-        if self:isMonthCardExpire() or smonthCards[cardId] == nil then return false end
-
-        --如果上期特刊奖励没有领取玩，则不能购买这期特刊。
-        if SuperMonthCard["isExpired"](self, cardId) == false and cardId ~= 101 then return false end
-
-        smonthCards[id] = {["periods"] = (card["cardPlusPeriods"] or 30), ["buyCount"] = 1}
+        if card["buyLimit"] and card["buyLimit"] ~= "" then
+            if buyLimitFunc(card["buyLimit"]:toNumMap()) == false then
+                skynet.error("不满足增刊条件")
+                return false
+            end
+        end
+        smonthCards[id] = {["periods"] = (card["amount"] or 30), ["buyCount"] = 1}
-        self:updateProperty({filed = "smonthCards", value = smonthCards})
+        self:updateProperty({field= "smonthCards", value = smonthCards})
         return true
     end
@@ -171,6 +201,12 @@ SuperMonthCard[&quot;itemDaily&quot;] = function(self, id)
     return reward, change, cur_ex
 end
+SuperMonthCard["itemFirst"] = function(self, id)
+    local card = csvdb["shop_cardCsv"][id] or {}
+    local reward, _ = self.owner:award(card["itemFirst"], {isRecharge = true, log = {desc = "recharge", int1 = id}})
+    return reward
+end
+
 -- 删除过期商品
 function Store:deleteExpireLimitGoods()
     local timeNow = skynet.timex()
@@ -313,7 +349,7 @@ function Store:getMonthCardDailyReward(id)
     self:updateProperty({field = "monthCardEx", delta = -1})
     local cur_ex = self:getProperty("monthCardEx")
-    local actCfg = csvdb["shop_card"][id] or {}
+    local actCfg = csvdb["shop_cardCsv"][id] or {}
     local award = actCfg.itemDaily:toNumMap()
     local reward, change = self.owner:award(award, {log = {desc = "monthCardReward", int1 = id, int2 = cur_ex}})
@@ -354,7 +390,7 @@ function Store:firstBuyMonthCard(id)
     if self:getProperty("firstMonthCard") == 1 then
         self:updateProperty({field = "firstMonthCard", value = 0})
         local card = csvdb["shop_cardCsv"][id] or {}
-        return self:award(card["cardFirst"], {log = {desc = "monthCardReward", int1 = id, int2 = 30}})
+        return self.owner:award(card["itemOnce"], {log = {desc = "monthCardReward", int1 = id, int2 = 30}})
     end
     return nil
 end
@@ -377,9 +413,8 @@ function Store:onBuyCard(type, duration, id, actid)
             end
         end
-        --签收奖励
-        tmpreward, _= self:getMonthCardDailyReward(id)
-        if tmpreward then
+        tmpreward = SuperMonthCard["itemFirst"](self, id)
+        if next(tmpreward) then
             for k, v in pairs(tmpreward) do
                 reward[k] = (reward[k] or 0) + v
             end
@@ -387,9 +422,10 @@ function Store:onBuyCard(type, duration, id, actid)
         return reward
     elseif type == CardType.SuperMonthCard then
         if SuperMonthCard["buy"](self, id) then
-            return self:getSMonthCardDailyReward(id)
+            skynet.error("特刊购买成功:"..id)
+            return SuperMonthCard["itemFirst"](self, id)
         end
-        return nil, nil
+        return nil
     elseif type == CardType.NormalMonthCardLevelUp then
         if self:isMonthCardExpire() then
             skynet.error(string.format("month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))