Merge branch 'main' into dev

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build
 on:
   push:
     branches:
-      - 'dev'
+      - 'main'
     paths-ignore:
       - '**/LICENSE'
       - '**/README.md'

AssetStudio/Classes/Shader.cs

@@ -608,6 +608,17 @@ namespace AssetStudio
             m_GpuProgramType = (ShaderGpuProgramType)reader.ReadSByte();
             reader.AlignStream();
 
+            if (reader.Game.Name == "GI" && (m_GpuProgramType == ShaderGpuProgramType.Unknown || !Enum.IsDefined(typeof(ShaderGpuProgramType), m_GpuProgramType)))
+            {
+                reader.Position -= 4;
+                var m_LocalKeywordIndices = reader.ReadUInt16Array();
+                reader.AlignStream();
+
+                m_ShaderHardwareTier = reader.ReadSByte();
+                m_GpuProgramType = (ShaderGpuProgramType)reader.ReadSByte();
+                reader.AlignStream();
+            }
+
             if ((version[0] == 2020 && version[1] > 3) ||
                (version[0] == 2020 && version[1] == 3 && version[2] >= 2) || //2020.3.2f1 and up
                (version[0] > 2021) ||

AssetStudioGUI/AssetStudioGUIForm.Designer.cs

@@ -1344,6 +1344,14 @@ namespace AssetStudioGUI
             sceneHierarchy.Text = "Scene hierarchy";
             sceneHierarchy.Click += sceneHierarchy_Click;
             // 
+            // enableFileLogging
+            // 
+            this.enableFileLogging.CheckOnClick = true;
+            this.enableFileLogging.Name = "enableFileLogging";
+            this.enableFileLogging.Size = new System.Drawing.Size(191, 22);
+            this.enableFileLogging.Text = "Enable file logging";
+            this.enableFileLogging.CheckedChanged += new System.EventHandler(this.enableFileLogging_CheckedChanged);
+            // 
             // AssetStudioGUIForm
             // 
             AllowDrop = true;

AssetStudioGUI/GUILogger.cs

@@ -31,7 +31,7 @@ namespace AssetStudioGUI
                     action(message);
                     break;
             }
-
+            return message;
         }
     }
 }

AssetStudioGUI/Properties/Settings.Designer.cs

@@ -501,5 +501,35 @@ namespace AssetStudioGUI.Properties {
                 this["enableVerbose"] = value;
             }
         }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool exportUV0UV1
+        {
+            get
+            {
+                return ((bool)(this["exportUV0UV1"]));
+            }
+            set
+            {
+                this["exportUV0UV1"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool isFileLogging
+        {
+            get
+            {
+                return ((bool)(this["isFileLogging"]));
+            }
+            set
+            {
+                this["isFileLogging"] = value;
+            }
+        }
     }
 }

README.md

@@ -46,10 +46,4 @@ Special Thank to:
 - Khang06: [Project](https://github.com/khang06/genshinblkstuff) for extraction.
 - Radioegor146: [Asset-indexes](https://github.com/radioegor146/gi-asset-indexes) for recovered/updated asset_index's.
 - Ds5678: [AssetRipper](https://github.com/AssetRipper/AssetRipper)[[discord](https://discord.gg/XqXa53W2Yh)] for information about Asset Formats & Parsing.
-- mafaca: [uTinyRipper](https://github.com/mafaca/UtinyRipper) for `YAML` and `AnimationClipConverter`. 
+- mafaca: [uTinyRipper](https://github.com/mafaca/UtinyRipper) for `YAML` and `AnimationClipConverter`. 
-_____________________________________________________________________________________________________________________________
-
-If you find `Studio` useful, you can leave a star 😄
-If you want to support (optional), you can do so [here](https://ko-fi.com/razmoth)
-
-Thank you, looking forward for your feedback

appveyor.yml

@@ -0,0 +1,28 @@
+image: Visual Studio 2022
+
+shallow_clone: true
+clone_depth: 1
+cache:
+    - '%APPVEYOR_BUILD_FOLDER%\AssetStudioFBXNative\obj'
+    - '%LocalAppData%\NuGet\v3-cache' # NuGet v3
+
+environment:
+    FBX_SDK: https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-3-2/fbx202032_fbxsdk_vs2019_win.exe
+    File_NAME: Studio
+    File_Format: zip
+
+install:
+    - pwsh: appveyor DownloadFile $env:FBX_SDK && Start (Get-ChildItem ./'fbx*'.exe -Name) /S -Wait
+    
+build_script:
+    - msbuild -m -t:AssetStudioGUI:publish -t:AssetStudioCLI:publish -r -p:Configuration=Release -v:minimal AssetStudio.sln
+
+after_build:
+    - ps: $env:TIME_STRING=(Get-Date -UFormat "%Y%m%d%H%M%S%a").ToString()
+    - 7z a -y -mx9 %File_NAME%-%TIME_STRING%.%File_Format% %APPVEYOR_BUILD_FOLDER%\AssetStudioGUI\bin\Release\net6.0-windows\publish\
+    - appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\%File_NAME%-%TIME_STRING%.%File_Format%
+
+# artifacts:
+#   - path: AssetStudioGUI\bin\Release\net6.0-windows\publish\
+#     name: "%File_NAME%-%TIME_STRING%.%File_Format%"
+#     type: zip