Merge branch 'bugfix' into qa

* bugfix: 扣层数被动取消引导用到的剧情的奖励可以直接领调整顺序签到成就充值返利邮件内容优化

Merge branch 'bugfix' into qa
* bugfix: 扣层数被动取消引导用到的剧情的奖励可以直接领调整顺序签到成就充值返利邮件内容优化
熊润斐
2 parents cd8907bb bdd3a194
Showing 8 changed files with 19 additions and 12 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/RoleAction.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/csvdata
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RoleTask.lua
@@ -138,6 +138,7 @@ function _M.signRpc(agent, data)
 	local reward, change = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
 	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
+	role:checkTaskEnter("SignIn")
 	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -679,7 +679,7 @@ function _M.storyBookRewardRpc(agent, data)
 	if status == -1 then return end
 	if not status or status ~= 1 then 
-		if storyBookData.unlockType == 1 and role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) then  -- 挂机剧情正在挂机也可以领奖
+		if storyBookData.unlockType == 1 and (role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) or storyId == 1 or storyId == 2) then  -- 挂机剧情正在挂机也可以领奖
 		else
 			return 
 		end
@@ -304,7 +304,8 @@ function Passive:canEffect(effType, effValue)
 	end
 	--禁用被动技
 	local count = self.owner:getDisablePassiveCount()
-	if count and (count == 0 or self.owner:getPassiveIdx(self) <= count) then
+	local idx = self.owner:getPassiveIdx(self)
+	if count and idx and (count == 0 or idx <= count) then
 		return
 	end
 	return true
@@ -115,10 +115,13 @@ end
 function BaseObject:getPassiveIdx(passive)
 	for idx, passive_ in ipairs(self.passives) do
 		if passive_ == passive then
-			return idx
+			if passive.passiveData.dispel ~= 1 then
+				return idx
+			end
+			return
 		end
 	end
-	return 999
+	return
 end
 function BaseObject:getDisablePassiveCount()
@@ -667,6 +670,7 @@ function Player:effectBattleBuff()
 	for _, buff in ipairs(self.buffs) do
 		if not buff:isHide() and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
 			buff:effect()
+			buff:uncover()
 		end
 	end
 end
-Subproject commit d54c7ca07fd397022166b38b58b80a78f339f592
+Subproject commit 9bb26cfdb11f81dbfe6abbc468b44ca9f814deb2
@@ -355,7 +355,7 @@ activityFunc[Activity.ActivityType.PayBack] = {
 		local newVal = oldVal + twd
 		local gift, checkPoint = self.owner:getPaybackReward(oldVal, newVal)
 		if gift ~= "" then
-			local strCp = table.concat(checkPoint ,"/")
+			local strCp = table.concat(checkPoint ,"、")
 			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal, strCp})
 		end
 		self:updateActData(actType, newVal, not notify)
@@ -367,7 +367,6 @@ local MethodType = {
 	--]]
 	friend_opt = { --好友操作
 		friend_opt_type = true, -- 好友操作类型，见枚举表中 好友操作类型枚举表
-		friend_accountid = true, -- 好友账户id
 		friend_roleid = true, -- 好友账户下的角色id
 		friend_cnt = true, -- 操作后好友数量
 	},
@@ -82,8 +82,13 @@ local TaskType = {
 	GetFriendP = 803,			-- 获得友情点 		- count
 	-- 角色相关 
-	RoleLevelUp = 901,			-- 角色升级			- curlevel
-	RuneQualityCollect	= 902,	-- 铭文品质收集进度
+	RoleLevelUp = 851,			-- 角色升级			- curlevel
+	RuneQualityCollect	= 852,	-- 铭文品质收集进度
+
+	-- 其他相关
+	SignIn = 901,				-- 签到
+	Pay	= 902,					-- 充值
+	ShopAll = 903,				-- 在任意商店购买 	
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -93,9 +98,6 @@ local TaskType = {
 	BindPhone = 1008,			-- 绑定手机
 	WeChat = 1009,				-- 关注微信
 	WeBlog = 1010,				-- 关注微博
-	SignIn = 1011,				-- 签到
-	ShopAll = 1013,				-- 在任意商店购买 	
-	Pay	= 1014,				-- 充值
 }
 local function f(field, func)