imported music, added combat and death

2023-04-21 03:30:43 -04:00
parent 0b7b2515d1
commit c4094b169c
82 changed files with 11177 additions and 2270 deletions
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@ -346,7 +346,7 @@ InputManager:
    descriptiveName: 
    descriptiveNegativeName: 
    negativeButton: 
-    positiveButton: 
+    positiveButton: joystick button 10
    altNegativeButton: 
    altPositiveButton: 
    gravity: 1000
@ -380,7 +380,7 @@ InputManager:
    negativeButton: 
    positiveButton: x
    altNegativeButton: 
-    altPositiveButton: joystick button 2
+    altPositiveButton: joystick button 3
    gravity: 1000
    dead: 0.001
    sensitivity: 1000
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -22,7 +22,7 @@ PlayerSettings:
  m_SplashScreenOverlayOpacity: 1
  m_SplashScreenAnimation: 1
  m_SplashScreenLogoStyle: 1
-  m_SplashScreenDrawMode: 0
+  m_SplashScreenDrawMode: 1
  m_SplashScreenBackgroundAnimationZoom: 1
  m_SplashScreenLogoAnimationZoom: 1
  m_SplashScreenBackgroundLandscapeAspect: 1
@ -39,7 +39,11 @@ PlayerSettings:
    y: 0
    width: 1
    height: 1
-  m_SplashScreenLogos: []
+  m_SplashScreenLogos:
+  - logo: {fileID: 10404, guid: 0000000000000000e000000000000000, type: 0}
+    duration: 2
+  - logo: {fileID: 21300000, guid: 0721a573d493710408b907a4fad0f47f, type: 3}
+    duration: 2
  m_VirtualRealitySplashScreen: {fileID: 0}
  m_HolographicTrackingLossScreen: {fileID: 0}
  defaultScreenWidth: 1920
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -5,6 +5,7 @@ TagManager:
  serializedVersion: 2
  tags:
  - Collectable
+  - Damaging
  layers:
  - Default
  - TransparentFX