Update All resources to 5.0

Author: jie65535

Source/GrasscutterTools/Game/CutScene/CutSceneItem.cs

@@ -17,10 +17,12 @@
  *
  **/
 
+using GrasscutterTools.Game.Data;
 using Newtonsoft.Json;
 
 namespace GrasscutterTools.Game.CutScene
 {
+    [ResourceType("CutsceneExcelConfigData.json")]
     internal class CutSceneItem
     {
         [JsonProperty("id")]

Source/GrasscutterTools/Game/Data/GameResources.cs

@@ -25,7 +25,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading;
-
+using GrasscutterTools.Game.CutScene;
 using GrasscutterTools.Game.Data.Excels;
 using GrasscutterTools.Game.Inventory;
 using GrasscutterTools.Game.Props;
@@ -70,6 +70,7 @@ internal class GameResources
         public TextMapData TextMapData { get; set; }
 
         public List<WeatherData> WeatherData { get; set; }
+        public List<CutSceneItem> CutSceneData { get; set; }
 
         public GameResources(string resourcesDirPath, TextMapData textMapData)
         {
@@ -431,6 +432,21 @@ public void ConvertResources(string projectResourcesDir)
 
                     #endregion Scene
 
+                    #region CutScene
+
+                    // CutScene
+                    File.WriteAllLines(
+                        Path.Combine(dir, "Cutscene.txt"),
+                        CutSceneData.Select(it =>
+                        {
+                            var text = GameData.CutScenes[it.Id];
+                            return text == ItemMap.EmptyName
+                                ? $"{it.Id}:{it.Path.Substring(it.Path.IndexOf('/') + 1)}"
+                                : $"{it.Id}:{text}";
+                        }), Encoding.UTF8);
+
+                    #endregion CutScene
+
                     #region Weapon
 
                     // Weapon

Source/GrasscutterTools/Game/Inventory/MaterialType.cs

@@ -65,6 +65,9 @@ internal enum MaterialType
         MATERIAL_REMUS_MUSIC_BOX = 53,
         MATERIAL_GREATEFESTIVALV2_INVITE = 54,
         MATERIAL_PHOTOGRAPH_POSE = 55,
+        MATERIAL_FIRE_MASTER_AVATAR_TALENT_ITEM = 56,
+        MATERIAL_PHOTOV5_HAND_BOOK = 57,
+        MATERIAL_AVATAR_TRACE = 58,
     }
 
     internal static class MaterialTypeExtension
@@ -125,6 +128,9 @@ internal static class MaterialTypeExtension
             [MaterialType.MATERIAL_REMUS_MUSIC_BOX] = "音乐盒",
             [MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "邀请函",
             [MaterialType.MATERIAL_PHOTOGRAPH_POSE] = "照相姿势",
+            [MaterialType.MATERIAL_FIRE_MASTER_AVATAR_TALENT_ITEM] = "燧原矿",
+            [MaterialType.MATERIAL_PHOTOV5_HAND_BOOK] = "回忆相册",
+            [MaterialType.MATERIAL_AVATAR_TRACE] = "游迹",
         };
         private static readonly Dictionary<MaterialType, string> TextMapEN = new Dictionary<MaterialType, string>
         {
@@ -182,6 +188,9 @@ internal static class MaterialTypeExtension
             [MaterialType.MATERIAL_REMUS_MUSIC_BOX]         = "MusicBox",
             [MaterialType.MATERIAL_GREATEFESTIVALV2_INVITE] = "Invitation",
             [MaterialType.MATERIAL_PHOTOGRAPH_POSE]         = "Photograph_pose",
+            [MaterialType.MATERIAL_FIRE_MASTER_AVATAR_TALENT_ITEM] = "Fire_master_avatar_talent_item",
+            [MaterialType.MATERIAL_PHOTOV5_HAND_BOOK] = "Photov5_hand_book",
+            [MaterialType.MATERIAL_AVATAR_TRACE] = "Avatar_trace",
         };
 
         public static string ToTranslatedString(this MaterialType materialType, string language)

Source/GrasscutterTools/Pages/PageTools.Designer.cs

@@ -27,7 +27,6 @@
 
 using GrasscutterTools.Game;
 using GrasscutterTools.Game.Activity;
-using GrasscutterTools.Game.CutScene;
 using GrasscutterTools.Game.Data;
 using GrasscutterTools.Properties;
 
@@ -101,27 +100,6 @@ private void BtnUpdateResources_Click(object sender, EventArgs e)
             }
         }
 
