Alpha 0.0.1

Firelamp-studio · Apr 19, 2021 · 350f4ae · 350f4ae
1 parent 05e294d
commit 350f4ae
Show file tree

Hide file tree

Showing 553 changed files with 15,893 additions and 4,675 deletions.
diff --git a/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset b/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset
diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset
@@ -18,13 +18,13 @@ MonoBehaviour:
   active: 1
   Properties:
     LiveUpdate:
-      Value: 1
+      Value: 0
       HasValue: 1
     LiveUpdatePort:
       Value: 9264
       HasValue: 1
     Overlay:
-      Value: 1
+      Value: 0
       HasValue: 1
     Logging:
       Value: 0
@@ -163,7 +163,9 @@ MonoBehaviour:
   Plugins: []
   MasterBanks:
   - Master
-  Banks: []
+  Banks:
+  - Music
+  - SFX
   BanksToLoad: []
   LiveUpdatePort: 9264
   EnableMemoryTracking: 0

diff --git a/Assets/Resources/Input/PlayerControls.inputactions b/Assets/Resources/Input/PlayerControls.inputactions
@@ -13,6 +13,14 @@
                     "processors": "",
                     "interactions": ""
                 },
+                {
+                    "name": "Rotate",
+                    "type": "Value",
+                    "id": "c48b1531-ece0-4236-a41f-34b0f8e2cdd5",
+                    "expectedControlType": "Axis",
+                    "processors": "",
+                    "interactions": ""
+                },
                 {
                     "name": "Fire",
                     "type": "Button",
@@ -22,17 +30,25 @@
                     "interactions": ""
                 },
                 {
-                    "name": "Rotate",
-                    "type": "Value",
-                    "id": "c48b1531-ece0-4236-a41f-34b0f8e2cdd5",
-                    "expectedControlType": "Axis",
+                    "name": "Reload",
+                    "type": "Button",
+                    "id": "4538e9b1-03dc-4ac4-b6f0-c9c7b0be5772",
+                    "expectedControlType": "Button",
                     "processors": "AxisDeadzone",
                     "interactions": ""
                 },
                 {
-                    "name": "Reload",
+                    "name": "SwitchMusic",
                     "type": "Button",
-                    "id": "4538e9b1-03dc-4ac4-b6f0-c9c7b0be5772",
+                    "id": "fa117d48-15e7-483c-8a7e-95b12abba8e0",
+                    "expectedControlType": "Button",
+                    "processors": "AxisDeadzone",
+                    "interactions": ""
+                },
+                {
+                    "name": "SwitchPlayerJoinActive",
+                    "type": "Button",
+                    "id": "a429ad98-2761-41e4-bdfe-327d013fd7e3",
                     "expectedControlType": "Button",
                     "processors": "AxisDeadzone",
                     "interactions": ""
@@ -44,42 +60,64 @@
                     "id": "ebc2ef91-91f7-409f-97d6-4ca9e618f1f4",
                     "path": "<Gamepad>/leftStick",
                     "interactions": "",
-                    "processors": "",
+                    "processors": "StickDeadzone(min=0.3,max=0.975)",
                     "groups": "Gamepad",
                     "action": "Move",
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
                 {
                     "name": "",
-                    "id": "f714ae70-fd0e-48bf-a794-ed254441e36f",
-                    "path": "<Gamepad>/rightShoulder",
+                    "id": "0f1b60a7-aba8-4cd2-92aa-08cdca32ffb0",
+                    "path": "<Gamepad>/rightStick/x",
                     "interactions": "",
-                    "processors": "",
+                    "processors": "AxisDeadzone(min=0.3,max=0.975)",
                     "groups": "Gamepad",
-                    "action": "Fire",
+                    "action": "Rotate",
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
                 {
                     "name": "",
-                    "id": "0f1b60a7-aba8-4cd2-92aa-08cdca32ffb0",
-                    "path": "<Gamepad>/rightStick/x",
+                    "id": "251215da-2198-405a-8de6-88ae7b704f4c",
+                    "path": "<Gamepad>/buttonWest",
                     "interactions": "",
                     "processors": "",
                     "groups": "Gamepad",
-                    "action": "Rotate",
+                    "action": "Reload",
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
                 {
                     "name": "",
-                    "id": "251215da-2198-405a-8de6-88ae7b704f4c",
-                    "path": "<Gamepad>/buttonWest",
+                    "id": "bf30755f-3105-4ba1-9110-c410d21314fc",
+                    "path": "<Gamepad>/start",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "SwitchMusic",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "f07817cc-a81c-4ece-b258-89d492cf6234",
+                    "path": "<Gamepad>/select",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "SwitchPlayerJoinActive",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "f714ae70-fd0e-48bf-a794-ed254441e36f",
+                    "path": "<Gamepad>/rightShoulder",
                     "interactions": "",
                     "processors": "",
                     "groups": "Gamepad",
-                    "action": "Reload",
+                    "action": "Fire",
                     "isComposite": false,
                     "isPartOfComposite": false
                 }

diff --git a/Assets/Resources/Materials/Leaf_Mat.mat b/Assets/Resources/Materials/Leaf_Mat.mat
@@ -110,7 +110,7 @@ Material:
     - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.5
+    - _Smoothness: 0.2
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Resources/Materials/Log_Mat.mat b/Assets/Resources/Materials/Log_Mat.mat
@@ -110,7 +110,7 @@ Material:
     - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.5
+    - _Smoothness: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Resources/Materials/StoneWall_LR_Mat.mat b/Assets/Resources/Materials/StoneWall_LR_Mat.mat
@@ -110,7 +110,7 @@ Material:
     - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.5
+    - _Smoothness: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Resources/Materials/StoneWall_TD_Mat.mat b/Assets/Resources/Materials/StoneWall_TD_Mat.mat
@@ -110,7 +110,7 @@ Material:
     - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.5
+    - _Smoothness: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Resources/Materials/Stone_Mat.mat b/Assets/Resources/Materials/Stone_Mat.mat
@@ -110,7 +110,7 @@ Material:
     - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.5
+    - _Smoothness: 0.075
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

diff --git a/Assets/Resources/Prefabs/BulletPrefab.prefab b/Assets/Resources/Prefabs/BulletPrefab.prefab
@@ -132,6 +132,7 @@ MonoBehaviour:
   bodyMesh: {fileID: 2636373893987903740}
   contactParticlePrefab: {fileID: 482035692201474898, guid: b5a69dd45daef9e4bbd5fc06d27a22a3, type: 3}
   damage: 0
+  hitSFX: event:/SFX/BulletHit
   lifeTime: 0
 --- !u!54 &9038412236012877042
 Rigidbody: