Skip to content

Commit 1b18a3a

Browse files
jie65535jie65535
committed
Update all resources to 5.8
1 parent e201281 commit 1b18a3a

Some content is hidden

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

56 files changed

+19032
-2293
lines changed

‎Source/GrasscutterTools/Game/Inventory/MaterialType.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ internal enum MaterialType
7575
MATERIAL_NATLAN_RACE_ALBUM,
7676
MATERIAL_NATLAN_RACE_ENVELOPE,
7777
MATERIAL_MUSIC_GAME_BOOK_THEME,
78+
MATERIAL_MIKAWA_FLOWER_INVITE,
79+
MATERIAL_QUEST_ALBUM,
80+
MATERIAL_HOLIDAY_MEMORY_BOOK,
81+
MATERIAL_HOLIDAY_RESORT_INVITE,
82+
MATERIAL_PHOTOV6_HAND_BOOK,
83+
MATERIAL_WEAPON_SKIN,
7884
}
7985

8086
internal static class MaterialTypeExtension
@@ -145,6 +151,12 @@ internal static class MaterialTypeExtension
145151
[MaterialType.MATERIAL_NATLAN_RACE_ALBUM] = "砥砺之证",
146152
[MaterialType.MATERIAL_NATLAN_RACE_ENVELOPE] = "纪念信件",
147153
[MaterialType.MATERIAL_MUSIC_GAME_BOOK_THEME] = "音乐游戏书主题",
154+
[MaterialType.MATERIAL_MIKAWA_FLOWER_INVITE] = "神子邀请函",
155+
[MaterialType.MATERIAL_QUEST_ALBUM] = "任务相册",
156+
[MaterialType.MATERIAL_HOLIDAY_MEMORY_BOOK] = "悠悠纪念册",
157+
[MaterialType.MATERIAL_HOLIDAY_RESORT_INVITE] = "悠悠度假村邀请函",
158+
[MaterialType.MATERIAL_PHOTOV6_HAND_BOOK] = "提瓦特影册",
159+
[MaterialType.MATERIAL_WEAPON_SKIN] = "武器皮肤",
148160
};
149161
private static readonly Dictionary<MaterialType, string> TextMapEN = new Dictionary<MaterialType, string>
150162
{
@@ -212,6 +224,12 @@ internal static class MaterialTypeExtension
212224
[MaterialType.MATERIAL_NATLAN_RACE_ALBUM] = "Natlan_race_album",
213225
[MaterialType.MATERIAL_NATLAN_RACE_ENVELOPE] = "Natlan_race_envelope",
214226
[MaterialType.MATERIAL_MUSIC_GAME_BOOK_THEME] = "Music_game_book_theme",
227+
[MaterialType.MATERIAL_MIKAWA_FLOWER_INVITE] = "Mikawa_flower_invite",
228+
[MaterialType.MATERIAL_QUEST_ALBUM] = "Quest_album",
229+
[MaterialType.MATERIAL_HOLIDAY_MEMORY_BOOK] = "Holiday_memory_book",
230+
[MaterialType.MATERIAL_HOLIDAY_RESORT_INVITE] = "Holiday_resort_invite",
231+
[MaterialType.MATERIAL_PHOTOV6_HAND_BOOK] = "Photov6_hand_book",
232+
[MaterialType.MATERIAL_WEAPON_SKIN] = "Material_weapon_skin",
215233
};
216234

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

