Made a test build + readme update

bas-boop · Dec 22, 2023 · 4d7e1a2 · 4d7e1a2
1 parent 5760303
commit 4d7e1a2
Show file tree

Hide file tree

Showing 25 changed files with 609 additions and 33 deletions.
diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity
diff --git a/Assets/Scenes/Horse selector.unity b/Assets/Scenes/Horse selector.unity
@@ -504,7 +504,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 870e999ea9ac24c48a3a203bdab90164, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  playerHorse: 0
 --- !u!4 &375571238
 Transform:
   m_ObjectHideFlags: 0
@@ -691,7 +690,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -217}
   m_SizeDelta: {x: 1000, y: 600}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &478987054
@@ -1059,6 +1058,143 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1096171684
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1096171685}
+  - component: {fileID: 1096171687}
+  - component: {fileID: 1096171686}
+  m_Layer: 5
+  m_Name: Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1096171685
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1096171684}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1515997828}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 300}
+  m_SizeDelta: {x: 800, y: 250}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1096171686
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1096171684}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 'Smoll Knight
+
+    + Horse'
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 100
+  m_fontSizeBase: 100
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1096171687
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1096171684}
+  m_CullTransparentMesh: 1
 --- !u!1 &1436072665
 GameObject:
   m_ObjectHideFlags: 0
@@ -1247,6 +1383,7 @@ RectTransform:
   m_Children:
   - {fileID: 478987053}
   - {fileID: 378607177}
+  - {fileID: 1096171685}
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

