Hotfix - 1.6.0.85

EN: 1.6.0.85
CN: 1.6.0.88
JP: 1.6.0.89
KR: 1.6.0.92

data/gave_up/LanguageCommon.zh_cn.json

@@ -2055,7 +2055,7 @@
   "ActivityStory.101040209.1": "医者仁心",
   "ActivityStory.101040209.2": "别跑啊，打针是为了你好！",
   "ActivityStory.101040209.4": "BT",
-  "ActivityStory.101040210.1": "此去今年",
+  "ActivityStory.101040210.1": "此去经年",
   "ActivityStory.101040210.2": "他们只是想过个好年。",
   "ActivityStory.101040210.4": "08",
   "ActivityStory.101040211.1": "人间万象更新时",
@@ -6057,11 +6057,11 @@
   "CharacterArchiveContent.13301.2": "姓名：夏花\n生日：6月17日\n所属：■■旅团\n技能：野外冒险；魔物狩猎；爬塔；文书\n工作地址：菲莱城外东部森林■■旅团驻地\n经验：三年\n武器：风华\n薪资：可通过■■旅团发布委托；有专属委托请联系本人详谈",
   "CharacterArchiveContent.13301.3": "姓名：夏花\n生日：6月17日\n所属：花令旅团\n技能：野外冒险；魔物狩猎；爬塔；文书\n工作地址：菲莱城外东部森林花令旅团驻地\n经验：三年\n武器：风华\n薪资：可通过花令旅团发布委托；有专属委托请联系本人详谈",
   "CharacterArchiveContent.13302.1": "成为旅人的理由",
-  "CharacterArchiveContent.13302.2": "星塔历996年-联合种业内部调查报告\n\n……在地理协会撤出后，菲莱的旅人行业陷入了短暂的混乱期，目前尚不清楚达尔茜娅执行官在这一过程中扮演的角色。\n——《菲莱近况说明》，P24\n……\n菲莱分部向旅人们发布巨额委托的动机成谜……很可能提前与近期完成三大委托之一的知名旅人夏花和她的新讨伐队达成了某种协议。\n——《菲莱近况说明》，P26",
+  "CharacterArchiveContent.13302.2": "想要改变旅人行业，让每个旅人都能有保障、有尊严地从事热爱的工作。",
   "CharacterArchiveContent.13303.1": "简历摘录之一",
-  "CharacterArchiveContent.13303.2": "星塔历996年-菲莱周报第350期\n\n在“三大委托”终结过后，曾经主导了魔物讨伐的知名旅人夏花并没有就此停下脚步，她与花令旅团共同联手维护营地，开拓星塔，以及即将重新迎回地理协会。\n但是她真的能肩负起责任吗？有人充满怀疑，且看这位风头正劲的明星旅人，能否再创奇迹，本报将持续关注。",
+  "CharacterArchiveContent.13303.2": "星塔历996年-联合种业内部调查报告\n\n……在地理协会撤出后，菲莱的旅人行业陷入了短暂的混乱期，目前尚不清楚达尔茜娅执行官在这一过程中扮演的角色。\n——《菲莱近况说明》，P24\n……\n菲莱分部向旅人们发布巨额委托的动机成谜……很可能提前与近期完成三大委托之一的知名旅人夏花和她的新讨伐队达成了某种协议。\n——《菲莱近况说明》，P26",
   "CharacterArchiveContent.13304.1": "简历摘录之二",
-  "CharacterArchiveContent.13304.2": "某旅团会议材料\n\n夏花擅长适用魔法操纵战场局势，辅助队友，阻挠敌人。灵活多变的策略，令她总能在战斗中占据上风。\n重要的是头脑，而非力量，从她的战斗风格中可以很明确地看出这一点。明白了吗，诸位？\n想要赶上她可不容易，但她是最适合我们学习的对象。不是所有人都天赋异禀，不断进步、成长才是长久之道。",
+  "CharacterArchiveContent.13304.2": "星塔历996年-菲莱周报第350期\n\n在“三大委托”终结过后，曾经主导了魔物讨伐的知名旅人夏花并没有就此停下脚步，她与花令旅团共同联手维护营地，开拓星塔，以及即将重新迎回地理协会。\n但是她真的能肩负起责任吗？有人充满怀疑，且看这位风头正劲的明星旅人，能否再创奇迹，本报将持续关注。",
   "CharacterArchiveContent.13305.1": "简历摘录之三",
   "CharacterArchiveContent.13305.2": "某旅团会议材料\n\n夏花擅长适用魔法操纵战场局势，辅助队友，阻挠敌人。灵活多变的策略，令她总能在战斗中占据上风。\n重要的是头脑，而非力量，从她的战斗风格中可以很明确地看出这一点。明白了吗，诸位？\n想要赶上她可不容易，但她是最适合我们学习的对象。不是所有人都天赋异禀，不断进步、成长才是长久之道。",
   "CharacterArchiveContent.13306.1": "简历摘录之四",

data/language/en_us/activitystory.json

@@ -10,7 +10,7 @@
   "ActivityStory.101040203.4": "03",
   "ActivityStory.101040204.1": "The Bait Is Set",
   "ActivityStory.101040204.2": "Using bait, you lured the \"culprit\" out...",
-  "ActivityStory.101040204.4": "4",
+  "ActivityStory.101040204.4": "04",
   "ActivityStory.101040205.1": "Clean Sweep",
   "ActivityStory.101040205.2": "Make it quick and clean. Capture them in one sweep.",
   "ActivityStory.101040205.4": "BT",

data/language/en_us/affinityupreward.json

