Skip to content

Commit d9272ac

Browse files
committed
Update all resource to 4.6
1 parent 5c89eb5 commit d9272ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5610
-1378
lines changed

Source/GrasscutterTools/Game/Inventory/MaterialType.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ internal enum MaterialType
6262
MATERIAL_PROFILE_PICTURE = 50,
6363
MATERIAL_RAINBOW_PRINCE_HAND_BOOK = 51,
6464
MATERIAL_PHOTO_DISPLAY_BOOK = 52,
65+
MATERIAL_REMUS_MUSIC_BOX = 53,
66+
MATERIAL_GREATEFESTIVALV2_INVITE = 54,
6567
}
6668

6769
internal static class MaterialTypeExtension
@@ -119,6 +121,8 @@ internal static class MaterialTypeExtension
119121
[MaterialType.MATERIAL_PROFILE_PICTURE] = "头像道具",
120122
[MaterialType.MATERIAL_RAINBOW_PRINCE_HAND_BOOK] = "特尔克西的奇幻历险",
121123
[MaterialType.MATERIAL_PHOTO_DISPLAY_BOOK] = "纪念册",
124+
[MaterialType.MATERIAL_REMUS_MUSIC_BOX] = "音乐盒",
125+
[MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "邀请函",
122126
};
123127
private static readonly Dictionary<MaterialType, string> TextMapEN = new Dictionary<MaterialType, string>
124128
{
@@ -173,6 +177,8 @@ internal static class MaterialTypeExtension
173177
[MaterialType.MATERIAL_PROFILE_PICTURE] = "Profile_picture",
174178
[MaterialType.MATERIAL_RAINBOW_PRINCE_HAND_BOOK] = "Thelxie's Fantastic Adventures",
175179
[MaterialType.MATERIAL_PHOTO_DISPLAY_BOOK] = "Album",
180+
[MaterialType.MATERIAL_REMUS_MUSIC_BOX] = "MusicBox",
181+
[MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "Invitation",
176182
};
177183

178184
public static string ToTranslatedString(this MaterialType materialType, string language)

Source/GrasscutterTools/Pages/PageTools.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private void BtnUpdateActivity_Click(object sender, EventArgs e)
179179
if (TextMapData == null)
180180
TextMapData = new TextMapData(TxtGcResRoot.Text);
181181

182-
//UpdateActivityForLanguage(activityItems, "TextMapCHS", "zh-cn");
182+
UpdateActivityForLanguage(activityItems, "TextMapCHS", "zh-cn");
183183
UpdateActivityForLanguage(activityItems, "TextMapCHT", "zh-tw");
184184
UpdateActivityForLanguage(activityItems, "TextMapEN", "en-us");
185185
UpdateActivityForLanguage(activityItems, "TextMapRU", "ru-ru");

Source/GrasscutterTools/Resources/AvatarColor.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,4 @@
7979
1092:4
8080
1093:5
8181
1094:5
82+
1096:5

Source/GrasscutterTools/Resources/SceneTag.txt

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
178:AlchemySim03
5454
179:AlchemySim02
5555
180:AlchemySim01
56+
181:GreatFesV2
57+
182:XM_TomatoFarm
5658
1001:Combine_Lyg
5759
1002:Combine_Mdc
5860
1011:Combine_RBQyg
@@ -254,6 +256,8 @@
254256
1386:LY_BJSL_0 (Default)
255257
1387:LY_BJSL_1
256258
1388:Filmfestquest
259+
1393:FD_PTLK_BF
260+
1394:FD_PTLK_AF
257261
1395:HdjV4
258262
1396:HdjV4_Ylb
259263
1397:Combine_AlchemySim01
@@ -266,10 +270,13 @@
266270
1427:LY_YUNQI_06 (Default)
267271
1428:LY_YUNQI_07 (Default)
268272
1429:Alc_BaseGrass
273+
1430:Combine_GreatFesV2
269274
1431:FD_QZLQ_01
270275
1439:Combine_FD_QZLQ_01
276+
1440:Combine_XM_TomatoFarm
271277
1445:NT_YSKJ_P1 (Default)
272278
1446:NT_YSKJ_P2
279+
1447:Combine_WishPond_mx
273280
// 4
274281
106:SummerTime
275282
108:SummerTime_High
@@ -535,13 +542,29 @@
535542
1377:Fungus03_1 (Default)
536543
// 35936
537544
1378:Fungus03_2 (Default)
545+
// 11
546+
1380:FD_JSHD_TS_AF
547+
1381:FD_JSHD_BC_AF
548+
1416:FD_JSHD_BF (Default)
549+
1417:FD_JSHD_SC_AF
550+
1418:FD_JSHD_QG_AF
551+
1419:FD_JSDT_BF
552+
1420:FD_JSDT_AF (Default)
553+
1454:FD_PSHA_BF (Default)
554+
1455:FD_PSHA_AF
555+
1470:FD_JSHD_LIGHT (Default)
538556
// 20209
539557
1389:LY_Yunbao_1
540558
1390:LY_Yunbao_2
541559
1391:LY_Yunbao_3
542560
1392:LY_Yunbao_4
543561
1399:LY_Yunbao_5
544562
1400:LY_Yunbao_6
545-
// 11
546-
1454:FD_PSHA_BF (Default)
547-
1455:FD_PSHA_AF
563+
// 20208
564+
1432:Nihil_P1 (Default)
565+
1433:Nihil_P2
566+
1443:Nihil_P1_1
567+
// 20214
568+
1434:Nihil_P1 (Default)
569+
1435:Nihil_P2
570+
1444:Nihil_P1_1

Source/GrasscutterTools/Resources/WeaponColor.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
13507:yellow
112112
13509:yellow
113113
13511:yellow
114+
13512:yellow
114115
14101:blue
115116
14201:blue
116117
14301:blue

0 commit comments

Comments
 (0)