-        private void BtnConvertCutScene_Click(object sender, EventArgs e)
-        {
-            var src = new OpenFileDialog
-            {
-                Title = "请选择 Json 格式的 Cutscene.txt",
-                Multiselect = false,
-            };
-            if (src.ShowDialog() != DialogResult.OK)
-                return;
-            try
-            {
-                var cutScenes = JsonConvert.DeserializeObject<List<CutSceneItem>>(File.ReadAllText(src.FileName));
-                File.WriteAllLines(src.FileName, cutScenes.Select(it => $"{it.Id}:{it.Path.Substring(it.Path.IndexOf('/') + 1)}"));
-                MessageBox.Show("OK", Resources.Tips, MessageBoxButtons.OK);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.ToString(), Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
         private bool CheckInputPaths()
         {
             if (string.IsNullOrEmpty(TxtProjectResRoot.Text) || string.IsNullOrEmpty(TxtGcResRoot.Text))
@@ -177,7 +155,7 @@ private void BtnUpdateActivity_Click(object sender, EventArgs e)
 
                 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");

Source/GrasscutterTools/Pages/PageTools.cs

@@ -83,3 +83,7 @@
 1096:5
 1097:4
 1098:5
+1099:5
+1100:4
+1101:5
+1102:5

Source/GrasscutterTools/Resources/AvatarColor.txt

@@ -262,6 +262,10 @@
 1396:HdjV4_Ylb
 1397:Combine_AlchemySim01
 1398:Combine_CookGame
+1401:NT_PSSNCD
+1402:NT_ALPHA (Default)
+1403:NT_JYZMSY (Default)
+1421:NT_JYZM_P4
 1422:LY_YUNQI_01 (Default)
 1423:LY_YUNQI_02 (Default)
 1424:LY_YUNQI_03 (Default)
@@ -272,13 +276,62 @@
 1429:Alc_BaseGrass
 1430:Combine_GreatFesV2
 1431:FD_QZLQ_01
+1436:NT_JBCSZD_P1 (Default)
+1437:NT_JBCSZD_P2
 1438:TrpgGame
 1439:Combine_FD_QZLQ_01
 1440:Combine_XM_TomatoFarm
+1441:NT_JSLY_P1 (Default)
+1442:NT_JSLY_P2
 1445:NT_YSKJ_P1 (Default)
 1446:NT_YSKJ_P2
 1447:Combine_WishPond_mx
+1448:NT_QSYS_Before (Default)
+1449:NT_QSYS_After
+1450:Mihai_P0 (Default)
+1451:Mihai_P1
+1452:Mihai_P2
+1453:Mihai_P3
+1471:NT_HGJT_AF
+1472:NT_HMS_P1 (Default)
+1473:NT_HMS_P2
+1475:Combine_NT_HMS_P2
 1476:Combine_TrpgGame
+1481:BigWorld_-2_10_BaseTerrain
+1482:BigWorld_-2_10_BaseGrass
+1486:NT_JSLY_SpVo
+1487:NT_Yyj0 (Default)
+1488:NT_Yyj1
+1489:NT_Yyj2
+1490:NT_Yyj3
+1491:NT_Qqfw_BF (Default)
+1492:NT_Qqfw_AF
+1493:Combine_NT_PSSNCD (Default)
+1494:BigWorld_-2_10_01_BaseGrass
+1495:BigWorld_-2_10_02_BaseGrass
+1496:BigWorld_-2_10_03_BaseGrass
+1497:Nt_XKLCamp
+1498:NT_TKC_Bf (Default)
+1499:NT_TKC_Af
+1500:NT_TKC_Dr
+1501:NT_AX_P1 (Default)
+1502:NT_AX_P2
+1503:NT_AX_P3
+1504:NT_XKLDusk
+1505:Combine_NT_XKLDusk (Default)
+1506:NT_HookTribal
+1507:NT_AQ_HDD_AF
+1509:Combine_NT_AQ_HDD_AF
+1512:NT_JSLY_SpVo02
+1515:NT_JSLY_P1_L (Default)
+1516:NT_OfferingTemple_max
+1517:NT_TKC_Fd (Default)
+1520:Mihai_P4
+1525:NT_HJCSX_01 (Default)
+1526:NT_HJCSX_02
+1527:NT_HJJSY_01 (Default)
+1528:NT_HJJSY_02
+1559:NT_AQ_ANH
 // 4
 106:SummerTime
 108:SummerTime_High
@@ -562,6 +615,24 @@
 1392:LY_Yunbao_4
 1399:LY_Yunbao_5
 1400:LY_Yunbao_6
+// 100
+1404:FB_GKXH
+1405:FB_FTXH_BF (Default)
+1406:FB_FTXH_AF
+1407:FB_JMPB_BF (Default)
+1408:FB_JMPB_AF
+1409:FB_JMCZ_BF (Default)
+1410:FB_JMCZ_AF
+1411:FB_JMYL_AF
+1412:FB_ZZSL_BF (Default)
+1413:FB_ZZSL_AF
+1414:FB_FTYD_BF (Default)
+1415:FB_FTYD_AF
+1483:FB_LZGS_BF (Default)
+1484:FB_LZGS_AF
+1485:FB_XLZT_AF
+1510:FB_WISH_BF (Default)
+1511:FB_WISH_AF
 // 20208
 1432:Nihil_P1 (Default)
 1433:Nihil_P2
@@ -594,3 +665,16 @@
 1468:MVM_DEF_03 (Default)
 // 35987
 1469:MVM_DEF_04 (Default)
+// 20220
+1477:FB_LDCKD_BF (Default)
+1478:FB_LDCKD_AF
+// 20221
+1479:FB_LDCCZ_BF (Default)
+1480:FB_LDCCZ_AF
+// 1095
+1508:NT_AQ_HSD_AF (Default)
+// 20229
+1513:Nyx_Light_AF (Default)
+1514:Nyx_Light_BF
+1518:Nyx_Light_Dark
+1521:Nyx_TalkLight

Source/GrasscutterTools/Resources/SceneTag.txt

@@ -33,6 +33,7 @@
 11427:purple
 11428:purple
 11429:purple
+11431:purple
 11501:yellow
 11502:yellow
 11503:yellow
@@ -74,13 +75,15 @@
 12425:purple
 12426:purple
 12427:purple
+12431:purple
 12501:yellow
 12502:yellow
 12503:yellow
 12504:yellow
 12510:yellow
 12511:yellow
 12512:yellow
+12513:yellow
 13101:blue
 13201:blue
 13301:blue
@@ -105,6 +108,7 @@
 13425:purple
 13426:purple
 13427:purple
+13431:purple
 13501:yellow
 13502:yellow
 13504:yellow
@@ -113,6 +117,7 @@
 13509:yellow
 13511:yellow
 13512:yellow
+13513:yellow
 14101:blue
 14201:blue
 14301:blue
@@ -140,6 +145,8 @@
 14424:purple
 14425:purple
 14426:purple
+14427:purple
+14431:purple
 14501:yellow
 14502:yellow
 14504:yellow
@@ -151,6 +158,7 @@
 14513:yellow
 14514:yellow
 14515:yellow
+14516:yellow
 15101:blue
 15201:blue
 15301:blue
@@ -182,6 +190,7 @@
 15425:purple
 15426:purple
 15427:purple
+15431:purple
 15501:yellow
 15502:yellow
 15503:yellow