Commit ede080cb authored by Michael But's avatar Michael But
Browse files

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

parents 6ff0739e 34d76eca
fileFormatVersion: 2
guid: 59d96edea2ecb434999c09413da7449a
NativeFormatImporter:
guid: d08078c315d7ac545834bfee9dc018a5
folderAsset: yes
DefaultImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -9,6 +9,6 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea24d0e4eff9b514184d2081be52c833, type: 3}
m_Name: OnAirInfused
m_Script: {fileID: 11500000, guid: 9c49b9c852d102f46917ed068a87a1df, type: 3}
m_Name: InfusedElementGameEvent
m_EditorClassIdentifier:
fileFormatVersion: 2
guid: f553df1a50d464e48837fbb6cb99b7e5
guid: 7e5b80a8353af1846a878c3a997bdb4a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea24d0e4eff9b514184d2081be52c833, type: 3}
m_Name: OnWaterInfused
m_EditorClassIdentifier:
fileFormatVersion: 2
guid: 08f59aba687367b48b0635e52116d8f5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 08f59aba687367b48b0635e52116d8f5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: AirMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: d8ddf6924a883e94583c59a55fd11f8d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: DefaultMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: 11203796b90159848b6c5f4217eed3ec
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: EarthMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: 92286a125406f3643b98aa3f886d53b1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: FireMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: 805f35d42b113b841b2c8f64adf50f4a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -9,6 +9,6 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea24d0e4eff9b514184d2081be52c833, type: 3}
m_Name: OnFireInfused
m_EditorClassIdentifier:
m_Script: {fileID: 0}
m_Name: Movement State
m_EditorClassIdentifier: Assembly-CSharp:_Game.Scripts.Scriptable_Object:MovementStates
fileFormatVersion: 2
guid: b0928121a3619584c9612f68610a97a5
guid: c757aad6925b37a46b916f609fa9012b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c06767ded2b76f145919c9655e53c998, type: 3}
m_Name: WaterMoveState
m_EditorClassIdentifier:
jumpForce: 0
smoothing: 0
airControl: 0
moveSpeed: 0
maxJumpCount: 0
mass: 0
gravity: 0
fileFormatVersion: 2
guid: b76e74a09da3f224f99559ac3d31fc0c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -12,4 +12,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
m_Name: PlayerState
m_EditorClassIdentifier:
currentElement: 0
currentInfusedElement: 0
currentMoveState: {fileID: 11400000, guid: 11203796b90159848b6c5f4217eed3ec, type: 2}
airMoveState: {fileID: 11400000, guid: d8ddf6924a883e94583c59a55fd11f8d, type: 2}
earthMoveState: {fileID: 11400000, guid: 92286a125406f3643b98aa3f886d53b1, type: 2}
fireMoveState: {fileID: 11400000, guid: 805f35d42b113b841b2c8f64adf50f4a, type: 2}
waterMoveState: {fileID: 11400000, guid: b76e74a09da3f224f99559ac3d31fc0c, type: 2}
defaultMoveState: {fileID: 11400000, guid: 11203796b90159848b6c5f4217eed3ec, type: 2}
currentJumpForce: 0
currentSmoothing: 0
currentAirControl: 0
currentMoveSpeed: 0
currentMaxJumpCount: 0
currentMass: 0
currentGravity: 0
fileFormatVersion: 2
guid: 0a5536b52c3053e45b0e646de9b5b9a3
TextureImporter:
fileIDToRecycleName: {}
fileIDToRecycleName:
2186277476908879412: ImportLogs
externalObjects: {}
serializedVersion: 9
mipmaps:
......
fileFormatVersion: 2
guid: 5b37ef45d4d539849b7887786f4f905c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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