Merge branch 'develop' into player

zhouhaihai
2 parents cb3b7127 aad10fac
Showing 12 changed files with 228 additions and 49 deletions Show diff stats
docs/日志说明.xlsx
src/RedisKeys.lua
src/actions/GmAction.lua
src/actions/StoreAction.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/adv/AdvTask.lua
src/models/RoleActivity.lua -> src/models/Activity.lua
src/models/Role.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
@@ -3,6 +3,7 @@ R_INCR 	= &quot;role:%d:autoincr&quot;
 R_HEROS = "role:%d:heroIds"
 R_HERO 	= "hero:%d:%d"
 R_DAILY = "role:%d:daily"
+R_ACTIVITY = "role:%d:act"
 R_DINER = "role:%d:diner"		-- 餐厅
 R_PVP = "role:%d:pvp"		-- pvp
 R_EQUIP_ROOT = "role:%d:equip*"       -- 装备根目录
@@ -516,7 +516,7 @@ end
  
 -- 充值回调
 function _M.ayncPurchase(role, params)
-	return role:handlePurchase(params)
+	return role:handlePurchase(params) or ""
 end
  
  
@@ -82,9 +82,10 @@ function _M.googleRechargeRpc(agent, data)
 	local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
 	local need = {
 		out_trade_no = partnerOrderId,
-		money = dataSet.rmb,
+		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
 		product_id = dataSet.productId,
+		notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/google"
 	}
 	local sign = signPms(need, secret_key)
  
@@ -108,8 +109,9 @@ function _M.myCardRechargeRpc(agent, data)
 	local secret_key = "48759e07540f46d9af17ec82669b4272"
 	local need = {
 		out_trade_no = partnerOrderId,
-		money = dataSet.rmb,
+		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
+		notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/mycard"
 	}
 	local sign = signPms(need, secret_key)
  
@@ -133,9 +135,10 @@ function _M.iosRechargeRpc(agent, data)
 	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
 	local need = {
 		out_trade_no = partnerOrderId,
-		money = dataSet.rmb,
+		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
-		product_id = dataSet.productId,
+		product_id = dataSet.iap_product_id,
+		notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/ios"
 	}
 	local sign = signPms(need, secret_key)
  
@@ -8,6 +8,7 @@ local Adv = class(&quot;Adv&quot;)
 local AdvTask = import(".AdvTask")  --任务相关数据搞出去
 AdvTask.bind(Adv)
  
+
 function Adv:ctor(owner)
 	assert(owner, "Adv instance must have owner(role)")
 	self.owner = owner
@@ -1307,6 +1308,7 @@ local function clickLinkChoose(self, room, block, params)
 		self.lchoose[startId] = (self.lchoose[startId] or 0) + 1
 		self:checkAchievement(Adv.AchievType.LinkChoose, 1, startId)
 		self:checkAchievement(Adv.AchievType.FinishStoryId, 1, chooseData.storyid)
+		self:checkTask(Adv.TaskType.FinishStoryId, 1, chooseData.storyid)
 		local advStoryB = self.owner:getProperty("advStoryB")
 		advStoryB[chooseData.storyid] = (advStoryB[chooseData.storyid] or 0) + 1
 		self.owner:setProperty("advStoryB", advStoryB)
@@ -1401,6 +1403,7 @@ end
  
 local function clickClick(self, room, block, params)
 	local clickData = csvdb["event_clickCsv"][block.event.id]
+	local oldId = block.event.id
 	if not clickData then return end
 	local clearBlock = true
 	local doEffect = {
@@ -1423,8 +1426,11 @@ local function clickClick(self, room, block, params)
 			end
 		end,
 	}
+
 	assert(doEffect[clickData.type], "error effect, event_clickCsv id :" .. block.event.id)
 	doEffect[clickData.type]()
+	self:checkTask(Adv.TaskType.Click, 1, oldId)
+
 	if clearBlock then
 		block:clear()
 	end
@@ -1800,45 +1806,77 @@ function Adv:enemyDead(enemy, escape)
 			end
 			local changeV = self.battle.player:addExp(monsterData.exp)
 			self:backDead(enemyId, changeV)
