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

jiyue
2 parents 0cd001ee d85ecb3f
Showing 3 changed files with 19 additions and 4 deletions Show diff stats
src/actions/ActivityAction.lua
src/models/RolePlugin.lua
src/models/Store.lua
@@ -799,12 +799,18 @@ function _M.endBattleRpc(agent, data)
 	if  newStarNum > oldStarNum then
 		battleInfo["star"] = curStar
 	end
-
-	if battleCfg.rank ~= 0 and isWin then
+    if battleCfg.type ~= "" then
 		-- 消耗门票
 		role.activity:getBattleTicket(actid)
 		local num = battleCfg.type:toArray(true, "=")[3]
 		actData["ticket"] = math.max(actData["ticket"] - num, 0)
+    end
+
+	if battleCfg.rank ~= 0 and isWin then
+		-- 消耗门票
+		--role.activity:getBattleTicket(actid)
+		--local num = battleCfg.type:toArray(true, "=")[3]
+		--actData["ticket"] = math.max(actData["ticket"] - num, 0)
 		-- 更新排行榜 最高伤害
 		battleInfo["top"] = math.max(battleInfo["top"] or 0, dmg)
@@ -1486,7 +1492,7 @@ function _M.buyBattleTicketRpc(agent, data)
     end
     local cost = globalCsv.activity_scrofa_tickets[curCount + 1]
 	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 3 end
-	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyActivityBattleTicket", int1 = actid, int2 = count, cint1 = curCount}})
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyActivityBattleTicket", int1 = actid, int2 = count, long1 = curCount}})
     actData["ticket"] = (actData["ticket"] or 0) + 1
     actData["buyC"] = curCount + count
@@ -2437,6 +2437,11 @@ function RolePlugin.bind(Role)
 			end
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
+
+            --增加购买记录
+			local buyRecord = self.storeData:getProperty("buyR") or {}
+			buyRecord[id] = (buyRecord[id] or 0) + 1
+			self.storeData:updateProperty({field = "buyR", value = buyRecord})
 		else
 			skynet.error("[recharge] invalid recharge shop type " .. id)
 			return 3
@@ -474,7 +474,7 @@ function Store:onBuyCard(type, duration, id, actid)
         self:updateProperty({field = "bpInfo", value = bpInfo})
     elseif type == CardType.ActBattleCommandCard then
         if not self.owner.activity:isOpenById(actid, "ActShopGoods") then
-            return
+            return nil
         end
         local actCfg = csvdb["activity_ctrlCsv"][actid]
         if not actCfg then return end
@@ -486,6 +486,10 @@ function Store:onBuyCard(type, duration, id, actid)
         end
         self.owner:mylog("act_action", {desc="buyBc", int1=id, int2=actData["lvl"] or 0})
         self.owner.activity:updateActData("BattleCommand", actData)
+        local rechargeData = csvdb["shop_rechargeCsv"][id]
+        if rechargeData then
+            return self.owner:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
+        end
     end
     return nil, nil
 end