diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index ef8000e0..421513ab 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -10,6 +10,13 @@ local chapter = { 1, 5 }, + ["involved_skill"]={ + { + 200200, + 29, + 20 + } + }, ["not_involved_skill"]={ 4, 5, diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index ac6dfe34..48f8f1c3 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -9,18 +9,78 @@ local chapter_board = { 1, 0 }, + { + 0, + 3 + }, { 0, 2 }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 0, 4 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, { 0, 2 }, + { + 0, + 4 + }, + { + 1, + 0 + }, { 1, 0 @@ -45,14 +105,6 @@ local chapter_board = { 0, 3 }, - { - 0, - 2 - }, - { - 0, - 4 - }, { 1, 0 @@ -61,26 +113,6 @@ local chapter_board = { 1, 0 }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, { 1, 0 @@ -89,30 +121,6 @@ local chapter_board = { 1, 0 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, { 1, 0 @@ -122,16 +130,8 @@ local chapter_board = { 0 }, { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 + 1, + 0 }, { 1, @@ -199,16 +199,18 @@ local chapter_board = { } }, ["control_element"]={ + 2, + 3, + 3, + 2, 2, 2, 2, 4, 2, - 4, 2, 2, - 2, - 2 + 3 } }, [2]={ diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index d2209299..0160c3ce 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -653,6 +653,7 @@ local skill_rogue = { [200100]={ ["limit_times"]=1, ["weight"]=30000, + ["qlt"]=4, ["type"]=6, ["skill_position"]=3, ["icon"]="55" diff --git a/lua/app/server/data/server_chapter_data.lua b/lua/app/server/data/server_chapter_data.lua index 64bfed90..04da52ed 100644 --- a/lua/app/server/data/server_chapter_data.lua +++ b/lua/app/server/data/server_chapter_data.lua @@ -3,8 +3,7 @@ local ServerChapterData = class("ServerChapterData", ServerBaseData) local MIN_CHAPTER_ID = 1 function ServerChapterData:init(data) - self.data.chapterId = data and data.chapterId or MIN_CHAPTER_ID - self.data.maxChapterId = data and data.maxChapterId or (self.data.chapterId - 1) + self.data.maxChapterId = data and data.maxChapterId or (MIN_CHAPTER_ID - 1) self.data.chapterBoxInfo = data and data.chapterBoxInfo or {} self.data.chapterFightInfo = data and data.chapterFightInfo or {} end diff --git a/lua/app/userdata/chapter/chapter_data.lua b/lua/app/userdata/chapter/chapter_data.lua index aef458c4..529c2e0a 100644 --- a/lua/app/userdata/chapter/chapter_data.lua +++ b/lua/app/userdata/chapter/chapter_data.lua @@ -18,10 +18,10 @@ function ChapterData:clear() end function ChapterData:init(data, notChangeChapterId) + self.data.maxChapterId = data and data.maxChapterId or MIN_CHAPTER_ID - 1 if not notChangeChapterId then - self.data.chapterId = data and data.chapterId or MIN_CHAPTER_ID + self.data.chapterId = self:getNextChapter(self.data.maxChapterId) end - self.data.maxChapterId = data and data.maxChapterId or self.data.chapterId - 1 self.data.chapterBoxInfo = data and data.chapterBoxInfo or {} self.data.chapterFightInfo = data and data.chapterFightInfo or {} end @@ -54,16 +54,24 @@ function ChapterData:setChapterId(chapterId) self.data.chapterId = chapterId end -function ChapterData:goNextChapter() - local chapterInfo = self:getChapterCfg()[self.data.chapterId] +function ChapterData:getNextChapter(chapterId) + local chapterInfo = self:getChapterCfg()[chapterId] if chapterInfo == nil then - return false + return chapterId end - local chapterId = chapterInfo.next_chapter - if chapterId == nil then - return false + if chapterInfo.next_chapter == nil then + return chapterId + end + return chapterInfo.next_chapter +end + +function ChapterData:goNextChapter() + local chapterId = self:getNextChapter(self.data.chapterId) + if self.data.chapterId == chapterId then + return false + else + self.data.chapterId = chapterId end - self.data.chapterId = chapterId return true end