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

jiyue
2 parents 2f0830e3 34c8cf27
Showing 8 changed files with 63 additions and 24 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/Store.lua
src/shared/functions.lua
@@ -154,6 +154,7 @@ ItemId = {
 	AdvKey = 80, -- 冒险钥匙
 	AdvPower = 4701, -- 拾荒体力
 	CrisisScore = 8010, -- 积分
+	MonthCard = 31000, --兑换月卡的物品
 }
 TimeReset = {
@@ -59,6 +59,7 @@ actionCodes = {
     Role_runeBuyRpc = 142,   	-- 铭文购买
     Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
     Role_setBgRpc = 144,   	-- 设置看板娘
+	Role_itemExchangeRpc = 145, -- 道具兑换
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -1710,4 +1710,36 @@ function _M.setBgRpc(agent, data)
 	return true
 end
+function _M.itemExchangeRpc(agent, data)
+    local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local itemId = msg.item_id
+	local typ = msg.typ
+    local count = msg.count
+	local exchangeId = msg.change_id
+
+    if not ItemId[itemId] then return 1 end
+
+	if not role:checkItemEnough({[itemId] = count}) then return 2 end
+	role:costItems({[itemId] = count}, {log = {desc = "itemConvertmonthCard", int1 = count, int2 = count}})
+
+	local rechargeData = csvdb["shop_rechargeCsv"][exchangeId]
+	if not rechargeData then
+		skynet.error("[recharge] recharge id not exist", exchangeId)
+		return 3
+	end
+    local reward = {}
+	for i = 1, count do
+		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.id , rechargeData.activity_id)
+		if tmpreward then
+			table.rewardMerge(reward, tmpreward)
+		else
+			return
+		end
+	end
+
+	SendPacket(actionCodes.Role_itemExchangeRpc, MsgPack.pack(role:packReward(reward)))
+    return status
+end
+
 return _M
 \ No newline at end of file
@@ -291,15 +291,17 @@ function _M.shopBuyRpc(agent , data)
 		return 1 
 	end
-	local cost = {[dataSet.icon] = dataSet.cost * count}
+    local cost
+    if dataSet.disount == 0 then
+		cost = {[dataSet.icon] = math.ceil(dataSet.cost * count)}
+	else
+		cost = {[dataSet.icon] = math.ceil(dataSet.cost * count * ((dataSet.disount or 10) / 10))}
+	end
+
 	local desc = "unknowShop"
 	if dataSet.shop == 1 then		-- 普通商店
 		desc = "dailyShop"
-		local dailySDD = role.dailyData:getProperty("dailySDD")
-		if dailySDD[id] then -- 折扣
-			cost = math.ceil(dataSet.cost * (1 - dataSet.disount / 100))
-		end
 	elseif dataSet.shop == 2 then		-- 美食商店
 		desc = "dinerShop"
 	elseif dataSet.shop == 3 then		-- 竞技场商店
@@ -314,7 +316,7 @@ function _M.shopBuyRpc(agent , data)
 		role.storeData:updateProperty({field = "buyR", value = buyRecord})
         limitStr = string.format("%s/%s", buyRecord[id], dataSet.limit)
 	end
-	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, short1 = dataSet.shop}})
+	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, cint1= dataSet.shop}})
 	local gift = {}
 	for _id, _count in pairs(dataSet.gift:toNumMap()) do
@@ -66,6 +66,8 @@ local ItemReason = {
     shopBuy = 150,  -- 商店购买
 	monthCardReward = 151, --月卡奖励
 	smonthCardReward = 152, --特刊奖励
+	itemConvertmonthCard = 153, --兑换月卡
+	itemConvertsmonthCard = 154, --兑换特刊
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -2393,15 +2393,10 @@ function RolePlugin.bind(Role)
 			end
 			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
 		elseif rechargeData.shop == 2 then  --通行证商店
-            --订阅奖励
-			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-
-            --签收奖励
+            --签收 + 订阅奖励
 			local tmpreward, _ = self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
 			if tmpreward then
-				for k, v in pairs(tmpreward) do
-					reward[k] = (reward[k] or 0) + v
-				end
+				table.rewardMerge(reward, tmpreward)
 			end
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
@@ -343,6 +343,8 @@ end
 --获取月卡每日奖励
 function Store:getMonthCardDailyReward(id)
+    if not id then return nil end
+
     if self:isMonthCardExpire() or self:getProperty("monthCardReceive") == 1 then return nil, nil end
     local before_ex = self:getProperty("monthCardEx")
@@ -369,6 +371,8 @@ end
 --获取特刊每日奖励
 function Store:getSMonthCardDailyReward(id)
+    if not id then return nil end
+
     local before_ex = SuperMonthCard["periods"](self, id)
     local reward, change, cur_ex= SuperMonthCard["itemDaily"](self, id)
@@ -404,21 +408,15 @@ function Store:onBuyCard(type, duration, id, actid)
         end
         self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + 30})
+        local reward = {}
         --初回特典  仅首次购买月卡时赠送SSR级角色"拉塔托娅"
-       local reward = {}
         local tmpreward, _ = self:firstBuyMonthCard(id)
-        if tmpreward then
-            for k, v in pairs(tmpreward) do
-                reward[k] = (reward[k] or 0) + v
-            end
-        end
+        if tmpreward then table.rewardMerge(reward, tmpreward) end
+        --订阅奖励
         tmpreward = SuperMonthCard["itemFirst"](self, id)
-        if next(tmpreward) then
-            for k, v in pairs(tmpreward) do
-                reward[k] = (reward[k] or 0) + v
-            end
-        end
+        if next(tmpreward) then table.rewardMerge(reward, tmpreward) end
+
         return reward
     elseif type == CardType.SuperMonthCard then
         if SuperMonthCard["buy"](self, id) then
@@ -832,6 +830,8 @@ function Store:data()
         bpInfo = self:getProperty("bpInfo"),
         totalRR = self:getProperty("totalRR"),
         monthCardId  = self:getProperty("monthCardId"),
+        firstMonthCard = self:getProperty("firstMonthCard"),
+        monthCardReceive = self:getProperty("monthCardReceive"),
         smonthCards  = self:getProperty("smonthCards"),
         smonthCardReceive  = self:getProperty("smonthCardReceive"),
         dailyShop  = self:getProperty("dailyShop"),
@@ -865,3 +865,9 @@ function table.array2Table(arr)
     return ret
 end
+
+function table.rewardMerge(dest, src)
+    for k, v in pairs(src) do
+        dest[k] = (dest[k] or 0) + v
+    end
+end
 \ No newline at end of file