Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

liuzujun · xiongrenfei · xiongrenfei · xiongrenfei · xiongrenfei
2 parents 190e1415 c23734ee
Showing 7 changed files with 29 additions and 16 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/HangAction.lua
src/actions/RoleAction.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
@@ -483,9 +483,11 @@ function _M.buyBonusCountRpc(agent, data)
 	if not TimeReset["DailyBattle" .. btype] then return end
 	local open, actId = role.activity:isOpen("BonusDouble")
 	local actData = csvdb["activity_ctrlCsv"][actId]
-	if not actData then return end
-	local coef = open and tonumber(actData.condition2) or 1
+	local coef = 1
+	if open and actData then
+		coef= tonumber(actData.condition2)
+	end
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
@@ -528,9 +530,11 @@ function _M.startBonusBattleRpc(agent, data)
 	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
 	local actData = csvdb["activity_ctrlCsv"][actId]
-	if not actData then return 6 end
-	local coef = open and tonumber(actData.condition2) or 1
+	local coef = 1
+	if open and actData then
+		coef = tonumber(actData.condition2)
+	end
 	if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 7 end
@@ -552,9 +556,11 @@ function _M.endBonusBattleRpc(agent, data)
 	if not role.__bonusBattleCache then return 1 end
 	local open, actId = role.activity:isOpen("BonusDouble")
 	local actData = csvdb["activity_ctrlCsv"][actId]
-	if not actData then return end
-	local coef = open and tonumber(actData.condition2) or 1
+	local coef = 1
+	if open and actData then
+		coef = tonumber(actData.condition2)
+	end
 	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
 		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
@@ -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
-Subproject commit d54c7ca07fd397022166b38b58b80a78f339f592
+Subproject commit 9bb26cfdb11f81dbfe6abbc468b44ca9f814deb2
@@ -218,10 +218,15 @@ function Activity:checkWeeklyAct(actType, notify, count, pool)
 		local info = actInfoMap[actType]
 		if not info then return end
+		local open, actId = self:isOpen(actType)
+		if not open then
+			return
+		end
+
 		local curData = self:getActData(actType)
 		local roundData = self:getProperty("round")
 		local curRound = roundData[actType] or 0
-		local ctrlData = csvdb["activity_ctrlCsv"][actType]
+		local ctrlData = csvdb["activity_ctrlCsv"][actId]
 		if not ctrlData then return end
 		if curRound >= ctrlData.condition then
 			return
@@ -350,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)