v0.24

0x7c13 · Sep 23, 2022 · 6afbe7e · 6afbe7e
1 parent bf61513
commit 6afbe7e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 414 deletions.
diff --git a/Assets/Scripts/Pal3/Dev/MazeSkipper.cs b/Assets/Scripts/Pal3/Dev/MazeSkipper.cs
@@ -663,7 +663,7 @@ public class MazeSkipper :
             { "m12_1_0", new List<ICommand>()
             {
                 new ActorSetNavLayerCommand(-1, 0),
-                new ActorSetTilePositionCommand(-1, 122, 231)
+                new ActorSetTilePositionCommand(-1, 126, 231)
             }},
             { "m12_1_1", new List<ICommand>()
             {
@@ -673,7 +673,13 @@ public class MazeSkipper :
             { "m12_1_100300", new List<ICommand>()
             {
                 new ActorSetNavLayerCommand(-1, 0),
-                new ActorSetTilePositionCommand(-1, 122, 225)
+                new ActorSetTilePositionCommand(-1, 121, 211),
+                new PlayerInteractionRequest()
+            }},
+            { "m12_1_100400", new List<ICommand>()
+            {
+                new ActorSetNavLayerCommand(-1, 0),
+                new ActorSetTilePositionCommand(-1, 126, 231)
             }},
             { "m12_1_110200", new List<ICommand>()
             {
@@ -923,7 +929,7 @@ private void ExitButtonClicked()
 
             // This is how exit button works:
             // If there are predefined commands that has a format of <sceneCityName>_<sceneName>_<mainStoryVarValue>
-            // It will check if current main story var is equal to <mainStoryVarValue>, if it does, it will run the commandsm
+            // It will check if current main story var is equal to <mainStoryVarValue>, if it does, it will run the commands
             // if no matching pattern found, it will execute the default exit commands (<sceneCityName>_<sceneName>_1)
 
             var mainStoryVarCurrentValue = ServiceLocator.Instance.Get<ScriptManager>()

diff --git a/Assets/Scripts/ResourceViewer/GameResourceViewer.cs b/Assets/Scripts/ResourceViewer/GameResourceViewer.cs
@@ -236,7 +236,7 @@ private bool LoadMv3(string filePath)
 
                 var mv3AnimationRenderer = animationNode.AddComponent<Mv3ModelRenderer>();
 
-                // For debuging tag node:
+                // For debugging tag node:
                 // if (mv3File.TagNodes is {Length: > 0} &&
                 //     !mv3File.TagNodes[0].Name.Equals("tag_weapon3", StringComparison.OrdinalIgnoreCase) &&
                 //     filePath.Contains(@"ROLE\101"))

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.23
+  bundleVersion: 0.24
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.9f1
-m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536)
+m_EditorVersion: 2021.3.10f1
+m_EditorVersionWithRevision: 2021.3.10f1 (1c7d0df0160b)