自选箱子协议

测试
1 parent 5bc88864
Showing 6 changed files with 30 additions and 5 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/RoleAction.lua
src/csvdata
src/models/Activity.lua
src/models/RoleTimeReset.lua
@@ -68,6 +68,7 @@ ItemType = {
 	AdvItem						= 14, 	-- 冒险道具
 	FuncOpen					= 15, 	-- 管理功能开放
 	SpeedBox					= 16, 	-- 加速箱子
+	SelectItemBox				= 17, 	-- 自选箱子
 }
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -46,6 +46,7 @@ actionCodes = {
 	Role_goldBuyRpc = 131,
 	Role_getDownloadCvRewardRpc = 132,
 	Role_updateFeedbackInfoRpc = 133,
+	Role_useSelectItemRpc = 134,		-- 使用多选一礼包
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -1207,4 +1207,31 @@ function _M.updateFeedbackInfoRpc(agent, data)
 	return true
 end
+function _M.useSelectItemRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local itemId = msg.itemId
+	local index = msg.index
+	local count = msg.count
+	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
+	local itemData = csvdb["itemCsv"][itemId]
+	if itemData.type ~= ItemType.SelectItemBox then return end
+	local itemMap = itemData.use_effect:toNumMap()
+	local i = 1
+	local reward, change = {}
+	for k, v in pairs(itemMap) do
+		if i == index then
+			reward[k] = v * count
+			break
+		end
+		i = i + 1
+	end
+
+	if next(reward) then
+		reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
+		role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
+	end
+	SendPacket(actionCodes.Role_useSelectItemRpc, MsgPack.pack(role:packReward(reward, change)))
+end
+
 return _M
 \ No newline at end of file
-Subproject commit 15cca1cea5a190b9ed014890efdf3343dd28c2b8
+Subproject commit d90070e4a761a53afb25de2f01c51401af9791c1
@@ -260,7 +260,6 @@ activityFunc[Activity.ActivityType.DrawHero] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day draw card")
 		self.owner:sendMail(MailId.ActDrawCard)
 	end,
 }
@@ -278,7 +277,6 @@ activityFunc[Activity.ActivityType.FoodSell] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day sell food")
 		self.owner:sendMail(MailId.ActSellFood)
 	end,
 }
@@ -313,7 +311,6 @@ activityFunc[Activity.ActivityType.OpenBox] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day open box")
 		self.owner:sendMail(MailId.ActOpenBox)
 	end,
 }
@@ -34,7 +34,6 @@ end
 ResetFunc["CrossMonth"] = function(self, notify, response)
 	local ltime = self:getProperty("ltime")
 	if isCrossMonth(ltime, skynet.timex()) then
-		print("cross month")
 		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id
 	end
 end