diff --git a/Assets/Scripts/Enviorment/SpawnParticle.cs b/Assets/Scripts/Enviorment/SpawnParticle.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class SpawnParticle : MonoBehaviour
     {

diff --git a/Assets/Scripts/Framework/DontDestroyOnLoad.cs b/Assets/Scripts/Framework/DontDestroyOnLoad.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class DontDestroyOnLoad : MonoBehaviour
     {

diff --git a/Assets/Scripts/Framework/GetPlayerSettings.cs b/Assets/Scripts/Framework/GetPlayerSettings.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
 
     public class GetPlayerSettings : MonoBehaviour

diff --git a/Assets/Scripts/Framework/Horse selector/HorseSelector.cs b/Assets/Scripts/Framework/Horse selector/HorseSelector.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class HorseSelector : GetPlayerSettings
     {

diff --git a/Assets/Scripts/Framework/Horse selector/HorseType.cs b/Assets/Scripts/Framework/Horse selector/HorseType.cs
@@ -1,4 +1,4 @@
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public enum HorseType
     {

diff --git a/Assets/Scripts/Framework/QuickTimeEvents/BaseQuickTimeEventHolder.cs b/Assets/Scripts/Framework/QuickTimeEvents/BaseQuickTimeEventHolder.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public abstract class BaseQuickTimeEventHolder : MonoBehaviour
     {

diff --git a/Assets/Scripts/Framework/QuickTimeEvents/KeyCodeQTE.cs b/Assets/Scripts/Framework/QuickTimeEvents/KeyCodeQTE.cs
@@ -1,6 +1,6 @@
 using Baz_geluk9.Extensions;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public enum KeyCodeQTE
     {

diff --git a/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEvent.cs b/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEvent.cs
@@ -1,10 +1,10 @@
 using System;
 using Baz_geluk9.Extensions;
-using Baz_geluk9.HKU.UI;
+using Baz_geluk9.SKPH.UI;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class QuickTimeEvent : MonoBehaviour
     {
@@ -35,8 +35,8 @@ private void Update()
             if (parent is QuickTimeEventSystem
                 && _timer <= 0)
             {
-                onLose?.Invoke();
                 StopQte();
+                onLose?.Invoke();
                 return;
             }
 

diff --git a/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEventCaller.cs b/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEventCaller.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class QuickTimeEventCaller : MonoBehaviour
     {
@@ -31,7 +31,7 @@ private IEnumerator CallQtesSequentially()
 
         private IEnumerator CallQte(float timeBetween)
         {
-            yield return new WaitForSeconds(timeBetween);
+            yield return new WaitForSeconds(timeBetween + 0.01f);
             system.StartNextQte();    
         }
     }

diff --git a/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEventGroup.cs b/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEventGroup.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     /// <summary>
     /// This class is unused and not working as intended.

diff --git a/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEventSystem.cs b/Assets/Scripts/Framework/QuickTimeEvents/QuickTimeEventSystem.cs
@@ -1,6 +1,4 @@
-using UnityEngine;
-
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class QuickTimeEventSystem : BaseQuickTimeEventHolder
     {

diff --git a/Assets/Scripts/Framework/SceneSwitcher.cs b/Assets/Scripts/Framework/SceneSwitcher.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class SceneSwitcher : MonoBehaviour
     {

diff --git a/Assets/Scripts/Framework/ScoreCalculator.cs b/Assets/Scripts/Framework/ScoreCalculator.cs
@@ -1,8 +1,9 @@
 using System;
+using System.Collections;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class ScoreCalculator : GetPlayerSettings
     {
@@ -14,6 +15,7 @@ public sealed class ScoreCalculator : GetPlayerSettings
         [SerializeField] private UnityEvent onDraw;
         [SerializeField] private UnityEvent onPlayerWon;
         [SerializeField] private UnityEvent onNpcWon;
+        [SerializeField] private UnityEvent onLater;
 
         private bool _isCalled;
 
@@ -61,6 +63,7 @@ public void CalculateScore()
                 onGameResult = onDraw;
 
             onGameResult?.Invoke();
+            StartCoroutine(CallLaterEvent());
         }
 
         /// <summary>
@@ -93,5 +96,11 @@ private bool DetermineWinner(HorseType player, HorseType npc)
                 HorseType.DEFENCE => npc == HorseType.POWER,
                 _ => false
             };
+
+        private IEnumerator CallLaterEvent()
+        {
+            yield return new WaitForSeconds(2);
+            onLater?.Invoke();
+        }
     }
 }
diff --git a/Assets/Scripts/NPC/HorseMovement.cs b/Assets/Scripts/NPC/HorseMovement.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     [RequireComponent(typeof(Rigidbody2D))]
     public sealed class HorseMovement : MonoBehaviour

diff --git a/Assets/Scripts/NPC/HorseStatesGenerator.cs b/Assets/Scripts/NPC/HorseStatesGenerator.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class HorseStatesGenerator : MonoBehaviour
     {

diff --git a/Assets/Scripts/NPC/NpcDifficulty.cs b/Assets/Scripts/NPC/NpcDifficulty.cs
@@ -1,4 +1,4 @@
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public enum NpcDifficulty
     {

diff --git a/Assets/Scripts/Player/PlayerSettings.cs b/Assets/Scripts/Player/PlayerSettings.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Baz_geluk9.HKU
+namespace Baz_geluk9.SKPH
 {
     public sealed class PlayerSettings : MonoBehaviour
     { 

diff --git a/Assets/Scripts/UI/QuickTimeEvents/QuickTimeEventBar.cs b/Assets/Scripts/UI/QuickTimeEvents/QuickTimeEventBar.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Baz_geluk9.HKU.UI
+namespace Baz_geluk9.SKPH.UI
 {
     public sealed class QuickTimeEventBar : MonoBehaviour
     {

diff --git a/Assets/Scripts/UI/QuickTimeEvents/QuickTimeEventKey.cs b/Assets/Scripts/UI/QuickTimeEvents/QuickTimeEventKey.cs
@@ -1,7 +1,7 @@
 using TMPro;
 using UnityEngine;
 
-namespace Baz_geluk9.HKU.UI
+namespace Baz_geluk9.SKPH.UI
 {
     public sealed class QuickTimeEventKey : MonoBehaviour
     {

diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json
@@ -0,0 +1,18 @@
+{
+  "MonoBehaviour": {
+    "Version": 4,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "DebugDataKind": 1,
+    "EnableArmv9SecurityFeatures": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "CpuTargetsX32": 6,
+    "CpuTargetsX64": 72,
+    "OptimizeFor": 0
+  }
+}