@@ -1,6 +1,6 @@
 {
   "AffinityUpReward.10301.1": "Trekker Story",
-  "AffinityUpReward.10301.4": "Trekker Story, Part I",
+  "AffinityUpReward.10301.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.10302.1": "Archive",
   "AffinityUpReward.10302.4": "CV Excerpt",
   "AffinityUpReward.10304.1": "Archive",
@@ -40,7 +40,7 @@
   "AffinityUpReward.10342.1": "Affinity Title",
   "AffinityUpReward.10342.4": "Affinity Up",
   "AffinityUpReward.10601.1": "Trekker Story",
-  "AffinityUpReward.10601.4": "Trekker Story, Part I",
+  "AffinityUpReward.10601.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.10602.1": "Archive",
   "AffinityUpReward.10602.4": "CV Excerpt",
   "AffinityUpReward.10604.1": "Archive",
@@ -80,7 +80,7 @@
   "AffinityUpReward.10642.1": "Affinity Title",
   "AffinityUpReward.10642.4": "Affinity Up",
   "AffinityUpReward.10701.1": "Trekker Story",
-  "AffinityUpReward.10701.4": "Trekker Story, Part I",
+  "AffinityUpReward.10701.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.10702.1": "Archive",
   "AffinityUpReward.10702.4": "CV Excerpt",
   "AffinityUpReward.10704.1": "Archive",
@@ -120,7 +120,7 @@
   "AffinityUpReward.10742.1": "Affinity Title",
   "AffinityUpReward.10742.4": "Affinity Up",
   "AffinityUpReward.10801.1": "Trekker Story",
-  "AffinityUpReward.10801.4": "Trekker Story, Part I",
+  "AffinityUpReward.10801.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.10802.1": "Archive",
   "AffinityUpReward.10802.4": "CV Excerpt",
   "AffinityUpReward.10804.1": "Archive",
@@ -160,7 +160,7 @@
   "AffinityUpReward.10842.1": "Affinity Title",
   "AffinityUpReward.10842.4": "Affinity Up",
   "AffinityUpReward.10901.1": "Trekker Story",
-  "AffinityUpReward.10901.4": "Trekker Story, Part I",
+  "AffinityUpReward.10901.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.10902.1": "Archive",
   "AffinityUpReward.10902.4": "CV Excerpt",
   "AffinityUpReward.10904.1": "Archive",
@@ -200,7 +200,7 @@
   "AffinityUpReward.10942.1": "Affinity Title",
   "AffinityUpReward.10942.4": "Affinity Up",
   "AffinityUpReward.11001.1": "Trekker Story",
-  "AffinityUpReward.11001.4": "Trekker Story, Part I",
+  "AffinityUpReward.11001.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11002.1": "Archive",
   "AffinityUpReward.11002.4": "CV Excerpt",
   "AffinityUpReward.11004.1": "Archive",
@@ -240,7 +240,7 @@
   "AffinityUpReward.11042.1": "Affinity Title",
   "AffinityUpReward.11042.4": "Affinity Up",
   "AffinityUpReward.11101.1": "Trekker Story",
-  "AffinityUpReward.11101.4": "Trekker Story, Part I",
+  "AffinityUpReward.11101.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11102.1": "Archive",
   "AffinityUpReward.11102.4": "CV Excerpt",
   "AffinityUpReward.11104.1": "Archive",
@@ -280,7 +280,7 @@
   "AffinityUpReward.11142.1": "Affinity Title",
   "AffinityUpReward.11142.4": "Affinity Up",
   "AffinityUpReward.11201.1": "Trekker Story",
-  "AffinityUpReward.11201.4": "Trekker Story, Part I",
+  "AffinityUpReward.11201.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11202.1": "Archive",
   "AffinityUpReward.11202.4": "CV Excerpt",
   "AffinityUpReward.11204.1": "Archive",
@@ -320,7 +320,7 @@
   "AffinityUpReward.11242.1": "Affinity Title",
   "AffinityUpReward.11242.4": "Affinity Up",
   "AffinityUpReward.11301.1": "Trekker Story",
-  "AffinityUpReward.11301.4": "Trekker Story, Part I",
+  "AffinityUpReward.11301.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11302.1": "Archive",
   "AffinityUpReward.11302.4": "CV Excerpt",
   "AffinityUpReward.11304.1": "Archive",
@@ -360,7 +360,7 @@
   "AffinityUpReward.11342.1": "Affinity Title",
   "AffinityUpReward.11342.4": "Affinity Up",
   "AffinityUpReward.11401.1": "Trekker Story",
-  "AffinityUpReward.11401.4": "Trekker Story, Part I",
+  "AffinityUpReward.11401.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11402.1": "Archive",
   "AffinityUpReward.11402.4": "CV Excerpt",
   "AffinityUpReward.11404.1": "Archive",
@@ -400,7 +400,7 @@
   "AffinityUpReward.11442.1": "Affinity Title",
   "AffinityUpReward.11442.4": "Affinity Up",
   "AffinityUpReward.11501.1": "Trekker Story",
-  "AffinityUpReward.11501.4": "Trekker Story, Part I",
+  "AffinityUpReward.11501.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11502.1": "Archive",
   "AffinityUpReward.11502.4": "CV Excerpt",
   "AffinityUpReward.11504.1": "Archive",
@@ -440,7 +440,7 @@
   "AffinityUpReward.11542.1": "Affinity Title",
   "AffinityUpReward.11542.4": "Affinity Up",
   "AffinityUpReward.11601.1": "Trekker Story",
-  "AffinityUpReward.11601.4": "Trekker Story, Part I",
+  "AffinityUpReward.11601.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11602.1": "Archive",
   "AffinityUpReward.11602.4": "CV Excerpt",
   "AffinityUpReward.11604.1": "Archive",
@@ -480,7 +480,7 @@
   "AffinityUpReward.11642.1": "Affinity Title",
   "AffinityUpReward.11642.4": "Affinity Up",
   "AffinityUpReward.11701.1": "Trekker Story",
-  "AffinityUpReward.11701.4": "Trekker Story, Part I",
+  "AffinityUpReward.11701.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11702.1": "Archive",
   "AffinityUpReward.11702.4": "CV Excerpt",
   "AffinityUpReward.11704.1": "Archive",
@@ -520,7 +520,7 @@
   "AffinityUpReward.11742.1": "Affinity Title",
   "AffinityUpReward.11742.4": "Affinity Up",
   "AffinityUpReward.11801.1": "Trekker Story",
-  "AffinityUpReward.11801.4": "Trekker Story, Part I",
+  "AffinityUpReward.11801.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11802.1": "Archive",
   "AffinityUpReward.11802.4": "CV Excerpt",
   "AffinityUpReward.11804.1": "Archive",
@@ -560,7 +560,7 @@
   "AffinityUpReward.11842.1": "Affinity Title",
   "AffinityUpReward.11842.4": "Affinity Up",
   "AffinityUpReward.11901.1": "Trekker Story",
-  "AffinityUpReward.11901.4": "Trekker Story, Part I",
+  "AffinityUpReward.11901.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.11902.1": "Archive",
   "AffinityUpReward.11902.4": "CV Excerpt",
   "AffinityUpReward.11904.1": "Archive",
@@ -600,7 +600,7 @@
   "AffinityUpReward.11942.1": "Affinity Title",
   "AffinityUpReward.11942.4": "Affinity Up",
   "AffinityUpReward.12001.1": "Trekker Story",
-  "AffinityUpReward.12001.4": "Trekker Story, Part I",
+  "AffinityUpReward.12001.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.12002.1": "Archive",
   "AffinityUpReward.12002.4": "CV Excerpt",
   "AffinityUpReward.12004.1": "Archive",
@@ -640,7 +640,7 @@
   "AffinityUpReward.12042.1": "Affinity Title",
   "AffinityUpReward.12042.4": "Affinity Up",
   "AffinityUpReward.12301.1": "Trekker Story",
-  "AffinityUpReward.12301.4": "Trekker Story, Part I",
+  "AffinityUpReward.12301.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.12302.1": "Archive",
   "AffinityUpReward.12302.4": "CV Excerpt",
   "AffinityUpReward.12304.1": "Archive",
@@ -680,7 +680,7 @@
   "AffinityUpReward.12342.1": "Affinity Title",
   "AffinityUpReward.12342.4": "Affinity Up",
   "AffinityUpReward.12501.1": "Trekker Story",
-  "AffinityUpReward.12501.4": "Trekker Story, Part I",
+  "AffinityUpReward.12501.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.12502.1": "Archive",
   "AffinityUpReward.12502.4": "CV Excerpt",
   "AffinityUpReward.12504.1": "Archive",
@@ -720,7 +720,7 @@
   "AffinityUpReward.12542.1": "Affinity Title",
   "AffinityUpReward.12542.4": "Affinity Up",
   "AffinityUpReward.12601.1": "Trekker Story",
-  "AffinityUpReward.12601.4": "Trekker Story, Part I",
+  "AffinityUpReward.12601.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.12602.1": "Archive",
   "AffinityUpReward.12602.4": "CV Excerpt",
   "AffinityUpReward.12604.1": "Archive",
@@ -760,7 +760,7 @@
   "AffinityUpReward.12642.1": "Affinity Title",
   "AffinityUpReward.12642.4": "Affinity Up",
   "AffinityUpReward.12701.1": "Trekker Story",
-  "AffinityUpReward.12701.4": "Trekker Story, Part I",
+  "AffinityUpReward.12701.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.12702.1": "Archive",
   "AffinityUpReward.12702.4": "CV Excerpt",
   "AffinityUpReward.12704.1": "Archive",
@@ -800,7 +800,7 @@
   "AffinityUpReward.12742.1": "Affinity Title",
   "AffinityUpReward.12742.4": "Affinity Up",
   "AffinityUpReward.12901.1": "Trekker Story",
-  "AffinityUpReward.12901.4": "Trekker Story, Part I",
+  "AffinityUpReward.12901.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.12902.1": "Archive",
   "AffinityUpReward.12902.4": "CV Excerpt",
   "AffinityUpReward.12904.1": "Archive",
@@ -840,7 +840,7 @@
   "AffinityUpReward.12942.1": "Affinity Title",
   "AffinityUpReward.12942.4": "Affinity Up",
   "AffinityUpReward.13001.1": "Trekker Story",
-  "AffinityUpReward.13001.4": "Trekker Story, Part I",
+  "AffinityUpReward.13001.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.13002.1": "Archive",
   "AffinityUpReward.13002.4": "CV Excerpt",
   "AffinityUpReward.13004.1": "Archive",
@@ -880,7 +880,7 @@
   "AffinityUpReward.13042.1": "Affinity Title",
   "AffinityUpReward.13042.4": "Affinity Up",
   "AffinityUpReward.13201.1": "Trekker Story",
-  "AffinityUpReward.13201.4": "Trekker Story, Part I",
+  "AffinityUpReward.13201.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.13202.1": "Archive",
   "AffinityUpReward.13202.4": "CV Excerpt",
   "AffinityUpReward.13204.1": "Archive",
@@ -920,7 +920,7 @@
   "AffinityUpReward.13242.1": "Affinity Title",
   "AffinityUpReward.13242.4": "Affinity Up",
   "AffinityUpReward.13301.1": "Trekker Story",
-  "AffinityUpReward.13301.4": "Trekker Story, Part I",
+  "AffinityUpReward.13301.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.13302.1": "Archive",
   "AffinityUpReward.13302.4": "CV Excerpt",
   "AffinityUpReward.13304.1": "Archive",
@@ -960,7 +960,7 @@
   "AffinityUpReward.13342.1": "Affinity Title",
   "AffinityUpReward.13342.4": "Affinity Up",
   "AffinityUpReward.13401.1": "Trekker Story",
-  "AffinityUpReward.13401.4": "Trekker Story, Part I",
+  "AffinityUpReward.13401.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.13402.1": "Archive",
   "AffinityUpReward.13402.4": "CV Excerpt",
   "AffinityUpReward.13404.1": "Archive",
@@ -1000,7 +1000,7 @@
   "AffinityUpReward.13442.1": "Affinity Title",
   "AffinityUpReward.13442.4": "Affinity Up",
   "AffinityUpReward.13501.1": "Trekker Story",
-  "AffinityUpReward.13501.4": "Trekker Story, Part I",
+  "AffinityUpReward.13501.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.13502.1": "Archive",
   "AffinityUpReward.13502.4": "CV Excerpt",
   "AffinityUpReward.13504.1": "Archive",
@@ -1040,7 +1040,7 @@
   "AffinityUpReward.13542.1": "Affinity Title",
   "AffinityUpReward.13542.4": "Affinity Up",
   "AffinityUpReward.14101.1": "Trekker Story",
-  "AffinityUpReward.14101.4": "Trekker Story, Part I",
+  "AffinityUpReward.14101.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.14102.1": "Archive",
   "AffinityUpReward.14102.4": "CV Excerpt",
   "AffinityUpReward.14104.1": "Archive",
@@ -1080,7 +1080,7 @@
   "AffinityUpReward.14142.1": "Affinity Title",
   "AffinityUpReward.14142.4": "Affinity Up",
   "AffinityUpReward.14201.1": "Trekker Story",
-  "AffinityUpReward.14201.4": "Trekker Story, Part I",
+  "AffinityUpReward.14201.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.14202.1": "Archive",
   "AffinityUpReward.14202.4": "CV Excerpt",
   "AffinityUpReward.14204.1": "Archive",
@@ -1120,7 +1120,7 @@
   "AffinityUpReward.14242.1": "Affinity Title",
   "AffinityUpReward.14242.4": "Affinity Up",
   "AffinityUpReward.14301.1": "Trekker Story",
-  "AffinityUpReward.14301.4": "Trekker Story, Part I",
+  "AffinityUpReward.14301.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.14302.1": "Archive",
   "AffinityUpReward.14302.4": "CV Excerpt",
   "AffinityUpReward.14304.1": "Archive",
@@ -1160,7 +1160,7 @@
   "AffinityUpReward.14342.1": "Affinity Title",
   "AffinityUpReward.14342.4": "Affinity Up",
   "AffinityUpReward.14401.1": "Trekker Story",
-  "AffinityUpReward.14401.4": "Trekker Story, Part I",
+  "AffinityUpReward.14401.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.14402.1": "Archive",
   "AffinityUpReward.14402.4": "CV Excerpt",
   "AffinityUpReward.14404.1": "Archive",
@@ -1200,7 +1200,7 @@
   "AffinityUpReward.14442.1": "Affinity Title",
   "AffinityUpReward.14442.4": "Affinity Up",
   "AffinityUpReward.14701.1": "Trekker Story",
-  "AffinityUpReward.14701.4": "Trekker Story, Part I",
+  "AffinityUpReward.14701.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.14702.1": "Archive",
   "AffinityUpReward.14702.4": "CV Excerpt",
   "AffinityUpReward.14704.1": "Archive",
@@ -1240,7 +1240,7 @@
   "AffinityUpReward.14742.1": "Affinity Title",
   "AffinityUpReward.14742.4": "Affinity Up",
   "AffinityUpReward.14901.1": "Trekker Story",
-  "AffinityUpReward.14901.4": "Trekker Story, Part I",
+  "AffinityUpReward.14901.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.14902.1": "Archive",
   "AffinityUpReward.14902.4": "CV Excerpt",
   "AffinityUpReward.14904.1": "Archive",
@@ -1280,7 +1280,7 @@
   "AffinityUpReward.14942.1": "Affinity Title",
   "AffinityUpReward.14942.4": "Affinity Up",
   "AffinityUpReward.15001.1": "Trekker Story",
-  "AffinityUpReward.15001.4": "Trekker Story, Part I",
+  "AffinityUpReward.15001.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.15002.1": "Archive",
   "AffinityUpReward.15002.4": "CV Excerpt",
   "AffinityUpReward.15004.1": "Archive",
@@ -1320,7 +1320,7 @@
   "AffinityUpReward.15042.1": "Affinity Title",
   "AffinityUpReward.15042.4": "Affinity Up",
   "AffinityUpReward.15501.1": "Trekker Story",
-  "AffinityUpReward.15501.4": "Trekker Story, Part I",
+  "AffinityUpReward.15501.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.15502.1": "Archive",
   "AffinityUpReward.15502.4": "CV Excerpt",
   "AffinityUpReward.15504.1": "Archive",
@@ -1360,7 +1360,7 @@
   "AffinityUpReward.15542.1": "Affinity Title",
   "AffinityUpReward.15542.4": "Affinity Up",
   "AffinityUpReward.15601.1": "Trekker Story",
-  "AffinityUpReward.15601.4": "Trekker Story, Part I",
+  "AffinityUpReward.15601.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.15602.1": "Archive",
   "AffinityUpReward.15602.4": "CV Excerpt",
   "AffinityUpReward.15604.1": "Archive",
@@ -1400,7 +1400,7 @@
   "AffinityUpReward.15642.1": "Affinity Title",
   "AffinityUpReward.15642.4": "Affinity Up",
   "AffinityUpReward.15801.1": "Trekker Story",
-  "AffinityUpReward.15801.4": "Trekker Story, Part I",
+  "AffinityUpReward.15801.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.15802.1": "Archive",
   "AffinityUpReward.15802.4": "CV Excerpt",
   "AffinityUpReward.15804.1": "Archive",
@@ -1440,7 +1440,7 @@
   "AffinityUpReward.15842.1": "Affinity Title",
   "AffinityUpReward.15842.4": "Affinity Up",
   "AffinityUpReward.15901.1": "Trekker Story",
-  "AffinityUpReward.15901.4": "Trekker Story, Part I",
+  "AffinityUpReward.15901.4": "Trekker Story, Part Ⅰ",
   "AffinityUpReward.15902.1": "Archive",
   "AffinityUpReward.15902.4": "CV Excerpt",
   "AffinityUpReward.15904.1": "Archive",

data/language/en_us/characterarchivecontent.json

@@ -521,11 +521,11 @@
   "CharacterArchiveContent.13301.2": "Name: Nazuka\nBirthday: June 17th\nAffiliation: ■■ Guild\nSkills: Wilderness adventuring, monster hunting, Monolith climbing, paperwork\nAddress: ■■ Guild Camp, Eastern Forest, Philae Outskirts\nExperience: Three years\nWeapon: Timeless Grace\nRates: Commissions may be sent to the ■■ Guild. For exclusive commissions, please contact me directly for details.",
   "CharacterArchiveContent.13301.3": "Name: Nazuka\nBirthday: June 17th\nAffiliation: Petal Bloom Guild\nSkills: Wilderness adventuring, monster hunting, Monolith climbing, paperwork\nAddress: Petal Bloom Guild Camp, Eastern Forest, Philae Outskirts\nExperience: Three years\nWeapon: Timeless Grace\nRates: Commissions may be sent to the Petal Bloom Guild. For exclusive commissions, please contact me directly for details.",
   "CharacterArchiveContent.13302.1": "Reason for Becoming a Trekker",
-  "CharacterArchiveContent.13302.2": "Monolith Calendar, Year 996 – United Harvest Internal Investigation Report\n\n...After the Trekker Association withdrew from the area, the Trekker industry in Philae fell into a brief period of disorder. It remains unclear what role CEO Darcia played during this process.\n—\"Report on the Current Situation in Philae,\" p.24\n...\nThe motive behind Philae branch's issuance of large-scale commissions to Trekkers remains a mystery... It is highly possible that an advance agreement was made with the renowned Trekker Nazuka and her newly formed team—Nazuka being the one who recently completed one of the Three Grand Commissions.\n—\"Report on the Current Situation in Philae,\" p.26",
+  "CharacterArchiveContent.13302.2": "I want to change the Trekker profession so that every Trekker can pursue the work they love with both security and dignity.",
   "CharacterArchiveContent.13303.1": "CV Excerpt 1",
-  "CharacterArchiveContent.13303.2": "Monolith Calendar, Year 996 – Philae Weekly, Issue 350\n\nFollowing the completion of the Three Grand Commissions, renowned Trekker Nazuka, who once led the monster-hunting campaigns, shows no sign of slowing down. Working alongside Petal Bloom, she's maintaining the Trekker camps, pushing deeper into the Monolith, and preparing for the return of the Trekker Association.\nBut can she truly take on such weighty responsibility? Some remain skeptical. Can this rising star of the Trekkers perform another miracle? Philae Weekly will be following her closely.",
+  "CharacterArchiveContent.13303.2": "Monolith Calendar, Year 996 – United Harvest Internal Investigation Report\n\n...After the Trekker Association withdrew from the area, the Trekker industry in Philae fell into a brief period of disorder. It remains unclear what role CEO Darcia played during this process.\n—\"Report on the Current Situation in Philae,\" p.24\n...\nThe motive behind Philae branch's issuance of large-scale commissions to Trekkers remains a mystery... It is highly possible that an advance agreement was made with the renowned Trekker Nazuka and her newly formed team—Nazuka being the one who recently completed one of the Three Grand Commissions.\n—\"Report on the Current Situation in Philae,\" p.26",
   "CharacterArchiveContent.13304.1": "CV Excerpt 2",
-  "CharacterArchiveContent.13304.2": "Guild Meeting Notes\n\nNazuka specializes in using magic to shape the battlefield—supporting her allies, hindering her enemies, and turning the tide with clever tactics. Her adaptable style lets her stay in control no matter how the fight unfolds.\nIt's brains, not brawn, that make the difference. Her way of fighting proves it. Got that, everyone?\nCatching up to her won't be easy, but she's the best example we could ask for. Not everyone's born with talent, but steady progress and growth—that's what lasts.",
+  "CharacterArchiveContent.13304.2": "Monolith Calendar, Year 996 – Philae Weekly, Issue 350\n\nFollowing the completion of the Three Grand Commissions, renowned Trekker Nazuka, who once led the monster-hunting campaigns, shows no sign of slowing down. Working alongside Petal Bloom, she's maintaining the Trekker camps, pushing deeper into the Monolith, and preparing for the return of the Trekker Association.\nBut can she truly take on such weighty responsibility? Some remain skeptical. Can this rising star of the Trekkers perform another miracle? Philae Weekly will be following her closely.",
   "CharacterArchiveContent.13305.1": "CV Excerpt 3",
   "CharacterArchiveContent.13305.2": "Guild Meeting Notes\n\nNazuka specializes in using magic to shape the battlefield—supporting her allies, hindering her enemies, and turning the tide with clever tactics. Her adaptable style lets her stay in control no matter how the fight unfolds.\nIt's brains, not brawn, that make the difference. Her way of fighting proves it. Got that, everyone?\nCatching up to her won't be easy, but she's the best example we could ask for. Not everyone's born with talent, but steady progress and growth—that's what lasts.",
   "CharacterArchiveContent.13306.1": "CV Excerpt 4",

data/language/en_us/chargetlines.json

@@ -13,7 +13,7 @@
   "CharGetLines.10802.1": "I'm delighted that you'll be staying on with us.",
   "CharGetLines.10803.1": "Here's the update to the contract. Make sure you read it.",
   "CharGetLines.10804.1": "I did think about adding another condition to the contract.\nI spent ages tried to figure out how to word it.\nBut now I know friendship isn't something that's built on paperwork.",
-  "CharGetLines.11001.1": "I'm Firenze. Let me show you what I can do.\nJust don't your dare disappoint me.",
+  "CharGetLines.11001.1": "I'm Firenze. Let me show you what I can do.\nJust don't you dare disappoint me.",
   "CharGetLines.11002.1": "We know each other well enough. No need for formalities.\nTell me why you want me, and maybe I'll go along.",
   "CharGetLines.11003.1": "Perhaps it's time to renegotiate our contract. Our partnership would benefit from it.",
   "CharGetLines.11004.1": "Now that you've chosen to stay by my side, there's no escaping me.",

data/language/en_us/datingcharacterevent.json

@@ -95,7 +95,7 @@
   "DatingCharacterEvent.116302.5": "Cakes To-Go",
   "DatingCharacterEvent.116302.6": "Visit the Dessert Shop to unlock",
   "DatingCharacterEvent.116302.7": "Together with Ridge, you ordered way too much at the Dessert Shop. You give her most of the extra. Cakes may be tasty, but they don't last long. Ridge, who loves stockpiling food, probably doesn't eat it often.",
-  "DatingCharacterEvent.117301.1": "While waiting for food,Jinglin runs to the kitchen's display window, peeking inside out of curiosity.",
+  "DatingCharacterEvent.117301.1": "While waiting for food, Jinglin runs to the kitchen's display window, peeking inside out of curiosity.",
   "DatingCharacterEvent.117301.2": "You come up behind her and tap lightly on her shoulder.\n\nJinglin is a bit startled and turns around to greet you.\n\n\"B-Boss, I was just curious about how they make their desserts here!\"",
   "DatingCharacterEvent.117301.3": "\"I see, then let's watch together.\" Before your food is served, you and Jinglin observe the chef's exquisite skills.",
   "DatingCharacterEvent.117301.5": "A Study in Dessert",

data/language/en_us/discip.json

@@ -122,7 +122,7 @@
   "DiscIP.213014.1": "Main Melody",
   "DiscIP.213014.2": "Victory Tune",
   "DiscIP.213014.3": "The Knight's Smith",
-  "DiscIP.213014.4": "Kaydoke is in her workshop, performing routine maintenance on her tools.\nA tender smile spreads across her face as she polishes her \"treasures.\"\nThe peace is shattered by the arrival of a blonde girl.\n\n\"Hey there! Sorry to barge in!\"\n\"... Yo, Tilia. What brings you by?\"\n\"Lapis Eagle's been acting up again. I was hoping you could ... take a look?\" she asks, scratching her head sheepishly.\n\"Again? Let me guess... You pushed it too hard chasing those Ashwind punks, didn't you?\"\n\"Rushing over the rough terrain of the Ash District for way too long?\"\n\"Whoa, spot on! You have your own intel network or something?\"\n\"Hardly. This is the fourth time this week.\"\n\"Heh heh...\"\n\"You're hopeless. Bring 'er in.\"\n\nKaydoke gets to work, focusing on the Lapis Eagle before her.\nAfter a moment, the blonde girl pipes up.\n\n\"So, um...\"\n\"Hm?\"\n\"Since you're taking it apart anyway, could you maybe also...\"\n\"No.\"\n\"Huh? I haven't even says anything yet.\"\n\"I know exactly what you want. Some kind of glowing, transforming armor, right? Or maybe bolt-on weapons or an extra engine?\"\n\"So that's a no?\"\n\"Of course not. This is a patrol scooter! Look, what happens if you make a little kid wear a full suit of Imperial Guard armor?\"\n\"They'd ... become a little knight?\"\n\"... They'd get crushed by the weight of it, right?\"\n\"Oh! Right! I guess they would.\"\n\"It's the same for your scooter.\"\n\"Adding all those flashy mods won't improve its performance. It'll just weigh it down.\"\n\"I see... Have the other knights really never asked for stuff like that?\"\n\"You think everyone's like you?!\"\n\nWith the Lapis Eagle fixed, Kaydoke walks Tilia out.\n\n\"Thanks, Kay! Oh, this is for you.\"\n\"Is this ... taiyaki?\"\n\"Yep! From that new dessert shop.\nTheir taiyaki is amazing, and I wanted you to try some.\"\n\"Oh, thanks. You didn't have to.\nAnyway, try to take better care of your Lapis Eagle. If you wreck it again this week, I'm not fixing it.\"\n\"Three days! Can we make it three days? I swear I'll make it last longer this time, please, Kay?\"\n(Sighs)\n\nThe boisterous blonde finally leaves.\nThe paper bag holding the taiyaki rustles in Kaydoke's hand.\n\"It's already gone cold from the ride over!\"",
+  "DiscIP.213014.4": "Kaydoke is in her workshop, performing routine maintenance on her tools.\nA tender smile spreads across her face as she polishes her \"treasures.\"\nThe peace is shattered by the arrival of a blonde girl.\n\n\"Hey there! Sorry to barge in!\"\n\"... Yo, Tilia. What brings you by?\"\n\"Lapis Eagle's been acting up again. I was hoping you could ... take a look?\" she asks, scratching her head sheepishly.\n\"Again? Let me guess... You pushed it too hard chasing those Ashwind punks, didn't you?\"\n\"Rushing over the rough terrain of the Ash District for way too long?\"\n\"Whoa, spot on! You have your own intel network or something?\"\n\"Hardly. This is the fourth time this week.\"\n\"Heh heh...\"\n\"You're hopeless. Bring 'er in.\"\n\nKaydoke gets to work, focusing on the Lapis Eagle before her.\nAfter a moment, the blonde girl pipes up.\n\n\"So, um...\"\n\"Hm?\"\n\"Since you're taking it apart anyway, could you maybe also...\"\n\"No.\"\n\"Huh? I haven't even said anything yet.\"\n\"I know exactly what you want. Some kind of glowing, transforming armor, right? Or maybe bolt-on weapons or an extra engine?\"\n\"So that's a no?\"\n\"Of course not. This is a patrol scooter! Look, what happens if you make a little kid wear a full suit of Imperial Guard armor?\"\n\"They'd ... become a little knight?\"\n\"... They'd get crushed by the weight of it, right?\"\n\"Oh! Right! I guess they would.\"\n\"It's the same for your scooter.\"\n\"Adding all those flashy mods won't improve its performance. It'll just weigh it down.\"\n\"I see... Have the other knights really never asked for stuff like that?\"\n\"You think everyone's like you?!\"\n\nWith the Lapis Eagle fixed, Kaydoke walks Tilia out.\n\n\"Thanks, Kay! Oh, this is for you.\"\n\"Is this ... taiyaki?\"\n\"Yep! From that new dessert shop.\nTheir taiyaki is amazing, and I wanted you to try some.\"\n\"Oh, thanks. You didn't have to.\nAnyway, try to take better care of your Lapis Eagle. If you wreck it again this week, I'm not fixing it.\"\n\"Three days! Can we make it three days? I swear I'll make it last longer this time, please, Kay?\"\n(Sighs)\n\nThe boisterous blonde finally leaves.\nThe paper bag holding the taiyaki rustles in Kaydoke's hand.\n\"It's already gone cold from the ride over!\"",
   "DiscIP.213015.1": "Main Melody",
   "DiscIP.213015.2": "Victory Tune",
   "DiscIP.213015.3": "Unknown Fragrance",

data/language/en_us/plot.json

@@ -1,45 +1,45 @@
 {
-  "Plot.10301.1": "The Lost Kitten, Part I",
+  "Plot.10301.1": "The Lost Kitten, Part Ⅰ",
   "Plot.10301.2": "A single \"hunt,\" one unfortunate mistake, and a pair of innocent eyes.",
   "Plot.10302.1": "The Lost Kitten, Part Ⅱ",
   "Plot.10302.2": "A grand adventure with you, a girl, and a cat.",
   "Plot.10303.1": "The Lost Kitten, Part Ⅲ",
   "Plot.10303.2": "Words spoken from the heart, and a promise made.",
-  "Plot.10701.1": "Masked Knight Tilia! Part I",
+  "Plot.10701.1": "Masked Knight Tilia! Part Ⅰ",
   "Plot.10701.2": "Crisis looms! Storms never cease.",
   "Plot.10702.1": "Masked Knight Tilia! Part Ⅱ",
   "Plot.10702.2": "The heart of justice awakens! A knight who hunts giants.",
   "Plot.10703.1": "Masked Knight Tilia!, Part Ⅲ",
   "Plot.10703.2": "Friendship and bonds! The hero returns riding Falcon.",
-  "Plot.10801.1": "Lucky Day, Part I",
+  "Plot.10801.1": "Lucky Day, Part Ⅰ",
   "Plot.10801.2": "A lost lucky charm? Nothing is more important than that!",
   "Plot.10802.1": "Lucky Day, Part Ⅱ",
   "Plot.10802.2": "Where shall a new lucky charm be found? Out in the Wilds? Or in a fortune cookie shop?",
   "Plot.10803.1": "Lucky Day, Part Ⅲ",
   "Plot.10803.2": "Run, Boss! Run if you wanna keep your shoes!",
-  "Plot.11001.1": "Philae Vacation, Part I",
+  "Plot.11001.1": "Philae Vacation, Part Ⅰ",
   "Plot.11001.2": "A side of her you have never seen.",
   "Plot.11002.1": "Philae Vacation, Part Ⅱ",
   "Plot.11002.2": "The super-popular girl makes her debut?!",
   "Plot.11003.1": "Philae Vacation, Part Ⅲ",
   "Plot.11003.2": "I want to share this taste with you, for it is linked to my memories.",
-  "Plot.11101.1": "The Shopping War, Part I",
+  "Plot.11101.1": "The Shopping War, Part Ⅰ",
   "Plot.11101.2": "Oh no! Everything's on the line! Iris's future must be saved!",
   "Plot.11102.1": "The Shopping War, Part Ⅱ",
   "Plot.11102.2": "Time is life! Speed means survival! There is no time to hesitate! Every second counts!",
   "Plot.11103.1": "The Shopping War, Part Ⅲ",
   "Plot.11103.2": "Leave your worries and gloom behind—lose yourself in the sweet scent of butter and sugar.",
-  "Plot.11201.1": "Fast and Focused, Part I",
+  "Plot.11201.1": "Fast and Focused, Part Ⅰ",
   "Plot.11201.2": "Having successfully modified Loxy, Noya warmly invites you to join her for a \"relaxing\" joyride.",
   "Plot.11202.1": "Fast and Focused, Part Ⅱ",
   "Plot.11202.2": "Her wild driving quickly makes you fear for your life. And sure enough, your worst fears start to come true...",
   "Plot.11203.1": "Fast and Focused, Part Ⅲ",
   "Plot.11203.2": "You get caught in a tense, high-speed chase against street racers. In a critical moment, Noya makes her choice...",
-  "Plot.11301.1": "Hot Pot Buddies, Part I",
+  "Plot.11301.1": "Hot Pot Buddies, Part Ⅰ",
   "Plot.11301.2": "Commission From Shimiao: Case investigation... Wait, why does this sound dangerous?",
   "Plot.11302.1": "Hot Pot Buddies, Part Ⅱ",
   "Plot.11302.2": "The first step in solving the case: retrace the steps of the Xuan Shi group!",
-  "Plot.11303.1": "Hot Pot Buddies, Part Ⅱ",
+  "Plot.11303.1": "Hot Pot Buddies, Part Ⅲ",
   "Plot.11303.2": "The truth comes to light... But a new commission appears?!",
   "Plot.11401.1": "???",
   "Plot.11401.2": "???",
@@ -53,55 +53,55 @@
   "Plot.11502.2": "???",
   "Plot.11503.1": "???",
   "Plot.11503.2": "???",
-  "Plot.11601.1": "Atypical Greenhouse, Part I",
+  "Plot.11601.1": "Atypical Greenhouse, Part Ⅰ",
   "Plot.11601.2": "You are invited to Ridge's greenhouse, but wait ... is it really just a greenhouse?",
   "Plot.11602.1": "Atypical Greenhouse, Part Ⅱ",
   "Plot.11602.2": "You and Ridge caught a few food thieves. What? They did it out of necessity?",
   "Plot.11603.1": "Atypical Greenhouse, Part Ⅲ",
   "Plot.11603.2": "The peas are thriving with Ridge's boost, but ... aren't they a little too big now? Oh no, the pea plants are eating people!",
-  "Plot.11701.1": "Candy Hidden within the Promise, Part I",
+  "Plot.11701.1": "Candy Hidden within the Promise, Part Ⅰ",
   "Plot.11701.2": "\"The place in front of you is the most popular restaurant in all of Philae!\"—says the little manager proudly, her tail wagging.",
   "Plot.11702.1": "Candy Hidden within the Promise, Part Ⅱ",
   "Plot.11702.2": "Beat a Loong master at mahjong? That challenge should be a piece of cake for the Boss!",
   "Plot.11703.1": "Candy Hidden within the Promise, Part Ⅲ",
   "Plot.11703.2": "\"Thank you... For sticking with someone childish like me~\"",
-  "Plot.11801.1": "Bones Obsession, Part I",
+  "Plot.11801.1": "Bones Obsession, Part Ⅰ",
   "Plot.11801.2": "The guild arrived at Coronis' clinic to confirm whether the Boss's sickness truly is terminal. From the expression on the three's faces, you realize your life is about to come to an end...",
   "Plot.11802.1": "Bones Obsession, Part Ⅱ",
   "Plot.11802.2": "As you stay and rest, you witness Coronis' superior medical practice techniques. Would a doctor with such skills be able to cheat death...?",
   "Plot.11803.1": "Bones Obsession, Part Ⅲ",
   "Plot.11803.2": "When you were discharged, Coronis bestowed upon you her treasured specimen.",
-  "Plot.11901.1": "The Maid's Secret Mission, Part I",
+  "Plot.11901.1": "The Maid's Secret Mission, Part Ⅰ",
   "Plot.11901.2": "Maid's Mission One: Share Sweetness.",
   "Plot.11902.1": "The Maid's Secret Mission, Part Ⅱ",
   "Plot.11902.2": "Maid's Mission Two: Win the Grand Prize.",
   "Plot.11903.1": "The Maid's Secret Mission, Part Ⅲ",
   "Plot.11903.2": "Maid's Mission Three: ...Mission? What Mission!",
-  "Plot.12001.1": "After-Class Paper Writing, Part I",
+  "Plot.12001.1": "After-Class Paper Writing, Part Ⅰ",
   "Plot.12001.2": "Nobody's told me that freelance Trekkers need to write papers!",
   "Plot.12002.1": "After-Class Paper Writing, Part Ⅱ",
   "Plot.12002.2": "Unexpected! Unforeseen! A sudden visit!",
   "Plot.12003.1": "After-Class Paper Writing, Part Ⅲ",
   "Plot.12003.2": "Does anyone still remember that we came here to write a paper!",
-  "Plot.12301.1": "The Sleepless Guardian, Part I",
+  "Plot.12301.1": "The Sleepless Guardian, Part Ⅰ",
   "Plot.12301.2": "There's no age requirement for being a forest guardian.",
   "Plot.12302.1": "The Sleepless Little Guardian, Part Ⅱ",
   "Plot.12302.2": "Trap handling, medicine grinding, wound treatment, animal communication... Don't be surprised—these are all required skills.",
   "Plot.12303.1": "The Sleepless Guardian, Part Ⅲ",
   "Plot.12303.2": "When something doesn't make sense, get some sleep first. One day, you'll understand.",
-  "Plot.12501.1": "A Bonding Duel, Part I",
+  "Plot.12501.1": "A Bonding Duel, Part Ⅰ",
   "Plot.12501.2": "What does it take to become a Special Delivery Person at Post Haste?",
   "Plot.12502.1": "A Bonding Duel, Part Ⅱ",
   "Plot.12502.2": "When the girl swings her great axe, the earth itself trembles.",
   "Plot.12503.1": "A Bonding Duel, Part Ⅲ",
   "Plot.12503.2": "This time, the one standing across the ring is you.",
-  "Plot.12601.1": "Miss Butterfly, Part I",
+  "Plot.12601.1": "Miss Butterfly, Part Ⅰ",
   "Plot.12601.2": "The grand stage of the Magician Maximus—today, you're the guest of honor.",
   "Plot.12602.1": "Miss Butterfly, Part Ⅱ",
   "Plot.12602.2": "A chance to be a big star's personal assistant—better make the most of it.",
   "Plot.12603.1": "Miss Butterfly, Part Ⅲ",
   "Plot.12603.2": "When the spotlight fades, she reveals the true secrets behind her \"magic.\"",
-  "Plot.12701.1": "The Nimble yet Unbreakable Messenger, Part I",
+  "Plot.12701.1": "The Nimble yet Unbreakable Messenger, Part Ⅰ",
   "Plot.12701.2": "They say that if you always walk by the water, your shoes are bound to get wet, but even so...",
   "Plot.12702.1": "The Nimble yet Unbreakable Messenger, Part Ⅱ",
   "Plot.12702.2": "Some people just have ... very strange talents.",
@@ -113,25 +113,25 @@
   "Plot.13002.2": "???",
   "Plot.13003.1": "???",
   "Plot.13003.2": "???",
-  "Plot.13201.1": "A Delinquent's Day, Part I",
+  "Plot.13201.1": "A Delinquent's Day, Part Ⅰ",
   "Plot.13201.2": "Throwing down over honor and turf is just another day's work for a \"delinquent girl.\"",
   "Plot.13202.1": "A Delinquent's Day, Part Ⅱ",
   "Plot.13202.2": "The battlefield of pen and paper is the delinquent girl's voluntary overtime.",
   "Plot.13203.1": "A Delinquent's Day, Part Ⅲ",
   "Plot.13203.2": "Bombs! More bombs! Phantom Bomb Rider are her secret hobby.",
-  "Plot.13301.1": "Whispers in the Wind, Part I",
+  "Plot.13301.1": "Whispers in the Wind, Part Ⅰ",
   "Plot.13301.2": "The meaning of the pinwheel gift is a secret that I would never tell.",
   "Plot.13302.1": "Whispers in the Wind, Part Ⅱ",
   "Plot.13302.2": "The real reason for being late is a secret; I just wanted to share your burden.",
   "Plot.13303.1": "Whispers in the Wind, Part Ⅲ",
   "Plot.13303.2": "What I said that day is a secret; someday, I'll tell you what's truly in my heart.",
-  "Plot.13401.1": "First Snow（Part I）",
+  "Plot.13401.1": "First Snow, Part I",
   "Plot.13401.2": "The adventures have come to a temporary end. Growth has brought on new troubles. You and the timid white-haired girl reunite once again as Philae is slowly covered in snow.",
-  "Plot.13402.1": "First Snow（Part Ⅱ）",
+  "Plot.13402.1": "First Snow, Part Ⅱ",
   "Plot.13402.2": "Her efforts may be clumsy, but they're sincere. And the change is happening before anyone realizes it.",
-  "Plot.13403.1": "First Snow（Part Ⅲ）",
+  "Plot.13403.1": "First Snow, Part Ⅲ",
   "Plot.13403.2": "She speaks on the stage to say farewell to her past. With your help and care, she rediscovers her true self.",
-  "Plot.13501.1": "A Special Report, Part I",
+  "Plot.13501.1": "A Special Report, Part Ⅰ",
   "Plot.13501.2": "Sensing a gaze on you, you turn around to find the Witch sneaking closer—as it turns out, she's plotting a big scoop!",
   "Plot.13502.1": "A Special Report, Part Ⅱ",
   "Plot.13502.2": "The Boss and the Witch arrange a private, up-close interview, only for a mysterious thug to crash the scene!",
@@ -143,13 +143,13 @@
   "Plot.14002.2": "???",
   "Plot.14003.1": "???",
   "Plot.14003.2": "???",
-  "Plot.14101.1": "The Haunted Village, Part I",
+  "Plot.14101.1": "The Haunted Village, Part Ⅰ",
   "Plot.14101.2": "Spooky things continue to happen in the wilderness outside the city. There are suspicions of areas being \"haunted.\" The cowardly Xuan Shi is tasked with the incident... With only one step into the village, Xuan Shi began to scream frantically—",
   "Plot.14102.1": "The Haunted Village, Part Ⅱ",
   "Plot.14102.2": "Does the old diary's record of that unfinished wedding contain a trace of regret? A shadow flickers—could it really be a ghost?",
   "Plot.14103.1": "The Haunted Village, Part Ⅲ",
   "Plot.14103.2": "Are the secrets veiled by night the doings of \"ghosts\" or simply humans? As the candlelight flickers, it points to what took place beneath the red silk.",
-  "Plot.14201.1": "The \"Date\", Part I",
+  "Plot.14201.1": "The \"Date\", Part Ⅰ",
   "Plot.14201.2": "Supposedly a date invitation ... But there's no way it's a normal date, right!?",
   "Plot.14202.1": "The \"Date\", Part Ⅱ",
   "Plot.14202.2": "Always remember the main goal of this \"date\" is to gather intel... Huh?? What drink?!",
@@ -161,7 +161,7 @@
   "Plot.14302.2": "???",
   "Plot.14303.1": "???",
   "Plot.14303.2": "???",
-  "Plot.14401.1": "Training for Oneness, Part I",
+  "Plot.14401.1": "Training for Oneness, Part Ⅰ",
   "Plot.14401.2": "You ran into Chitose on the street, and the two of you started talking about how to achieve the state of Oneness...",
   "Plot.14402.1": "Training for Oneness, Part Ⅱ",
   "Plot.14402.2": "They say if you hold your breath, focus, and gaze into each other's eyes, your hearts will connect... But for two people who are always out of sync, can it really work?",
@@ -173,37 +173,37 @@
   "Plot.14502.2": "???",
   "Plot.14503.1": "???",
   "Plot.14503.2": "???",
-  "Plot.14701.1": "Echo of Hearts and Stars, Part I",
+  "Plot.14701.1": "Echo of Hearts and Stars, Part Ⅰ",
   "Plot.14701.2": "Given the task of \"healing the trauma of war-ridden Trekkers,\" a troubled Boss unexpectedly hears a familiar melody in Flavio...",
   "Plot.14702.1": "Echo of Hearts and Stars, Part Ⅱ",
   "Plot.14702.2": "Caramel asks you to become her personal producer. You think of a great way for her to get inspired...",
   "Plot.14703.1": "Echo of Hearts and Stars, Part Ⅲ",
   "Plot.14703.2": "At the Trekker Camp beneath the Monolith, you and Caramel step on the stage. Flavio's next legend is about to be born...",
-  "Plot.14901.1": "Collar and Rope, Part I",
+  "Plot.14901.1": "Collar and Rope, Part Ⅰ",
   "Plot.14901.2": "An unbreakable cursed bond. An unforeseen reunion.",
   "Plot.14902.1": "Collar and Rope, Part Ⅱ",
   "Plot.14902.2": "What terrible secrets lie behind those wild, cynical eyes?",
   "Plot.14903.1": "Collar and Rope, Part Ⅲ",
   "Plot.14903.2": "The reins of fate have been placed in your hands—you are destined to tame the ravenous beast before you.",
-  "Plot.15001.1": "The Great Fry-tastrophe, Part I",
+  "Plot.15001.1": "The Great Fry-tastrophe, Part Ⅰ",
   "Plot.15001.2": "No work talk while fishing on company time! But if you catch a fish, Laru will hear you out~",
   "Plot.15002.1": "The Great Fry-tastrophe, Part Ⅱ",
   "Plot.15002.2": "Even if you only catch a strand of weed, it still counts as a catch—but you said fries, what fries?!",
   "Plot.15003.1": "The Great Fry-tastrophe, Part Ⅲ",
   "Plot.15003.2": "At this point, Laru's future is in your hands...!",
-  "Plot.15501.1": "The Nostalgic Scent, Part I",
+  "Plot.15501.1": "The Nostalgic Scent, Part Ⅰ",
   "Plot.15501.2": "A scent adrift on the sea breeze, stirring memories.",
   "Plot.15502.1": "The Nostalgic Scent, Part Ⅱ",
   "Plot.15502.2": "A scent lingering in the old alleys, long since vanished.",
   "Plot.15503.1": "The Nostalgic Scent, Part Ⅲ",
   "Plot.15503.2": "A scent clinging to your back, constant and unchanging.",
-  "Plot.15601.1": "Big Cleanup Job in a Small Room, Part I",
+  "Plot.15601.1": "Big Cleanup Job in a Small Room, Part Ⅰ",
   "Plot.15601.2": "Death K has delivered the final verdict, the end draws near. And then—that person appeared.",
   "Plot.15602.1": "Big Cleanup Job in a Small Room, Part Ⅱ",
   "Plot.15602.2": "Even with eyes clouded by desire and a soul worn down by time, they never stopped moving forward.",
   "Plot.15603.1": "Big Cleanup Job in a Small Room, Part Ⅲ",
   "Plot.15603.2": "The crisis was averted. Following those footsteps, her adventure had only just begun.",
-  "Plot.15801.1": "Gifts on Delivery, Part I",
+  "Plot.15801.1": "Gifts on Delivery, Part Ⅰ",
   "Plot.15801.2": "The Snowish Festival has already passed, but the work isn't over, and the new mission is... Huh? A cannon?!",
   "Plot.15802.1": "Gifts on Delivery, Part Ⅱ",
   "Plot.15802.2": "First test of the cannon delivery system, the capsule we fired... Why is it coming back?",

data/language/en_us/secondaryskill.json

@@ -979,15 +979,15 @@
   "SecondarySkill.4044204.2": "After the main Terra Trekker deals DMG to targets inflicted with Spring Blossom {1} times, increases Terra squadmates' Skill DMG by <color=#ec6d21>{2}</color> for {3}s.",
   "SecondarySkill.4044205.1": "Blossom's Requiring",
   "SecondarySkill.4044205.2": "After the main Terra Trekker deals DMG to targets inflicted with Spring Blossom {1} times, increases Terra squadmates' Skill DMG by <color=#ec6d21>{2}</color> for {3}s.",
-  "SecondarySkill.4048101.1": "Kingdom of Fires",
+  "SecondarySkill.4048101.1": "Kingdom of Fries",
   "SecondarySkill.4048101.2": "Hymn grants extra effects: Increases the Ignis Skill DMG Taken by <color=#ec6d21>{1}</color>.\u000bWhen ##Ode#6002# is converted in to Hymn, increases the Skill DMG of Ignis Trekkers in the squad by <color=#ec6d21>{2}</color> for {3}s, up to {4} stacks.",
-  "SecondarySkill.4048102.1": "Kingdom of Fires",
+  "SecondarySkill.4048102.1": "Kingdom of Fries",
   "SecondarySkill.4048102.2": "Hymn grants extra effects: Increases the Ignis Skill DMG Taken by <color=#ec6d21>{1}</color>.\u000bWhen ##Ode#6002# is converted in to Hymn, increases the Skill DMG of Ignis Trekkers in the squad by <color=#ec6d21>{2}</color> for {3}s, up to {4} stacks.",
-  "SecondarySkill.4048103.1": "Kingdom of Fires",
+  "SecondarySkill.4048103.1": "Kingdom of Fries",
   "SecondarySkill.4048103.2": "Hymn grants extra effects: Increases the Ignis Skill DMG Taken by <color=#ec6d21>{1}</color>.\u000bWhen ##Ode#6002# is converted in to Hymn, increases the Skill DMG of Ignis Trekkers in the squad by <color=#ec6d21>{2}</color> for {3}s, up to {4} stacks.",
-  "SecondarySkill.4048104.1": "Kingdom of Fires",
+  "SecondarySkill.4048104.1": "Kingdom of Fries",
   "SecondarySkill.4048104.2": "Hymn grants extra effects: Increases the Ignis Skill DMG Taken by <color=#ec6d21>{1}</color>.\u000bWhen ##Ode#6002# is converted in to Hymn, increases the Skill DMG of Ignis Trekkers in the squad by <color=#ec6d21>{2}</color> for {3}s, up to {4} stacks.",
-  "SecondarySkill.4048105.1": "Kingdom of Fires",
+  "SecondarySkill.4048105.1": "Kingdom of Fries",
   "SecondarySkill.4048105.2": "Hymn grants extra effects: Increases the Ignis Skill DMG Taken by <color=#ec6d21>{1}</color>.\u000bWhen ##Ode#6002# is converted in to Hymn, increases the Skill DMG of Ignis Trekkers in the squad by <color=#ec6d21>{2}</color> for {3}s, up to {4} stacks.",
   "SecondarySkill.4048201.1": "Crispy Crunch",
   "SecondarySkill.4048201.2": "##Ode#6002# grants extra effects: Reduces enemy ATK by <color=#ec6d21>{1}</color>.\u000bIgnis Trekkers in the squad deal increased Ultimate DMG to targets inflicted with Ode by <color=#ec6d21>{2}</color>.",

data/language/en_us/storysetsection.json

@@ -1,12 +1,12 @@
 {
   "StorySetSection.100101.1": "Act One",
-  "StorySetSection.100101.2": "The Chill of the Blade, the Warmth of Your Grip, Part I",
+  "StorySetSection.100101.2": "The Chill of the Blade, the Warmth of Your Grip, Part Ⅰ",
   "StorySetSection.100102.1": "Act Two",
   "StorySetSection.100102.2": "The Chill of the Blade, the Warmth of Your Grip, Part Ⅱ",
   "StorySetSection.100103.1": "Act Three",
   "StorySetSection.100103.2": "The Chill of the Blade, the Warmth of Your Grip, Part Ⅲ",
   "StorySetSection.100201.1": "Act One",
-  "StorySetSection.100201.2": "Your Name, Unknown to My Heart, Part I",
+  "StorySetSection.100201.2": "Your Name, Unknown to My Heart, Part Ⅰ",
   "StorySetSection.100202.1": "Act Two",
   "StorySetSection.100202.2": "Your Name, Unknown to My Heart, Part Ⅱ",
   "StorySetSection.100203.1": "Act Three",
@@ -14,37 +14,37 @@
   "StorySetSection.100204.1": "Act Four",
   "StorySetSection.100204.2": "Your Name, Unknown to My Heart, Part Ⅳ",
   "StorySetSection.100301.1": "Act One",
-  "StorySetSection.100301.2": "A Thousand Blossoms by Night, Part I",
+  "StorySetSection.100301.2": "A Thousand Blossoms by Night, Part Ⅰ",
   "StorySetSection.100302.1": "Act Two",
   "StorySetSection.100302.2": "A Thousand Blossoms by Night, Part Ⅱ",
   "StorySetSection.100303.1": "Act Three",
   "StorySetSection.100303.2": "A Thousand Blossoms by Night, Part Ⅲ",
   "StorySetSection.100401.1": "Act One",
-  "StorySetSection.100401.2": "Matcha Dreaming, Part I",
+  "StorySetSection.100401.2": "Matcha Dreaming, Part Ⅰ",
   "StorySetSection.100402.1": "Act Two",
   "StorySetSection.100402.2": "Matcha Dreaming, Part Ⅱ",
   "StorySetSection.100403.1": "Act Three",
   "StorySetSection.100403.2": "Matcha Dreaming, Part Ⅲ",
   "StorySetSection.100501.1": "Act One",
-  "StorySetSection.100501.2": "The Old Timer and the Newcomer, Part I",
+  "StorySetSection.100501.2": "The Old Timer and the Newcomer, Part Ⅰ",
   "StorySetSection.100502.1": "Act Two",
   "StorySetSection.100502.2": "The Old Timer and the Newcomer, Part Ⅱ",
   "StorySetSection.100503.1": "Act Three",
   "StorySetSection.100503.2": "The Old Timer and the Newcomer, Part Ⅲ",
   "StorySetSection.100601.1": "Act One",
-  "StorySetSection.100601.2": "Soul of a Guard, Heart of a Knight, Part I",
+  "StorySetSection.100601.2": "Soul of a Guard, Heart of a Knight, Part Ⅰ",
   "StorySetSection.100602.1": "Act Two",
   "StorySetSection.100602.2": "Soul of a Guard, Heart of a Knight, Part Ⅱ",
   "StorySetSection.100603.1": "Act Three",
   "StorySetSection.100603.2": "Soul of a Guard, Heart of a Knight, Part Ⅲ",
   "StorySetSection.100701.1": "Act One",
-  "StorySetSection.100701.2": "Wish in the Snow, Part I",
+  "StorySetSection.100701.2": "Wish in the Snow, Part Ⅰ",
   "StorySetSection.100702.1": "Act Two",
   "StorySetSection.100702.2": "Wish in the Snow, Part Ⅱ",
   "StorySetSection.100703.1": "Act Three",
   "StorySetSection.100703.2": "Wish in the Snow, Part Ⅲ",
   "StorySetSection.100801.1": "Act One",
-  "StorySetSection.100801.2": "Captive of Truth, Part I",
+  "StorySetSection.100801.2": "Captive of Truth, Part Ⅰ",
   "StorySetSection.100802.1": "Act Two",
   "StorySetSection.100802.2": "Captive of Truth, Part Ⅱ",
   "StorySetSection.100803.1": "Act Three",

data/language/ja_jp/activitylevelslevel.json

@@ -329,7 +329,7 @@
   "ActivityLevelsLevel.1040206.3": "120秒以内にクリアする",
   "ActivityLevelsLevel.1040206.4": "残り時間20秒以上でクリアする",
   "ActivityLevelsLevel.1040206.5": "残り時間30秒以上でクリアする",
-  "ActivityLevelsLevel.1040207.1": "巡回隊Ⅴ",
+  "ActivityLevelsLevel.1040207.1": "巡回隊Ⅳ",
   "ActivityLevelsLevel.1040207.2": "賑やかなお祭り会場を怪しい影が横切った！\r\n楽しい新春を守るため、正体を調査せよ！",
   "ActivityLevelsLevel.1040207.3": "120秒以内にクリアする",
   "ActivityLevelsLevel.1040207.4": "残り時間20秒以上でクリアする",

data/language/ja_jp/characterarchivecontent.json

@@ -521,11 +521,11 @@
   "CharacterArchiveContent.13301.2": "*****",
   "CharacterArchiveContent.13301.3": "*****",
   "CharacterArchiveContent.13302.1": "巡遊者になった理由",
-  "CharacterArchiveContent.13302.2": "星歴996年- アグリ・ユニオン内部調査報告\r\n\r\n……地理協会の撤退後、フィーリエの巡遊者業界は一時的な混乱に陥った。現在のところ、ダリシア執行官がこの過程で果たした役割は不明である。\r\n――『フィーリエ近況報告』P24\r\n……\r\n……フィーリエ支部が巡遊者たちに巨額の依頼を発注した動機は謎に包まれている。三大依頼の一つを完遂した実力派の巡遊者・ナツカ、そして彼女が率いる新しい討伐隊との間にあらかじめ何らかの合意があった可能性が高い。\r\n――『フィーリエ近況報告』P26",
+  "CharacterArchiveContent.13302.2": "フィーリエの巡遊者業界の現状を変え、すべての巡遊者がよりよい生活を送れるようにする。",
   "CharacterArchiveContent.13303.1": "履歴書からの抜粋（１）",
-  "CharacterArchiveContent.13303.2": "星歴996年 - フィーリエ週報 第350号\r\n\r\n「三大依頼」が完了した後も、魔物討伐を主導した高名な巡遊者・ナツカは歩みを止めなかった。花咲旅団に戻った彼女は、キャンプの維持や星ノ塔の開拓、そして地理協会の再受け入れに向けた準備を進めている。\r\nだが、彼女は本当にその責任を背負えるのだろうか？世間の評価は割れている。いま最も注目を集める巡遊者であるナツカが、再び奇跡を起こせるか――本紙は今後も追い続けていく。",
+  "CharacterArchiveContent.13303.2": "星歴996年- アグリ・ユニオン内部調査報告\r\n\r\n……地理協会の撤退後、フィーリエの巡遊者業界は一時的な混乱に陥った。現在のところ、ダリシア執行官がこの過程で果たした役割は不明である。\r\n――『フィーリエ近況報告』P24\r\n……\r\n……フィーリエ支部が巡遊者たちに巨額の依頼を発注した動機は謎に包まれている。三大依頼の一つを完遂した実力派の巡遊者・ナツカ、そして彼女が率いる新しい討伐隊との間にあらかじめ何らかの合意があった可能性が高い。\r\n――『フィーリエ近況報告』P26",
   "CharacterArchiveContent.13304.1": "履歴書からの抜粋（２）",
-  "CharacterArchiveContent.13304.2": "某ギルドの会議資料より\r\n\r\nナツカは魔法を駆使して戦闘を有利に進め、味方を援護し、敵を翻弄することを得意とする。その柔軟で多彩な戦術により、常に戦場では主導権を握ってきた。\r\n重要なのは「力」ではなく「頭脳」。彼女の戦い方がそれを明確に示している。\r\nいいか諸君、彼女に追いつくのは容易ではない。\r\nだが、彼女こそ我々が学ぶべき最高の模範だ。天賦の才を持つ者は少ない。それゆえに、成長し続ける努力が何より大切なのだ。",
+  "CharacterArchiveContent.13304.2": "星歴996年 - フィーリエ週報 第350号\r\n\r\n「三大依頼」が完了した後も、魔物討伐を主導した高名な巡遊者・ナツカは歩みを止めなかった。花咲旅団に戻った彼女は、キャンプの維持や星ノ塔の開拓、そして地理協会の再受け入れに向けた準備を進めている。\r\nだが、彼女は本当にその責任を背負えるのだろうか？世間の評価は割れている。いま最も注目を集める巡遊者であるナツカが、再び奇跡を起こせるか――本紙は今後も追い続けていく。",
   "CharacterArchiveContent.13305.1": "履歴書からの抜粋（３）",
   "CharacterArchiveContent.13305.2": "某ギルドの会議資料より\r\n\r\nナツカは魔法を駆使して戦闘を有利に進め、味方を援護し、敵を翻弄することを得意とする。その柔軟で多彩な戦術により、常に戦場では主導権を握ってきた。\r\n重要なのは「力」ではなく「頭脳」。彼女の戦い方がそれを明確に示している。\r\nいいか諸君、彼女に追いつくのは容易ではない。\r\nだが、彼女こそ我々が学ぶべき最高の模範だ。天賦の才を持つ者は少ない。それゆえに、成長し続ける努力が何より大切なのだ。",
   "CharacterArchiveContent.13306.1": "履歴書からの抜粋（４）",

data/language/ja_jp/dictionarytopbarentry.json

@@ -49,10 +49,10 @@
   "DictionaryTopBarEntry.400210.1": "守れ！星ノ塔-重量（首領）",
   "DictionaryTopBarEntry.400211.1": "守れ！星ノ塔-引き寄せ",
   "DictionaryTopBarEntry.400301.1": "クッキーラボ",
-  "DictionaryTopBarEntry.400401.1": "*****",
-  "DictionaryTopBarEntry.400402.1": "*****",
-  "DictionaryTopBarEntry.400403.1": "*****",
-  "DictionaryTopBarEntry.400404.1": "*****",
+  "DictionaryTopBarEntry.400401.1": "ブロックくずし-遊び方",
+  "DictionaryTopBarEntry.400402.1": "ブロックくずし-アイテム",
+  "DictionaryTopBarEntry.400403.1": "ブロックくずし-モンスター",
+  "DictionaryTopBarEntry.400404.1": "ブロックくずし-ギミック",
   "DictionaryTopBarEntry.900101.1": "デイリー任務",
   "DictionaryTopBarEntry.900301.1": "事業支援"
 }

data/language/ja_jp/mainskill.json

@@ -924,17 +924,17 @@
   "MainSkill.404306.1": "革命の萌芽",
   "MainSkill.404306.2": "チーム内の闇属性巡遊者の従者ダメージが<color=#ec6d21>{1}</color>増加する。\u000b闇属性の主力巡遊者が従者を召喚時、{3}秒間、その従者の従者ダメージが<color=#ec6d21>{2}</color>増加する。",
   "MainSkill.404401.1": "帳の内の秘め事",
-  "MainSkill.404401.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、対象に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
+  "MainSkill.404401.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、敵に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
   "MainSkill.404402.1": "帳の内の秘め事",
-  "MainSkill.404402.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、対象に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
+  "MainSkill.404402.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、敵に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
   "MainSkill.404403.1": "帳の内の秘め事",
-  "MainSkill.404403.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、対象に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
+  "MainSkill.404403.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、敵に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
   "MainSkill.404404.1": "帳の内の秘め事",
-  "MainSkill.404404.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、対象に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
+  "MainSkill.404404.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、敵に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
   "MainSkill.404405.1": "帳の内の秘め事",
-  "MainSkill.404405.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、対象に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
+  "MainSkill.404405.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、敵に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
   "MainSkill.404406.1": "帳の内の秘め事",
-  "MainSkill.404406.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、対象に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
+  "MainSkill.404406.2": "地属性の支援巡遊者のスキルダメージが<color=#ec6d21>{1}</color>増加する。\u000b地属性のバランサー巡遊者がスキルダメージを与えた時、敵に春華を付与する。春華：{3}秒間、地属性のスキル被ダメージが<color=#ec6d21>{2}</color>増加する。",
   "MainSkill.404801.1": "メリーサプライズ",
   "MainSkill.404801.2": "チーム全体の火属性ダメージが<color=#ec6d21>{1}</color>増加する。\u000bチーム内の火属性巡遊者がスキルダメージを与えた時から{2}秒間、敵に##賛歌#6002#を付与する。\u000b賛歌は讃美歌に変化する場合がある。\u000b讃美歌：{4}秒間、火属性被ダメージが<color=#ec6d21>{3}</color>増加する。この効果は{5}回まで重複できる。",
   "MainSkill.404802.1": "メリーサプライズ",

data/language/ja_jp/potential.json

@@ -2064,7 +2064,7 @@
   "Potential.515922.1": "チーム内に地属性巡遊者が1名存在するごとに、ローゼンアンプルが与える&Param1&が増加する。\u000bローゼンアンプルは急速に開花するようになり、持続時間中のダメージを一度にまとめて与えるようになる。",
   "Potential.515922.2": "チーム内に地属性巡遊者が1名存在するごとに、ローゼンアンプルが与える&Param1&が<color=#0abec5>&Param2&</color>増加する。\u000bローゼンアンプルは急速に開花するようになり、持続時間中のダメージを一度にまとめて与えるようになる。",
   "Potential.515923.1": "チーム内に地属性巡遊者が1名存在するごとに、ポイズンアンプルが与える&Param1&が増加する。\u000b支援スキルで設置するアンプルの数が変化し、ポイズンアンプルに隣接するローゼンアンプルはポイズンアンプルに変化するようになる。",
-  "Potential.515923.2": "チーム内に地属性巡遊者が1名存在するごとに、ポイズンアンプルが与える&Param1&が<color=#0abec5>&Param2&</color>増加する。\u000b支援スキルはポイズンアンプルを3つ、ローズアンプルを4つ設置するようになる。ポイズンアンプルに隣接するローゼンアンプルはポイズンアンプルに変化するようになる。",
+  "Potential.515923.2": "チーム内に地属性巡遊者が1名存在するごとに、ポイズンアンプルが与える&Param1&が<color=#0abec5>&Param2&</color>増加する。\u000b支援スキルはポイズンアンプルを3つ、ローゼンアンプルを4つ設置するようになる。ポイズンアンプルに隣接するローゼンアンプルはポイズンアンプルに変化するようになる。",
   "Potential.515924.1": "すべてのアンプルの持続時間が延長される。",
   "Potential.515924.2": "すべてのアンプルの持続時間が<color=#0abec5>50%</color>延長される。",
   "Potential.515925.1": "フィールドに存在するローゼンアンプル1つごとに、ローゼンアンプルが与える&Param1&が増加する。",

data/language/ja_jp/skill.json

@@ -976,7 +976,7 @@
   "Skill.8211101.2": "凛霜の大矢を発射し、敵を攻撃する。\nアヤメがアイテム獲得時、追加でスコアを獲得できる。",
   "Skill.8211201.1": "破岩斬",
   "Skill.8211201.13": "高速で剣を振り回し、素早く攻撃する。\nセイナのエネルギー獲得速度が上昇する。",
-  "Skill.8211201.2": "高速で剣を振り回し、貫通する剣気で素早く攻撃する。\nセイナのエネルギー獲得速度が上昇する。",
+  "Skill.8211201.2": "高速で剣を振り回し、剣気で素早く攻撃する。\nセイナのエネルギー獲得速度が上昇する。",
   "Skill.8219990.1": "ブロック生成",
   "Skill.8219999.1": "ブロックidle",
   "Skill.8299999.1": "かかし",

data/language/ja_jp/story.json

@@ -252,7 +252,7 @@
   "Story.601.2": "魔王からすぐに逃げ出すよう連絡を受けたセイナたちは、軟禁されていた部屋から外へと飛び出していく。しかし異常に気づいたダリシアの手下たちは、すぐに追跡を開始して…",
   "Story.601.4": "BT01",
   "Story.602.1": "魔王の使者",
-  "Story.602.2": "魔王の権能を行使するにあたり、花咲旅団に接触をはかるため巡遊者キャンプへとやって来たフィレン。しかしキャンプではアグリ・ユニオン本社の兵士が駐屯しており、敵対するフィレンを見かけるなり襲いかかってくる。",
+  "Story.602.2": "魔王の権能を行使するため、花咲旅団と空白旅団のサポートに向かったフィレン。ようやく巡遊者キャンプへと到着するが、アグリ・ユニオンの制服を着ていため知性植物たちはフィレンも敵だと認識して襲いかかってくるのだった。",
   "Story.602.4": "BT02",
   "Story.603.1": "悪を断つ剣",
   "Story.603.2": "植物と融合し、襲い来るダリシア。父を陥れた罪、親友との関係を壊そうとした罪、アグリ・ユニオンを私物化しようとした罪――それらを償わせるため、フィレンはニュクスとの誓いを胸に剣を手に取った。",

data/language/ja_jp/uitext.json

@@ -2078,16 +2078,16 @@
   "UIText.PRESENTS_01.1": "ドーラが不足しているため、レベルアップできません",
   "UIText.Pause_Btn_ContinueBattle.1": "戦闘継続",
   "UIText.Pause_Btn_EndBattle.1": "戦闘終了",
-  "UIText.PenguinCard_AddBtnMaxLevel.1": "*****",
-  "UIText.PenguinCard_AddRollSuccess.1": "*****",
-  "UIText.PenguinCard_AddRoundSuccess.1": "*****",
-  "UIText.PenguinCard_AddSlotSuccess.1": "*****",
-  "UIText.PenguinCard_Error_EmptyPenguinCard.1": "*****",
-  "UIText.PenguinCard_NotEnoughScoreRoll.1": "*****",
-  "UIText.PenguinCard_NotEnoughScoreUpgrade.1": "*****",
-  "UIText.PenguinCard_Quest_ReceiveNone.1": "*****",
-  "UIText.PenguinCard_RollMax.1": "*****",
-  "UIText.PenguinCard_SlotMax.1": "*****",
+  "UIText.PenguinCard_AddBtnMaxLevel.1": "これ以上レベルアップできません。",
+  "UIText.PenguinCard_AddRollSuccess.1": "レベルアップ！毎ターン<color=#fb8037>{num_0}</color>回シャロカードを更新できます",
+  "UIText.PenguinCard_AddRoundSuccess.1": "レベルアップ！毎ターン<color=#fb8037>{num_0}</color>回カードがディールされます",
+  "UIText.PenguinCard_AddSlotSuccess.1": "レベルアップ！カードスロットが<color=#fb8037>{num_0}</color>になりました",
+  "UIText.PenguinCard_Error_EmptyPenguinCard.1": "選択可能なシャロカードがありません",
+  "UIText.PenguinCard_NotEnoughScoreRoll.1": "<sprite name=\"icon_pengbuildcard_coin\">が足りません",
+  "UIText.PenguinCard_NotEnoughScoreUpgrade.1": "<sprite name=\"icon_pengbuildcard_coin\">が足りません",
+  "UIText.PenguinCard_Quest_ReceiveNone.1": "獲得可能な報酬がありません",
+  "UIText.PenguinCard_RollMax.1": "これ以上更新することはできません",
+  "UIText.PenguinCard_SlotMax.1": "スロットがいっぱいになりました",
   "UIText.PerActivity_Not_Open.1": "現在未開放です",
   "UIText.PerActivity_Quest_Complete.1": "完了",
   "UIText.PerActivity_Quest_Jump.1": "進む",
@@ -3006,24 +3006,24 @@
   "UIText.Template_PerkCard_Up.1": "レベルアップ",
   "UIText.Template_Score.1": "記録",
   "UIText.ThemePrev_Title.1": "出現テーマ",
-  "UIText.ThrowGift_Difficulty1.1": "*****",
-  "UIText.ThrowGift_Difficulty2.1": "*****",
-  "UIText.ThrowGift_Difficulty3.1": "*****",
-  "UIText.ThrowGift_Difficulty4.1": "*****",
+  "UIText.ThrowGift_Difficulty1.1": "チュートリアル",
+  "UIText.ThrowGift_Difficulty2.1": "ノーマル",
+  "UIText.ThrowGift_Difficulty3.1": "ハード",
+  "UIText.ThrowGift_Difficulty4.1": "エキスパート",
   "UIText.ThrowGift_GroupLockHint.1": "未解放のエリアです",
   "UIText.ThrowGift_Item.1": "アイテム",
   "UIText.ThrowGift_LevelInfo_Go.1": "進む",
   "UIText.ThrowGift_LevelInfo_MaxScore.1": "最高スコア",
   "UIText.ThrowGift_LevelInfo_Unlock.1": "未解放",
-  "UIText.ThrowGift_LevelScoreTitle.1": "*****",
-  "UIText.ThrowGift_Settle_Close.1": "*****",
-  "UIText.ThrowGift_Settle_GiftCount.1": "*****",
-  "UIText.ThrowGift_Settle_NextLevel.1": "*****",
-  "UIText.ThrowGift_Settle_Restart.1": "*****",
+  "UIText.ThrowGift_LevelScoreTitle.1": "スコア",
+  "UIText.ThrowGift_Settle_Close.1": "クリア",
+  "UIText.ThrowGift_Settle_GiftCount.1": "プレゼントを配る",
+  "UIText.ThrowGift_Settle_NextLevel.1": "次のステージ",
+  "UIText.ThrowGift_Settle_Restart.1": "リトライ",
   "UIText.ThrowGift_Settle_ScoreTitle.1": "*****",
   "UIText.ThrowGift_Target.1": "目標",
-  "UIText.ThrowGift_TargetHint_Title.1": "*****",
-  "UIText.ThrowGift_UseItem.1": "*****",
+  "UIText.ThrowGift_TargetHint_Title.1": "クリア条件",
+  "UIText.ThrowGift_UseItem.1": "使う",
   "UIText.Tip_CDTitle.1": "スキルクールタイム",
   "UIText.Tip_DiscMainTitle.1": "メインロスレコは基本ステータスとスキルボーナスを提供",
   "UIText.Tip_DiscSubTitle.1": "サブロスレコは基本ステータスと追加の音符を提供",

data/language/ko_kr/characterarchivecontent.json

@@ -521,11 +521,11 @@
   "CharacterArchiveContent.13301.2": "이름: 나츠카\r\n생일: 6월 17일\r\n소속: ■■ 여단\r\n특기: 마법, 야생 탐험, 탑 오르기, 문서 작업\r\n근무지: 필리에 외곽 동쪽 숲 ■■ 여단 주둔지\r\n경력: 3년\r\n무기: 윈드 블룸\r\n보수: ■■ 여단에서 의뢰 수주. 개별 의뢰는 본인에게 직접 문의 바람.",
   "CharacterArchiveContent.13301.3": "이름: 나츠카\r\n생일: 6월 17일\r\n소속: 하나사키 여단\r\n특기: 마법, 야생 탐험, 탑 오르기, 문서 작업\r\n근무지: 필리에 외곽 동쪽 숲 하나사키 여단 주둔지\r\n경력: 3년\r\n무기: 윈드 블룸\r\n보수: 하나사키 여단에서 의뢰 수주. 개별 의뢰는 본인에게 직접 문의 바람.",
   "CharacterArchiveContent.13302.1": "여행가가 된 이유",
-  "CharacterArchiveContent.13302.2": "성력 996년 - 아그리 유니온 내부 조사 보고서\r\n\r\n달리시아 총독의 인수 계획은 사실상 실패한 셈이다…… 지리 협회가 철수한 이후, 필리에 여행가 업계는 혼란기에 접어들었다.\r\n——「필리에 현황 보고」, P24\r\n……\r\n필리에 지부가 거액의 의뢰를 통해 간접적으로 여행가들의 활동에 영향력을 행사하고 통제하려고 나서며…… 최근 3대 의뢰 중 하나를 완수한 유명 여행가 나츠카와 그녀가 세운 토벌대가 가장 적합한 거래 대상으로 떠올랐다.\r\n——「필리에 현황 보고」, P26",
+  "CharacterArchiveContent.13302.2": "여행가 업계를 변화시켜 모든 여행가가 안전하게 존엄성을 지키며 좋아하는 일을 할 수 있도록 돕기 위함",
   "CharacterArchiveContent.13303.1": "이력 발췌(1)",
-  "CharacterArchiveContent.13303.2": "성력 996년 - 필리에 주간지 제350호\r\n\r\n‘3대 의뢰’가 마무리된 뒤에도, 마물 토벌을 주도했던 유명 여행가 나츠카의 행보는 계속되었다. 하나사키 여단과 함께 캠프를 수호하고, 별의 탑을 개척하며, 곧 지리 협회도 재개할 것이다.\r\n그러나, 나츠카가 정말 그 책임을 감당할 수 있을까? 의문을 제기하는 사람도 있다. 한창 주목받는 스타 여행가가 또 한 번의 기적을 만들어낼 수 있을지는, 본지가 앞으로도 계속 주목할 것이다.",
+  "CharacterArchiveContent.13303.2": "성력 996년 - 아그리 유니온 내부 조사 보고서\r\n\r\n달리시아 총독의 인수 계획은 사실상 실패한 셈이다…… 지리 협회가 철수한 이후, 필리에 여행가 업계는 혼란기에 접어들었다.\r\n——「필리에 현황 보고」, P24\r\n……\r\n필리에 지부가 거액의 의뢰를 통해 간접적으로 여행가들의 활동에 영향력을 행사하고 통제하려고 나서며…… 최근 3대 의뢰 중 하나를 완수한 유명 여행가 나츠카와 그녀가 세운 토벌대가 가장 적합한 거래 대상으로 떠올랐다.\r\n——「필리에 현황 보고」, P26",
   "CharacterArchiveContent.13304.1": "이력 발췌(2)",
-  "CharacterArchiveContent.13304.2": "모 여단의 회의 자료\r\n\r\n나츠카는 마법을 활용해 전장의 흐름을 좌우하고, 아군을 지원하며 적을 저지하는 데 능해요. 유연하고 변화무쌍한 전술 운용 덕분에 나츠카는 언제나 전투에서 우위를 점해왔죠.\r\n중요한 것은 힘이 아니라 머리예요. 나츠카의 전투 스타일을 보면 그 사실을 분명하게 알 수 있죠. 다들, 이해했나요?\r\n나츠카의 수준에 도달하기는 쉽지 않겠지만, 나츠카는 우리가 본보기로 삼기에 최적의 인물이에요. 모두가 재능을 타고나는 것은 아니니, 꾸준히 발전하고 성장하는 것이야말로 꾸준히 나아가는 방법이랍니다.",
+  "CharacterArchiveContent.13304.2": "성력 996년 - 필리에 주간지 제350호\r\n\r\n‘3대 의뢰’가 마무리된 뒤에도, 마물 토벌을 주도했던 유명 여행가 나츠카의 행보는 계속되었다. 하나사키 여단과 함께 캠프를 수호하고, 별의 탑을 개척하며, 곧 지리 협회도 재개할 것이다.\r\n그러나, 나츠카가 정말 그 책임을 감당할 수 있을까? 의문을 제기하는 사람도 있다. 한창 주목받는 스타 여행가가 또 한 번의 기적을 만들어낼 수 있을지는, 본지가 앞으로도 계속 주목할 것이다.",
   "CharacterArchiveContent.13305.1": "이력 발췌(3)",
   "CharacterArchiveContent.13305.2": "모 여단의 회의 자료\r\n\r\n나츠카는 마법을 활용해 전장의 흐름을 좌우하고, 아군을 지원하며 적을 저지하는 데 능해요. 유연하고 변화무쌍한 전술 운용 덕분에 나츠카는 언제나 전투에서 우위를 점해왔죠.\r\n중요한 것은 힘이 아니라 머리예요. 나츠카의 전투 스타일을 보면 그 사실을 분명하게 알 수 있죠. 다들, 이해했나요?\r\n나츠카의 수준에 도달하기는 쉽지 않겠지만, 나츠카는 우리가 본보기로 삼기에 최적의 인물이에요. 모두가 재능을 타고나는 것은 아니니, 꾸준히 발전하고 성장하는 것이야말로 꾸준히 나아가는 방법이랍니다.",
   "CharacterArchiveContent.13306.1": "이력 발췌(4)",

data/language/ko_kr/datingcharacterevent.json

@@ -364,7 +364,7 @@
   "DatingCharacterEvent.159301.3": "크루니스의 뒤를 따라 동굴 안을 한참이나 걸었지만, 그 토템이라는 건 전혀 보이지 않았다.\n이에 막 질문을 던지려던 순간, 크루니스가 걸음을 멈췄다.\n“음, 이건 나 혼자 옮기기엔 너무 무겁네. 같이 옮겨줄 수 있어?”\n그녀가 가리킨 곳을 보자, 버섯이 잔뜩 피어난 멧돼지 사체가 놓여 있었다.",
   "DatingCharacterEvent.159301.5": "“토템을 찾아서”",
   "DatingCharacterEvent.159301.6": "동굴에서 뭔가 특별한 일이 일어날지도 모른다……",
-  "DatingCharacterEvent.159301.7": "크루니스가 요즘 용족 문화에 부쩍 관심이 커져, 용족의 토템까지 조사하는 줄 알았다. 하지만 멧돼지 앞에 서고 나서야, 이 의사는 그저 질병에만 관심을 가질 뿐이었다.",
+  "DatingCharacterEvent.159301.7": "크루니스가 요즘 용족 문화에 부쩍 관심이 커져, 용족의 토템까지 조사하는 줄 알았다. 하지만 멧돼지 앞에 서고 나서야, 이 의사는 그저 질병에만 관심을 가질 뿐이란 것을 깨닫게 됐다.",
   "DatingCharacterEvent.159302.1": "용족의 시장은 다른 곳과 분위기가 사뭇 달랐다. 가판대 앞에 쪼그려 앉아 정교하게 조각된 목각 인형을 구경하고 있을 때, 갑자기 귓가에 크루니스의 목소리가 들려왔다. \n“이 인형의 구조가 어딘가 좀 이상하지 않아?”",
   "DatingCharacterEvent.159302.2": "크루니스의 목소리에 깜짝 놀라 고개를 돌려 보니, 그녀는 이미 옆에 쪼그려 앉아 인형을 집어 들고 유심히 살펴보고 있었다. \n“이 비율대로라면, 이 인형은 실제 사람보다 좌우 갈비뼈 두 쌍이 적어.”",
   "DatingCharacterEvent.159302.3": "크루니스의 말에 노점의 사장이 불쾌해하는 건 아닐지 걱정하던 찰나, 중년의 노점 주인은 갑자기 두 눈을 반짝이며 당신들을 바라보았다.\n“손님, 안목이 대단하시네요. 혹시 이런 거에 관심이 있으신가요?”\n주인은 훨씬 정교하게 만들어진 인형을 하나 꺼내, 우리 앞에서 인형을 열어 보였다. 그 안에는 장기와 골격 구조가 완벽하게 구현되어 있었다. \n옆을 보니 크루니스가 간절한 눈빛으로 당신을 빤히 바라보고 있었다. 당신은 크루니스의 기대 어린 눈빛에 홀리기라도 한 듯, 그 인형을 구매해 버렸다.",

data/language/zh_cn/activitystory.json

@@ -26,7 +26,7 @@
   "ActivityStory.101040209.1": "医者仁心",
   "ActivityStory.101040209.2": "别跑啊，打针是为了你好！",
   "ActivityStory.101040209.4": "BT",
-  "ActivityStory.101040210.1": "此去今年",
+  "ActivityStory.101040210.1": "此去经年",
   "ActivityStory.101040210.2": "他们只是想过个好年。",
   "ActivityStory.101040210.4": "08",
   "ActivityStory.101040211.1": "人间万象更新时",

data/language/zh_cn/characterarchivecontent.json

@@ -521,11 +521,11 @@
   "CharacterArchiveContent.13301.2": "姓名：夏花\n生日：6月17日\n所属：■■旅团\n技能：野外冒险；魔物狩猎；爬塔；文书\n工作地址：菲莱城外东部森林■■旅团驻地\n经验：三年\n武器：风华\n薪资：可通过■■旅团发布委托；有专属委托请联系本人详谈",
   "CharacterArchiveContent.13301.3": "姓名：夏花\n生日：6月17日\n所属：花令旅团\n技能：野外冒险；魔物狩猎；爬塔；文书\n工作地址：菲莱城外东部森林花令旅团驻地\n经验：三年\n武器：风华\n薪资：可通过花令旅团发布委托；有专属委托请联系本人详谈",
   "CharacterArchiveContent.13302.1": "成为旅人的理由",
-  "CharacterArchiveContent.13302.2": "星塔历996年-联合种业内部调查报告\n\n……在地理协会撤出后，菲莱的旅人行业陷入了短暂的混乱期，目前尚不清楚达尔茜娅执行官在这一过程中扮演的角色。\n——《菲莱近况说明》，P24\n……\n菲莱分部向旅人们发布巨额委托的动机成谜……很可能提前与近期完成三大委托之一的知名旅人夏花和她的新讨伐队达成了某种协议。\n——《菲莱近况说明》，P26",
+  "CharacterArchiveContent.13302.2": "想要改变旅人行业，让每个旅人都能有保障、有尊严地从事热爱的工作。",
   "CharacterArchiveContent.13303.1": "简历摘录之一",
-  "CharacterArchiveContent.13303.2": "星塔历996年-菲莱周报第350期\n\n在“三大委托”终结过后，曾经主导了魔物讨伐的知名旅人夏花并没有就此停下脚步，她与花令旅团共同联手维护营地，开拓星塔，以及即将重新迎回地理协会。\n但是她真的能肩负起责任吗？有人充满怀疑，且看这位风头正劲的明星旅人，能否再创奇迹，本报将持续关注。",
+  "CharacterArchiveContent.13303.2": "星塔历996年-联合种业内部调查报告\n\n……在地理协会撤出后，菲莱的旅人行业陷入了短暂的混乱期，目前尚不清楚达尔茜娅执行官在这一过程中扮演的角色。\n——《菲莱近况说明》，P24\n……\n菲莱分部向旅人们发布巨额委托的动机成谜……很可能提前与近期完成三大委托之一的知名旅人夏花和她的新讨伐队达成了某种协议。\n——《菲莱近况说明》，P26",
   "CharacterArchiveContent.13304.1": "简历摘录之二",
-  "CharacterArchiveContent.13304.2": "某旅团会议材料\n\n夏花擅长适用魔法操纵战场局势，辅助队友，阻挠敌人。灵活多变的策略，令她总能在战斗中占据上风。\n重要的是头脑，而非力量，从她的战斗风格中可以很明确地看出这一点。明白了吗，诸位？\n想要赶上她可不容易，但她是最适合我们学习的对象。不是所有人都天赋异禀，不断进步、成长才是长久之道。",
+  "CharacterArchiveContent.13304.2": "星塔历996年-菲莱周报第350期\n\n在“三大委托”终结过后，曾经主导了魔物讨伐的知名旅人夏花并没有就此停下脚步，她与花令旅团共同联手维护营地，开拓星塔，以及即将重新迎回地理协会。\n但是她真的能肩负起责任吗？有人充满怀疑，且看这位风头正劲的明星旅人，能否再创奇迹，本报将持续关注。",
   "CharacterArchiveContent.13305.1": "简历摘录之三",
   "CharacterArchiveContent.13305.2": "某旅团会议材料\n\n夏花擅长适用魔法操纵战场局势，辅助队友，阻挠敌人。灵活多变的策略，令她总能在战斗中占据上风。\n重要的是头脑，而非力量，从她的战斗风格中可以很明确地看出这一点。明白了吗，诸位？\n想要赶上她可不容易，但她是最适合我们学习的对象。不是所有人都天赋异禀，不断进步、成长才是长久之道。",
   "CharacterArchiveContent.13306.1": "简历摘录之四",

lua/game/ui/activitytheme/10104/activitylevels/activitylevelsselectctrl.lua

@@ -13,8 +13,9 @@ local mapToggle = {
 }
 local colorSelect = Color(1.0, 0.9882352941176471, 0.9568627450980393, 1)
 local colorUnSelect = Color(0.4, 0.13333333333333333, 0.15294117647058825, 1)
-local colorSelectLock = Color(0.7137254901960784, 0.6431372549019608, 0.5411764705882353, 1)
+local colorSelectLock = Color(0.9529411764705882, 0.8588235294117647, 0.7294117647058823, 1)
 local colorUnSelectLock = Color(0.4, 0.13333333333333333, 0.15294117647058825, 1)
+local colorSelectLockMask = Color(0.7137254901960784, 0.6431372549019608, 0.5411764705882353, 1)
 local colorUnSelectLockMask = Color(0.2980392156862745, 0.09803921568627451, 0.11372549019607843, 1)
 local timeUnLockColor = "fff7ca"
 local colorConditionsUnLock = Color(1, 1, 1, 1)
@@ -337,6 +338,8 @@ function ActivityLevelsSelectCtrl:RefreshTogType(nType)
 end
 function ActivityLevelsSelectCtrl:RefreshTogList(nType, nDifficulty)
 	local tabLevelInfo, tabLevelInfoDifficulty
+	local isOpenAdventure = self.activityLevelsData:GetLevelDayOpen(GameEnum.ActivityLevelType.Adventure, self.firstAdventureLevel)
+	local isOpenHard = self.activityLevelsData:GetLevelDayOpen(GameEnum.ActivityLevelType.HARD, self.firstHardLevel)
 	if nType == GameEnum.ActivityLevelType.Explore then
 		tabLevelInfo = self.activityLevelsData.levelTabExplore
 		tabLevelInfoDifficulty = self.activityLevelsData.levelTabExploreDifficulty
@@ -344,20 +347,50 @@ function ActivityLevelsSelectCtrl:RefreshTogList(nType, nDifficulty)
 		NovaAPI.SetImageColor(tmpImageAdventure, colorUnSelectLockMask)
 		local tmpImageHard = self._mapNode.lockHard.gameObject.transform:Find("Image"):GetComponent("Image")
 		NovaAPI.SetImageColor(tmpImageHard, colorUnSelectLockMask)
+		if not isOpenAdventure then
+			local tmpLockAdventure = self._mapNode.lockAdventure.gameObject:GetComponent("Image")
+			self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas_1010401", "tab_spring_1")
+			tmpLockAdventure:SetNativeSize()
+		end
+		if not isOpenHard then
+			local tmpLockHard = self._mapNode.lockHard.gameObject:GetComponent("Image")
+			self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas_1010401", "tab_spring_1")
+			tmpLockHard:SetNativeSize()
+		end
 	elseif nType == GameEnum.ActivityLevelType.Adventure then
 		tabLevelInfo = self.activityLevelsData.levelTabAdventure
 		tabLevelInfoDifficulty = self.activityLevelsData.levelTabAdventureDifficulty
 		local tmpImageAdventure = self._mapNode.lockAdventure.gameObject.transform:Find("Image"):GetComponent("Image")
-		NovaAPI.SetImageColor(tmpImageAdventure, colorSelectLock)
+		NovaAPI.SetImageColor(tmpImageAdventure, colorSelectLockMask)
 		local tmpImageHard = self._mapNode.lockHard.gameObject.transform:Find("Image"):GetComponent("Image")
 		NovaAPI.SetImageColor(tmpImageHard, colorUnSelectLockMask)
+		if not isOpenAdventure then
+			local tmpLockAdventure = self._mapNode.lockAdventure.gameObject:GetComponent("Image")
+			self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas_1010401", "tab_spring_1_slc")
+			tmpLockAdventure:SetNativeSize()
+		end
+		if not isOpenHard then
+			local tmpLockHard = self._mapNode.lockHard.gameObject:GetComponent("Image")
+			self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas_1010401", "tab_spring_1")
+			tmpLockHard:SetNativeSize()
+		end
 	else
 		tabLevelInfo = self.activityLevelsData.levelTabHard
 		tabLevelInfoDifficulty = self.activityLevelsData.levelTabHardDifficulty
 		local tmpImageAdventure = self._mapNode.lockAdventure.gameObject.transform:Find("Image"):GetComponent("Image")
 		NovaAPI.SetImageColor(tmpImageAdventure, colorUnSelectLockMask)
 		local tmpImageHard = self._mapNode.lockHard.gameObject.transform:Find("Image"):GetComponent("Image")
-		NovaAPI.SetImageColor(tmpImageHard, colorSelectLock)
+		NovaAPI.SetImageColor(tmpImageHard, colorSelectLockMask)
+		if not isOpenAdventure then
+			local tmpLockAdventure = self._mapNode.lockAdventure.gameObject:GetComponent("Image")
+			self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas_1010401", "tab_spring_1")
+			tmpLockAdventure:SetNativeSize()
+		end
+		if not isOpenHard then
+			local tmpLockHard = self._mapNode.lockHard.gameObject:GetComponent("Image")
+			self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas_1010401", "tab_spring_1_slc")
+			tmpLockHard:SetNativeSize()
+		end
 	end
 	for i = 1, 10 do
 		self._mapNode.tog[i].gameObject:SetActive(i <= #tabLevelInfoDifficulty)
@@ -475,10 +508,16 @@ function ActivityLevelsSelectCtrl:OnBtnClick_Tog(btn)
 		for idx, value in pairs(mapToggle) do
 			if value == self.curSelectHard then
 				self._mapNode.togCtrl[idx]:SetDefaultActivity(false, colorSelect, colorUnSelect)
+				local tmpImage = self._mapNode.togCtrl[idx].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockInfo/imgLockMask"):GetComponent("Image")
+				self:SetActivityAtlasSprite_New(tmpImage, "10104/SpriteAtlas_1010401", "btn_spring_3")
+				tmpImage:SetNativeSize()
 				break
 			end
 		end
 		self._mapNode.togCtrl[togIdx]:SetDefaultActivity(true, colorSelect, colorUnSelect)
+		local tmpImageSelect = self._mapNode.togCtrl[togIdx].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockInfo/imgLockMask"):GetComponent("Image")
+		self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas_1010401", "btn_spring_4")
+		tmpImageSelect:SetNativeSize()
 		self.SelectTogPreLvLock = self._mapNode.togCtrl[togIdx].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockPreLv/rtLockPreLvSelect"):GetComponent("Image")
 		NovaAPI.SetImageColor(self.SelectTogPreLvLock, colorSelectLock)
 		self:RefreshInstanceInfo(self.nLevelType, nHard, nil, false)
@@ -505,6 +544,13 @@ function ActivityLevelsSelectCtrl:RefreshInstanceInfo(nType, nHard, bLocation, b
 	if bSetTog then
 		for i = 1, 10 do
 			self._mapNode.togCtrl[i]:SetDefaultActivity(i == nHard, colorSelect, colorUnSelect)
+			local tmpImageSelect = self._mapNode.togCtrl[i].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockInfo/imgLockMask"):GetComponent("Image")
+			if i == nHard then
+				self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas_1010401", "btn_spring_4")
+			else
+				self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas_1010401", "btn_spring_3")
+			end
+			tmpImageSelect:SetNativeSize()
 		end
 	end
 	self.curSelectHard = nHard
@@ -646,7 +692,7 @@ function ActivityLevelsSelectCtrl:RefreshInstanceInfo(nType, nHard, bLocation, b
 			local objTog = self._mapNode.tog[nHard].gameObject
 			local rtLockInfo = objTog.transform:Find("AnimRoot/AnimSwitch/rtLockInfo").gameObject
 			self.tmpLockInfoDay = rtLockInfo.gameObject.transform:Find("rtLockInfoDay"):GetComponent("Image")
-			NovaAPI.SetImageColor(self.tmpLockInfoDay, colorSelectLock)
+			NovaAPI.SetImageColor(self.tmpLockInfoDay, colorSelectLockMask)
 		end
 	end
 	for i = 1, #self.tabRewardList do

lua/game/ui/avg/_cn/config/cg_disc4044.lua

@@ -5573,7 +5573,7 @@ return {
 			"none",
 			"OutQuad",
 			1.0,
-			false,
+			true,
 			0
 		}
 	},
@@ -5836,8 +5836,8 @@ return {
 			nil,
 			nil,
 			"none",
-			"OutQuad",
-			12.0,
+			"Linear",
+			8.0,
 			false,
 			0
 		}
@@ -5858,12 +5858,12 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{cmd = "SetGoOn"},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5881,7 +5881,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5899,7 +5899,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5917,7 +5917,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetChoiceBegin",

lua/game/ui/avg/_cn/config/stev_03_04.lua

@@ -6534,7 +6534,7 @@ return {
 			0,
 			"none",
 			"avg1_159",
-			"b",
+			"a",
 			"004",
 			"none",
 			nil,
@@ -7365,7 +7365,7 @@ return {
 			0,
 			"none",
 			"avg1_159",
-			"b",
+			"a",
 			"005",
 			"none",
 			nil,

lua/game/ui/avg/_en/config/cg_disc4044.lua

@@ -5573,7 +5573,7 @@ return {
 			"none",
 			"OutQuad",
 			1.0,
-			false,
+			true,
 			0
 		}
 	},
@@ -5836,8 +5836,8 @@ return {
 			nil,
 			nil,
 			"none",
-			"OutQuad",
-			12.0,
+			"Linear",
+			8.0,
 			false,
 			0
 		}
@@ -5858,12 +5858,12 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{cmd = "SetGoOn"},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5881,7 +5881,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5899,7 +5899,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5917,7 +5917,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetChoiceBegin",

lua/game/ui/avg/_en/config/dp_multi01.lua

@@ -2025,7 +2025,7 @@ return {
 			"",
 			false,
 			"",
-			"If you feel bad for me, how about a little scoop?==RT==Maybe spill some tea about the Boss? You're buddies with him, aren't ya? If you feel bad for me, how about a little scoop?==RT==Maybe spill some tea about the Boss? You're buddies with her, aren't ya?",
+			"If you feel bad for me, how about a little scoop? Maybe spill some tea about the Boss? You're buddies with ==SEX4==, aren't ya?",
 			""
 		}
 	},

lua/game/ui/avg/_en/config/pm12601.lua

@@ -2808,7 +2808,7 @@ return {
 			"",
 			false,
 			"",
-			"Don't tell anyone about this, or my mage will be completely ruined!",
+			"Don't tell anyone about this, or my image will be completely ruined!",
 			""
 		}
 	},

lua/game/ui/avg/_en/config/pm15001.lua

@@ -1323,7 +1323,7 @@ return {
 			"",
 			false,
 			"",
-			"Not everyone can just work whenever they feel like it!",
+			"Not everyone can just slack off whenever they feel like it!",
 			""
 		}
 	},

lua/game/ui/avg/_en/config/stev_03_04.lua

@@ -6534,7 +6534,7 @@ return {
 			0,
 			"none",
 			"avg1_159",
-			"b",
+			"a",
 			"004",
 			"none",
 			nil,
@@ -7365,7 +7365,7 @@ return {
 			0,
 			"none",
 			"avg1_159",
-			"b",
+			"a",
 			"005",
 			"none",
 			nil,

lua/game/ui/avg/_en/config/stsp_10_02.lua

@@ -5949,7 +5949,7 @@ return {
 			"",
 			false,
 			"",
-			"I-I see...==W====RT==Personally, if I can eat well and be full, any approach is fine...",
+			"I-I see...==W==Honestly, my biggest wish is just for everyone to have enough to eat. But if the ingredients could be fresher too, I guess that really would make people even happier...",
 			""
 		}
 	},

lua/game/ui/avg/_jp/config/cg_disc4044.lua

@@ -5573,7 +5573,7 @@ return {
 			"none",
 			"OutQuad",
 			1.0,
-			false,
+			true,
 			0
 		}
 	},
@@ -5836,8 +5836,8 @@ return {
 			nil,
 			nil,
 			"none",
-			"OutQuad",
-			12.0,
+			"Linear",
+			8.0,
 			false,
 			0
 		}
@@ -5858,12 +5858,12 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{cmd = "SetGoOn"},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5881,7 +5881,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5899,7 +5899,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5917,7 +5917,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetChoiceBegin",

lua/game/ui/avg/_jp/config/cg_npc174_02.lua

@@ -1751,7 +1751,7 @@ return {
 			"",
 			false,
 			"",
-			"いつもはデリバリーサービス利用してるので、==RT==お店に来るのは久しぶりなのですよ。",
+			"いつもはデリバリーサービスを利用しているので==RT==お店に来るのは久しぶりなのですよ。",
 			""
 		}
 	},

lua/game/ui/avg/_jp/config/stev_03_01.lua

@@ -4192,7 +4192,7 @@ return {
 			"",
 			false,
 			"",
-			"これ見たら返信してくれ",
+			"これを見たら返信してくれ",
 			""
 		}
 	},

