Merge pull request #40 from Capstone-Projects-2021-Spring/gamerules_3

Gamerules 3
Capstone-Projects-2021-Spring · Apr 26, 2021 · 89edbdc · 89edbdc
2 parents 24e9e73 + c5555d9
commit 89edbdc
Show file tree

Hide file tree

Showing 68 changed files with 4,943 additions and 247 deletions.
diff --git a/Assets/Audio/Music.meta b/Assets/Audio/Music.meta
diff --git a/Assets/Audio/Music/TRANSPOSE_THEME.mp3 b/Assets/Audio/Music/TRANSPOSE_THEME.mp3
diff --git a/Assets/Audio/Music/TRANSPOSE_THEME.mp3.meta b/Assets/Audio/Music/TRANSPOSE_THEME.mp3.meta
diff --git a/Assets/Audio/Sound Effects/Weapons/RailFailure.wav b/Assets/Audio/Sound Effects/Weapons/RailFailure.wav
diff --git a/Assets/Audio/Sound Effects/Weapons/RailFailure.wav.meta b/Assets/Audio/Sound Effects/Weapons/RailFailure.wav.meta
diff --git a/Assets/Audio/Sound Effects/Weapons/RailShot.mp3 b/Assets/Audio/Sound Effects/Weapons/RailShot.mp3
diff --git a/Assets/Audio/Sound Effects/Weapons/RailShot.mp3.meta b/Assets/Audio/Sound Effects/Weapons/RailShot.mp3.meta
diff --git a/Assets/Audio/Sound Effects/Weapons/Wrong.mp3 b/Assets/Audio/Sound Effects/Weapons/Wrong.mp3
diff --git a/Assets/Audio/Sound Effects/Weapons/Wrong.mp3.meta b/Assets/Audio/Sound Effects/Weapons/Wrong.mp3.meta
diff --git a/Assets/GameManager.cs b/Assets/GameManager.cs
@@ -81,10 +81,14 @@ public void DestroyAI(GameObject AI)
 		Invoke("SpawnAI", 3);
 	}
 
+
 	public override void OnLeftRoom()
 	{
+		Cursor.lockState = CursorLockMode.None;
+		Cursor.visible = true;
 		SceneManager.LoadScene(0);
 	}
+
 
 	public void LeaveRoom()
 	{

diff --git a/Assets/Items/Guns/RailGun.asset b/Assets/Items/Guns/RailGun.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16e63c2db9a70544692943663e3d1d96, type: 3}
+  m_Name: RailGun
+  m_EditorClassIdentifier: 
+  itemInfo: RailGun
+  damage: 130
diff --git a/Assets/Items/Guns/RailGun.asset.meta b/Assets/Items/Guns/RailGun.asset.meta
diff --git a/Assets/Materials/Player Materials/WeaponMaterials.meta b/Assets/Materials/Player Materials/WeaponMaterials.meta
diff --git a/...terials/Player Materials/Gun Material.mat → ...aterials/WeaponMaterials/Gun Material.mat b/...terials/Player Materials/Gun Material.mat → ...aterials/WeaponMaterials/Gun Material.mat
@@ -61,9 +61,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.5
+    - _Glossiness: 0.833
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 1
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

diff --git a/...ls/Player Materials/Gun Material.mat.meta → ...als/WeaponMaterials/Gun Material.mat.meta b/...ls/Player Materials/Gun Material.mat.meta → ...als/WeaponMaterials/Gun Material.mat.meta
diff --git a/Assets/Materials/Player Materials/WeaponMaterials/Projectile Material.mat b/Assets/Materials/Player Materials/WeaponMaterials/Projectile Material.mat
@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Projectile Material
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.624
+    - _GlossyReflections: 1
+    - _Metallic: 1
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.0036622894, g: 0.1509434, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/Player Materials/WeaponMaterials/Projectile Material.mat.meta b/Assets/Materials/Player Materials/WeaponMaterials/Projectile Material.mat.meta
diff --git a/Assets/Materials/Player Materials/WeaponMaterials/RailGunMaterial.mat b/Assets/Materials/Player Materials/WeaponMaterials/RailGunMaterial.mat
@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RailGunMaterial
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.765
+    - _GlossyReflections: 1
+    - _Metallic: 1
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0, g: 0.01867642, b: 0.3490566, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/Player Materials/WeaponMaterials/RailGunMaterial.mat.meta b/Assets/Materials/Player Materials/WeaponMaterials/RailGunMaterial.mat.meta
diff --git a/Assets/Plugins/GitHub.meta b/Assets/Plugins/GitHub.meta
diff --git a/Assets/Plugins/GitHub/Editor.meta b/Assets/Plugins/GitHub/Editor.meta
diff --git a/Assets/Prefabs/FullyAutomaticRifle.prefab b/Assets/Prefabs/FullyAutomaticRifle.prefab
@@ -80,6 +80,7 @@ MonoBehaviour:
   itemGameObject: {fileID: 419261588132141064}
   camera: {fileID: 0}
   myClip: {fileID: 8300000, guid: 63e0cc565dd9e554b8a6e4a9cb81b976, type: 3}
+  hitEffect: {fileID: 100006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3}
 --- !u!1 &5084822531753875640
 GameObject:
   m_ObjectHideFlags: 0
@@ -138,7 +139,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 7db93057c3ede3144af3e176f234d4a3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -229,7 +230,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 7db93057c3ede3144af3e176f234d4a3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0