Commit 9026cd55 authored by Sebastian Frey's avatar Sebastian Frey
Browse files

Layer für Attacks hinzugefügt

parent 8499db2d
......@@ -290,7 +290,7 @@ PrefabInstance:
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3}
......@@ -359,7 +359,7 @@ PrefabInstance:
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3}
......@@ -510,7 +510,7 @@ PrefabInstance:
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3}
......@@ -529,130 +529,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 599519593b27fd2448e33dcb9f69045b, type: 3}
--- !u!1001 &966608049
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5143124933316929969, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_Name
value: Character
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929969, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929978, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: onAirInfused
value:
objectReference: {fileID: 11400000, guid: b0928121a3619584c9612f68610a97a5,
type: 2}
- target: {fileID: 5143124933316929978, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: onEarthInfused
value:
objectReference: {fileID: 11400000, guid: 59d96edea2ecb434999c09413da7449a,
type: 2}
- target: {fileID: 5143124933316929978, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: onFireInfused
value:
objectReference: {fileID: 11400000, guid: f553df1a50d464e48837fbb6cb99b7e5,
type: 2}
- target: {fileID: 5143124933316929978, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: onWaterInfused
value:
objectReference: {fileID: 11400000, guid: ca31b08da78cb134086d7688bbb50628,
type: 2}
- target: {fileID: 5143124933316929978, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: state
value:
objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
type: 2}
- target: {fileID: 5143124933316929982, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_GroundCheck
value:
objectReference: {fileID: 1496802682}
- target: {fileID: 5143124933316929982, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_AirControl
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929982, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_WhatIsGround.m_Bits
value: 512
objectReference: {fileID: 0}
- target: {fileID: 5143124933316929982, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
propertyPath: m_Speed
value: 10
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35, type: 3}
--- !u!1001 &1343459453
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -703,7 +579,7 @@ PrefabInstance:
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3}
......@@ -722,12 +598,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4512b8eb550115443bbba2ecd59a960c, type: 3}
--- !u!4 &1496802682 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5143124933316929980, guid: 787ca5c3ab8d21d44ad1ba0c254fbd35,
type: 3}
m_PrefabInstance: {fileID: 966608049}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1685552533
GameObject:
m_ObjectHideFlags: 0
......@@ -797,3 +667,178 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1711059647
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_Color.r
value: 0.27959237
objectReference: {fileID: 0}
- target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_Color.g
value: 0.5947245
objectReference: {fileID: 0}
- target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_Color.b
value: 0.9716981
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
--- !u!1 &1876157326 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
m_PrefabInstance: {fileID: 1711059647}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1876157327
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1876157326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adc21094da13d8649a490855a137565f, type: 3}
m_Name:
m_EditorClassIdentifier:
cooldown: 0
volleySize: 0
launchPower: 0
attackSpeed: 0
shotSpawn: {fileID: 0}
elementalAttack: {fileID: 0}
--- !u!114 &1876157328
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1876157326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83eb4399ff535ee4cbc76de3b8a32e46, type: 3}
m_Name:
m_EditorClassIdentifier:
cooldown: 0
volleySize: 0
launchPower: 0
attackSpeed: 0
shotSpawn: {fileID: 0}
elementalAttack: {fileID: 0}
--- !u!114 &1876157329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1876157326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ad90db0185377664288543ce4696c6b8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1876157330
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1876157326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a8392b2d467dfc428ede6cd785337f2, type: 3}
m_Name:
m_EditorClassIdentifier:
weight: 0
isPerformingAction: 0
windAttack: {fileID: 0}
Cooldown: 0
attackRange: 0
firePower: 0
--- !u!114 &1876157331
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1876157326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2f8415a7fda2c084e87b3caa1b43ffbf, type: 3}
m_Name:
m_EditorClassIdentifier:
state: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639, type: 2}
onElementInfused: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
fileFormatVersion: 2
guid: 83b2ccd8caab22846876189bc6815151
guid: 5782222d4c9b9424ea96676650e643a8
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
......@@ -25,7 +25,7 @@ TagManager:
- Ground
- Character
- Elements
-
- ElementalAttacks
-
-
-
......
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