lua/game/ui/avg/_jp/preset/avgcontacts.lua

@@ -81,7 +81,7 @@ return {
 		id = 118,
 		icon = "Icon/Head/head_11801_S",
 		name = "クルニス",
-		landmark = "住所不定",
+		landmark = "フィーリエ-アッシュエリア診療所",
 		signature = "珍しい病気にピンときたら連絡を"
 	},
 	{
@@ -186,8 +186,8 @@ return {
 		id = 143,
 		icon = "Icon/Head/head_14301_S",
 		name = "レイス",
-		landmark = "ゲームセンター",
-		signature = "チャットは基本見ません"
+		landmark = "秘密",
+		signature = "暑いのは嫌い"
 	},
 	{
 		id = 144,
@@ -242,8 +242,8 @@ return {
 		id = 159,
 		icon = "Icon/Head/head_15901_S",
 		name = "クルニス（華服）",
-		landmark = "フィーリエ 例のクリニック",
-		signature = "休暇外出中。"
+		landmark = "フィーリエ-アッシュエリア診療所",
+		signature = "休暇中につき休診"
 	},
 	{
 		id = 999,
@@ -257,7 +257,7 @@ return {
 		icon = "Icon/Head/head_9100_S",
 		name = "==PLAYER_NAME==",
 		landmark = "オアシス号",
-		signature = "魔王プロトコル人材派遣カンパニー代表執行官"
+		signature = "魔王プロトコル人材派遣カンパニー/代表執行官"
 	},
 	{
 		id = 997,

lua/game/ui/avg/_kr/config/cg_disc4044.lua

@@ -5573,7 +5573,7 @@ return {
 			"none",
 			"OutQuad",
 			1.0,
-			false,
+			true,
 			0
 		}
 	},
@@ -5836,8 +5836,8 @@ return {
 			nil,
 			nil,
 			"none",
-			"OutQuad",
-			12.0,
+			"Linear",
+			8.0,
 			false,
 			0
 		}
@@ -5858,12 +5858,12 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{cmd = "SetGoOn"},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5881,7 +5881,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5899,7 +5899,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetTalk",
@@ -5917,7 +5917,7 @@ return {
 	},
 	{
 		cmd = "Wait",
-		param = {0.5}
+		param = {1.5}
 	},
 	{
 		cmd = "SetChoiceBegin",

lua/game/ui/avg/_kr/config/stev_03_05.lua

@@ -3982,7 +3982,7 @@ return {
 			"",
 			false,
 			"",
-			"방금도 근처를 한참 돌아다녔는데, 조금밖에 못 캤지 뭐예요.",
+			"방금도 근처를 한참 돌아다녔는데, 조금밖에 못 캤지 뭐야.",
 			""
 		}
 	},

lua/game/ui/characterinfoex/characterinfoctrl.lua

@@ -144,7 +144,6 @@ function CharacterInfoCtrl:RefreshShow()
 	self:CalculateCharacterInfo()
 	self:RefreshCharacterInfo()
 	self:RefreshProperty()
-	self:RefreshActor2D()
 end
 function CharacterInfoCtrl:CalculateCharacterInfo()
 	self:CalculateProperty()
@@ -308,6 +307,7 @@ function CharacterInfoCtrl:OnBtnClick_Left()
 	self.characterId = self.characterIdList[self.curCharacterIndex]
 	self.configData = ConfigTable.GetData_Character(self.characterId)
 	self:RefreshShow()
+	self:RefreshActor2D()
 end
 function CharacterInfoCtrl:OnBtnClick_Right()
 	if #self.characterIdList <= 1 then
@@ -320,6 +320,7 @@ function CharacterInfoCtrl:OnBtnClick_Right()
 	self.characterId = self.characterIdList[self.curCharacterIndex]
 	self.configData = ConfigTable.GetData_Character(self.characterId)
 	self:RefreshShow()
+	self:RefreshActor2D()
 end
 function CharacterInfoCtrl:OnBtnClick_Property()
 	local attrList = self.attrData:GetAttrList()

lua/game/ui/characterinfoex/charbgctrl.lua

@@ -125,6 +125,8 @@ function CharBgCtrl:SetCharacterPng(nSkinId, nType)
 	if bSetSuccess and self.lasttrPanelOffsetL2DPos ~= nil then
 		self._mapNode.trPanelOffsetL2D:DOLocalMoveX(self.lasttrPanelOffsetL2DPos, 0):SetUpdate(true)
 	end
+	local skinCfgData = ConfigTable.GetData_CharacterSkin(nSkinId)
+	NovaAPI.SetSpriteRendererSprite(self._mapNode.bgRight, self:LoadAsset(skinCfgData.Bg .. ".png", typeof(Sprite)))
 end
 function CharBgCtrl:SetCharacterL2D(nSkinId, nType)
 	if nil ~= self.tbRenderer then

lua/game/ui/characterinfoex/charequipmentctrl.lua

@@ -128,11 +128,12 @@ function CharEquipmentCtrl:OnEnable()
 			local ani = function()
 				if not PlayerData.Guide:CheckInGuideGroup(50) then
 					local mapSelect = PlayerData.Equipment:GetEquipmentSelect()
-					if mapSelect then
+					if mapSelect and mapSelect.nCharId == self.nCharId then
 						local nEquipIndex = 0
-						for _, v in ipairs(self.tbSlot) do
+						for k, v in ipairs(self.tbSlot) do
 							if v.nSlotId == mapSelect.nSlotId then
 								nEquipIndex = v.nGemIndex
+								self.nLastIndex = k
 								break
 							end
 						end
@@ -151,6 +152,7 @@ function CharEquipmentCtrl:OnEnable()
 	end
 end
 function CharEquipmentCtrl:OnDestroy()
+	PlayerData.Equipment:GetEquipmentSelect()
 	self.nLastIndex = 0
 end
 function CharEquipmentCtrl:OnBtnClick_EquipmentSlot(_, nIndex)

lua/game/ui/dispatch/dispatchctrl.lua

@@ -886,8 +886,7 @@ function DispatchCtrl:OnBtnClick_OneClickSelection()
 			end
 		end
 	end
-	self.findcombinationCount = 0
-	local result = self:find_min_roles(tbCharTagList, data.Tags, data.ExtraTags)
+	local result = self:find_min_roles_greedy(tbCharTagList, data.Tags, data.ExtraTags)
 	if result then
 		if self.bOpenBuild then
 		else
@@ -921,61 +920,40 @@ function DispatchCtrl:can_meet_requirements(role_tags, requirements)
 	end
 	return true
 end
-function DispatchCtrl:find_min_roles(roles, normal_req, extra_req)
-	local selected_roles = {}
-	local cachedIds = {}
-	for _, role in ipairs(roles) do
-		if self:can_meet_requirements(role.tags, normal_req) then
-			cachedIds[role.id] = true
-			table.insert(selected_roles, role)
+function DispatchCtrl:calculate_role_score(role_tags, normal_req, extra_req)
+	local score = 0
+	local tag_count = {}
+	for _, tag in ipairs(role_tags) do
+		tag_count[tag] = (tag_count[tag] or 0) + 1
+	end
+	for _, req in ipairs(normal_req) do
+		if tag_count[req] and 0 < tag_count[req] then
+			score = score + 10
+			tag_count[req] = tag_count[req] - 1
 		end
 	end
-	local bHasNormalReqRole = 0 < #selected_roles
-	if #selected_roles == 0 then
-		selected_roles = roles
-	else
-		for _, role in ipairs(roles) do
-			if self:can_meet_requirements(role.tags, extra_req) and cachedIds[role.id] == nil then
-				table.insert(selected_roles, role)
-				cachedIds[role.id] = true
-			end
+	for _, req in ipairs(extra_req) do
+		if tag_count[req] and 0 < tag_count[req] then
+			score = score + 3
+			tag_count[req] = tag_count[req] - 1
 		end
 	end
-	for i = 1, #selected_roles do
-		local found_combination, combination = self:find_combination(selected_roles, {}, normal_req, extra_req, 1, i)
-		if found_combination and #combination <= 3 then
-			return combination
-		end
-	end
-	for i = 1, #selected_roles do
-		local found_combination, combination = self:find_combination(selected_roles, {}, normal_req, {}, 1, i)
-		if found_combination then
-			return combination
-		end
-	end
-	return nil
+	return score
 end
-function DispatchCtrl:find_combination(roles, selected, normal_req, extra_req, start_index, max_depth)
-	self.findcombinationCount = self.findcombinationCount + 1
-	if self.findcombinationCount >= 999999 then
-		return false
+function DispatchCtrl:count_remaining_requirements(selected_tags, requirements)
+	local tag_count = {}
+	for _, tag in ipairs(selected_tags) do
+		tag_count[tag] = (tag_count[tag] or 0) + 1
 	end
-	if max_depth == 0 then
-		if self:can_meet_requirements(self:concat_tags(selected), normal_req) and self:can_meet_requirements(self:concat_tags(selected), extra_req) then
-			return true, selected
+	local remaining = {}
+	for _, req in ipairs(requirements) do
+		if not tag_count[req] or tag_count[req] <= 0 then
+			table.insert(remaining, req)
 		else
-			return false
+			tag_count[req] = tag_count[req] - 1
 		end
 	end
-	for i = start_index, #roles do
-		table.insert(selected, roles[i])
-		local found, combination = self:find_combination(roles, selected, normal_req, extra_req, i + 1, max_depth - 1)
-		if found then
-			return true, combination
-		end
-		table.remove(selected)
-	end
-	return false
+	return remaining
 end
 function DispatchCtrl:concat_tags(selected_roles)
 	local combined_tags = {}
@@ -986,6 +964,136 @@ function DispatchCtrl:concat_tags(selected_roles)
 	end
 	return combined_tags
 end
+function DispatchCtrl:find_min_roles_greedy(roles, normal_req, extra_req)
+	if #roles == 0 then
+		return nil
+	end
+	for target_count = 1, 3 do
+		local result = self:greedy_select_roles_with_limit(roles, normal_req, extra_req, true, target_count)
+		if result then
+			return result
+		end
+	end
+	for target_count = 1, 3 do
+		local result = self:greedy_select_roles_with_limit(roles, normal_req, {}, false, target_count)
+		if result then
+			return result
+		end
+	end
+	return nil
+end
+function DispatchCtrl:greedy_select_roles_with_limit(roles, normal_req, extra_req, check_both, max_count)
+	if #normal_req == 0 and #extra_req == 0 then
+		return {}
+	end
+	local scored_roles = {}
+	for _, role in ipairs(roles) do
+		local score = self:calculate_role_score(role.tags, normal_req, extra_req)
+		if 0 < score then
+			table.insert(scored_roles, {role = role, score = score})
+		end
+	end
+	if #scored_roles == 0 then
+		return nil
+	end
+	table.sort(scored_roles, function(a, b)
+		return a.score > b.score
+	end)
+	return self:try_combinations_greedy(scored_roles, normal_req, extra_req, check_both, max_count)
+end
+function DispatchCtrl:try_combinations_greedy(scored_roles, normal_req, extra_req, check_both, target_count)
+	local max_attempts = math.min(100, #scored_roles * target_count)
+	local attempt_count = 0
+	local selected = {}
+	local selected_tags = {}
+	for _, scored_role in ipairs(scored_roles) do
+		if target_count <= #selected then
+			break
+		end
+		attempt_count = attempt_count + 1
+		if max_attempts < attempt_count then
+			break
+		end
+		local remaining_normal = self:count_remaining_requirements(selected_tags, normal_req)
+		local remaining_extra = self:count_remaining_requirements(selected_tags, extra_req)
+		if #remaining_normal == 0 and #remaining_extra == 0 then
+			break
+		end
+		local can_help = DispatchCtrl.role_can_help(scored_role.role.tags, remaining_normal, remaining_extra)
+		if can_help then
+			table.insert(selected, scored_role.role)
+			for _, tag in ipairs(scored_role.role.tags) do
+				table.insert(selected_tags, tag)
+			end
+		end
+	end
+	if #selected == target_count then
+		if check_both then
+			if self:can_meet_requirements(selected_tags, normal_req) and self:can_meet_requirements(selected_tags, extra_req) then
+				return selected
+			end
+		elseif self:can_meet_requirements(selected_tags, normal_req) then
+			return selected
+		end
+	end
+	if target_count <= 2 and target_count <= #scored_roles then
+		for start_idx = 1, math.min(5, #scored_roles - target_count + 1) do
+			attempt_count = attempt_count + 1
+			if max_attempts < attempt_count then
+				break
+			end
+			local test_selected = {}
+			local test_tags = {}
+			table.insert(test_selected, scored_roles[start_idx].role)
+			for _, tag in ipairs(scored_roles[start_idx].role.tags) do
+				table.insert(test_tags, tag)
+			end
+			for i = 1, #scored_roles do
+				if target_count <= #test_selected then
+					break
+				end
+				if i ~= start_idx then
+					local remaining_normal = self:count_remaining_requirements(test_tags, normal_req)
+					local remaining_extra = self:count_remaining_requirements(test_tags, extra_req)
+					if #remaining_normal == 0 and #remaining_extra == 0 then
+						break
+					end
+					if DispatchCtrl.role_can_help(scored_roles[i].role.tags, remaining_normal, remaining_extra) then
+						table.insert(test_selected, scored_roles[i].role)
+						for _, tag in ipairs(scored_roles[i].role.tags) do
+							table.insert(test_tags, tag)
+						end
+					end
+				end
+			end
+			if #test_selected == target_count then
+				if check_both then
+					if self:can_meet_requirements(test_tags, normal_req) and self:can_meet_requirements(test_tags, extra_req) then
+						return test_selected
+					end
+				elseif self:can_meet_requirements(test_tags, normal_req) then
+					return test_selected
+				end
+			end
+		end
+	end
+	return nil
+end
+function DispatchCtrl.role_can_help(role_tags, remaining_normal, remaining_extra)
+	for _, tag in ipairs(role_tags) do
+		for _, req in ipairs(remaining_normal) do
+			if tag == req then
+				return true
+			end
+		end
+		for _, req in ipairs(remaining_extra) do
+			if tag == req then
+				return true
+			end
+		end
+	end
+	return false
+end
 function DispatchCtrl:OnEvent_OpenBuildList(dispatchId)
 	self.bOpenBuild = true
 	self:RefreshSelectList(true, dispatchId)

lua/game/ui/equipment/equipmentinfoctrl.lua

@@ -255,6 +255,7 @@ function EquipmentInfoCtrl:Awake()
 		if self.nSelectGemIndex == nil then
 			self.nSelectGemIndex = self.nEquipedGemIndex == 0 and 1 or self.nEquipedGemIndex
 		end
+		PlayerData.Equipment:CacheEquipmentSelect(self.nSlotId, self.nSelectGemIndex, self.nCharId)
 	end
 end
 function EquipmentInfoCtrl:OnEnable()
@@ -280,6 +281,7 @@ function EquipmentInfoCtrl:OnBtnClick_Next()
 	else
 		self.nSelectGemIndex = self.nSelectGemIndex + 1
 	end
+	PlayerData.Equipment:CacheEquipmentSelect(self.nSlotId, self.nSelectGemIndex, self.nCharId)
 	self.nSubSelectIndex = 2
 	self._mapNode.aniIconMask:Play("IconMaskSwitch_R")
 	self:RefreshSelectPoint(nBefore, self.nSelectGemIndex)
@@ -303,6 +305,7 @@ function EquipmentInfoCtrl:OnBtnClick_Pre()
 	else
 		self.nSelectGemIndex = self.nSelectGemIndex - 1
 	end
+	PlayerData.Equipment:CacheEquipmentSelect(self.nSlotId, self.nSelectGemIndex, self.nCharId)
 	self.nSubSelectIndex = 2
 	self._mapNode.aniIconMask:Play("IconMaskSwitch_L")
 	self:RefreshSelectPoint(nBefore, self.nSelectGemIndex)
@@ -365,6 +368,7 @@ function EquipmentInfoCtrl:OnBtnClick_Active()
 	local callback = function(nNewIndex)
 		self:RefreshPoint()
 		self.nSelectGemIndex = nNewIndex
+		PlayerData.Equipment:CacheEquipmentSelect(self.nSlotId, self.nSelectGemIndex, self.nCharId)
 		self:Refresh(true)
 	end
 	PlayerData.Equipment:SendCharGemGenerateReq(self.nCharId, self.nSlotId, callback)

lua/game/ui/equipment/equipmentrollctrl.lua

@@ -142,7 +142,10 @@ EquipmentRollCtrl._mapNodeConfig = {
 	},
 	FX = {sNodeName = "--FX--"}
 }
-EquipmentRollCtrl._mapEventConfig = {}
+EquipmentRollCtrl._mapEventConfig = {
+	[EventId.UIBackConfirm] = "OnEvent_Back",
+	[EventId.UIHomeConfirm] = "OnEvent_BackHome"
+}
 function EquipmentRollCtrl:Refresh()
 	self:RefreshPresetData()
 	self:RefreshPresetSlot()
@@ -522,7 +525,7 @@ function EquipmentRollCtrl:OnBtnClick_EquipmentSlot(_, nIndex)
 	self._panel.nSlotId = self.tbSlot[nIndex].nSlotId
 	self._panel.nEquipedGemIndex = self.tbSlot[nIndex].nGemIndex
 	self._panel.nSelectGemIndex = self.tbSlot[nIndex].nGemIndex == 0 and 1 or self.tbSlot[nIndex].nGemIndex
-	PlayerData.Equipment:CacheEquipmentSelect(self._panel.nSlotId, self._panel.nSelectGemIndex)
+	PlayerData.Equipment:CacheEquipmentSelect(self._panel.nSlotId, self._panel.nSelectGemIndex, self._panel.nCharId)
 	for i = 1, 3 do
 		self._mapNode.imgChoose[i].gameObject:SetActive(self._panel.nSlotId == self.tbSlot[i].nSlotId)
 	end
@@ -554,7 +557,7 @@ function EquipmentRollCtrl:OnBtnClick_Tab(btn, nIndex)
 	self.nSubSelectIndex = 2
 	self._mapNode.aniIconMask:Play(sAnimName)
 	self._panel.nSelectGemIndex = nIndex
-	PlayerData.Equipment:CacheEquipmentSelect(self._panel.nSlotId, self._panel.nSelectGemIndex)
+	PlayerData.Equipment:CacheEquipmentSelect(self._panel.nSlotId, self._panel.nSelectGemIndex, self._panel.nCharId)
 	self:RefreshIndexGem()
 	self.animator:Play("EquipmentSelectPanel_in", 0, 0)
 	local callback = function()
@@ -573,7 +576,7 @@ function EquipmentRollCtrl:OnBtnClick_Active()
 	end
 	local callback = function(nNewIndex)
 		self._panel.nSelectGemIndex = nNewIndex
-		PlayerData.Equipment:CacheEquipmentSelect(self._panel.nSlotId, self._panel.nSelectGemIndex)
+		PlayerData.Equipment:CacheEquipmentSelect(self._panel.nSlotId, self._panel.nSelectGemIndex, self._panel.nCharId)
 		self:RefreshTab()
 		self:RefreshIndexGem(true)
 	end
@@ -599,4 +602,17 @@ function EquipmentRollCtrl:OnBtnClick_Equip()
 	end
 	PlayerData.Equipment:SendCharGemEquipGemReq(self._panel.nCharId, self._panel.nSlotId, self._panel.nSelectGemIndex, nSelectPreset, callback)
 end
+function EquipmentRollCtrl:OnEvent_Back(nPanelId)
+	if self._panel._nPanelId ~= nPanelId then
+		return
+	end
+	EventManager.Hit(EventId.CloesCurPanel)
+end
+function EquipmentRollCtrl:OnEvent_BackHome(nPanelId)
+	if self._panel._nPanelId ~= nPanelId then
+		return
+	end
+	PlayerData.Equipment:GetEquipmentSelect()
+	PanelManager.Home()
+end
 return EquipmentRollCtrl

lua/game/ui/equipment/equipmentrollpanel.lua

@@ -12,7 +12,7 @@ function EquipmentRollPanel:Awake()
 		self.nSlotId = tbParam[2]
 		self.nSelectGemIndex = tbParam[3]
 		self.nEquipedGemIndex = tbParam[4]
-		PlayerData.Equipment:CacheEquipmentSelect(self.nSlotId, self.nSelectGemIndex)
+		PlayerData.Equipment:CacheEquipmentSelect(self.nSlotId, self.nSelectGemIndex, self.nCharId)
 	end
 end
 function EquipmentRollPanel:OnEnable()

lua/game/ui/play_breakout_30101/breakoutlevelcellctrl.lua

@@ -49,7 +49,7 @@ function BreakOutLevelCellCtrl:SetData(nActId, nLevelId, bIsActEnd)
 	end
 	self.LevelId = nLevelId
 	self.BreakOutData = PlayerData.Activity:GetActivityDataById(nActId)
-	if self.BreakOutData == nil then
+	if self.BreakOutData == nil or self.BreakOutData ~= nil and self.BreakOutData:GetLevelData() == nil then
 		printError("活动 id:" .. self.ActId .. " 数据为空 用本地临时数据初始化")
 		self:InitErrorSate()
 		self.levelData = ConfigTable.GetData("BreakOutLevel", self.LevelId)
@@ -154,7 +154,7 @@ function BreakOutLevelCellCtrl:RefreshLevelFinishState()
 	self._mapNode.img_FinishIcon.gameObject:SetActive(self.BreakOutData:IsLevelComplete(self.LevelId))
 end
 function BreakOutLevelCellCtrl:OnBtnClick_SelectLevel()
-	if self.BreakOutData == nil then
+	if self.BreakOutData == nil or self.BreakOutData ~= nil and self.BreakOutData:GetLevelData() == nil then
 		return
 	end
 	local bTimeUnlock, bPreComplete = self.BreakOutData:IsLevelUnlocked(self.LevelId)

lua/game/ui/play_breakout_30101/breakoutplayctrl.lua

@@ -250,6 +250,7 @@ function BreakOutPlayCtrl:OnEvent_Exit()
 	local confirmCallback = function()
 		EventManager.Hit("Close_BattlePause")
 		EventManager.Hit("BreakOut_Complete", true)
+		EventManager.Hit("SetBreakOutPlaySkill_Visible", false)
 		NovaAPI.SetCanvasGroupAlpha(self.Canvas, 0)
 		local requestCb = function(mapChangeInfo)
 			local cb = function()
@@ -277,7 +278,7 @@ function BreakOutPlayCtrl:OnEvent_Exit()
 	local msg = {
 		nType = AllEnum.MessageBox.Confirm,
 		sContent = sTip,
-		callbackConfirm = confirmCallback
+		callbackConfirmAfterClose = confirmCallback
 	}
 	EventManager.Hit(EventId.OpenMessageBox, msg)
 end

lua/game/ui/play_breakout_30101/levelselectctrl.lua

@@ -58,7 +58,7 @@ function LevelSelectCtrl:Awake()
 	local actData = self.BreakOut_30101Data:GetActivityDataByIndex(nIndex)
 	self.nActId = actData.ActivityId
 	self.BreakOutData = PlayerData.Activity:GetActivityDataById(self.nActId)
-	if self.BreakOutData == nil then
+	if self.BreakOutData == nil or self.BreakOutData ~= nil and self.BreakOutData:GetLevelData() == nil then
 		self.BreakOutData_00 = BreakOutData_00.new()
 		printError("活动 id:" .. self.nActId .. " 数据为空，开始初始化本地备用数据")
 		local tableData = {}
@@ -82,7 +82,7 @@ function LevelSelectCtrl:OnDisable()
 	}
 end
 function LevelSelectCtrl:OnEnable()
-	if self.BreakOutData == nil then
+	if self.BreakOutData == nil or self.BreakOutData ~= nil and self.BreakOutData:GetLevelData() == nil then
 		printError("活动 id:" .. self.nActId .. " 数据为空，无法记录当前的难度状态默认定位初始难度")
 	else
 		local param = self:GetPanelParam()
@@ -163,7 +163,7 @@ function LevelSelectCtrl:RefreshTabIcon()
 	self:RefreshTabRedIcon()
 end
 function LevelSelectCtrl:RefreshTabRedIcon()
-	if self.BreakOutData == nil then
+	if self.BreakOutData == nil or self.BreakOutData ~= nil and self.BreakOutData:GetLevelData() == nil then
 		self._mapNode.img_RightIcon:SetActive(false)
 		self._mapNode.img_LeftIcon:SetActive(false)
 		return
@@ -188,7 +188,7 @@ function LevelSelectCtrl:RefreshTabRedIcon()
 end
 function LevelSelectCtrl:RefreshDotsIcon()
 	local nMaxNum = 4
-	if self.BreakOutData == nil then
+	if self.BreakOutData == nil or self.BreakOutData ~= nil and self.BreakOutData:GetLevelData() == nil then
 		nMaxNum = self.BreakOutData_00:GetBreakoutLevelTypeNum()
 	else
 		nMaxNum = self.BreakOutData:GetBreakoutLevelTypeNum()
@@ -218,7 +218,7 @@ function LevelSelectCtrl:SetBanner()
 	end
 end
 function LevelSelectCtrl:AddGrids()
-	if self.BreakOutData == nil then
+	if self.BreakOutData == nil or self.BreakOutData ~= nil and self.BreakOutData:GetLevelData() == nil then
 		local nAllLevelType = self.BreakOutData_00:GetBreakoutLevelTypeNum()
 		for i = 1, nAllLevelType do
 			table.insert(self.tbGridsList, self.BreakOutData_00:GetLevelsByTab(i))

lua/game/ui/play_cookie_400006/cookieboardctrl.lua

@@ -1205,7 +1205,7 @@ function CookieBoardCtrl:LevelEnd()
 		self._mapNode.btnConfirmScore.gameObject:SetActive(true)
 		self._mapNode.btnShortcutConfirmScore.gameObject:SetActive(true)
 	end
-	EventManager.Hit("Cookie_Game_Complete", self.nLevelId, self.nScore, self.nCompBoxCount, self.nCompCookieCount, self.nGoodCount, self.nPerfectCount, self.nCriticalPerfectCount, self.nMissCount, callback)
+	EventManager.Hit("Cookie_Game_Complete", self.nLevelId, self.nScore, self.nCompBoxCount, self.nCompCookieCount, self.nGoodCount, self.nPerfectCount, self.nCriticalPerfectCount, self.nMissCount, self.nActId, callback)
 	EventManager.Hit(EventId.TemporaryBlockInput, 2)
 	cs_coroutine.start(wait)
 end

lua/game/ui/storyset/storysetctrl.lua

@@ -267,6 +267,9 @@ function StorySetCtrl:OnRefreshTabGrid(goGrid, gridIndex)
 	txtOff.gameObject:SetActive(nIndex ~= self.nCurrentTabIndex)
 	local tabLine = root.transform:Find("tabLine").gameObject
 	tabLine:SetActive(nIndex < #self.tbTabData)
+	if self.nCurrentTabIndex == nIndex then
+		self.goCurrentTabGrid = goGrid
+	end
 	local redDot = root:Find("RedDot").gameObject
 	RedDotManager.RegisterNode(RedDotDefine.Story_Set_Tab, cfg.Id, redDot, nil, nil, true)
 end
@@ -276,27 +279,42 @@ function StorySetCtrl:OnTabGridClick(goGrid, gridIndex)
 		return
 	end
 	self.nCurrentTabIndex = nIndex
+	local root = goGrid.transform:Find("btnGrid/AnimRoot")
+	local imgOn = root:Find("imgOn"):GetComponent("Image")
+	imgOn.gameObject:SetActive(true)
+	local txtOn = root:Find("txtOn"):GetComponent("TMP_Text")
+	local txtOff = root:Find("txtOff"):GetComponent("TMP_Text")
+	txtOn.gameObject:SetActive(true)
+	txtOff.gameObject:SetActive(false)
+	if self.goCurrentTabGrid ~= nil then
+		local lastRoot = self.goCurrentTabGrid.transform:Find("btnGrid/AnimRoot")
+		local lastImgOn = lastRoot:Find("imgOn"):GetComponent("Image")
+		lastImgOn.gameObject:SetActive(false)
+		local lastTxtOn = lastRoot:Find("txtOn"):GetComponent("TMP_Text")
+		local lastTxtOff = lastRoot:Find("txtOff"):GetComponent("TMP_Text")
+		lastTxtOn.gameObject:SetActive(false)
+		lastTxtOff.gameObject:SetActive(true)
+	end
+	self.goCurrentTabGrid = goGrid
 	local nAnimLen = 0
 	for _, v in pairs(self.tbChapterGrid) do
 		nAnimLen = v:PlayOutAnim()
 	end
 	if 0 < nAnimLen then
 		self:AddTimer(1, nAnimLen, function()
-			self:RefreshTab()
-			self.tbChapter = PlayerData.StorySet:GetAllChapterList(self.nCurrentTabIndex, self.bOnlyShowUnRead)
+			self:UpdateChapterList()
 			self:RefreshChapter()
 		end, true, true, true)
 		EventManager.Hit(EventId.TemporaryBlockInput, nAnimLen)
 	else
-		self:RefreshTab()
-		self.tbChapter = PlayerData.StorySet:GetAllChapterList(self.nCurrentTabIndex, self.bOnlyShowUnRead)
+		self:UpdateChapterList()
 		self:RefreshChapter()
 	end
 end
 function StorySetCtrl:ShowGetReward()
 	if self.bGetReward and self.tbReward ~= nil and self.bTransitionEnd then
 		UTILS.OpenReceiveByChangeInfo(self.tbReward, function()
-			self.tbChapter = PlayerData.StorySet:GetAllChapterList(self.nCurrentTabIndex, self.bOnlyShowUnRead)
+			self:UpdateChapterList()
 			if self.nPanelType == panelType_Section then
 				self:RefreshSection()
 			end
@@ -308,6 +326,14 @@ function StorySetCtrl:ShowGetReward()
 end
 function StorySetCtrl:FilterSectionList()
 end
+function StorySetCtrl:UpdateChapterList()
+	if self.tbTabData == nil then
+		self.tbChapter = PlayerData.StorySet:GetAllChapterList(self.nCurrentTabIndex, self.bOnlyShowUnRead)
+	else
+		local cfg = self.tbTabData[self.nCurrentTabIndex]
+		self.tbChapter = PlayerData.StorySet:GetAllChapterList(cfg.Id, self.bOnlyShowUnRead)
+	end
+end
 function StorySetCtrl:Awake()
 	self.nSelectIndex = 0
 	self.nCurrentTabIndex = 1
@@ -324,7 +350,7 @@ end
 function StorySetCtrl:OnEnable()
 	self.tbChapterGrid = {}
 	self.tbSectionGrid = {}
-	self.tbChapter = PlayerData.StorySet:GetAllChapterList(self.nCurrentTabIndex, self.bOnlyShowUnRead)
+	self:UpdateChapterList()
 	self.animRoot = self.gameObject:GetComponent("Animator")
 	if self.nChapterId > 0 then
 		for k, v in ipairs(self.tbChapter) do
@@ -389,7 +415,7 @@ function StorySetCtrl:OnEvent_StorySetChapterRefresh()
 	end
 	self.bSendMsg = true
 	local serverCallback = function()
-		self.tbChapter = PlayerData.StorySet:GetAllChapterList(self.nCurrentTabIndex, self.bOnlyShowUnRead)
+		self:UpdateChapterList()
 		self.bSendMsg = false
 		if self.nPanelType == panelType_chapter then
 			self:RefreshChapter()
@@ -400,7 +426,7 @@ end
 function StorySetCtrl:OnClick_ShowUnRead()
 	self._mapNode.imgShowUnReadOn.gameObject:SetActive(not self.bOnlyShowUnRead)
 	self.bOnlyShowUnRead = not self.bOnlyShowUnRead
-	self.tbChapter = PlayerData.StorySet:GetAllChapterList(self.nCurrentTabIndex, self.bOnlyShowUnRead)
+	self:UpdateChapterList()
 	self:RefreshChapter()
 end
 return StorySetCtrl

lua/game/ui/topbarex/topbarctrl.lua

@@ -118,7 +118,8 @@ local mapConfig = {
 	[PanelId.StorySet] = {bEvent = true},
 	[PanelId.BdConvertPanel] = {bEvent = true},
 	[PanelId.GachaSpin] = {bEvent = true},
-	[PanelId.JointDrillLevelSelect_2] = {bEvent = true}
+	[PanelId.JointDrillLevelSelect_2] = {bEvent = true},
+	[PanelId.EquipmentRoll] = {bEvent = true}
 }
 function TopBarCtrl:CreateCoin(tbCoin, bHideCoinAdd)
 	self.mapCoinIndex, self.mapItemIndex = nil, nil

lua/gamecore/data/dataclass/activity/cookieactdata.lua

@@ -220,7 +220,7 @@ function CookieActData:SetNMHighScoreDay()
 	local nDayCount = nYear * 366 + nMonth * 31 + nDay
 	LocalData.SetPlayerLocalData("Cookie_Nightmare_HighScoreDay", nDayCount)
 end
-function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, callback)
+function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, nActId, callback)
 	local callbackFunc = function(_, msgData)
 		self:SetLevelData(nLevelId, nScore)
 		self:SetLevelReward(msgData)
@@ -229,6 +229,7 @@ function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCo
 		end
 	end
 	if self.nActId == 0 then
+		self.nActId = nActId
 		printError("RequestCookieLevelResult: ActivityId is 0!!!  -  ActivityId = " .. self.nActId .. ", nLevelId = " .. nLevelId .. ", nScore = " .. nScore)
 	end
 	HttpNetHandler.SendMsg(NetMsgId.Id.activity_cookie_settle_req, {
@@ -243,8 +244,8 @@ function CookieActData:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCo
 		Good = nGoodCount
 	}, nil, callbackFunc)
 end
-function CookieActData:OnEvent_GameComplete(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, callback)
-	self:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, callback)
+function CookieActData:OnEvent_GameComplete(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, nActId, callback)
+	self:RequestLevelResult(nLevelId, nScore, nBoxCount, nCookieCount, nGoodCount, nPerfectCount, nExcellentCount, nMissCount, nActId, callback)
 end
 function CookieActData:OnEvent_QuestClaim(nQuestId)
 	self:SendQuestReceive(nQuestId)

lua/gamecore/data/dataclass/playerequipmentdataex.lua

@@ -234,8 +234,12 @@ end
 function PlayerEquipmentData:SetRollWarning(bAble)
 	self.bRollWarning = bAble
 end
-function PlayerEquipmentData:CacheEquipmentSelect(nSlotId, nGemIndex)
-	self.mapSelect = {nSlotId = nSlotId, nGemIndex = nGemIndex}
+function PlayerEquipmentData:CacheEquipmentSelect(nSlotId, nGemIndex, nCharId)
+	self.mapSelect = {
+		nSlotId = nSlotId,
+		nGemIndex = nGemIndex,
+		nCharId = nCharId
+	}
 end
 function PlayerEquipmentData:GetEquipmentSelect()
 	if self.mapSelect == nil then

lua/gamecore/data/dataclass/playermalldata.lua

@@ -2,6 +2,7 @@ local PlayerMallData = class("PlayerMallData")
 local TimerManager = require("GameCore.Timer.TimerManager")
 local MessageBoxManager = require("GameCore.Module.MessageBoxManager")
 local LocalData = require("GameCore.Data.LocalData")
+local ModuleManager = require("GameCore.Module.ModuleManager")
 local ClientManager = CS.ClientManager.Instance
 local WwiseAudioMgr = CS.WwiseAudioManager.Instance
 local SDKManager = CS.SDKManager.Instance
@@ -671,7 +672,8 @@ function PlayerMallData:CollectEnd(bError)
 	if not bError then
 		self:CloseOrderWait()
 	end
-	if PanelManager.CheckPanelOpen(PanelId.ReceiveAutoTrans) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsTips) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsNPC) == true or PanelManager.CheckPanelOpen(PanelId.ReceiveSpecialReward) == true or PanelManager.CheckNextPanelOpening() then
+	local bInAdventure = ModuleManager.GetIsAdventure()
+	if PanelManager.CheckPanelOpen(PanelId.ReceiveAutoTrans) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsTips) == true or PanelManager.CheckPanelOpen(PanelId.ReceivePropsNPC) == true or PanelManager.CheckPanelOpen(PanelId.ReceiveSpecialReward) == true or PanelManager.CheckNextPanelOpening() or bInAdventure == true then
 		funcClear()
 	else
 		local sTip

