Commit b9c65c9f authored by Jonas's avatar Jonas

kp sry

parent 23c1ed5e
......@@ -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}
......@@ -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
......
......@@ -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
......
......@@ -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}
......
......@@ -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;
}
}
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment