catman/forellenforderung3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tutorialszene weiter bearbeitet, immer noch bugs drinne; in 10Conflikt Sceneloader hinzugefügt

Browse Source
This commit is contained in:
Ayumi
2023-06-21 21:33:24 +02:00
parent 0ba07605ca
commit adb328737f
4 changed files with 102 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
Assets/Scenes/ScenesInGame/10Conflict.unity generated
View File

@@ -155,6 +155,77 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &99131509
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 99131512}
- component: {fileID: 99131511}
- component: {fileID: 99131510}
m_Layer: 0
m_Name: Sceneloader
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &99131510
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 99131509}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &99131511
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 99131509}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d4c28211ac36e1548b54a009b7b0b10e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &99131512
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 99131509}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.24, y: -1.49, z: 0.0190261}
m_LocalScale: {x: 1, y: 4, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &264188615 --- !u!1 &264188615
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -408,7 +479,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 577942789} m_GameObject: {fileID: 577942789}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 12.73, y: 2.0367157, z: -0.00097334036} m_LocalPosition: {x: 12.31, y: 2.0367157, z: -0.00097334036}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -863,7 +934,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e4ea2b46765b2a94c81f15618d3ea519, type: 3} m_Script: {fileID: 11500000, guid: e4ea2b46765b2a94c81f15618d3ea519, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_LevelManager1: {fileID: 944927912}
isFalling: 0 isFalling: 0
counter: 0 counter: 0
--- !u!114 &944927914 --- !u!114 &944927914
@@ -891,6 +961,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
inFirstDim: 1 inFirstDim: 1
ShiftingEnabled: 0
--- !u!114 &944927916 --- !u!114 &944927916
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

27
Assets/Scenes/ScenesInGame/5.1Tutorial.unity generated
View File

@@ -8318,7 +8318,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1496411488} - component: {fileID: 1496411488}
- component: {fileID: 1496411490} - component: {fileID: 1496411490}
- component: {fileID: 1496411489} - component: {fileID: 1496411491}
m_Layer: 0 m_Layer: 0
m_Name: SceneLoader m_Name: SceneLoader
m_TagString: Untagged m_TagString: Untagged
@@ -8341,19 +8341,6 @@ Transform:
m_Father: {fileID: 1428104201} m_Father: {fileID: 1428104201}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1496411489
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496411487}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ca90d16c544e534db98f0e088afac9f, type: 3}
m_Name:
m_EditorClassIdentifier:
newGameScene: 5.2. TutorialDimShift
--- !u!61 &1496411490 --- !u!61 &1496411490
BoxCollider2D: BoxCollider2D:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -8380,6 +8367,18 @@ BoxCollider2D:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 4.751754} m_Size: {x: 1, y: 4.751754}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!114 &1496411491
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496411487}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d4c28211ac36e1548b54a009b7b0b10e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1526488104 --- !u!1 &1526488104
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

8
Assets/Scenes/ScenesInGame/5.2.TutorialDimShift.unity generated
View File

@@ -510,7 +510,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 13af0af2052bc354cbdcc5815507a4fe, type: 3} m_Script: {fileID: 11500000, guid: 13af0af2052bc354cbdcc5815507a4fe, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
player: {fileID: 442553581}
respawnPoint: {fileID: 1175333728} respawnPoint: {fileID: 1175333728}
--- !u!1 &114229337 --- !u!1 &114229337
GameObject: GameObject:
@@ -664,7 +663,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: -1
m_Sprite: {fileID: 21300000, guid: 4f42e324d8148c046af3e70cf5c7cc22, type: 3} m_Sprite: {fileID: 21300000, guid: 4f42e324d8148c046af3e70cf5c7cc22, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@@ -48172,7 +48171,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 13af0af2052bc354cbdcc5815507a4fe, type: 3} m_Script: {fileID: 11500000, guid: 13af0af2052bc354cbdcc5815507a4fe, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
player: {fileID: 442553581}
respawnPoint: {fileID: 1175333728} respawnPoint: {fileID: 1175333728}
--- !u!4 &1125125478 --- !u!4 &1125125478
Transform: Transform:
@@ -49336,11 +49334,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7932259858093015194, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3} - target: {fileID: 7932259858093015194, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 78.87749 value: 79.89
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7932259858093015194, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3} - target: {fileID: 7932259858093015194, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 7.6350756 value: 7.52
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7932259858093015194, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3} - target: {fileID: 7932259858093015194, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z

27
Assets/Scenes/ScenesInGame/6.0Luna.unity generated
View File

@@ -4566,7 +4566,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1201044430} - component: {fileID: 1201044430}
- component: {fileID: 1201044429} - component: {fileID: 1201044429}
- component: {fileID: 1201044428} - component: {fileID: 1201044431}
m_Layer: 0 m_Layer: 0
m_Name: SceneLoader m_Name: SceneLoader
m_TagString: Untagged m_TagString: Untagged
@@ -4574,19 +4574,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!114 &1201044428
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1201044427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ca90d16c544e534db98f0e088afac9f, type: 3}
m_Name:
m_EditorClassIdentifier:
newGameScene: 7Prototype
--- !u!61 &1201044429 --- !u!61 &1201044429
BoxCollider2D: BoxCollider2D:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4628,6 +4615,18 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1201044431
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1201044427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d4c28211ac36e1548b54a009b7b0b10e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1264534166 --- !u!1 &1264534166
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0