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

jiyue
2 parents e825af8c d63519df
Showing 11 changed files with 92 additions and 59 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/shared/functions.lua
@@ -433,7 +433,7 @@ SystemBnousType = {
 	UpSpeedNum = 15, -- 加速次数上限增加 15=1探索加速or 2齿轮加速or 3餐厅加速=增加次数
 	ChangeBaseCount = 16, -- 每日奖励关卡挑战卡基础数量增加
 	ChangeBuyCount = 17, -- 每日奖励关卡挑战卡可购买次数增加，
-	ExtraProp = 18, -- 每次探索加速额外获得道具
+	ExtraProps= 18, -- 每次探索加速额外获得道具
 	AccountLevel = 19, -- 账号等级提升角色等级上限
 }
@@ -62,8 +62,8 @@ actionCodes = {
     Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
     Role_setBgRpc = 144,   	-- 设置看板娘
 	Role_itemConvertSpecialRpc = 145, -- 兑换月卡/战令探索指令等 特殊道具
-	Role_worldLineRoulette = 146, --世界线抽轮盘
-	Role_worldLineReward = 147, -- 世界线一键领取奖励
+	Role_worldLineRouletteRpc = 146, --世界线抽轮盘
+	Role_worldLineRewardRpc = 147, -- 世界线一键领取奖励
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -117,6 +117,7 @@ actionCodes = {
 	Hero_setWishPoolRpc = 226,
 	Hero_changeSparkRpc = 227,
 	Hero_saveGeniusTreeRpc = 228,
+	Hero_stickersConvertRpc = 229, --兑换英雄贴纸
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -327,12 +327,16 @@ function _M.actBattleCommandTaskRpc(agent, data)
 		end
 	end
-	local taskReward = {}
+	local taskReward
 	if recordFlag then
+		-- recordFlag = true时，taskCfg.reward 只会有经验奖励
+        taskReward = {}
 		for k, v in pairs(taskCfg.reward:toNumMap()) do
 			taskReward[k] = (taskReward[k] or 0) + v + taskCfg.battlepass_reward
             break
 		end
+	else
+		taskReward = taskCfg.reward
 	end
 	local reward, change = role:award(taskReward, {log = {desc = "battleCommandTask"}})
@@ -506,14 +506,15 @@ function _M.buyAdvCountRpc(agent , data)
 	local msg = MsgPack.unpack(data)
 	local count = msg.count --购买次数
-	local isEl = msg.isEl -- 是否是无尽模式
+	local isEl = msg.isEl -- 是否是无尽模式 国服没有
 	local cost
 	if isEl then
 		if math.illegalNum(count, 1, globalCsv.adv_endless_daily_buy_count - role.dailyData:getProperty("advElBC")) then return end
 		cost = {[ItemId.Jade] = count * globalCsv.adv_endless_daily_buy_cost}
 	else
-		if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
-		cost = {[ItemId.Jade] = count * globalCsv.adv_daily_buy_cost}
+		--if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
+		local advCount = (role.dailyData:getProperty("advBC") + count ) * globalCsv.adv_daily_buy_num
+		cost = {[ItemId.Jade] = table.findMinKeyByItem(globalCsv.adv_buy_cost, advCount, globalCsv.adv_daily_buy_num)}
 	end
@@ -128,12 +128,10 @@ local function checkReward(role, isTreasure, carbonId)
 	--挂机得到的宝藏加入到挂机奖励
 	if isTreasure or false == true then
 		local treasureList= role.dailyData:checkTreasureList(carbonId or hangInfo.carbonId) or {}
-		if next(treasureList) then
-			for _, val in pairs(treasureList) do
-				local award  = val.award:toNumMap()
-				for k,v in pairs(award) do
-					items[k] = (items[k] or 0) + v
-				end
+		for _, val in pairs(treasureList) do
+			local award  = val.award:toNumMap()
+			for k,v in pairs(award) do
+				items[k] = (items[k] or 0) + v
 			end
 		end
 	end
@@ -473,30 +471,17 @@ function _M.quickRpc(agent , data)
 	local role = agent.role
 	local hangInfo = role:getProperty("hangInfo")
-	if not hangInfo.carbonId then return end
+	if not hangInfo.carbonId then return 1 end
 	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
 	--local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
 	local expCarbonData = hangInfo.expData or {}
+	local change = globalCsv.idle_quickproduce_time / 3600
 	local curCount = role.dailyData:getProperty("hangQC") + 1
-	local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
-
-    -- 增加今日探索加速次数
-	local maxIdx = #costs
-	local maxCount = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.ExplorationUpSpeed)
-	if curCount > maxCount then return end
+	local costCount = table.findMinKeyByItem(globalCsv.idle_quickproduce_cost, curCount * change, change)
-	if curCount > maxIdx then
-		for idx = maxIdx+1, curCount do
-			costs[idx] = costs[maxIdx]
-		end
-	end
-
-	if not costs[curCount] then return end
-	if costs[curCount] > 0 then
-		if not role:checkItemEnough({[ItemId.Jade] = costs[curCount]}) then return end
-		role:costItems({[ItemId.Jade] = costs[curCount]}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
-	end
+	if not role:checkItemEnough({[ItemId.Jade] = costCount}) then return 2 end
+	role:costItems({[ItemId.Jade] = costCount}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	role.dailyData:updateProperty({field = "hangQC", value = curCount})
@@ -536,8 +521,8 @@ function _M.quickRpc(agent , data)
 		end
 	end
-	--等级 额外奖励
-	local levelReward = role:getExtraProp()
+	--等级 每次探索加速额外获得道具
+	local levelReward = role:getBnousExtraProps()
 	for k, v in pairs(levelReward or {}) do
 		reward[k] = (reward[k] or 0) + v
 	end
@@ -586,13 +571,16 @@ function _M.buyBonusCountRpc(agent, data)
 	local bonusC = role.dailyData:getProperty("bonusC")
 	local extraCnt = role.storeData:getBonusExtraFightCount()
 	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
-	local lastCount = (globalCsv.bonus_daily_buy_count + role:getBnousChangeBuyCount()) * coef + extraCnt - bonusC[btype]["b"]
-	if math.illegalNum(count, 1, lastCount)  then return 1 end
+	--local lastCount = (globalCsv.bonus_daily_buy_count + role:getBnousChangeBuyCount()) * coef + extraCnt - bonusC[btype]["b"]
+	--if math.illegalNum(count, 1, lastCount)  then return 1 end
+
+	local costCount = bonusC[btype]["b"] + count
+	local cost = table.findMinKeyByItem(globalCsv.bonus_buy_cost, costCount, 1)
-	if not role:checkItemEnough({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}) then return 2 end
+	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 2 end
-	role:costItems({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
-	bonusC[btype]["b"] = bonusC[btype]["b"] + count
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
+	bonusC[btype]["b"] = costCount
 	bonusC[btype]["c"] = bonusC[btype]["c"] - count
 	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
@@ -1389,4 +1389,27 @@ function _M.saveGeniusTreeRpc(agent, data)
 	return true
 end
+function _M.stickersConvertRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local itemId = msg.itemId
+	local heroType = msg.heroType -- heroId-300 举例 [泡泡]= {[heroType] = 120, [heroId]= 420}
+
+	local itemData = csvdb["itemCsv"][itemId]
+	if not itemData then return 1 end
+
+    local useEffect = itemData["use_effect"]:toNumMap()
+	if not useEffect[heroType] then return 2 end
+
+	if not role:isHaveHero(heroType) then return 3 end
+
+    local cost = {[itemId] = 1}
+    if not role:checkItemEnough(cost) then return 4 end
+	role:costItems({[heroType] = cost}, {log = {desc = "heroStickers"}})
+	local reward, change = role:award({[heroType] = 1}, {log = {desc = "heroStickers"}})
+
+	SendPacket(actionCodes.Hero_stickersConvertRpc, MsgPack.pack(role:packReward(reward, change)))
+    return true
+end
+
 return _M
@@ -83,6 +83,9 @@ function _M.loginRpc( agent, data )
 		end
 	end
+	-- 设备记录
+	redisproxy:sadd(string_format("device:%d", roleId), msg.device)
+
 	local now = skynet.timex()
 	local role = agent.role
 	-- 2
@@ -614,11 +617,11 @@ function _M.openItemRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local itemId = msg.itemId
 	local count = msg.count
-	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
+	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return 1 end
 	local itemData = csvdb["itemCsv"][itemId]
-	if itemData.use_type ~= 2 then return end
+	if itemData.use_type ~= 2 then return 2 end
 	local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
-	if not randomData or randomData.openTime > 0 then return end
+	if not randomData or randomData.openTime > 0 then return 3 end
 	local reward = {}
 	for _i = 1, count do
@@ -1549,9 +1552,11 @@ function _M.diamondConvertRpc(agent, data)
 		local allReward = {}
 		if remain > old then
 			allReward[ItemId.Jade] = remain - old
+			role:checkWorldChangePoints({[ItemWorldLine.CostJade]= quan * globalCsv.recruit_cost})
 		elseif remain == old then
 		else
 			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert", short1=oper}})
+			role:checkWorldChangePoints({[ItemWorldLine.CostJade]= quan * globalCsv.recruit_cost - (old - remain)})
 		end
 		if quan > 0 then
@@ -1759,7 +1764,7 @@ function _M.itemConvertSpecialRpc(agent, data)
     return true
 end
-function _M.worldLineRoulette(agent, data)
+function _M.worldLineRouletteRpc(agent, data)
 	local role = agent.role
 	local worldChangePoints = role:getProperty("worldChangePoints") or {}
@@ -1776,7 +1781,7 @@ function _M.worldLineRoulette(agent, data)
 	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
+	for k, v in pairs(globalCsv["worldline_gift_magnification_0.1"]) do
 		worldline_gift_magnification_0[k] = {v}
 	end
@@ -1788,21 +1793,21 @@ function _M.worldLineRoulette(agent, data)
 	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
+	worldChangePoints[ItemWorldLine.Points] = (worldChangePoints[ItemWorldLine.Points] or 0) + points
     role:updateProperty({field = "worldChangePoints", value = worldChangePoints})
-	SendPacket(actionCodes.Role_worldLineRoulette, MsgPack.pack(worldChangePoints))
+	SendPacket(actionCodes.Role_worldLineRouletteRpc, MsgPack.pack({base_10 = gift_base_10, base_1 = gift_base_1, magnification_1 = gift_magnification_1, magnification_0 = gift_magnification_0}))
     return true
 end
-function _M.worldLineReward(agent, data)
+function _M.worldLineRewardRpc(agent, data)
 	local role = agent.role
     local worldLineReward = role:getProperty("worldLineReward") or {}
 	local worldChangePoints = role:getProperty("worldChangePoints") or {}
 	local points =  worldChangePoints[ItemWorldLine.Points] or 0
 	local reward, change = {}
-	for key, val in pairs(csvdb["worldline_rewardCsv"]) do
+	for key, val in pairs(csvdb["worldline_awardCsv"]) do
 		if points >= key and not worldLineReward[key] then
 			for k, v in pairs(val.award:toNumMap()) do
 				reward[k] = (reward[k] or 0) + v
@@ -1816,7 +1821,7 @@ function _M.worldLineReward(agent, data)
 	if next(reward) then
 		reward, change = role:award(reward,  {log = {desc = "worldLine", int1 = role:getProperty("id")}})
 	end
-	SendPacket(actionCodes.Role_worldLineReward, MsgPack.pack(role:packReward(reward, change)))
+	SendPacket(actionCodes.Role_worldLineRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -535,8 +535,16 @@ function _M.getExploreCommandRewardRpc(agent, data)
 		return 3
 	end
-	if not role:checkHangPass(config.level) then
-		return 4
+	for k, level in pairs(config.level:toNumMap()) do
+		if k == 1 then
+			if not role:checkHangPass(level) then
+				return 4
+			end
+		elseif k == 2 then
+			if not role:checkAdvChapterPass(level) then
+				return 4
+			end
+		end
 	end
 	local gift = ""
@@ -146,6 +146,7 @@ local ItemReason = {
 	sparkLvlUp = 1214,		-- 火花强化
 	sparkQualityUp = 1215,	-- 火花升华
 	heroGenius = 1216,  	-- 英雄天赋点
+	heroStickers = 1217, 	-- 英雄贴纸
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
@@ -3020,19 +3020,13 @@ function RolePlugin.bind(Role)
 		return levelBnous[SystemBnousType.ChangeBuyCount] or 0
 	end
-	function Role:getExtraProp()
+	function Role:getBnousExtraProps()
 		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
+		return levelBnous[SystemBnousType.ExtraProps] or {}
 	end
 	function Role:getAccountLevel()
 		local levelBnous = self:getLevelBnous()
-		dump(levelBnous)
 		return levelBnous[SystemBnousType.AccountLevel] or 0
 	end
@@ -3307,7 +3301,7 @@ function RolePlugin.bind(Role)
 			worldChangePoints[ItemWorldLine.CostDiamond] = worldChangePoints[ItemWorldLine.CostDiamond] - cost * globalCsv.worldline_count_currency
 			worldChangePoints[ItemWorldLine.Points] = (worldChangePoints[ItemWorldLine.Points] or 0) + cost
 		end
-		self:setProperty("worldChangePoints", worldChangePoints)
+		self:updateProperty({field = "worldChangePoints", value = worldChangePoints})
 	end
 end
@@ -865,6 +865,14 @@ function table.array2Table(arr)
     return ret
 end
+function table.findMinKeyByItem(t, item, change)
+    if next(t) and not t[item] then
+            item = item - change
+            return table.findMinKeyByItem(t, item, change)
+    else
+        return t[item]
+    end
+end
 function table.rewardMerge(dest, src)
     for k, v in pairs(src) do