冒险手册

zhouhaihai
1 parent 27cc6f23
Showing 3 changed files with 11 additions and 6 deletions Show diff stats
src/adv/AdvTask.lua
src/csvdata
src/models/Role.lua
@@ -226,11 +226,13 @@ function AdvTask.bind(Adv)
 	local advAchievChange = {}
  
 	local function insertChange(chapterId, taskId, value)
-		table.insert(advAchievChange, {type = "advAchiev", field = {chapterId, taskId}, value = value})
+		local achievField = AdvCommon.isEndless(chapterId) and "advEAchiev" or "advAchiev"
+		table.insert(advAchievChange, {type = achievField, field = {chapterId, taskId}, value = value})
 	end
  
 	function Adv:checkAchievement(taskType, count, cond, cond2)
-		local advAchiev = self.owner:getProperty("advAchiev")[self.chapterId] or {}
+		local achievField = self:isEndless() and "advEAchiev" or "advAchiev"
+		local advAchiev = self.owner:getProperty(achievField)[self.chapterId] or {}
 		for taskId , data in pairs(csvdb["adv_achievementCsv"][self.chapterId] or {}) do
 			local oldStatus = advAchiev[taskId] or 0
 			if oldStatus ~= -1 and data.type == taskType then
@@ -306,7 +308,7 @@ function AdvTask.bind(Adv)
 				if status and status ~= oldStatus then
 					insertChange(self.chapterId, taskId, status)
 					if status == -1 then
-						local ptcount = (self.owner:getProperty("advAchiev")[self.chapterId] or {})[-1] or 0
+						local ptcount = (self.owner:getProperty(achievField)[self.chapterId] or {})[-1] or 0
 						ptcount = ptcount + data.pt
 						insertChange(self.chapterId, -1, ptcount)
 					end
@@ -331,9 +333,10 @@ function AdvTask.bind(Adv)
 	-- end
  
 	function Adv:getAchievementReward(chapterId, taskId)
-		local count = (self.owner:getProperty("advAchiev")[chapterId] or {})[-1] or 0
+		local achievField = AdvCommon.isEndless(chapterId) and "advEAchiev" or "advAchiev"
+		local count = (self.owner:getProperty(achievField)[chapterId] or {})[-1] or 0
 		local achievData = (csvdb["adv_achievement_rewardCsv"][chapterId] or {})[taskId]
-		local status = ((self.owner:getProperty("advAchiev")[chapterId] or {})["pts"] or {})[taskId] or 0
+		local status = ((self.owner:getProperty(achievField)[chapterId] or {})["pts"] or {})[taskId] or 0
 		if status == -1 or count < achievData.pt then return end
  
 		local reward = self.owner:award(achievData.reward)
-Subproject commit 9a3181fa2f55dd5a1247bfd99f596b0cbc96a828
+Subproject commit bc23b59073a7200db7f84316fa049019f5495796
@@ -71,6 +71,7 @@ Role.schema = {
 	advDrawB			= {"table", {}}, -- 冒险抽奖回馈 {[1] = 0, [2] = 100} -- 池子类型 = 点数
 	advStoryB			= {"table", {}}, -- 冒险故事完成记录 （连锁事件绑定的故事） -- {storyId = 1}
 	advShop				= {"table", {}}, -- 冒险內的商店限制购买次数记录 {goodId = count}
+	advEAchiev			= {"table", {}}, -- 冒险无尽冒险手册
  
 	--挂机相关
 	hangPass 			= {"table", {}}, -- 挂机通过的最大关卡
@@ -253,6 +254,7 @@ function Role:data()
 		advAFWear = self:getProperty("advAFWear"),
 		advDrawB = self:getProperty("advDrawB"),
 		advShop = self:getProperty("advShop"),
+		advEAchiev = self:getProperty("advEAchiev"),
  
 		hangPass = self:getProperty("hangPass"),
 		hangTeam = self:getProperty("hangTeam"),