-			if enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK) then -- 掉落转为 click
-				local clickId = buff:effect()
-				block:updateEvent({
-					etype = AdvEventType.Click,
-					id = clickId
-				})
-				self.battle.player:triggerPassive(Passive.BATTLE_WIN)
-			else
-				local item = block.event.item
-				if not item then
-					local buff = enemy:hadBuff(Buff.CHANGE_DROP) 
-					if buff then
-						item = table.pack(buff:effect())
-					else
-						if monsterData.dropid == 0 then
-							item = {0, 0}
+
+			local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
+			if toClick then
+				toClick = toClick:effect()
+			end
+
+			local changItem = enemy:hadBuff(Buff.CHANGE_DROP)
+			if changItem then
+				changItem = table.pack(changItem:effect())
+			end
+
+			local addMult = 0
+			local dropBuff = enemy:hadBuff(Buff.DROP_BUFF_BY_ENEMY)  -- 根据敌人数量变化个数
+			if dropBuff then
+				local team = enemy:getTeam(1, true)
+				addMult = addMult + 0.2 * #team
+			end
+
+			local dropIds = monsterData.dropid:toArray(true, "=")
+			local drops = {}
+			local cCcount = 0 -- 需要改变为click 的个数
+			for _, dropId in ipairs(dropIds) do
+				local dropData = csvdb["event_dropCsv"][dropId]
+				if dropData then
+					local cur = dropData["range"]:randWeight(true)
+					if cur and cur[1] ~= 0 then
+						if toClick then
+							cCcount = cCcount + 1
 						else
