Commit 6b18b1e3 authored by Skydiver3's avatar Skydiver3

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/best-enemies-forever
parents 2c9b677b a17118c0
fileFormatVersion: 2
guid: c29aa0de4bb26a945ae50fd6de53f7ec
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!95 &3360223211526825010
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7158361529639807900}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0d0987d1fa408194b91241ece74637c7, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7788739322047572457
GameObject:
m_ObjectHideFlags: 0
......@@ -75,6 +94,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_tags:
- {fileID: 11400000, guid: 3458fcec955445a4f94e41fc34583bcd, type: 2}
- {fileID: 0}
--- !u!114 &3451643705598922238
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -204,7 +224,7 @@ PrefabInstance:
- target: {fileID: 8807706914074638617, guid: db56befc96f88cd48ad904bdac159a3e,
type: 3}
propertyPath: _tags.Array.size
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4873641921461956947, guid: db56befc96f88cd48ad904bdac159a3e,
type: 3}
......@@ -236,3 +256,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2357676383563577444}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7158361529639807900 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4895340019375592440, guid: db56befc96f88cd48ad904bdac159a3e,
type: 3}
m_PrefabInstance: {fileID: 2357676383563577444}
m_PrefabAsset: {fileID: 0}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &693092424377557188
--- !u!1 &275276907146416357
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -8,46 +8,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7801766652566378592}
- component: {fileID: 5864696316302939135}
- component: {fileID: 7100399299791724797}
- component: {fileID: 5614064296286347713}
- component: {fileID: 5614064296286347712}
- component: {fileID: 5614064296286347727}
- component: {fileID: 5614064296286347726}
- component: {fileID: 5614064296286347715}
- component: {fileID: -1043016615810532741}
- component: {fileID: 9063988152221244874}
- component: {fileID: 8606214126244195973}
- component: {fileID: 3031741997958560727}
- component: {fileID: 1679361420414116507}
- component: {fileID: 704336305406697539}
- component: {fileID: 285682736803151166}
m_Layer: 12
m_Name: Collectable
m_Name: Graphics
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5614064296286347713
--- !u!4 &1679361420414116507
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 275276907146416357}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 5614064296286347713}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5614064296286347712
--- !u!212 &704336305406697539
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 275276907146416357}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......@@ -90,13 +81,70 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &285682736803151166
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 275276907146416357}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0d0987d1fa408194b91241ece74637c7, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &693092424377557188
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5614064296286347713}
- component: {fileID: 5614064296286347727}
- component: {fileID: 5614064296286347726}
- component: {fileID: 5614064296286347715}
- component: {fileID: -1043016615810532741}
- component: {fileID: 9063988152221244874}
- component: {fileID: 8606214126244195973}
- component: {fileID: 3031741997958560727}
m_Layer: 12
m_Name: Collectable
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5614064296286347713
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 693092424377557188}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1679361420414116507}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &5614064296286347727
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 693092424377557188}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
......@@ -123,7 +171,7 @@ Rigidbody2D:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 693092424377557188}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
......@@ -143,12 +191,12 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 693092424377557188}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3570dca9cf8f40ac9731ef4082c9a4ef, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
_tags:
- {fileID: 0}
--- !u!199 &-1043016615810532741
......@@ -158,7 +206,7 @@ ParticleSystemRenderer:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 693092424377557188}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......@@ -220,7 +268,7 @@ ParticleSystem:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 693092424377557188}
serializedVersion: 6
lengthInSec: 3
simulationSpeed: 1
......@@ -4898,12 +4946,12 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 693092424377557188}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 143d1ea7b5c0b3440873995e045b034e, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
_counter: {fileID: 11400000, guid: aa6b5af4fd10a2147a445013199020e2, type: 2}
--- !u!114 &3031741997958560727
MonoBehaviour:
......@@ -4911,32 +4959,13 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_GameObject: {fileID: 693092424377557188}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5ac203b4075d3444aba6d58e4cf8eff5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
ColliderTag: {fileID: 11400000, guid: 201589f2ccab3ba4ebe722b8425484be, type: 2}
SoundName: SpecialItem
SoundName_WhenLeft:
SoundName_WhenLeft:
Trigger: 1
--- !u!95 &8239687346175528067
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5614064296286347725}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0d0987d1fa408194b91241ece74637c7, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
......@@ -91,21 +91,21 @@ MonoBehaviour:
source: {fileID: 0}
- name: SmallBlock
clip: {fileID: 8300000, guid: 690c77fd79737ca49b6bbf0591c8bd7b, type: 3}
volume: 0.076
pitch: 1
volume: 0.1
pitch: 1.5
loop: 0
randomized: 0
volumeMax: 0
pitchMax: 0
randomized: 1
volumeMax: 0.15
pitchMax: 1.64
source: {fileID: 0}
- name: ScaryPlatform
clip: {fileID: 8300000, guid: 1fbfcd1ff39f75b4bbcc2c9be9f98ee9, type: 3}
volume: 0.162
pitch: 1
volume: 0.05
pitch: 0.95
loop: 0
randomized: 0
volumeMax: 0
pitchMax: 0
volumeMax: 0.1
pitchMax: 1.05
source: {fileID: 0}
- name: MovingPlatform
clip: {fileID: 8300000, guid: d5f23f57a007cd845aec8dea079000c6, type: 3}
......@@ -118,8 +118,8 @@ MonoBehaviour:
source: {fileID: 0}
- name: Potion
clip: {fileID: 8300000, guid: 1adb846d255a2214786d141378b8c568, type: 3}
volume: 0.124
pitch: 1
volume: 0.105
pitch: 0.61
loop: 0
randomized: 0
volumeMax: 0
......
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