Merge pull request #6 from RohithKKannan/Two-Player

Added two player game controls
RohithKKannan · Apr 4, 2023 · fe7e73d · fe7e73d
2 parents b65e0ef + e1fbf04
commit fe7e73d
Show file tree

Hide file tree

Showing 16 changed files with 775 additions and 1,117 deletions.
diff --git a/Assets/Prefabs/Player/BluePlayer.prefab b/Assets/Prefabs/Player/BluePlayer.prefab
@@ -137,14 +137,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 45fbc8a0caa91db4881fe19c9cdb8471, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jumpHeight: 20
+  jumpHeight: 22
   speed: 7
   distance: 1
   groundLayer:
     serializedVersion: 2
     m_Bits: 64
   ballType: 0
   lightComponent: {fileID: 3528554601288459327}
+  gameManager: {fileID: 0}
 --- !u!1 &3528554601288459313
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Player/RedPlayer.prefab b/Assets/Prefabs/Player/RedPlayer.prefab
@@ -247,11 +247,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 45fbc8a0caa91db4881fe19c9cdb8471, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jumpHeight: 20
+  jumpHeight: 22
   speed: 7
   distance: 1
   groundLayer:
     serializedVersion: 2
     m_Bits: 64
   ballType: 1
   lightComponent: {fileID: 4114858133504657459}
+  gameManager: {fileID: 0}
diff --git a/Assets/Scenes/Levels/Level1.unity b/Assets/Scenes/Levels/Level1.unity
@@ -12752,6 +12752,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   timeBetweenChars: 0.1
   timeAfterText: 3
+  firstLevel: 1
 --- !u!1 &1757397730
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scenes/Levels/Level2.unity b/Assets/Scenes/Levels/Level2.unity
@@ -294,6 +294,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
       propertyPath: gameManager
       value: 
@@ -11965,6 +11969,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   timeBetweenChars: 0.05
   timeAfterText: 3
+  firstLevel: 0
 --- !u!1 &1407298145
 GameObject:
   m_ObjectHideFlags: 0
@@ -13338,6 +13343,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
       propertyPath: gameManager
       value: 

diff --git a/Assets/Scenes/Levels/Level3.unity b/Assets/Scenes/Levels/Level3.unity
@@ -294,6 +294,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
       propertyPath: gameManager
       value: 
@@ -13379,6 +13383,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: BluePlayer
       objectReference: {fileID: 0}
+    - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
       propertyPath: gameManager
       value: 

diff --git a/Assets/Scenes/Levels/Level4.unity b/Assets/Scenes/Levels/Level4.unity
@@ -294,6 +294,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
       propertyPath: gameManager
       value: 
@@ -13762,6 +13766,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
       propertyPath: gameManager
       value: 

diff --git a/Assets/Scenes/Levels/Level5.unity b/Assets/Scenes/Levels/Level5.unity
@@ -294,6 +294,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 588253420290936787, guid: a0bc16fb8b305384c8d43311d7c99aae, type: 3}
       propertyPath: gameManager
       value: 
@@ -15781,6 +15785,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
+      propertyPath: jumpHeight
+      value: 20
+      objectReference: {fileID: 0}
     - target: {fileID: 4987272121406211047, guid: bfed4afcaeca0f141a2d5b74e2ea0103, type: 3}
       propertyPath: gameManager
       value: