genshin_assetstudio

diff --git a/AssetStudio/BundleFile.cs b/AssetStudio/BundleFile.cs
index 95d7cd9..90d3581 100644
--- a/AssetStudio/BundleFile.cs
+++ b/AssetStudio/BundleFile.cs
@@ -45,6 +45,10 @@ namespace AssetStudio
         {
             m_Header = new Header();
             m_Header.signature = reader.ReadStringToNull();
+            if (m_Header.signature == null)
+            {
+                m_Header.signature = "";
+            }
             switch (m_Header.signature)
             {
                 case "UnityArchive":
diff --git a/AssetStudio/Classes/Mesh.cs b/AssetStudio/Classes/Mesh.cs
index ce145d5..08835ab 100644
--- a/AssetStudio/Classes/Mesh.cs
+++ b/AssetStudio/Classes/Mesh.cs
@@ -547,6 +547,7 @@ namespace AssetStudio
                 //Unity fixed it in 2017.3.1p1 and later versions
                 if ((version[0] > 2017 || (version[0] == 2017 && version[1] >= 4)) || //2017.4
                     ((version[0] == 2017 && version[1] == 3 && version[2] == 1) && buildType.IsPatch) || //fixed after 2017.3.1px
+                    (version[0] == 2017 && version[1] == 1 && version[2] == 0) || // For Gshin
                     ((version[0] == 2017 && version[1] == 3) && m_MeshCompression == 0))//2017.3.xfx with no compression
                 {
                     var m_IndexFormat = reader.ReadInt32();
diff --git a/AssetStudio/Classes/Shader.cs b/AssetStudio/Classes/Shader.cs
index 57f91a7..f2cd8b6 100644
--- a/AssetStudio/Classes/Shader.cs
+++ b/AssetStudio/Classes/Shader.cs
@@ -792,6 +792,10 @@ namespace AssetStudio
                     offsets = reader.ReadUInt32Array();
                     compressedLengths = reader.ReadUInt32Array();
                     decompressedLengths = reader.ReadUInt32Array();
+                    if (version[0] == 2017 && version[1] == 1 && version[2] == 0) // For Gshin
+                    {
+                        reader.ReadBytes(reader.ReadInt32());
+                    }
                 }
                 compressedBlob = reader.ReadBytes(reader.ReadInt32());
             }
diff --git a/AssetStudio/ImportHelper.cs b/AssetStudio/ImportHelper.cs
index fea5d53..31e1cc6 100644
--- a/AssetStudio/ImportHelper.cs
+++ b/AssetStudio/ImportHelper.cs
@@ -72,6 +72,10 @@ namespace AssetStudio
         private static FileType CheckFileType(EndianBinaryReader reader)
         {
             var signature = reader.ReadStringToNull(20);
+            if (signature == null)
+            {
+                signature = "";
+            }
             reader.Position = 0;
             switch (signature)
             {
diff --git a/AssetStudio/TypeTreeHelper.cs b/AssetStudio/TypeTreeHelper.cs
index 52bb2ea..9c66530 100644
--- a/AssetStudio/TypeTreeHelper.cs
+++ b/AssetStudio/TypeTreeHelper.cs
@@ -30,6 +30,10 @@ namespace AssetStudio
             object value = null;
             var append = true;
             var align = (member.m_MetaFlag & 0x4000) != 0;
+            if (varTypeStr == null)
+            {
+                varTypeStr = "";
+            }
             switch (varTypeStr)
             {
                 case "SInt8":
@@ -178,6 +182,10 @@ namespace AssetStudio
         {
             var member = members[i];
             var varTypeStr = member.m_Type;
+            if (varTypeStr == null)
+            {
+                varTypeStr = "";
+            }
             object value;
             var align = (member.m_MetaFlag & 0x4000) != 0;
             switch (varTypeStr)