‎Source/GrasscutterTools/Game/Props/GadgetType.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ internal static class GadgetType
2525
{
2626
private static readonly Dictionary<string, string> TextMapCHS = new Dictionary<string, string>
2727
{
28+
["None"] = "未知",
2829
["Avatar"] = "角色",
2930
["Gear"] = "机关装置",
3031
["Field"] = "领域",

‎Source/GrasscutterTools/Game/TextMapData.cs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,26 @@ private void LoadManualTextMap(string manualTextMapPath)
5151
using (var reader = new JsonTextReader(sr))
5252
{
5353
ManualTextMap = new Dictionary<string, string>();
54+
string textMapId = null, textMapContextHash = null;
5455
while (reader.Read())
5556
{
56-
if (reader.TokenType == JsonToken.PropertyName && ((string)reader.Value == "TextMapId" || (string)reader.Value == "textMapId"))
57+
58+
59+
if (reader.TokenType == JsonToken.PropertyName && ((string)reader.Value == "textMapId" || (string)reader.Value == "TextMapId"))
60+
{
61+
textMapId = reader.ReadAsString();
62+
}
63+
64+
if (reader.TokenType == JsonToken.PropertyName && ((string)reader.Value == "textMapContentTextMapHash" || (string)reader.Value == "TextMapContentTextMapHash"))
65+
{
66+
textMapContextHash = reader.ReadAsString();
67+
}
68+
69+
if (textMapId != null && textMapContextHash != null)
5770
{
58-
var textMapId = reader.ReadAsString();
59-
reader.Read();
60-
ManualTextMap.Add(reader.ReadAsString(), textMapId);
71+
ManualTextMap.Add(textMapContextHash, textMapId);
72+
textMapId = null;
73+
textMapContextHash = null;
6174
}
6275
}
6376
}

‎Source/GrasscutterTools/Resources/AvatarColor.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,14 @@
9393
1106:5
9494
1107:5
9595
1108:4
96+
1109:5
97+
1110:4
98+
1111:5
99+
1112:5
100+
1113:4
101+
1114:5
102+
1115:4
103+
1116:5
96104
1901:5
97105
1902:5
106+
1903:5

‎Source/GrasscutterTools/Resources/SceneTag.txt

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@
5858
183:SumeruBirth
5959
184:SumeruBirth_NL
6060
185:CeremonyEvent
61+
186:ThemeParkSim01
62+
187:ThemeParkSim02
63+
188:ThemeParkSim03
64+
189:ThemeParkSim04
65+
190:MD_MNCHV2
66+
191:ThemeParkSim05
67+
192:AutoChess
6168
1001:Combine_Lyg
6269
1002:Combine_Mdc
6370
1011:Combine_RBQyg
@@ -334,6 +341,10 @@
334341
1526:NT_DPSDT_P2
335342
1527:NT_HJJ_P1 (Default)
336343
1528:NT_HJJ_P2
344+
1529:Penfa_before (Default)
345+
1530:Penfa_after
346+
1531:NT_HSTD_AF
347+
1550:Penfa_end
337348
1554:Combine_WarBroken04 (Default)
338349
1555:Combine_WarBroken01 (Default)
339350
1556:Combine_WarBroken02 (Default)
@@ -352,12 +363,73 @@
352363
1580:HdjV5
353364
1582:Combine_CeremonyEvent
354365
1585:Combine_SumeruBirth
366+
1587:Combine_DQ_Mizuki
367+
1588:DQ_Mizuki
355368
1589:NT_AQWZ_BF (Default)
356369
1590:NT_AQWZ_AF
370+
1594:Combine_DQ_MizukiTree
371+
1595:DQ_MizukiTree
357372
1596:Combine_TournamentFes
373+
1598:Mikawa01
374+
1599:Mikawa02
375+
1600:Combine_Mikawa
358376
1601:TournamentFes
377+
1606:NT_HSTD_BF (Default)
359378
1607:NT_AQJNB_BF
360379
1608:NT_AQJNB_AF
380+
1610:NTDrillCamp
381+
1617:Combine_NTDrill (Default)
382+
1624:Combine_NTDrill
383+
1625:Mkw_BaseGrass
384+
1626:BrickBreakerV2
385+
1627:NtVolcano_Safe (Default)
386+
1634:NTEQ_Match_01
387+
1635:Combine_NTEQ_Match_01
388+
1636:NTEQ_Match_02
389+
1637:Combine_NTEQ_Match_02
390+
1638:NtVolcano_SfLt
391+
1639:NT1_BaseGrass
392+
1640:NT2_BaseGrass
393+
1671:NT_RQQHH_BF (Default)
394+
1672:NT_RQQHH_AF
395+
1674:NT_XHS_BF (Default)
396+
1675:NT_XHS_AF
397+
1678:NT_DJC_AF
398+
1679:NT_DJC_BF (Default)
399+
1680:Combine_NTDrillCamp
400+
1681:NT_BDWT_BF (Default)
401+
1682:NT_BDWT_AF
402+
1683:NT_JBS_BF (Default)
403+
1684:NT_JBS_AF
404+
1685:Combine_NT_JJH_ERR
405+
1686:NT_JJH_ERR
406+
1690:NT2_2_BaseGrass
407+
1691:NT_MXQ_QD
408+
1692:NT_BDWT_P1
409+
1693:NT_BDWT_P2
410+
1694:NT_CWT_P1 (Default)
411+
1695:NT_CWT_P2
412+
1699:Combine_ThemeParkSim
413+
1700:LLC_LYCamp
414+
1709:NT_BDWT_ACT (Default)
415+
1710:Combine_LLC
416+
1711:BigWorld_0_-1_Grass_LLC_LYCamp
417+
1714:Bugfix_56
418+
1715:NT_YNF
419+
1716:Combine_NT_YNF
420+
1726:AgentRecon_P3
421+
1727:AgentRecon_P4
422+
1729:NT_DJCBrush_BF (Default)
423+
1730:NT_DJCBrush_AF
424+
1732:NT_YDQ_BF (Default)
425+
1733:NT_YDQ_AF
426+
1734:NT_YGZD_1
427+
1735:NT_YGZD_2
428+
1736:NT_YNF_MT
429+
1737:Combine_NT_YNF_MT
430+
1762:YNF_MT_BaseGrass
431+
1766:NT_BDWT_QTE
432+
1767:AgentRecon_P2
361433
// 4
362434
106:SummerTime
363435
108:SummerTime_High
@@ -717,6 +789,34 @@
717789
1566:Combine_NT_AbyssWar (Default)
718790
1571:Combine_NT_AQ_HDD_AF (Default)
719791
1572:NT_AQ_HDD_AF
792+
// 101
793+
1532:NTLC_Dark (Default)
794+
1533:NTLC_Light
795+
1534:NTLC_ZSK_Low (Default)
796+
1535:NTLC_ZSK_High
797+
1536:NTLC_TTH_BF (Default)
798+
1537:NTLC_TTH_AF
799+
1538:NTLC_YST_D (Default)
800+
1539:NTLC_YST_L
801+
1540:NTLC_SYLX_BF (Default)
802+
1541:NTLC_SYLX_AF
803+
1542:NTLC_YZTDW_BF (Default)
804+
1543:NTLC_YZTDW_AF
805+
1544:NTLC_TYGD_BF (Default)
806+
1545:NTLC_TYGD_AF
807+
1546:NTLC_JSZ_BF (Default)
808+
1547:NTLC_JSZ_AF
809+
1548:NTLC_PSGF_BF (Default)
810+
1549:NTLC_PSGF_AF
811+
1573:NTLC_ZSK_End
812+
1574:NTLC_YSTGC_BF (Default)
813+
1575:NTLC_YSTGC_AF
814+
1592:NTLC_BOSS_BF (Default)
815+
1593:NTLC_BOSS_AF
816+
1602:NTLC_ZSKTTH_AF
817+
1603:Volcano_0_0_BaseGrass
818+
1604:Volcano_-1_0_BaseGrass
819+
1633:NTLC_YST_Lava
720820
// 20234
721821
1560:Nt_XLN_CS (Default)
722822
// 20235
@@ -735,3 +835,66 @@
735835
1605:NT_AQWZ_NAQ
736836
// 36001
737837
1609:MVM_DEF_03 (Default)
838+
// 36025
839+
1611:NTDrillAttack
840+
1612:Combine_NTDrill
841+
// 36056
842+
1613:NTDrillAttack
843+
1614:Combine_NTDrill
844+
// 36057
845+
1615:NTDrillAttack
846+
1616:Combine_NTDrill
847+
// 36058
848+
1618:NTDrillDefend
849+
1619:Combine_NTDrill
850+
1641:NTDrillDefend_BaseGrass
851+
// 36059
852+
1620:NTDrillDefend
853+
1621:Combine_NTDrill
854+
1642:NTDrillDefend_BaseGrass
855+
// 36060
856+
1622:NTDrillDefend
857+
1623:Combine_NTDrill
858+
1643:NTDrillDefend_BaseGrass
859+
// 36031
860+
1628:Level_Doppel01 (Default)
861+
// 36032
862+
1629:Level_Doppel02 (Default)
863+
// 36033
864+
1630:Level_Doppel03 (Default)
865+
// 36034
866+
1631:Level_Doppel04 (Default)
867+
// 36035
868+
1632:Level_Doppel05 (Default)
869+
// 20260
870+
1676:Fhj_MDAQ_AF
871+
1677:Combine_Mdc
872+
// 20262
873+
1696:MD_SWT_00
874+
1697:MD_SWT_01 (Default)
875+
// 20268
876+
1698:FD_Escoffier_LastDialogue
877+
// 48081
878+
1701:NT_BDWT_PT (Default)
879+
1705:NT_BDWT_AF (Default)
880+
// 48082
881+
1702:NT_BDWT_PT (Default)
882+
1706:NT_BDWT_AF (Default)
883+
// 48083
884+
1703:NT_BDWT_PT (Default)
885+
1707:NT_BDWT_AF (Default)
886+
// 48084
887+
1704:NT_BDWT_PT (Default)
888+
1708:NT_BDWT_AF (Default)
889+
// 20271
890+
1717:NT_LQXXFJ_BF (Default)
891+
1718:NT_LQXXFJ_AF
892+
// 20272
893+
1720:Skirk_Boss_01
894+
1722:Skirk_Boss_02 (Default)
895+
1725:Skirk_Rest_01
896+
// 1203
897+
1728:YLYZ_Auction (Default)
898+
1774:Combine_YLYZ_Auction
899+
// 1084
900+
1778:Combine_YLYZ_Auction

‎Source/GrasscutterTools/Resources/WeaponColor.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
11514:yellow
5050
11515:yellow
5151
11516:yellow
52+
11517:yellow
5253
12101:blue
5354
12201:blue
5455
12301:blue
@@ -80,6 +81,7 @@
8081
12427:purple
8182
12430:purple
8283
12431:purple
84+
12432:purple
8385
12501:yellow
8486
12502:yellow
8587
12503:yellow
@@ -115,6 +117,7 @@
115117
13427:purple
116118
13430:purple
117119
13431:purple
120+
13432:purple
118121
13501:yellow
119122
13502:yellow
120123
13504:yellow
@@ -124,6 +127,8 @@
124127
13511:yellow
125128
13512:yellow
126129
13513:yellow
130+
13514:yellow
131+
13515:yellow
127132
14101:blue
128133
14201:blue
129134
14301:blue
@@ -167,6 +172,8 @@
167172
14515:yellow
168173
14516:yellow
169174
14517:yellow
175+
14518:yellow
176+
14519:yellow
170177
15101:blue
171178
15201:blue
172179
15301:blue
@@ -200,6 +207,7 @@
200207
15427:purple
201208
15430:purple
202209
15431:purple
210+
15432:purple
203211
15501:yellow
204212
15502:yellow
205213
15503:yellow

0 commit comments

Comments
 (0)