-							local dropData = csvdb["event_dropCsv"][monsterData.dropid]
-							item = dropData["range"]:randWeight(true)
+							local item = changItem and changItem or cur
+							item[2] = math.floor(item[2] * (1 + addMult))
+							drops[#drops + 1] = item
 						end
 					end
-					
 				end
-				if item[1] == 0 then
-					block:clear()
-					self.battle.player:triggerPassive(Passive.BATTLE_WIN)
-				else
-					local buff = enemy:hadBuff(Buff.DROP_BUFF_BY_ENEMY)  -- 根据敌人数量变化个数
-					if buff then 
-						local team = enemy:getTeam(1, true)
-						item[2] = math.floor(item[2] * (1 + 0.2 * #team))
-					end
-					block:updateEvent({
-						etype = AdvEventType.Drop,
-						item = item
-					})
-					self.battle.player:triggerPassive(Passive.BATTLE_WIN, {itemId = item[1], count = item[2]})
+			end
+			-- 这些奖励可能会有被动加成
+			self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops})
+
+			-- 自身带的掉落是不会被改变的 也不会被加成
+			if block.event.item and block.event.item[1] ~= 0 then
+				drops[#drops + 1] = block.event.item
+			end
+
+			-- 清空当前的格子
+			block:clear()
+
+			-- 掉落走一波
+			local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, #drops)
+			for _i, cblock in ipairs(blocks) do
+				cblock:updateEvent({
+					etype = AdvEventType.Drop,
+					item = drops[_i]
+				})
+				if cblock ~= block then
+					self:backBlockChange(cblock.room.roomId, cblock.blockId)
 				end
 			end
+
+			-- 转换的click走一波
+			local blocks = self:getCurMap():getEmptyBlocks(roomId, blockId, cCcount)
+			for _i, cblock in ipairs(blocks) do
+				cblock:updateEvent({
+					etype = AdvEventType.Click,
+					id = clickId
+				})
+				if cblock ~= block then
+					self:backBlockChange(cblock.room.roomId, cblock.blockId)
+				end
+			end
+
 			self:checkTask(Adv.TaskType.Kill, 1, enemyId)
 			self:checkTask(Adv.TaskType.KillAll)
 			self:checkAchievement(Adv.AchievType.Kill, 1, enemyId)
@@ -1850,11 +1888,14 @@ function Adv:enemyDead(enemy, escape)
 			self:checkAchievement(Adv.AchievType.KillWithAMWeapon, 1)
  
 			if monsterData.type == 2 then
+				self:checkTask(Adv.TaskType.KillBoss, 1, enemyId)
 				self:checkAchievement(Adv.TaskType.KillBoss, 1, enemyId)
 				self:checkAchievement(Adv.TaskType.KillBossWithBuff, 1)
 				self:checkAchievement(Adv.TaskType.KillBossNoBuff, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithMWeapon, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithAMWeapon, 1)
+			elseif monsterData.type == 3 then
+				self:checkTask(Adv.TaskType.KillElite, 1, enemyId)
 			end
 		end
 	end
@@ -349,6 +349,55 @@ function Map:getBlocksBySize(roomId, blockId, size)
 	return blocks
 end
  
+-- 找周围的空格子 最多 49 个
+function Map:getEmptyBlocks(roomId, blockId, count)
+	local blocks = {}
+	if count == 0 then return blocks end
+	local room = self.rooms[roomId]
+	if not room then return end
+	local block = room.blocks[blockId]
+	if not block then return end
+
+	local col, row = room:tranLtoG(block.col, block.row)
+
+	-- 找周围49个格子
+	for range = 0, 3 do
+		if range == 0 then
+			if block.isOpen and not block:getEventType() then
+				blocks[#blocks + 1] = block
+				if #blocks >= count then
+					return blocks
+				end
+			end
+		else
+			for _, c in ipairs({col - range , col + range}) do
+				for r = row - range, row + range do
+					local rroom, rblock = self:getRBByPos(c, r)
+					if rroom and rblock.isOpen and not rblock:getEventType() then
+						blocks[#blocks + 1] = rblock
+						if #blocks >= count then
+							return blocks
+						end
+					end
+				end
+			end
+
+			for _, r in ipairs({row - range , row + range}) do
+				for c = col - range + 1, col + range - 1 do
+					local rroom, rblock = self:getRBByPos(c, r)
+					if rroom and rblock.isOpen and not rblock:getEventType() then
+						blocks[#blocks + 1] = rblock
+						if #blocks >= count then
+							return blocks
+						end
+					end
+				end
+			end
+		end
+	end
+	return blocks
+end
+
 function Map:getEnemysBySize(roomId, blockId, size)
 	local blocks = self:getBlocksBySize(roomId, blockId, size)
 	local enemys = {}
@@ -514,7 +563,6 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		--交易所
 		randomFunc[AdvEventType.Trader] = function()
 			-- if self.adv.isRelay and isNewRelay then return false end
-			if self.adv.isRelay then return false end
 			return randomCommon()
 		end
 		--建筑
@@ -485,8 +485,10 @@ end
  
 --10=战斗额外掉落次数
 function Passive:effect10(count, triggerPms)
-	if triggerPms.count then
-		self.owner.battle.adv:award({[triggerPms.itemId] = triggerPms.count * count}, {log = {desc = "passive", int1 = self.id}})
+	if triggerPms.drops then
+		for _, drop in pairs(triggerPms.drops) do
+			drop[2] = drop[2] + math.floor(drop[2] * count)
+		end
 	end
 end
  
@@ -11,6 +11,11 @@ function AdvTask.bind(Adv)
 		Shop		= 5, --和指定商人交易N次
 		Build		= 6, --和指定建筑交互N次
 		KillAll		= 7, --消灭本层所有怪物
+		KillElite	= 8, --击杀精英怪
+		KillBoss	= 9, --击杀Boss
+		RelayOpen = 10, -- 解锁中继营地
+		FinishStoryId = 11, -- 完成故事
+		Click = 12, -- 点击点击事件
 	}
  
 	-- 检查任务状态 在新领取任务的时候回进行检查
@@ -48,6 +53,13 @@ function AdvTask.bind(Adv)
 			end
 		end
  
+		checkTaskFunc[Adv.TaskType.RelayOpen] = function()
+			local limit = tonum(taskData.value2, 0)
+			if self.level > limit or (self.level == limit and self.isRelay) then
+				return -1
+			end
+		end
+
 		if checkTaskFunc[taskData.condition] then
 			status = checkTaskFunc[taskData.condition]()
 		else
@@ -84,6 +96,7 @@ function AdvTask.bind(Adv)
 			end
 		end
 		self:addTask()
+		self:checkTask(Adv.TaskType.RelayOpen) --每一层都检查一下
 	end
  
 	function Adv:checkTask(taskType, count, cond)
@@ -2,9 +2,10 @@ local Activity = class(&quot;Activity&quot;, require(&quot;shared.ModelBase&quot;))
  
  
 Activity.ActivityType = {
-
+	DoubleDrop = 1,  -- 双倍掉落
 }
  
+
 local function checkActivityType(activityType)
 	if type(activityType) == "string" then
 		activityType = Activity.ActivityType[activityType]
@@ -16,12 +17,12 @@ end
 function Activity:ctor(properties)
 	Activity.super.ctor(self, properties)
  
-	self.open = {}
-
+	self._isOpen = {}
 end
  
  
 Activity.schema = {
+	ctime 	= {"table", {}}, -- 最近检查某项活动的开始时间  {id = time}
 	_1		= {"table", {}},
 }
  
@@ -32,5 +33,49 @@ function Activity:data()
 end
  
  
+function Activity:updateProperty(params)
+	local type, default = table.unpack(self.schema[params.field])
+
+	if params.delta then
+		self:incrProperty(params.field, params.delta)
+		if not params.notNotify then
+			self.owner:notifyUpdateProperty(params.field, self:getProperty(params.field))
+		end
+		return true
+	end
+	if params.value then
+		self:setProperty(params.field, params.value)
+		if not params.notNotify then
+			self.owner:notifyUpdateProperty(params.field, self:getProperty(params.field))
+		end
+		return true
+	end
+	return false
+end
+
+
+function Activity:isOpen(activityType)
+	activityType = checkActivityType(activityType)
+
+end
+
+-- 跨天刷新 --登录刷新
+function Activity:checkActivityStatus(ltime, now, notify)
+	
+end
+
+local checkActivityFunc = {}
+
+checkActivityFunc[Activity.ActivityType.DoubleDrop] = function(self, notNotify, activityType, ...)
+
+end
+
+function Activity:checkActivityEnter(notNotify, activityType, ...)
+	if not activityType then return end
+	if checkActivityFunc[activityType] then
+		checkActivityFunc[activityType](self, notNotify, activityType, ...)
+	end
+end
+
  
 return Activity
 \ No newline at end of file
@@ -23,7 +23,7 @@ function Role:ctor( properties )
 	self.heros = {}
 	self.runeBag = {}
 	self.advData = nil
-
+	self.activity = nil
 	self.advElChapter = tonum(redisproxy:hget("adv_season", "chapter"), globalCsv.adv_endless_default_chapter) -- 无尽模式记录的赛季对应章节
 	self.advOverTime = tonum(redisproxy:hget("adv_season", "overTime")) -- 无尽模式关闭时间戳
 end
@@ -10,6 +10,7 @@ function RolePlugin.bind(Role)
 		self:loadRunes()
 		self:loadHeros()
 		self:loadDiner()
+		self:loadActivity()
 	end
  
 	function Role:reloadWhenLogin()
@@ -507,6 +508,18 @@ function RolePlugin.bind(Role)
 		end
 	end
  
+	function Role:loadActivity()
+		local roleId = self:getProperty("id")
+		local dataKey = string.format(R_ACTIVITY, roleId)
+		self.activity = require("models.Activity").new({key = dataKey})
+		self.activity.owner = self
+		if not redisproxy:exists(dataKey) then
+			self.activity:create()
+		else
+			self.activity:load()
+		end
+	end
+
 	function Role:loadDiner()
 		local roleId = self:getProperty("id")
 		local dataKey = string.format(R_DINER, roleId)
@@ -1191,6 +1204,7 @@ function RolePlugin.bind(Role)
 			info.wakeL = hero:getProperty("wakeL")
 			info.blockLevel = hero:getSkillLevel(4)
 			info.specialLevel = hero:getSkillLevel(1)
+			info.passiveLevel = hero:getSkillLevel(3)
 			info.runeSkill = hero:getRuneSkill(102)
 			teamInfo.heros[slot] = info
 		end
@@ -1443,8 +1457,8 @@ function RolePlugin.bind(Role)
  
 		local rechargeData = csvdb["shop_rechargeCsv"][orderObject:getProperty("rechargeId")]
 		if rechargeData.rmb ~= tonumber(params.amount) then
-			skynet.error(string.format("fake order: %s, roleId: %d, order: %s", 
-				params.transactionId, roleId, partnerOrderStr
+			skynet.error(string.format("fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
+				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
 			return
 		end
@@ -184,7 +184,7 @@ local AchievListener = {
 	}
 }
  
-local SudokuListerer = {
+local SudokuListener = {
 	func = "checkSudokuTask",
 	listen = {
 		[TaskType.HangPass] = {{1, 1, f("id")}},
@@ -205,12 +205,20 @@ local SudokuListerer = {
 	}
 }
  
+local ActivityListener = {
+	func = "checkActivityTask",
+	listener = {
+
+	}
+}
+
  
 local TaskListeners = {
 	StoryListener,
 	CommonListener,
 	AchievListener,
-	SudokuListerer,
+	SudokuListener,
+	ActivityListener,
 }
  
 local RoleTask = {}
@@ -517,6 +525,10 @@ function RoleTask.bind(Role)
 		end
 	end
  
+	function Role:checkActivityTask(notNotify, activityType, ...)
+		self.activity:checkActivityEnter(notNotify, activityType, ...)
+	end
+
 end
  
 return RoleTask
 \ No newline at end of file