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

# Conflicts: # src/csvdata

Merge branch 'cn/develop' into cn/publish/preview
# Conflicts: # src/csvdata
jiyue
2 parents f8a0d369 8c154e11
Showing 9 changed files with 102 additions and 26 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/HangAction.lua
src/actions/RoleAction.lua
src/agent.lua
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
@@ -430,6 +430,7 @@ SystemBnousType = {
 	UpSpeedNum = 15, -- 加速次数上限增加 15=1探索加速or 2齿轮加速or 3餐厅加速=增加次数
 	ChangeBaseCount = 16, -- 每日奖励关卡挑战卡基础数量增加
 	ChangeBuyCount = 17, -- 每日奖励关卡挑战卡可购买次数增加，
+	ExtraProp = 18, -- 每次探索加速额外获得道具
 }
 -- 开箱物品类型
@@ -61,7 +61,7 @@ actionCodes = {
     Role_runeBuyRpc = 142,   	-- 铭文购买
     Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
     Role_setBgRpc = 144,   	-- 设置看板娘
-	Role_itemConvertMonthCardRpc = 145, -- 兑换月卡/战令道具
+	Role_itemConvertSpecialRpc = 145, -- 兑换月卡/战令探索指令等 特殊道具
 	Role_worldLineRoulette = 146, --世界线抽轮盘
 	Role_worldLineReward = 147, -- 世界线一键领取奖励
@@ -250,7 +250,7 @@ actionCodes = {
 	Activity_actCalendaTaskRpc = 655,
 	Activity_actPaySignRpc = 656,
 	Activity_exchangeRpc = 657,
-	Activity_gachakonRpc = 658,
+	Activity_gachakonRpc = 658, --狩猎祭 抽扭蛋机
 	Activity_hangDropRpc = 659,
 	Activity_startBattleRpc = 660,
 	Activity_endBattleRpc = 661,
@@ -268,6 +268,7 @@ actionCodes = {
 	Activity_returnerTaskRpc = 673,
 	Activity_actNewUserTaskRpc = 674,
     Activity_buyBattleTicketRpc = 675,
+	Activity_resetGachakonRpc = 676, --狩猎祭，重制扭蛋机
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -479,6 +479,20 @@ function _M.gachakonRpc(agent, data)
 	return true
 end
+function _M.resetGachakonRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+
+	if not role.activity:isOpenById(actid, "Gachakon") then return 1 end
+
+	if role.activity:isResetById(actid, "Gachakon") then return 2 end
+	role.activity:resetActDataById(actid)
+
+	SendPacket(actionCodes.Activity_resetGachakonRpc, MsgPack.pack({}))
+    return true
+end
+
 function _M.hangDropRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -528,16 +528,20 @@ function _M.quickRpc(agent , data)
 	end
 	--宝藏加速
-	local treasureList= role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
-	if next(treasureList) then
-		for id, val in pairs(treasureList) do
-			local award  = val.award:toNumMap()
-			for k,v in pairs(award) do
-				reward[k] = (reward[k] or 0) + v
-			end
+	local treasureList = role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
+	for id, val in pairs(treasureList) do
+		local award  = val.award:toNumMap()
+		for k,v in pairs(award) do
+			reward[k] = (reward[k] or 0) + v
 		end
 	end
+	--等级 额外奖励
+	local levelReward = role:getExtraProp()
+	for k, v in pairs(levelReward or {}) do
+		reward[k] = (reward[k] or 0) + v
+	end
+
 	local change
 	reward, change = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	if reward[ItemId.Gold] then
@@ -1712,18 +1712,18 @@ function _M.setBgRpc(agent, data)
 	return true
 end
-function _M.itemConvertMonthCardRpc(agent, data)
+function _M.itemConvertSpecialRpc(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 count = msg.count or 1
 	local exchangeId = msg.exchange_id
-    if not ItemId[itemId] then return 1 end
+    local itemData = csvdb["itemCsv"][itemId]
+    if not itemData 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}})
+	role:costItems({[itemId] = count}, {log = {desc = "itemConvertSpecial", int1 = itemId, int2 = itemData.type}})
 	local rechargeData = csvdb["shop_rechargeCsv"][exchangeId]
 	if not rechargeData then
@@ -1751,27 +1751,27 @@ function _M.worldLineRoulette(agent, data)
     local rouletteCount =  worldChangePoints[ItemWorldLine.RouletteCount] or 0
 	if rouletteCount == 0 then return 1 end
-	local worldline_gift_base_10, worldline_gift_base_1, worldline_gift_magnification_10, worldline_gift_magnification_1 = {}, {}, {}, {}
+	local worldline_gift_base_10, worldline_gift_base_1, worldline_gift_magnification_1, worldline_gift_magnification_0 = {}, {}, {}, {}
 	for k, v in pairs(globalCsv.worldline_gift_base_10) do
 		worldline_gift_base_10[k] = {v}
 	end
 	for k, v in pairs(globalCsv.worldline_gift_base_1) do
 		worldline_gift_base_1[k] = {v}
 	end
-	for k, v in pairs(globalCsv.worldline_gift_magnification_10) do
-		worldline_gift_magnification_10[k] = {v}
-	end
 	for k, v in pairs(globalCsv.worldline_gift_magnification_1) do
 		worldline_gift_magnification_1[k] = {v}
 	end
+	for k, v in pairs(globalCsv.worldline_gift_magnification_0) do
+		worldline_gift_magnification_0[k] = {v}
+	end
     local gift_base_10 = (math.randWeight(worldline_gift_base_10, 1) or 0) * 10
 	local gift_base_1 = math.randWeight(worldline_gift_base_1, 1) or 0
-	local gift_magnification_10 = (math.randWeight(worldline_gift_magnification_10, 1) or 0) * 10
 	local gift_magnification_1 = math.randWeight(worldline_gift_magnification_1, 1) or 0
+	local gift_magnification_0 = (math.randWeight(worldline_gift_magnification_0, 1) or 0) * (0.1)
-	local points = (gift_base_10 + gift_base_1) * (gift_magnification_10 + gift_magnification_1)
+	local points = math.floor((gift_base_10 + gift_base_1) * (gift_magnification_1 + gift_magnification_0))
 	worldChangePoints[ItemWorldLine.RouletteCount] = worldChangePoints[ItemWorldLine.RouletteCount] - 1
 	worldChangePoints[ItemWorldLine.Points] = worldChangePoints[ItemWorldLine.Points] + points
     role:updateProperty({field = "worldChangePoints", value = worldChangePoints})
@@ -35,10 +35,17 @@ local function handle_timeout()
 	skynet.timeout(100, handle_timeout)
 end
+local function handle_gc()
+	if agentInfo.open_timer then return end
+    collectgarbage("collect")
+	skynet.timeout(6000, handle_gc)
+end
+
 function start_agent_timer()
 	if agentInfo.open_timer then return end
 	agentInfo.open_timer = true
 	skynet.timeout(150, handle_timeout)
+	skynet.timeout(6000, handle_gc)
 end
 function cancel_agent_timer()
@@ -93,6 +93,8 @@ Activity.schema = {
 	act34		= {"table", {}},	-- 战令记录{unlock = 1, freeR = "", payR = "", lvl = 10, sum = 100}
 	act36 		= {"table", {}}, -- 每日活跃签到 {0=day, 1=1,2=1,3=1}
+
+	reset20 = {"number", 1}, -- 重置扭蛋机
 }
 function Activity:data()
@@ -121,6 +123,8 @@ function Activity:data()
 		act34 = self:getProperty("act34"),
 		act36 = self:getProperty("act36"),
+
+		reset20 = self:getProperty("reset20")
 	}
 end
