Update - 1.12.0.120

EN: 1.12.0.120 CN: 1.12.0.120 JP: 1.12.0.124 KR: 1.12.0.124
2026-06-30 14:30:00 +09:00
parent 061d344bf2
commit 80af235e05
826 changed files with 625145 additions and 81163 deletions
@@ -0,0 +1,119 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"11401"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_happy",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"special_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"哼哼……猫眼大人成功凯旋！",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"已经感觉到了！我体内的黑暗之力，变得更加强大了！",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"11402"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_star",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"presents_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"哎呀哎呀，看样子拿到了不少报酬呢！",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"看来，与魔王一起行动，果然能够增幅猫眼大人体内的黑暗之力呢！",
+			0,
+			"",
+			false,
+			""
+		}
+	},
+	{cmd = "End"}
+}
@@ -254,7 +254,7 @@ return {
 	{
 		id = "avg1_146",
 		name = "蓝锥",
-		name_bg_color = "#0ABEC5"
+		name_bg_color = "#84afff"
 	},
 	{
 		id = "avg1_147",
@@ -356,7 +356,7 @@ return {
 	},
 	{
 		id = "avg2_944",
-		name = "***",
+		name = "捕草蝎",
 		name_bg_color = "#0ABEC5",
 		ver = "1.12.0"
 	},
@@ -1132,6 +1132,18 @@ return {
 		name_bg_color = "#fced8a",
 		ver = "1.9.0"
 	},
+	{
+		id = "avg3_218",
+		name = "米拉什居民男",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
+	{
+		id = "avg3_219",
+		name = "米拉什居民女",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
 	{
 		id = "avg3_220",
 		name = "梅尔库莉娅",
@@ -1150,6 +1162,12 @@ return {
 		name_bg_color = "#a5cdc3",
 		ver = "1.11.0"
 	},
+	{
+		id = "avg3_223",
+		name = "***",
+		name_bg_color = "#a5cdc3",
+		ver = "1.15.0"
+	},
 	{
 		id = "avg3_873",
 		name = "克莱儿",
@@ -2811,11 +2829,67 @@ return {
 	},
 	{
 		id = "avg3_1304",
-		name = "***",
+		name = "猫眼A",
 		name_bg_color = "#8e65ad",
 		reuse = "avg1_114",
 		ver = "1.12.0"
 	},
+	{
+		id = "avg3_1305",
+		name = "***",
+		name_bg_color = "#b0e0f6",
+		reuse = "avg1_160",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1306",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1307",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1308",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1309",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1310",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_991",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1311",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_100",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1312",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_101",
+		ver = "1.13.0"
+	},
 	{
 		id = "avg4_100",
 		name = "菈露发光",
@@ -0,0 +1,127 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"11401"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_happy",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"special_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"Heh heh... The great Chaton returns in triumph!",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"I can already feel it! My dark power is surging! It's getting stronger!",
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"11402"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_star",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"presents_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"Ooh, looks like we raked in quite the haul!",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"Guess fighting alongside the Tyrant really amps up the great Chaton's dark power!",
+			""
+		}
+	},
+	{cmd = "End"}
+}
@@ -254,7 +254,7 @@ return {
 	{
 		id = "avg1_146",
 		name = "Benito",
-		name_bg_color = "#0ABEC5"
+		name_bg_color = "#84afff"
 	},
 	{
 		id = "avg1_147",
@@ -356,7 +356,7 @@ return {
 	},
 	{
 		id = "avg2_944",
-		name = "***",
+		name = "Meadow Blade",
 		name_bg_color = "#0ABEC5",
 		ver = "1.12.0"
 	},
@@ -1132,6 +1132,18 @@ return {
 		name_bg_color = "#fced8a",
 		ver = "1.9.0"
 	},
+	{
+		id = "avg3_218",
+		name = "Mirage Resident M",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
+	{
+		id = "avg3_219",
+		name = "Mirage Resident F",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
 	{
 		id = "avg3_220",
 		name = "Mercurio",
@@ -1150,6 +1162,12 @@ return {
 		name_bg_color = "#a5cdc3",
 		ver = "1.11.0"
 	},
+	{
+		id = "avg3_223",
+		name = "***",
+		name_bg_color = "#a5cdc3",
+		ver = "1.15.0"
+	},
 	{
 		id = "avg3_873",
 		name = "Claire",
@@ -2811,11 +2829,67 @@ return {
 	},
 	{
 		id = "avg3_1304",
-		name = "***",
+		name = "Chaton A",
 		name_bg_color = "#8e65ad",
 		reuse = "avg1_114",
 		ver = "1.12.0"
 	},
+	{
+		id = "avg3_1305",
+		name = "***",
+		name_bg_color = "#b0e0f6",
+		reuse = "avg1_160",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1306",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1307",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1308",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1309",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1310",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_991",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1311",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_100",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1312",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_101",
+		ver = "1.13.0"
+	},
 	{
 		id = "avg4_100",
 		name = "Laru Bright Ver",
@@ -482,7 +482,7 @@ return {
 			"",
 			false,
 			"",
-			"ひゃっほぉぉぉう、勝てる……！==RT==これなら<r=・>あ</r><r=・>の</r>団長に……==W==『不敗のカシミラ』に勝てる！",
+			"ひゃっほぉぉぉう、勝てる……！==RT==これなら<r=・>あ</r><r=・>の</r>隊長に……==W==『不敗のカシミラ』に勝てる！",
 			""
 		}
 	},
@@ -1404,7 +1404,7 @@ return {
 			"",
 			false,
 			"",
-			"臨時指揮官……！==RT==昇降機から――カシミラ団長です！紅組を率いて出てきました！",
+			"臨時指揮官……！==RT==昇降機から――カシミラ隊長です！紅組を率いて出てきました！",
 			""
 		}
 	},
@@ -1804,7 +1804,7 @@ return {
 			"",
 			false,
 			"",
-			"カシミラ団長、白組が逃げます！==RT==早く追わないと……！",
+			"カシミラ隊長、白組が逃げます！==RT==早く追わないと……！",
 			""
 		}
 	},
@@ -3850,7 +3850,7 @@ return {
 			"",
 			false,
 			"",
-			"くるぞ……カシミラ団長の、本気……",
+			"くるぞ……カシミラ隊長の、本気……",
 			""
 		}
 	},
@@ -5373,7 +5373,7 @@ return {
 			"",
 			false,
 			"",
-			"いまからカシミラ団長のアレが始まるからですよ……はぁ……",
+			"いまからカシミラ隊長のアレが始まるからですよ……はぁ……",
 			""
 		}
 	},
@@ -0,0 +1,127 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"11401"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_happy",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"special_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"ふっふーん！シャトン様のご帰還だー！",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"感じるぞ、内なる漆黒の力が強まっているのを！！",
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"11402"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_star",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"presents_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"おー！たっぷり報酬が手に入ったみたいだね！",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"やっぱり魔王と一緒にいると、シャトン様の漆黒の力が強くなるみたい！",
+			""
+		}
+	},
+	{cmd = "End"}
+}
@@ -2178,7 +2178,7 @@ return {
 			"",
 			false,
 			"",
-			"カリンちゃんってね、おばあちゃんをすっごく慕ってるの。==RT==うちで一緒に暮らすようになったもの、それが理由だよ。",
+			"カリンちゃんってね、おばあちゃんをすっごく慕ってるの。==RT==うちで一緒に暮らすようになったのも、それが理由だよ。",
 			""
 		}
 	},
@@ -5622,7 +5622,7 @@ return {
 		cmd = "SetTalk",
 		param = {
 			0,
-			"チンピラ宝探し巡遊者",
+			"宝探し巡遊者のカシラ",
 			"",
 			0,
 			"",
@@ -11161,7 +11161,7 @@ return {
 			"",
 			false,
 			"",
-			"==A-1==『熱月18日曇り。ここに来て3日目。小さな角鯨が船を見つけてくれたけど、どこもかしこも壊れてて修理はできそうになかった。』==P====A-1==『熱月21日曇り時々晴れ。夜、砂浜で瀕死の角鯨を見つけた。小さな鯨は悲しんでいた。あたしは何もできず、ただ呼吸が止まるのを黙って見ていた。貝殻をいくつか拾って、そばに置いた。長い、いい夢を見られますように。』==P====A-1==『熱月30日晴れ。新しい船を作って、帰る準備ができた。小さな角鯨はあたしと別れるのが寂しそうだった。これから、誰がこの場所を守っていくのだろうか。』",
+			"==A-1==『熱月18日曇り。ここに来て3日目。小さな角鯨が船を見つけてくれたけど、どこもかしこも壊れてて修理はできそうになかった。』==P====RT====A-1==『熱月21日曇り時々晴れ。夜、砂浜で瀕死の角鯨を見つけた。小さな鯨は悲しんでいた。あたしは何もできず、ただ呼吸が止まるのを黙って見ていた。貝殻をいくつか拾って、そばに置いた。長い、いい夢を見られますように。』==P====RT====A-1==『熱月30日晴れ。新しい船を作って、帰る準備ができた。小さな角鯨はあたしと別れるのが寂しそうだった。これから、誰がこの場所を守っていくのだろうか。』",
 			""
 		}
 	},
@@ -254,7 +254,7 @@ return {
 	{
 		id = "avg1_146",
 		name = "ベニト",
-		name_bg_color = "#0ABEC5"
+		name_bg_color = "#84afff"
 	},
 	{
 		id = "avg1_147",
@@ -315,6 +315,12 @@ return {
 		name_bg_color = "#c553a5",
 		ver = "1.6.0"
 	},
+	{
+		id = "avg1_160",
+		name = "***",
+		name_bg_color = "#b0e0f6",
+		ver = "1.13.0"
+	},
 	{
 		id = "avg1_163",
 		name = "グレースホルン",
@@ -348,6 +354,12 @@ return {
 		name_bg_color = "#0ABEC5",
 		ver = "1.10.0"
 	},
+	{
+		id = "avg2_944",
+		name = "捕草蝎",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
 	{
 		id = "avg2_945",
 		name = "***",
@@ -360,6 +372,18 @@ return {
 		name_bg_color = "#0ABEC5",
 		ver = "1.9.0"
 	},
+	{
+		id = "avg2_947",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg2_948",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		ver = "1.13.0"
+	},
 	{
 		id = "avg2_949",
 		name = "微风小枭",
@@ -846,7 +870,7 @@ return {
 	},
 	{
 		id = "avg3_164",
-		name = "いおり",
+		name = "イオリ",
 		name_bg_color = "#fac89b"
 	},
 	{
@@ -1108,6 +1132,18 @@ return {
 		name_bg_color = "#fced8a",
 		ver = "1.9.0"
 	},
+	{
+		id = "avg3_218",
+		name = "米拉什居民男",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
+	{
+		id = "avg3_219",
+		name = "米拉什居民女",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
 	{
 		id = "avg3_220",
 		name = "メルクリア",
@@ -1126,6 +1162,12 @@ return {
 		name_bg_color = "#a5cdc3",
 		ver = "1.11.0"
 	},
+	{
+		id = "avg3_223",
+		name = "***",
+		name_bg_color = "#a5cdc3",
+		ver = "1.15.0"
+	},
 	{
 		id = "avg3_873",
 		name = "クレア",
@@ -1844,7 +1886,7 @@ return {
 	},
 	{
 		id = "avg3_1047",
-		name = "电话那头的男人",
+		name = "通话另一端的男人",
 		name_bg_color = "#0ABEC5"
 	},
 	{
@@ -2789,7 +2831,64 @@ return {
 		id = "avg3_1304",
 		name = "シャトンA",
 		name_bg_color = "#8e65ad",
-		reuse = "avg1_114"
+		reuse = "avg1_114",
+		ver = "1.12.0"
+	},
+	{
+		id = "avg3_1305",
+		name = "***",
+		name_bg_color = "#b0e0f6",
+		reuse = "avg1_160",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1306",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1307",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1308",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1309",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1310",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_991",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1311",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_100",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1312",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_101",
+		ver = "1.13.0"
 	},
 	{
 		id = "avg4_100",
@@ -0,0 +1,127 @@
+return {
+	{
+		cmd = "SetGroupId",
+		param = {"11401"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_happy",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"special_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"흥흥…… 샤통 님이 승리하고 돌아왔다!",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"벌써 느껴진다! 내 안의 칠흑의 힘이 더욱 강해지고 있어!",
+			""
+		}
+	},
+	{
+		cmd = "SetGroupId",
+		param = {"11402"}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			3,
+			"none",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"avg_emoji_star",
+			"",
+			0
+		}
+	},
+	{
+		cmd = "SetCharL2D",
+		param = {
+			"avg1_114",
+			0,
+			"none",
+			"presents_b",
+			0
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"어머 어머, 보상을 두둑이 챙긴 모양이군!",
+			""
+		}
+	},
+	{
+		cmd = "SetTalk",
+		param = {
+			0,
+			"avg1_114",
+			"",
+			0,
+			"",
+			false,
+			"",
+			"역시 마왕과 함께하니, 이 샤통 님의 몸속 칠흑의 힘도 증폭되는구나!",
+			""
+		}
+	},
+	{cmd = "End"}
+}
@@ -10764,7 +10764,7 @@ return {
 			"",
 			false,
 			"",
-			"스승님으로 모실게요. ==PLAYER_NAME== 님, 제 스승님이 되어주시겠어요?",
+			"스승님으로 모실게요. 마왕님, 제 스승님이 되어주시겠어요?",
 			""
 		}
 	},
@@ -5441,7 +5441,7 @@ return {
 			"",
 			false,
 			"",
-			"그래. 그렇기 때문에…… 네가 소원을 들어주는 별이 될 필요는 없는 거야.",
+			"그래. 그렇기 때문에…… 마왕이 소원을 들어주는 별이 될 필요는 없는 거야.",
 			""
 		}
 	},
@@ -5962,7 +5962,7 @@ return {
 			"",
 			false,
 			"",
-			"사저, 이거 너무 세게 나가는 거 아니에요? 지난번 연회에서 이미 마왕과 피렌은 컴퍼니를 제대로 운영하고 싶어 하는 사람들이란 걸 확인했잖아요.",
+			"사저, 이거 너무 세게 나가는 거 아니야? 지난번 연회에서, 마왕과 피렌은 컴퍼니를 제대로 운영하고 싶어 하는 사람들이란 걸 이미 확인했잖아.",
 			""
 		}
 	},
@@ -6005,7 +6005,7 @@ return {
 			"",
 			false,
 			"",
-			"게다가 필리에 컴퍼니와 우호적인 협력을 맺으면 노바의 식량 거래를 안정시킬 수 있으니, 이는 창오성에도 이득이에요. 만약 필리에 컴퍼니가 실패하기라도 하면……",
+			"게다가 필리에 컴퍼니와 우호적인 협력을 맺으면, 노바의 식량 거래를 안정시킬 수 있으니 창오성에도 이득이잖아. 만약 필리에 컴퍼니가 실패하기라도 하면……",
 			""
 		}
 	},
@@ -254,7 +254,7 @@ return {
 	{
 		id = "avg1_146",
 		name = "베니토",
-		name_bg_color = "#0ABEC5"
+		name_bg_color = "#84afff"
 	},
 	{
 		id = "avg1_147",
@@ -356,7 +356,7 @@ return {
 	},
 	{
 		id = "avg2_944",
-		name = "***",
+		name = "독침 전갈",
 		name_bg_color = "#0ABEC5",
 		ver = "1.12.0"
 	},
@@ -1132,6 +1132,18 @@ return {
 		name_bg_color = "#fced8a",
 		ver = "1.9.0"
 	},
+	{
+		id = "avg3_218",
+		name = "미라슈 주민(남)",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
+	{
+		id = "avg3_219",
+		name = "미라슈 주민(여)",
+		name_bg_color = "#0ABEC5",
+		ver = "1.12.0"
+	},
 	{
 		id = "avg3_220",
 		name = "메르쿠리아",
@@ -1150,6 +1162,12 @@ return {
 		name_bg_color = "#a5cdc3",
 		ver = "1.11.0"
 	},
+	{
+		id = "avg3_223",
+		name = "***",
+		name_bg_color = "#a5cdc3",
+		ver = "1.15.0"
+	},
 	{
 		id = "avg3_873",
 		name = "클레어",
@@ -2811,11 +2829,67 @@ return {
 	},
 	{
 		id = "avg3_1304",
-		name = "***",
+		name = "샤통A",
 		name_bg_color = "#8e65ad",
 		reuse = "avg1_114",
 		ver = "1.12.0"
 	},
+	{
+		id = "avg3_1305",
+		name = "***",
+		name_bg_color = "#b0e0f6",
+		reuse = "avg1_160",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1306",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1307",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_948",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1308",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1309",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_947",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1310",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg2_991",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1311",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_100",
+		ver = "1.13.0"
+	},
+	{
+		id = "avg3_1312",
+		name = "***",
+		name_bg_color = "#0ABEC5",
+		reuse = "avg3_101",
+		ver = "1.13.0"
+	},
 	{
 		id = "avg4_100",
 		name = "빛나는 라루",
@@ -570,6 +570,10 @@ function Avg_4_TalkCtrl:OnL2DAnimEvent_BtnClick()
 		self.twDOText:Kill(true)
 		self.twDOText = nil
 	end
+	if type(self.tbPage) == "table" and self.nPageIndex == #self.tbPage and type(self.tbLogData) == "table" then
+		EventManager.Hit(EventId.AvgMarkLog, self.tbLogData)
+		self.tbLogData = nil
+	end
 	self:OnBtnClick_GoOn()
 end
 function Avg_4_TalkCtrl:OnL2DAnimEvent_Done()
@@ -718,7 +722,11 @@ function Avg_4_TalkCtrl:_SetWaitingVisible(bVisible)
 		rt = self._mapNode.rtWaiting_White
 	end
 	rt.localScale = bVisible == true and Vector3.one or Vector3.zero
-	EventManager.Hit(EventId.AvgLogBtnEnable, bVisible == true and self.bForceDisableBtn_LogHide == false)
+	EventManager.Hit(EventId.AvgLogBtnEnable, bVisible == true)
+	if bVisible == true and type(self.tbPage) == "table" and self.nPageIndex == #self.tbPage and type(self.tbLogData) == "table" then
+		EventManager.Hit(EventId.AvgMarkLog, self.tbLogData)
+		self.tbLogData = nil
+	end
 end
 function Avg_4_TalkCtrl:_ResetWaitingPos()
 	local nX, nY, bCanScroll = 0, 0, false
@@ -1003,6 +1011,7 @@ function Avg_4_TalkCtrl:SetTalk(tbParam)
 	self.bWhite = nil
 	nDelayTime = self.nContentTextDelay_1
 	self.bNeedPlayPageSound = false
+	self.tbLogData = {}
 	self.tbLogData.nType = AllEnum.AvgLogType.Talk
 	self.tbLogData.sAvgId = sAvgCharId
 	self.tbLogData.sVoice = sVoiceName
@@ -1145,6 +1154,10 @@ function Avg_4_TalkCtrl:SetTalk(tbParam)
 		self.nPageIndex = 1
 		NovaAPI.SetText_RubyTMP(self.curTMP, sContent)
 		self.timerSubtitle = self:AddTimer(1, nDuration, "_SubtitleDone", true, true, true)
+		if bMarkInLog == true then
+			EventManager.Hit(EventId.AvgMarkLog, self.tbLogData)
+			self.tbLogData = nil
+		end
 	else
 		if bFixTmpPosY == true then
 			self:_ProcTmpPosY(sContent, sAvgCharId == "0")
@@ -1203,7 +1216,8 @@ function Avg_4_TalkCtrl:SetTalk(tbParam)
 		WwiseAudioMgr:WwiseVoice_PlayInAVG(sVoiceName)
 	end
 	if bMarkInLog == true then
-		EventManager.Hit(EventId.AvgMarkLog, self.tbLogData)
+	else
+		self.tbLogData = nil
 	end
 	return -1
 end
@@ -675,7 +675,14 @@ function AvgEditorQuickPreview:OnRefreshChoiceGrid(goSv, tbParam)
 			local rtTxtSelection = btnSelection.transform:Find("AnimRoot/txtSelection"):GetComponent("RectTransform")
 			local rtImgBg = btnSelection.transform:Find("AnimRoot/imgBg"):GetComponent("RectTransform")
 			local rtSelection = goSelection:GetComponent("RectTransform")
-			local sContent = ProcAvgTextContent(tbParam[i + 1], self._panel.nCurLanguageIdx)
+			local nOffset = 0
+			if PlayerBaseData:GetPlayerSex() == true then
+				nOffset = 3
+			end
+			local sContent = ProcAvgTextContent(tbParam[i + 1 + nOffset], self._panel.nCurLanguageIdx)
+			if type(sContent) ~= "string" or sContent == "" then
+				sContent = ProcAvgTextContent(tbParam[i + 1], self._panel.nCurLanguageIdx)
+			end
 			NovaAPI.SetTMPText(txtSelection, sContent)
 			local nHeight = self:_CalcChoiceHeight(sContent)
 			rtTxtSelection.sizeDelta = Vector2(rtTxtSelection.sizeDelta.x, nHeight)
@@ -58,6 +58,7 @@ local AvgPreset = {
 		"deserted_village_room_night_a",
 		"deserted_village_room_night_b",
 		"desert_daylight",
+		"desert_notower_daylight",
 		"dessert_house_inside",
 		"dessert_house_inside_dusk",
 		"dojo_daylight",
@@ -105,6 +106,10 @@ local AvgPreset = {
 		"japanese_pond_daylight",
 		"jewelry_store_inside",
 		"luckyoasis_forest_daylight",
+		"mine_inside",
+		"mirage_eyphkabar_inside_daylight",
+		"mirage_eyphkabar_inside_dusk",
+		"mirage_street_daylight",
 		"mood_1",
 		"mood_2",
 		"mood_3",
@@ -313,6 +318,9 @@ local AvgPreset = {
 		"story_event_08_001_a",
 		"story_event_08_002",
 		"story_event_08_003",
+		"story_event_09_001",
+		"story_event_09_001_a",
+		"story_event_09_002",
 		"story_main_00_001",
 		"story_main_00_002",
 		"story_main_00_003_FP",
@@ -533,10 +541,15 @@ local AvgPreset = {
 		"story_tales_13_001",
 		"story_tales_14_001",
 		"story_tales_14_001_a",
-		"story_tales_15_001"
+		"story_tales_15_001",
+		"story_tales_16_001",
+		"story_tales_16_001_a",
+		"story_tales_16_001_b"
 	},
 	FgResName = {
 		"circle_light",
+		"sniper_black",
+		"sniper_white",
 		"story_main_01_032_FP",
 		"story_main_01_032_MP",
 		"story_main_01_033",
@@ -5708,6 +5721,7 @@ local AvgPreset = {
 			"fx_avg_powerup_loop",
 			""
 		},
+		{"style_4", ""},
 		{
 			"--分割线，以下特效含后期效果--",
 			""
@@ -633,14 +633,21 @@ function AvgEditorMultiLanTool:_Export_Text(tbLuaData)
 			})
 			for j = 2, 4 do
 				local sContent = v.param[j]
-				if type(sContent) == "string" and sContent ~= "" then
+				local sContent_ = v.param[j + 3]
+				if type(sContent) == "string" and sContent ~= "" or type(sContent_) == "string" and sContent_ ~= "" then
+					if type(sContent) ~= "string" then
+						sContent = ""
+					end
+					if type(sContent_) ~= "string" then
+						sContent = ""
+					end
 					if self.nFromLanIdx == 1 then
 						table.insert(tbExportData, {
 							"【id:" .. tostring(i) .. "】" .. string.format("[手机选项] 组:%s 选项:%d", sGroupId, j - 1),
 							"",
 							self:_ProcText(sContent, true),
 							"",
-							"",
+							self:_ProcText(sContent_, true),
 							"",
 							"",
 							"",
@@ -657,7 +664,7 @@ function AvgEditorMultiLanTool:_Export_Text(tbLuaData)
 							"",
 							self:_ProcText(sContent, true),
 							"",
-							"",
+							self:_ProcText(sContent_, true),
 							""
 						})
 					end
@@ -1428,10 +1435,16 @@ function AvgEditorMultiLanTool:_Import_Text(tbTranslatedData, tbLuaData)
 		nTranslatedDataIndex = nTranslatedDataIndex + 1
 		return tbTranslatedData[nTranslatedDataIndex]
 	end
-	local func_GetColumn_H_D = function(rowData)
-		local sText = rowData[7]
+	local func_GetColumn_H_D = function(rowData, target, backup)
+		if target == nil then
+			target = 7
+		end
+		if backup == nil then
+			backup = 3
+		end
+		local sText = rowData[target]
 		if sText == nil or sText == "" then
-			sText = rowData[3]
+			sText = rowData[backup]
 		end
 		return sText
 	end
@@ -1467,9 +1480,11 @@ function AvgEditorMultiLanTool:_Import_Text(tbTranslatedData, tbLuaData)
 			nTranslatedDataIndex = nTranslatedDataIndex + 1
 			for j = 2, 4 do
 				local sContent = v.param[j]
-				if type(sContent) == "string" and sContent ~= "" then
+				local sContent_ = v.param[j + 3]
+				if type(sContent) == "string" and sContent ~= "" or type(sContent_) == "string" and sContent_ ~= "" then
 					local rowData = func_GetTranslatedData()
 					v.param[j] = self:_ProcText(func_GetColumn_H_D(rowData), false)
+					v.param[j + 3] = self:_ProcText(func_GetColumn_H_D(rowData, 9, 5), false)
 				end
 			end
 		elseif sCmdName == "SetPhoneMsgChoiceJumpTo" then
@@ -1291,8 +1291,15 @@ function CmdInfo.VisualizedCmd_SetPhoneMsgChoiceBegin(ctrl, tr, param)
 	NovaAPI.SetInputFieldText(tr:Find("groupId_mask/input_GroupId"):GetComponent("InputField"), param[1])
 	ctrl:SetAvgCharId(tr, param[8])
 	local nOffset = 0
-	for i = 1, 3 do
-		NovaAPI.SetInputFieldText(tr:Find("content/input_Content_" .. tostring(i)):GetComponent("InputField"), param[i + 1 + nOffset])
+	local bIsMale = PlayerBaseData:GetPlayerSex() == true
+	for i = 1, 6 do
+		local trInputContent = tr:Find("content/input_Content_" .. tostring(i))
+		NovaAPI.SetInputFieldText(trInputContent:GetComponent("InputField"), param[i + 1])
+		if i <= 3 then
+			trInputContent.gameObject:SetActive(bIsMale == false)
+		else
+			trInputContent.gameObject:SetActive(bIsMale == true)
+		end
 	end
 end
 function CmdInfo.TbDataToCfgStr_SetPhoneMsgChoiceBegin(ctrl, tbParam)
@@ -1300,11 +1307,14 @@ function CmdInfo.TbDataToCfgStr_SetPhoneMsgChoiceBegin(ctrl, tbParam)
 	local txt2 = Avg_ProcEnquotes(tbParam[2] or "")
 	local txt3 = Avg_ProcEnquotes(tbParam[3] or "")
 	local txt4 = Avg_ProcEnquotes(tbParam[4] or "")
-	return string.format(sCmd, tbParam[1], txt2, txt3, txt4, tbParam[5], tbParam[6], tbParam[7], tbParam[8])
+	local txt5 = Avg_ProcEnquotes(tbParam[5] or "")
+	local txt6 = Avg_ProcEnquotes(tbParam[6] or "")
+	local txt7 = Avg_ProcEnquotes(tbParam[7] or "")
+	return string.format(sCmd, tbParam[1], txt2, txt3, txt4, txt5, txt6, txt7, tbParam[8])
 end
 function CmdInfo.ParseParam_SetPhoneMsgChoiceBegin(ctrl, tr, tbParam)
 	tbParam[1] = NovaAPI.GetInputFieldText(tr:Find("groupId_mask/input_GroupId"):GetComponent("InputField"))
-	for i = 1, 3 do
+	for i = 1, 6 do
 		tbParam[i + 1] = ctrl:GetInputTalkContent(tr, "content/input_Content_" .. tostring(i))
 	end
 	tbParam[8] = ctrl:GetAvgCharId(tr)