Commit 64cdc6be authored by Sebastian Frey's avatar Sebastian Frey
Browse files

fixed Script conflict

parent 2b7d9b35
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Air value: AirElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Earth value: EarthElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Fire value: FireElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -10,7 +10,7 @@ PrefabInstance: ...@@ -10,7 +10,7 @@ PrefabInstance:
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Water value: WaterElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d, - target: {fileID: 1696247561678524538, guid: 45b8aefc7b4a3af4bb7e9f04aa24d88d,
type: 3} type: 3}
......
...@@ -250,7 +250,7 @@ PrefabInstance: ...@@ -250,7 +250,7 @@ PrefabInstance:
- target: {fileID: 6148069962227925277, guid: e79fbf1855fce6e4387f467f1fb65960, - target: {fileID: 6148069962227925277, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Fire value: FireElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960, - target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
type: 3} type: 3}
...@@ -319,7 +319,7 @@ PrefabInstance: ...@@ -319,7 +319,7 @@ PrefabInstance:
- target: {fileID: 4605225109116865588, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, - target: {fileID: 4605225109116865588, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Air value: AirElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, - target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
type: 3} type: 3}
...@@ -484,7 +484,7 @@ Transform: ...@@ -484,7 +484,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 531909445} m_GameObject: {fileID: 531909445}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalPosition: {x: 0, y: 1, z: -15}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -500,7 +500,7 @@ PrefabInstance: ...@@ -500,7 +500,7 @@ PrefabInstance:
- target: {fileID: 8187453823603247199, guid: 599519593b27fd2448e33dcb9f69045b, - target: {fileID: 8187453823603247199, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Water value: WaterElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b, - target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
type: 3} type: 3}
...@@ -569,7 +569,7 @@ PrefabInstance: ...@@ -569,7 +569,7 @@ PrefabInstance:
- target: {fileID: 1648869877852930880, guid: 4512b8eb550115443bbba2ecd59a960c, - target: {fileID: 1648869877852930880, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Earth value: EarthElement
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c, - target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
type: 3} type: 3}
...@@ -784,6 +784,41 @@ PrefabInstance: ...@@ -784,6 +784,41 @@ PrefabInstance:
propertyPath: m_Color.b propertyPath: m_Color.b
value: 0.9716981 value: 0.9716981
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_MovementSmoothing
value: 0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_JumpForce
value: 10
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_AirControl
value: 1
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_Speed
value: 40
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_MaxJumpCount
value: 2
objectReference: {fileID: 0}
- target: {fileID: 52145075018362284, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_GravityScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6060985002925283250, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: lowJumpMultiplier
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
--- !u!1 &1876157326 stripped --- !u!1 &1876157326 stripped
...@@ -828,7 +863,7 @@ MonoBehaviour: ...@@ -828,7 +863,7 @@ MonoBehaviour:
launchPower: 20 launchPower: 20
attackSpeed: 0.1 attackSpeed: 0.1
shotSpawn: {fileID: 1992150795} shotSpawn: {fileID: 1992150795}
fireBall: {fileID: 0} fireBall: {fileID: 1870586037468468, guid: 61411254df3161c4e81f6c0a4f2cd33c, type: 3}
--- !u!114 &1876157329 --- !u!114 &1876157329
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 83b2ccd8caab22846876189bc6815151 guid: 5782222d4c9b9424ea96676650e643a8
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
...@@ -20,14 +20,14 @@ namespace _Game.Scripts.Player ...@@ -20,14 +20,14 @@ namespace _Game.Scripts.Player
private PlayerAirAttack _airAttack; private PlayerAirAttack _airAttack;
private PlayerEarthAttack _earthAttack; private PlayerEarthAttack _earthAttack;
private PlayerFireAttack _fireAttack; private Player_FireAttack _fireAttack;
private PlayerWaterAttack _waterAttack; private PlayerWaterAttack _waterAttack;
private void Start() private void Start()
{ {
_airAttack = this.gameObject.GetComponent<PlayerAirAttack>(); _airAttack = this.gameObject.GetComponent<PlayerAirAttack>();
_earthAttack = this.gameObject.GetComponent<PlayerEarthAttack>(); _earthAttack = this.gameObject.GetComponent<PlayerEarthAttack>();
_fireAttack = this.gameObject.GetComponent<PlayerFireAttack>(); _fireAttack = this.gameObject.GetComponent<Player_FireAttack>();
_waterAttack = this.gameObject.GetComponent<PlayerWaterAttack>(); _waterAttack = this.gameObject.GetComponent<PlayerWaterAttack>();
} }
......
...@@ -92,7 +92,7 @@ InputManager: ...@@ -92,7 +92,7 @@ InputManager:
negativeButton: negativeButton:
positiveButton: w positiveButton: w
altNegativeButton: altNegativeButton:
altPositiveButton: up altPositiveButton: space
gravity: 1000 gravity: 1000
dead: 0.001 dead: 0.001
sensitivity: 1000 sensitivity: 1000
......
...@@ -19,10 +19,28 @@ Physics2DSettings: ...@@ -19,10 +19,28 @@ Physics2DSettings:
m_LinearSleepTolerance: 0.01 m_LinearSleepTolerance: 0.01
m_AngularSleepTolerance: 2 m_AngularSleepTolerance: 2
m_DefaultContactOffset: 0.01 m_DefaultContactOffset: 0.01
m_JobOptions:
serializedVersion: 2
useMultithreading: 0
useConsistencySorting: 0
m_InterpolationPosesPerJob: 100
m_NewContactsPerJob: 30
m_CollideContactsPerJob: 100
m_ClearFlagsPerJob: 200
m_ClearBodyForcesPerJob: 200
m_SyncDiscreteFixturesPerJob: 50
m_SyncContinuousFixturesPerJob: 50
m_FindNearestContactsPerJob: 100
m_UpdateTriggerContactsPerJob: 100
m_IslandSolverCostThreshold: 100
m_IslandSolverBodyCostScale: 1
m_IslandSolverContactCostScale: 10
m_IslandSolverJointCostScale: 10
m_IslandSolverBodiesPerJob: 50
m_IslandSolverContactsPerJob: 50
m_AutoSimulation: 1 m_AutoSimulation: 1
m_QueriesHitTriggers: 1 m_QueriesHitTriggers: 1
m_QueriesStartInColliders: 1 m_QueriesStartInColliders: 1
m_ChangeStopsCallbacks: 0
m_CallbacksOnDisable: 1 m_CallbacksOnDisable: 1
m_ReuseCollisionCallbacks: 1 m_ReuseCollisionCallbacks: 1
m_AutoSyncTransforms: 0 m_AutoSyncTransforms: 0
......
Supports Markdown
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