@@ -207,6 +211,24 @@ function Activity:isOpenById(id, activityType)
 	return self._isOpen[id]
 end
+function Activity:isResetById(id, activityType)
+	activityType = checkActivityType(activityType)
+	local cfg = csvdb["activity_ctrlCsv"][id]
+	if not cfg then return false end
+	if activityType ~= 0 and cfg.showType ~= activityType then return false end
+	return self:getResetData(activityType) == 0
+end
+
+function Activity:getResetData(actType)
+	actType = checkActivityType(actType)
+	return self:getProperty("reset" .. actType)
+end
+
+function Activity:updateResetData(actType, reset)
+	actType = checkActivityType(actType)
+	self:updateProperty({field = "reset" .. actType, value = reset})
+end
+
 function Activity:getActData(actType)
 	actType = checkActivityType(actType)
 	return self:getProperty("act" .. actType)
@@ -756,8 +778,14 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 		self:updateActData(actType, {}, not notify)
 	end,
 	["crossDay"] = function(self, actType, notify)
+		self:updateResetData(actType, 1)
 		self:updateActData(actType, {}, not notify)
 	end,
+	["reset"] = function(self, actType)
+		if self:getResetData(actType) == 0 then return end
+		self:updateResetData(actType, 0)
+		self:updateActData(actType, {})
+	end
 }
 -- 活动卡池
@@ -865,6 +893,15 @@ function Activity:refreshWeekData(notify)
 	end
 end
+function Activity:resetActDataById(actId)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
+	if activityFunc[actType] and activityFunc[actType]['reset'] then
+		activityFunc[actType]["reset"](self, actType)
+	end
+end
+
 function Activity:checkActivity(notNotify, activityType, ...)
 	if not activityType then return end
 	if not self:isOpen(activityType) then return end
@@ -66,8 +66,8 @@ local ItemReason = {
     shopBuy = 150,  -- 商店购买
 	monthCardReward = 151, --月卡奖励
 	smonthCardReward = 152, --特刊奖励
-	itemConvertmonthCard = 153, --兑换月卡
-	itemConvertsmonthCard = 154, --兑换特刊
+	itemConvertSpecial = 153, --兑换月卡/战令/探索指令  特殊道具
+	buyDiamondCardReward  = 154, --购买钻石额外赠送奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -2448,6 +2448,12 @@ function RolePlugin.bind(Role)
 				self:updateProperty({field = "rechargeF", value = rechargeF})
 			end
 			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
+
+			--已购月卡 购买魔导石 赠送cardReward
+			if not self.storeData:isMonthCardExpire() then
+				reward, _ = self:award(rechargeData.cardReward, {isRecharge = true, log = {desc = "buyDiamondCardReward", int1 = id}})
+			end
+
 		elseif rechargeData.shop == 2 then  --通行证商店
             --签收 + 订阅奖励
 			local tmpreward, _ = self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
@@ -2458,10 +2464,6 @@ function RolePlugin.bind(Role)
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 			self:checkTaskEnter("BuyLimitPack", {id = 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
@@ -3016,6 +3018,16 @@ function RolePlugin.bind(Role)
 		return levelBnous[SystemBnousType.ChangeBuyCount] or 0
 	end
+	function Role:getExtraProp()
+		local levelBnous = self:getLevelBnous()
+		local extraPropReward =  levelBnous[SystemBnousType.ExtraProp] or {}
+		local reward = {}
+		for k, v in pairs(extraPropReward) do
+			reward[k] = (reward[k] or 0) + v
+		end
+		return reward
+	end
+
 	function Role:getLevelBnous()
 		local levelBnous = {}
         local curLevel = self:getProperty("level")