Update all resource to 4.6

jie65535 · May 23, 2024 · d9272ac · d9272ac
1 parent 5c89eb5
commit d9272ac
Show file tree

Hide file tree

Showing 50 changed files with 5,610 additions and 1,378 deletions.
diff --git a/Source/GrasscutterTools/Game/Inventory/MaterialType.cs b/Source/GrasscutterTools/Game/Inventory/MaterialType.cs
@@ -62,6 +62,8 @@ internal enum MaterialType
         MATERIAL_PROFILE_PICTURE = 50,
         MATERIAL_RAINBOW_PRINCE_HAND_BOOK = 51,
         MATERIAL_PHOTO_DISPLAY_BOOK = 52,
+        MATERIAL_REMUS_MUSIC_BOX = 53,
+        MATERIAL_GREATEFESTIVALV2_INVITE = 54,
     }
 
     internal static class MaterialTypeExtension
@@ -119,6 +121,8 @@ internal static class MaterialTypeExtension
             [MaterialType.MATERIAL_PROFILE_PICTURE] = "头像道具",
             [MaterialType.MATERIAL_RAINBOW_PRINCE_HAND_BOOK] = "特尔克西的奇幻历险",
             [MaterialType.MATERIAL_PHOTO_DISPLAY_BOOK] = "纪念册",
+            [MaterialType.MATERIAL_REMUS_MUSIC_BOX] = "音乐盒",
+            [MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "邀请函",
         };
         private static readonly Dictionary<MaterialType, string> TextMapEN = new Dictionary<MaterialType, string>
         {
@@ -173,6 +177,8 @@ internal static class MaterialTypeExtension
             [MaterialType.MATERIAL_PROFILE_PICTURE]         = "Profile_picture",
             [MaterialType.MATERIAL_RAINBOW_PRINCE_HAND_BOOK] = "Thelxie's Fantastic Adventures",
             [MaterialType.MATERIAL_PHOTO_DISPLAY_BOOK]      = "Album",
+            [MaterialType.MATERIAL_REMUS_MUSIC_BOX]         = "MusicBox",
+            [MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "Invitation",
         };
 
         public static string ToTranslatedString(this MaterialType materialType, string language)

diff --git a/Source/GrasscutterTools/Pages/PageTools.cs b/Source/GrasscutterTools/Pages/PageTools.cs
@@ -179,7 +179,7 @@ private void BtnUpdateActivity_Click(object sender, EventArgs e)
                 if (TextMapData == null)
                     TextMapData = new TextMapData(TxtGcResRoot.Text);
 
-                //UpdateActivityForLanguage(activityItems, "TextMapCHS", "zh-cn");
+                UpdateActivityForLanguage(activityItems, "TextMapCHS", "zh-cn");
                 UpdateActivityForLanguage(activityItems, "TextMapCHT", "zh-tw");
                 UpdateActivityForLanguage(activityItems, "TextMapEN", "en-us");
                 UpdateActivityForLanguage(activityItems, "TextMapRU", "ru-ru");

diff --git a/Source/GrasscutterTools/Resources/AvatarColor.txt b/Source/GrasscutterTools/Resources/AvatarColor.txt
@@ -79,3 +79,4 @@
 1092:4
 1093:5
 1094:5
+1096:5
diff --git a/Source/GrasscutterTools/Resources/SceneTag.txt b/Source/GrasscutterTools/Resources/SceneTag.txt
@@ -53,6 +53,8 @@
 178:AlchemySim03
 179:AlchemySim02
 180:AlchemySim01
+181:GreatFesV2
+182:XM_TomatoFarm
 1001:Combine_Lyg
 1002:Combine_Mdc
 1011:Combine_RBQyg
@@ -254,6 +256,8 @@
 1386:LY_BJSL_0 (Default)
 1387:LY_BJSL_1
 1388:Filmfestquest
+1393:FD_PTLK_BF
+1394:FD_PTLK_AF
 1395:HdjV4
 1396:HdjV4_Ylb
 1397:Combine_AlchemySim01
@@ -266,10 +270,13 @@
 1427:LY_YUNQI_06 (Default)
 1428:LY_YUNQI_07 (Default)
 1429:Alc_BaseGrass
+1430:Combine_GreatFesV2
 1431:FD_QZLQ_01
 1439:Combine_FD_QZLQ_01
+1440:Combine_XM_TomatoFarm
 1445:NT_YSKJ_P1 (Default)
 1446:NT_YSKJ_P2
+1447:Combine_WishPond_mx
 // 4
 106:SummerTime
 108:SummerTime_High
@@ -535,13 +542,29 @@
 1377:Fungus03_1 (Default)
 // 35936
 1378:Fungus03_2 (Default)
+// 11
+1380:FD_JSHD_TS_AF
+1381:FD_JSHD_BC_AF
+1416:FD_JSHD_BF (Default)
+1417:FD_JSHD_SC_AF
+1418:FD_JSHD_QG_AF
+1419:FD_JSDT_BF
+1420:FD_JSDT_AF (Default)
+1454:FD_PSHA_BF (Default)
+1455:FD_PSHA_AF
+1470:FD_JSHD_LIGHT (Default)
 // 20209
 1389:LY_Yunbao_1
 1390:LY_Yunbao_2
 1391:LY_Yunbao_3
 1392:LY_Yunbao_4
 1399:LY_Yunbao_5
 1400:LY_Yunbao_6
-// 11
-1454:FD_PSHA_BF (Default)
-1455:FD_PSHA_AF
+// 20208
+1432:Nihil_P1 (Default)
+1433:Nihil_P2
+1443:Nihil_P1_1
+// 20214
+1434:Nihil_P1 (Default)
+1435:Nihil_P2
+1444:Nihil_P1_1
diff --git a/Source/GrasscutterTools/Resources/WeaponColor.txt b/Source/GrasscutterTools/Resources/WeaponColor.txt
@@ -111,6 +111,7 @@
 13507:yellow
 13509:yellow
 13511:yellow
+13512:yellow
 14101:blue
 14201:blue
 14301:blue