Final changes

KyleHammer · Nov 16, 2020 · b7543e7 · b7543e7
1 parent 1056e57
commit b7543e7
Show file tree

Hide file tree

Showing 17 changed files with 78 additions and 38 deletions.
diff --git a/Assets/Prefabs/Enemies/GlaiveHolder.prefab b/Assets/Prefabs/Enemies/GlaiveHolder.prefab
@@ -3095,7 +3095,7 @@ GameObject:
   - component: {fileID: 4735699741400305198}
   - component: {fileID: 7375878708038728420}
   - component: {fileID: 4052333975983555512}
-  m_Layer: 0
+  m_Layer: 11
   m_Name: GlaiveModel
   m_TagString: Untagged
   m_Icon: {fileID: 0}

diff --git a/Assets/Prefabs/Enemies/Miniboss.prefab b/Assets/Prefabs/Enemies/Miniboss.prefab
@@ -3712,17 +3712,17 @@ PrefabInstance:
     - target: {fileID: 3382333992990730575, guid: 287a90e02ab25d148b1e5144bdc15eb2,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 2
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 3382333992990730575, guid: 287a90e02ab25d148b1e5144bdc15eb2,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 2
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 3382333992990730575, guid: 287a90e02ab25d148b1e5144bdc15eb2,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 2
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 4320828841491607227, guid: 287a90e02ab25d148b1e5144bdc15eb2,
         type: 3}

diff --git a/Assets/Prefabs/PlayerPrefab/MainPlayerHolder.prefab b/Assets/Prefabs/PlayerPrefab/MainPlayerHolder.prefab
@@ -7098,6 +7098,7 @@ MonoBehaviour:
   lockOnTracker: {fileID: 0}
   cinematicBars: {fileID: 0}
   onLockOnEvent: {fileID: 11400000, guid: 5f051e9e3ef171047a76de81e93abe48, type: 2}
+  _lockCancelTimer: 0
 --- !u!114 &4694011085568007676
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10186,7 +10187,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_TargetDisplay: 0
 --- !u!114 &1299045849285113904
 MonoBehaviour:

diff --git a/Assets/Prefabs/Rewind/Managers/RewindManager.cs b/Assets/Prefabs/Rewind/Managers/RewindManager.cs
@@ -271,7 +271,7 @@ public void EndRewind()
         if(rewindCam) rewindCam.m_Priority = 3;
         if (isTravelling)
         {
-            OnEndRewind();
+
             isTravelling = false;
             foreach (RewindEntity entity in rewindObjects)
             {
@@ -283,9 +283,12 @@ public void EndRewind()
             _rewindAudio.Resume();
             _rewindAudio.audioManager.backgroundAudio.ResumeMusic();
             _rewindAudio.audioManager.trackManager.PauseAll();
-            Reset();
+
             Time.timeScale = 1f;
             Time.fixedDeltaTime = Time.timeScale * .02f;
+
+            Reset();
+            OnEndRewind();
         }
     }
 

diff --git a/Assets/Prefabs/Weapons/Armour Plate.prefab b/Assets/Prefabs/Weapons/Armour Plate.prefab
@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 2315376622992690566}
   - component: {fileID: 3070701598045003201}
   - component: {fileID: 2615304559798030742}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: Particle System
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4827,9 +4827,9 @@ GameObject:
   - component: {fileID: 2403961324669071517}
   - component: {fileID: 7514927814355041637}
   - component: {fileID: 2509059404289446404}
-  m_Layer: 0
+  m_Layer: 10
   m_Name: Armour Plate
-  m_TagString: Untagged
+  m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4937,8 +4937,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 586e974b2b179f046893687f46f9601f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  rb: {fileID: 0}
+  col: {fileID: 0}
   destroyed: 0
   particles: {fileID: 0}
+  originPos: {x: 0, y: 0, z: 0}
+  originRot:
+    value:
+      x: 0
+      y: 0
+      z: 0
+      w: 0
 --- !u!114 &2509059404289446404
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4956,4 +4965,3 @@ MonoBehaviour:
   transformDataList: []
   thisTransform: {fileID: 0}
   _rewindInput: {fileID: 0}
-  boardBreak: {fileID: 0}
diff --git a/Assets/Scenes/CleanedTutorial/MAINSCENE.unity b/Assets/Scenes/CleanedTutorial/MAINSCENE.unity
@@ -976,6 +976,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: BridgeCheckpoint
       objectReference: {fileID: 0}