lua/gamecore/data/dataclass/playerstartowerdata.lua

@@ -1318,6 +1318,7 @@ function PlayerStarTowerData:ChangeNpcAffinity(mapInfo)
 	self:UpdateNpcAffinityRedDot()
 end
 function PlayerStarTowerData:UpdateNpcAffinityRedDot()
+	RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity_Reward, "server", false)
 	local forEachNpc = function(mapData)
 		RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity_Reward, mapData.Id, false)
 	end

lua/gamecore/data/dataclass/playerstatedata.lua

@@ -22,7 +22,7 @@ function PlayerStateData:CacheStateData(mapMsgData)
 		RedDotManager.SetValid(RedDotDefine.Mall_Free, nil, mapMsgData.MallPackage.New)
 		RedDotManager.SetValid(RedDotDefine.Friend_Apply, nil, mapMsgData.Friend)
 		RedDotManager.SetValid(RedDotDefine.Friend_Energy, nil, mapMsgData.FriendEnergy.State)
-		RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity, nil, mapMsgData.NpcAffinityReward)
+		RedDotManager.SetValid(RedDotDefine.StarTowerBook_Affinity_Reward, "server", mapMsgData.NpcAffinityReward)
 		PlayerData.Quest:UpdateServerQuestRedDot(mapMsgData.TravelerDuelQuest)
 		PlayerData.Quest:UpdateServerQuestRedDot(mapMsgData.TravelerDuelChallengeQuest)
 		PlayerData.InfinityTower:UpdateBountyRewardState(mapMsgData.InfinityTower)

versions.txt

@@ -1,4 +1,4 @@
-EN: 1.6.0.84
-CN: 1.6.0.87
-JP: 1.6.0.88
-KR: 1.6.0.91
+EN: 1.6.0.85
+CN: 1.6.0.88
+JP: 1.6.0.89
+KR: 1.6.0.92