Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Touch me if you can
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
S
Sommersemester 2019
Unity
Touch me if you can
Commits
8586460e
Commit
8586460e
authored
Sep 21, 2019
by
Patrick Stengel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
next System overhaul
parent
4a47f284
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
354 additions
and
361 deletions
+354
-361
Assets/_Game/Prefabs/PlayerManagerPrefabs/Player2Manager.prefab
.../_Game/Prefabs/PlayerManagerPrefabs/Player2Manager.prefab
+0
-92
Assets/_Game/Prefabs/PlayerManagerPrefabs/Player2Manager.prefab.meta
...e/Prefabs/PlayerManagerPrefabs/Player2Manager.prefab.meta
+0
-7
Assets/_Game/Prefabs/PlayerManagerPrefabs/PlayerManager.prefab
...s/_Game/Prefabs/PlayerManagerPrefabs/PlayerManager.prefab
+11
-10
Assets/_Game/Prefabs/PlayerManagerPrefabs/PlayerManager.prefab.meta
...me/Prefabs/PlayerManagerPrefabs/PlayerManager.prefab.meta
+0
-0
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Body.prefab
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Body.prefab
+16
-0
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Head.prefab
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Head.prefab
+16
-0
Assets/_Game/Scenes/MainLevelSwitched.unity
Assets/_Game/Scenes/MainLevelSwitched.unity
+106
-138
Assets/_Game/Scripts/GameManager/GameHandler.cs
Assets/_Game/Scripts/GameManager/GameHandler.cs
+12
-1
Assets/_Game/Scripts/Input/InputMaster.inputactions
Assets/_Game/Scripts/Input/InputMaster.inputactions
+6
-6
Assets/_Game/Scripts/Input/SwitchPlayerManager.cs
Assets/_Game/Scripts/Input/SwitchPlayerManager.cs
+27
-6
Assets/_Game/Scripts/Mutations/GooMutation.cs
Assets/_Game/Scripts/Mutations/GooMutation.cs
+0
-10
Assets/_Game/Scripts/Mutations/HookMutation.cs
Assets/_Game/Scripts/Mutations/HookMutation.cs
+3
-2
Assets/_Game/Scripts/Mutations/MutationBase.cs
Assets/_Game/Scripts/Mutations/MutationBase.cs
+10
-2
Assets/_Game/Scripts/Mutations/ShroomMutation.cs
Assets/_Game/Scripts/Mutations/ShroomMutation.cs
+0
-23
Assets/_Game/Scripts/Mutations/UseMutation.cs
Assets/_Game/Scripts/Mutations/UseMutation.cs
+7
-8
Assets/_Game/Scripts/Observer/Countdown.cs
Assets/_Game/Scripts/Observer/Countdown.cs
+16
-1
Assets/_Game/Scripts/UI/PlayerTags.cs
Assets/_Game/Scripts/UI/PlayerTags.cs
+28
-55
Assets/_Game/Scripts/UI/ShowCountdown.cs
Assets/_Game/Scripts/UI/ShowCountdown.cs
+93
-0
Assets/_Game/Scripts/UI/ShowCountdown.cs.meta
Assets/_Game/Scripts/UI/ShowCountdown.cs.meta
+0
-0
ProjectSettings/TagManager.asset
ProjectSettings/TagManager.asset
+3
-0
No files found.
Assets/_Game/Prefabs/PlayerManagerPrefabs/Player2Manager.prefab
deleted
100644 → 0
View file @
4a47f284
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1
&5204299803420509726
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
5204299803420509725
}
-
component
:
{
fileID
:
5204299803420509724
}
-
component
:
{
fileID
:
5204299803420509727
}
-
component
:
{
fileID
:
6895848061928444444
}
m_Layer
:
0
m_Name
:
Player2Manager
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&5204299803420509725
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5204299803420509726
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&5204299803420509724
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5204299803420509726
}
m_Enabled
:
0
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
62899f850307741f2a39c98a8b639597
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Actions
:
{
fileID
:
-944628639613478452
,
guid
:
60fb516279b74524f91fcc9af2cfc4ae
,
type
:
3
}
m_NotificationBehavior
:
0
m_UIInputModule
:
{
fileID
:
0
}
m_DeviceLostEvent
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.InputSystem.PlayerInput+DeviceLostEvent, Unity.InputSystem,
Version=0.9.6.0, Culture=neutral, PublicKeyToken=null
m_DeviceRegainedEvent
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.InputSystem.PlayerInput+DeviceRegainedEvent, Unity.InputSystem,
Version=0.9.6.0, Culture=neutral, PublicKeyToken=null
m_NeverAutoSwitchControlSchemes
:
1
m_DefaultControlScheme
:
Gamepad
m_DefaultActionMap
:
38732b26-d9e3-4196-a316-9054667e9b3d
m_SplitScreenIndex
:
-1
m_Camera
:
{
fileID
:
0
}
---
!u!114
&5204299803420509727
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5204299803420509726
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5b7ddf446ce92e44db1b540ae5f55155
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
movement
:
{
fileID
:
0
}
mutation
:
{
fileID
:
0
}
---
!u!114
&6895848061928444444
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5204299803420509726
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
865a6f4af420e454086e6906b464c7b7
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
Assets/_Game/Prefabs/PlayerManagerPrefabs/Player2Manager.prefab.meta
deleted
100644 → 0
View file @
4a47f284
fileFormatVersion: 2
guid: 276ed99a0fe19ff48b6ad175cbbec559
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Prefabs/PlayerManagerPrefabs/Player
1
Manager.prefab
→
Assets/_Game/Prefabs/PlayerManagerPrefabs/PlayerManager.prefab
View file @
8586460e
...
...
@@ -10,11 +10,11 @@ GameObject:
m_Component
:
-
component
:
{
fileID
:
4412139409271564331
}
-
component
:
{
fileID
:
4412139409271564330
}
-
component
:
{
fileID
:
4412139409271564309
}
-
component
:
{
fileID
:
7027236318075671688
}
-
component
:
{
fileID
:
4412139409271564309
}
m_Layer
:
0
m_Name
:
Player
1
Manager
m_TagString
:
Untagged
m_Name
:
PlayerManager
m_TagString
:
ControllHandler1
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
@@ -64,7 +64,7 @@ MonoBehaviour:
m_DefaultActionMap
:
480005df-eb34-4300-80ff-96103380a4f8
m_SplitScreenIndex
:
-1
m_Camera
:
{
fileID
:
0
}
---
!u!114
&
4412139409271564309
---
!u!114
&
7027236318075671688
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
...
...
@@ -73,20 +73,21 @@ MonoBehaviour:
m_GameObject
:
{
fileID
:
4412139409271564308
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5b7ddf446ce92e44db1b540ae5f55155
,
type
:
3
}
m_Script
:
{
fileID
:
11500000
,
guid
:
865a6f4af420e454086e6906b464c7b7
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
movement
:
{
fileID
:
0
}
mutation
:
{
fileID
:
0
}
---
!u!114
&7027236318075671688
---
!u!114
&4412139409271564309
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4412139409271564308
}
m_Enabled
:
1
m_Enabled
:
0
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
865a6f4af420e454086e6906b464c7b7
,
type
:
3
}
m_Script
:
{
fileID
:
11500000
,
guid
:
5b7ddf446ce92e44db1b540ae5f55155
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
tag
:
movement
:
{
fileID
:
0
}
mutation
:
{
fileID
:
0
}
Assets/_Game/Prefabs/PlayerManagerPrefabs/Player
1
Manager.prefab.meta
→
Assets/_Game/Prefabs/PlayerManagerPrefabs/PlayerManager.prefab.meta
View file @
8586460e
File moved
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Body.prefab
View file @
8586460e
...
...
@@ -93,6 +93,7 @@ GameObject:
-
component
:
{
fileID
:
3713909334391863638
}
-
component
:
{
fileID
:
5454309568428411407
}
-
component
:
{
fileID
:
1957649875713174593
}
-
component
:
{
fileID
:
7438479100682827079
}
m_Layer
:
8
m_Name
:
Body
m_TagString
:
BodyPlayer
...
...
@@ -221,3 +222,18 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
c5dcddde29f5d3747912be55aba7420a
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
---
!u!114
&7438479100682827079
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2301140017794985292
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
6219fa0ffdc9db34cb51427902f06c90
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
mutation1
:
{
fileID
:
11400000
,
guid
:
3a533c310414823458ca2a6ea6c6ddce
,
type
:
2
}
mutation2
:
{
fileID
:
11400000
,
guid
:
674a68f9f71d2b640914ad1f3be2cbc0
,
type
:
2
}
animator
:
{
fileID
:
0
}
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Head.prefab
View file @
8586460e
...
...
@@ -14,6 +14,7 @@ GameObject:
-
component
:
{
fileID
:
7134929021021781532
}
-
component
:
{
fileID
:
500277867958067635
}
-
component
:
{
fileID
:
3164234182544628089
}
-
component
:
{
fileID
:
8000852281266291502
}
m_Layer
:
8
m_Name
:
Head
m_TagString
:
HeadPlayer
...
...
@@ -126,3 +127,18 @@ MonoBehaviour:
moveSpeed
:
5
maxSpeed
:
10
dir
:
{
x
:
0
,
y
:
0
}
---
!u!114
&8000852281266291502
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6281308049697573992
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
6219fa0ffdc9db34cb51427902f06c90
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
mutation1
:
{
fileID
:
11400000
,
guid
:
c64ba09c4b1c0eb479ec633963cb7215
,
type
:
2
}
mutation2
:
{
fileID
:
11400000
,
guid
:
296440bd939672349ab89b6dd84e58fe
,
type
:
2
}
animator
:
{
fileID
:
0
}
Assets/_Game/Scenes/MainLevelSwitched.unity
View file @
8586460e
...
...
@@ -189,9 +189,9 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
movement
value
:
objectReference
:
{
fileID
:
1655921399
}
propertyPath
:
tag
value
:
BodyPlayer
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
---
!u!4
&196361310
stripped
...
...
@@ -200,6 +200,105 @@ Transform:
type
:
3
}
m_PrefabInstance
:
{
fileID
:
196361309
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&275762816
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
4412139409271564308
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_Name
value
:
Player2Manager
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564308
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_TagString
value
:
ControllHandler2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564331
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564330
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_DefaultActionMap
value
:
38732b26-d9e3-4196-a316-9054667e9b3d
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564330
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_DefaultControlScheme
value
:
Gamepad
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
tag
value
:
HeadPLayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6485072180816658316
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
playerNr
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6485072180816658316
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
bodyType
value
:
1
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
---
!u!1
&848338633
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -360,36 +459,8 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3164234182544628089
,
guid
:
9b5e35e1fe41f15419dad967083bafa8
,
type
:
3
}
propertyPath
:
rigidbody
value
:
objectReference
:
{
fileID
:
1655921398
}
-
target
:
{
fileID
:
8283284295235088828
,
guid
:
9b5e35e1fe41f15419dad967083bafa8
,
type
:
3
}
propertyPath
:
m_DefaultActionMap
value
:
480005df-eb34-4300-80ff-96103380a4f8
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
9b5e35e1fe41f15419dad967083bafa8
,
type
:
3
}
---
!u!54
&944714733
stripped
Rigidbody
:
m_CorrespondingSourceObject
:
{
fileID
:
500277867958067635
,
guid
:
9b5e35e1fe41f15419dad967083bafa8
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
944714732
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!114
&944714734
stripped
MonoBehaviour
:
m_CorrespondingSourceObject
:
{
fileID
:
3164234182544628089
,
guid
:
9b5e35e1fe41f15419dad967083bafa8
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
944714732
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
54e178944901f4444b4ccecc904b0d1e
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
---
!u!1001
&1655921397
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -457,36 +528,13 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5
454309568428411407
,
guid
:
ea05ca32432105d468969c2ccef55e1a
,
-
target
:
{
fileID
:
5
210150450737429901
,
guid
:
ea05ca32432105d468969c2ccef55e1a
,
type
:
3
}
propertyPath
:
rigidbody
value
:
objectReference
:
{
fileID
:
944714733
}
-
target
:
{
fileID
:
1981334465046569869
,
guid
:
ea05ca32432105d468969c2ccef55e1a
,
type
:
3
}
propertyPath
:
m_DefaultActionMap
value
:
38732b26-d9e3-4196-a316-9054667e9b3d
propertyPath
:
m_IsKinematic
value
:
1
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
ea05ca32432105d468969c2ccef55e1a
,
type
:
3
}
---
!u!54
&1655921398
stripped
Rigidbody
:
m_CorrespondingSourceObject
:
{
fileID
:
5210150450737429901
,
guid
:
ea05ca32432105d468969c2ccef55e1a
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
1655921397
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!114
&1655921399
stripped
MonoBehaviour
:
m_CorrespondingSourceObject
:
{
fileID
:
5454309568428411407
,
guid
:
ea05ca32432105d468969c2ccef55e1a
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
1655921397
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
64ce53df6ad8d004b9a944bc4741ba8e
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
---
!u!1
&1718606470
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -692,86 +740,6 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
50
,
y
:
-30
,
z
:
0
}
---
!u!1001
&2099059706
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
5204299803420509726
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_Name
value
:
Player2Manager
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5204299803420509727
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
propertyPath
:
movement
value
:
objectReference
:
{
fileID
:
944714734
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
---
!u!4
&2099059707
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
5204299803420509725
,
guid
:
276ed99a0fe19ff48b6ad175cbbec559
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
2099059706
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6176636124327810795
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -848,6 +816,6 @@ PrefabInstance:
type
:
3
}
propertyPath
:
_handler2
value
:
objectReference
:
{
fileID
:
2099059707
}
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
afeeab36ad3988b48a0b2393b9cad511
,
type
:
3
}
Assets/_Game/Scripts/GameManager/GameHandler.cs
View file @
8586460e
...
...
@@ -13,6 +13,12 @@ namespace _Game.Scripts.GameManager {
[
SerializeField
]
private
Transform
_handler1
,
_handler2
;
private
Transform
_head
,
_body
;
public
enum
PlayerIndex
:
int
{
Default
=
-
1
,
Player1
=
1
,
Player2
=
2
,
}
private
void
OnEnable
()
{
SceneManager
.
sceneLoaded
+=
OnSceneLoaded
;
}
...
...
@@ -30,7 +36,8 @@ namespace _Game.Scripts.GameManager {
private
void
SetReferences
()
{
_head
=
GameObject
.
FindWithTag
(
"HeadPlayer"
).
transform
;
_body
=
GameObject
.
FindWithTag
(
"BodyPlayer"
).
transform
;
_handler1
=
GameObject
.
FindWithTag
(
"ControllHandler1"
).
transform
;
_handler2
=
GameObject
.
FindWithTag
(
"ControllHandler2"
).
transform
;
startDelay
.
Clear
();
startDelay
.
Register
(
_handler1
.
GetComponent
<
ActiveController
>().
ActivateAllComponents
);
...
...
@@ -58,6 +65,10 @@ namespace _Game.Scripts.GameManager {
data
.
RoundsPlayed
++;
print
(
"Rounds Played = "
+
data
.
RoundsPlayed
);
LoadCorrectScene
();
}
private
void
LoadCorrectScene
()
{
if
(
data
.
RoundsPlayed
>=
data
.
roundsToPlay
)
{
print
(
"Game Ends"
);
SceneManager
.
LoadScene
(
"StartMenu"
);
...
...
Assets/_Game/Scripts/Input/InputMaster.inputactions
View file @
8586460e
...
...
@@ -200,7 +200,7 @@
"interactions": ""
},
{
"name": "Ability
1",
"name": "Ability1",
"type": "Button",
"id": "d2fb14c0-2749-4ec5-b751-583331c859e8",
"expectedControlType": "",
...
...
@@ -208,7 +208,7 @@
"interactions": "Press"
},
{
"name": "Ability
2",
"name": "Ability2",
"type": "Button",
"id": "f8e238c6-0b73-453c-8954-80fd5fab1594",
"expectedControlType": "",
...
...
@@ -334,7 +334,7 @@
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Ability
1",
"action": "Ability1",
"isComposite": false,
"isPartOfComposite": false
},
...
...
@@ -345,7 +345,7 @@
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Ability
1",
"action": "Ability1",
"isComposite": false,
"isPartOfComposite": false
},
...
...
@@ -356,7 +356,7 @@
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Ability
2",
"action": "Ability2",
"isComposite": false,
"isPartOfComposite": false
},
...
...
@@ -367,7 +367,7 @@
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Ability
2",
"action": "Ability2",
"isComposite": false,
"isPartOfComposite": false
}
...
...
Assets/_Game/Scripts/Input/SwitchPlayerManager.cs
View file @
8586460e
using
System
;
using
_Game.Scripts.GameManager
;
using
_Game.Scripts.Movement
;
using
_Game.Scripts.Mutations
;
using
UnityEngine
;
using
UnityEngine.InputSystem
;
using
UnityEngine.Serialization
;
namespace
_Game.Scripts.Input
{
public
class
SwitchPlayerManager
:
MonoBehaviour
{
[
SerializeField
]
private
string
tag
;
[
SerializeField
]
private
MovementBase
movement
;
[
SerializeField
]
private
UseMutation
mutation
;
public
void
OnMovement
(
InputValue
value
)
{
if
(
movement
==
null
)
return
;
private
void
OnEnable
()
{
}
private
MovementBase
Movement
{
get
{
if
(
movement
==
null
||
!
movement
.
gameObject
.
tag
.
Equals
(
tag
))
{
movement
=
GameObject
.
FindWithTag
(
tag
).
GetComponent
<
MovementBase
>();