+    - target: {fileID: 8297008771409839546, guid: 66b680d0b4f9d154dbd60198a4910377,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 58.61
+      objectReference: {fileID: 0}
     - target: {fileID: 8297008771409839547, guid: 66b680d0b4f9d154dbd60198a4910377,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -2223,6 +2228,11 @@ PrefabInstance:
       propertyPath: m_Size.x
       value: 34.98
       objectReference: {fileID: 0}
+    - target: {fileID: 8297008771409839546, guid: 66b680d0b4f9d154dbd60198a4910377,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 98.5
+      objectReference: {fileID: 0}
     - target: {fileID: 8297008771409839547, guid: 66b680d0b4f9d154dbd60198a4910377,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -10024,6 +10034,11 @@ PrefabInstance:
       propertyPath: m_Size.x
       value: 34.98
       objectReference: {fileID: 0}
+    - target: {fileID: 8297008771409839546, guid: 66b680d0b4f9d154dbd60198a4910377,
+        type: 3}
+      propertyPath: m_Size.y
+      value: 46.8
+      objectReference: {fileID: 0}
     - target: {fileID: 8297008771409839547, guid: 66b680d0b4f9d154dbd60198a4910377,
         type: 3}
       propertyPath: m_LocalPosition.x

diff --git a/Assets/Scenes/SceneAdditive/03_ValleyCampsite.unity b/Assets/Scenes/SceneAdditive/03_ValleyCampsite.unity
@@ -39,7 +39,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
+  m_IndirectSpecularColor: {r: 0.26552925, g: 0.2648681, b: 0.26552925, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -4230,7 +4230,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &391095061
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6234,7 +6234,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &604737972
 RectTransform:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scenes/SceneAdditive/06_VillageTown.unity b/Assets/Scenes/SceneAdditive/06_VillageTown.unity
@@ -39,7 +39,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18288553, g: 0.22858404, b: 0.30692768, a: 1}
+  m_IndirectSpecularColor: {r: 0.26552925, g: 0.2648681, b: 0.26552925, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1753,17 +1753,17 @@ PrefabInstance:
     - target: {fileID: 8010861367417176798, guid: 75a43092b469b4740ba18cdc90873c36,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -104.376175
+      value: -105.47
       objectReference: {fileID: 0}
     - target: {fileID: 8010861367417176798, guid: 75a43092b469b4740ba18cdc90873c36,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 305.87036
+      value: 300.32
       objectReference: {fileID: 0}
     - target: {fileID: 8010861367417176798, guid: 75a43092b469b4740ba18cdc90873c36,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 121.41461
+      value: 106.86
       objectReference: {fileID: 0}
     - target: {fileID: 8010861367417176798, guid: 75a43092b469b4740ba18cdc90873c36,
         type: 3}

diff --git a/Assets/Scripts/Audio/BackgroundAudio.cs b/Assets/Scripts/Audio/BackgroundAudio.cs
@@ -79,7 +79,7 @@ void Update()
         birdsAndTreesSource.volume = audioManager.BGMVol;
         menuMusicSource.volume = audioManager.BGMVol;
         doorSource.volume = audioManager.BGMVol;
-        hum.volume = audioManager.SFXVol;
+        hum.volume = audioManager.SFXVol / 4;
 
         if (bActive)
         {
@@ -189,7 +189,7 @@ public void PlaySlam()
     public void PlayHum()
     {
         hum.clip = saberHum;
-        hum.volume = .1f;
+        hum.volume = .01f;
         hum.loop = true;
         hum.Play();
     }

diff --git a/Assets/Scripts/Camera/LockOnCamera/AddToLockOnTracker.cs b/Assets/Scripts/Camera/LockOnCamera/AddToLockOnTracker.cs
@@ -69,7 +69,7 @@ private void RaycastToCurrentEnemies()
                     if (enemyTransform == _lockOnTracker.targetEnemy)
                     {
                         Debug.Log("Raycast interrupted by " + hit.collider.name);
-                        CancelLockOnEvent.Raise();
+                        //CancelLockOnEvent.Raise();
                     }
                 }
             }

diff --git a/Assets/Scripts/Enemies/AISystem.cs b/Assets/Scripts/Enemies/AISystem.cs
@@ -166,7 +166,7 @@ private void Update()
             //if (enemyType == EnemyType.BOSS && Keyboard.current.oKey.wasPressedThisFrame) OnBossArrowMove();
             //if (enemyType == EnemyType.BOSS && Keyboard.current.iKey.wasPressedThisFrame) OnBossTaunt();
 
-            if (enemyType == EnemyType.BOSS && Keyboard.current.lKey.wasPressedThisFrame) OnEnemyDeath();
+            //if (enemyType == EnemyType.BOSS && Keyboard.current.lKey.wasPressedThisFrame) OnEnemyDeath();
         }
 
         #endregion
@@ -545,7 +545,7 @@ private void OnCollisionEnter(Collision other)
             {
                 if (OnCollisionLayers(other.gameObject.layer))
                 {
-                    Debug.LogError("Has collided with " + other.gameObject.name + " on layer " + other.gameObject.layer);
+                    //Debug.LogError("Has collided with " + other.gameObject.name + " on layer " + other.gameObject.layer);
 
                     //This next operation is fairly risky however since we check bIsCircling
                     //the enemy should ideally be in CircleEnemyState anyway

diff --git a/Assets/Scripts/Player/PCombatController.cs b/Assets/Scripts/Player/PCombatController.cs
@@ -212,7 +212,7 @@ public void PlaySlash()
         else if (audioManager.LightSaber == true)
         {
             int j = Random.Range(0, saberwhoosh.Length);
-            swordAudio.PlayOnce(saberwhoosh[j], audioManager.SFXVol * 2);
+            swordAudio.PlayOnce(saberwhoosh[j], audioManager.SFXVol / 2);
         }
 
     }
@@ -228,7 +228,7 @@ public void PlayHit()
         else if (audioManager.LightSaber == true)
         {
             int j = Random.Range(0, lightSaberHit.Length);
-            swordAudio.PlayOnce(lightSaberHit[j], audioManager.SFXVol * 2);
+            swordAudio.PlayOnce(lightSaberHit[j], audioManager.SFXVol / 2);
         }
     }
 
@@ -242,7 +242,7 @@ public void PlayHeavySwing()
         else if (audioManager.LightSaber == true)
         {
             int j = Random.Range(0, saberwhoosh.Length);
-            swordAudio.PlayOnce(saberwhoosh[j], audioManager.SFXVol * 2, .5f, .7f);
+            swordAudio.PlayOnce(saberwhoosh[j], audioManager.SFXVol / 2, .5f, .7f);
         }
     }
 

diff --git a/Assets/Scripts/Rewind/RewindInput.cs b/Assets/Scripts/Rewind/RewindInput.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.InputSystem;
@@ -39,7 +40,24 @@ void Start()
 
     }
 
-
+
+    private void Update()
+    {
+        if (Keyboard.current.iKey.wasPressedThisFrame)
+        {
+            Time.timeScale = 1.0f;
+            Time.fixedDeltaTime = Time.timeScale * .02f;
+
+            _inputComponent.SwitchCurrentActionMap("Gameplay");
+            GameManager.instance.postProcessingController.DisableRewindColourFilter();
+            isTravelling = false;
+            //rewindEntity.isTravelling = false;
+            rewindTut.SetActive(false);
+            rewindManager.isTravelling = false;
+            rewindManager.ResetRewind();
+            rewindManager.EndRewind();
+        }
+    }
 
     void OnInitRewind()
     {

diff --git a/Assets/Scripts/Rewind/TrackerRewindData/TrackerRewindEntity.cs b/Assets/Scripts/Rewind/TrackerRewindData/TrackerRewindEntity.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Enemies;
 using UnityEngine;
 
 public class TrackerRewindEntity : RewindEntity
@@ -93,10 +94,11 @@ public override void StepForward()
 
     public override void ApplyData()
     {
+        _lockOnTracker.targetableEnemies.Clear();
         _enemyTracker.currentEnemies = trackerDataList[currentIndex].trackedCurrentEnemies.ToList<Transform>();
         _lockOnTracker.currentEnemies = trackerDataList[currentIndex].lockOnEnemies.ToList<Transform>();
 
-        _lockOnTracker.targetableEnemies = _lockOnTracker.currentEnemies;
+        //_lockOnTracker.targetableEnemies = _lockOnTracker.currentEnemies;
     }
 
     protected new void OnDestroy()

diff --git a/Assets/Scripts/UI/AnimationsNTransitions.meta b/Assets/Scripts/UI/AnimationsNTransitions.meta
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -51,7 +51,7 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.1"
+        "com.unity.test-framework": "1.1.3"
       },
       "url": "https://packages.unity.com"
     },

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -131,6 +131,7 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1