Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GameDevWeek
S
Sommersemester 2019
Unity
Touch me if you can
Commits
b9c65c9f
Commit
b9c65c9f
authored
Sep 21, 2019
by
Jonas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kp sry
parent
23c1ed5e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
78 additions
and
17 deletions
+78
-17
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Head.prefab
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Head.prefab
+16
-0
Assets/_Game/Scenes/MainLevel.unity
Assets/_Game/Scenes/MainLevel.unity
+37
-6
Assets/_Game/Scenes/MainLevelSwitched.unity
Assets/_Game/Scenes/MainLevelSwitched.unity
+15
-5
Assets/_Game/ScriptableObjects/new GameData.asset
Assets/_Game/ScriptableObjects/new GameData.asset
+3
-3
Assets/_Game/Scripts/Mutations/HookMutation.cs
Assets/_Game/Scripts/Mutations/HookMutation.cs
+1
-1
Assets/_Game/Scripts/UI/CharacterCustomization.cs
Assets/_Game/Scripts/UI/CharacterCustomization.cs
+6
-2
No files found.
Assets/_Game/Prefabs/PlayerPrefabs_wMovement/Head.prefab
View file @
b9c65c9f
...
...
@@ -14,6 +14,7 @@ GameObject:
-
component
:
{
fileID
:
7134929021021781532
}
-
component
:
{
fileID
:
500277867958067635
}
-
component
:
{
fileID
:
3164234182544628089
}
-
component
:
{
fileID
:
3885557494305201596
}
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
&3885557494305201596
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/MainLevel.unity
View file @
b9c65c9f
...
...
@@ -386,6 +386,11 @@ PrefabInstance:
propertyPath
:
tag
value
:
BodyPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
characterTag
value
:
BodyPlayer
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
---
!u!1
&848338633
...
...
@@ -550,18 +555,39 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
9b5e35e1fe41f15419dad967083bafa8
,
type
:
3
}
---
!u!1
&944714733
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
6281308049697573992
,
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_GameObject
:
{
fileID
:
944714733
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
54e178944901f4444b4ccecc904b0d1e
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
---
!u!114
&944714735
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
944714733
}
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
}
---
!u!1001
&1192911554
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -1287,16 +1313,21 @@ PrefabInstance:
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
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
movement
value
:
objectReference
:
{
fileID
:
944714734
}
-
target
:
{
fileID
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
characterTag
value
:
HeadPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564330
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_DefaultActionMap
value
:
38732b26-d9e3-4196-a316-9054667e9b3d
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
---
!u!1001
&6176636124327810795
...
...
Assets/_Game/Scenes/MainLevelSwitched.unity
View file @
b9c65c9f
...
...
@@ -258,6 +258,11 @@ PrefabInstance:
propertyPath
:
tag
value
:
BodyPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
characterTag
value
:
BodyPlayer
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
---
!u!4
&196361310
stripped
...
...
@@ -370,6 +375,16 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
tag
value
:
HeadPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564309
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
characterTag
value
:
HeadPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4412139409271564330
,
guid
:
63e8800253376df44a1d2ea9ad6b520a
,
type
:
3
}
propertyPath
:
m_DefaultActionMap
...
...
@@ -380,11 +395,6 @@ PrefabInstance:
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
...
...
Assets/_Game/ScriptableObjects/new GameData.asset
View file @
b9c65c9f
...
...
@@ -13,17 +13,17 @@ MonoBehaviour:
m_Name
:
new GameData
m_EditorClassIdentifier
:
roundTime
:
30
roundsToPlay
:
2
roundsToPlay
:
5
player1
:
role
:
0
name
:
name
:
Abcde
score
:
0
scoreLastRound
:
0
color
:
{
r
:
0
,
g
:
1
,
b
:
0
,
a
:
1
}
isWinner
:
0
player2
:
role
:
1
name
:
name
:
fghjk
score
:
0
scoreLastRound
:
0
color
:
{
r
:
1
,
g
:
0
,
b
:
0
,
a
:
1
}
...
...
Assets/_Game/Scripts/Mutations/HookMutation.cs
View file @
b9c65c9f
...
...
@@ -15,7 +15,7 @@ namespace _Game.Scripts.Mutations {
public
override
IEnumerator
Behaviour
(
GameObject
player
)
{
_hook
=
player
.
GetComponent
<
HookBehaviour
>();
_hook
.
Initialize
(
duration
,
distance
);
//
_hook.Initialize(duration, distance);
yield
return
null
;
}
}
...
...
Assets/_Game/Scripts/UI/CharacterCustomization.cs
View file @
b9c65c9f
...
...
@@ -28,6 +28,8 @@ public class CharacterCustomization : MonoBehaviour {
// called first
void
OnEnable
()
{
SceneManager
.
sceneLoaded
+=
OnSceneLoaded
;
player1InputField
.
text
=
data
.
player1
.
name
;
player2InputField
.
text
=
data
.
player2
.
name
;
}
void
OnDisable
()
{
...
...
@@ -38,8 +40,8 @@ public class CharacterCustomization : MonoBehaviour {
//
// called second
void
OnSceneLoaded
(
Scene
scene
,
LoadSceneMode
mode
)
{
player1InputField
.
text
=
data
.
player1
.
name
;
player2InputField
.
text
=
data
.
player2
.
name
;
//
player1InputField.text = data.player1.name;
//
player2InputField.text = data.player2.name;
}
...
...
@@ -50,6 +52,8 @@ public class CharacterCustomization : MonoBehaviour {
data
.
Reset
();
data
.
player1
.
Reset
(
player1InputField
.
text
,
GameData
.
Role
.
Head
);
data
.
player2
.
Reset
(
player2InputField
.
text
,
GameData
.
Role
.
Body
);
data
.
player1
.
name
=
player1InputField
.
text
;
data
.
player2
.
name
=
player2InputField
.
text
;
SceneManager
.
LoadScene
(
"MainLevel"
);
SceneManager
.
LoadScene
(
"InGameUI"
,
LoadSceneMode
.
Additive
);
SceneManager
.
LoadScene
(
"DelayTimer"
,
LoadSceneMode
.
Additive
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment