Merge remote-tracking branch 'origin/develop' into feat/in-editor-tut…

…orials
Unity-Technologies · Oct 8, 2024 · 4ecd73a · 4ecd73a
2 parents 9737d1a + a6d1a53
commit 4ecd73a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
@@ -4,7 +4,7 @@ standards_{{ projects.first.name }}:
   name: Standards Check {{ projects.first.name }}
   agent:
     type: Unity::VM
-    image: desktop/logging-testing-linux:v0.1.2-926285
+    image: package-ci/ubuntu-18.04:v4
     flavor: b1.large
   commands:
     - dotnet --version

diff --git a/Assets/Scripts/Gameplay/Configuration/VisualizationConfiguration.cs b/Assets/Scripts/Gameplay/Configuration/VisualizationConfiguration.cs
@@ -57,14 +57,14 @@ public class VisualizationConfiguration : ScriptableObject
 
 
         // These are maintained by our OnValidate(). Code refers to these hashed values, not the string versions!
-        [SerializeField] [HideInInspector] public int AliveStateTriggerID;
-        [SerializeField] [HideInInspector] public int FaintedStateTriggerID;
-        [SerializeField] [HideInInspector] public int DeadStateTriggerID;
-        [SerializeField] [HideInInspector] public int AnticipateMoveTriggerID;
-        [SerializeField] [HideInInspector] public int EntryDeathTriggerID;
-        [SerializeField] [HideInInspector] public int EntryFaintedTriggerID;
-        [SerializeField] [HideInInspector] public int SpeedVariableID;
-        [SerializeField] [HideInInspector] public int BaseNodeTagID;
+        [SerializeField][HideInInspector] public int AliveStateTriggerID;
+        [SerializeField][HideInInspector] public int FaintedStateTriggerID;
+        [SerializeField][HideInInspector] public int DeadStateTriggerID;
+        [SerializeField][HideInInspector] public int AnticipateMoveTriggerID;
+        [SerializeField][HideInInspector] public int EntryDeathTriggerID;
+        [SerializeField][HideInInspector] public int EntryFaintedTriggerID;
+        [SerializeField][HideInInspector] public int SpeedVariableID;
+        [SerializeField][HideInInspector] public int BaseNodeTagID;
 
         void OnValidate()
         {