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

Uebergang zwischen MeowlinTalk, DScene und Tutorial bearbeitet; Uebergang zwischen Francois und Catman1

Browse Source
This commit is contained in:
Ayumi
2023-06-22 14:21:19 +02:00
parent a080f6031f
commit b0d57eea7d
4 changed files with 8295 additions and 1509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/ScenesInGame/3MeowlinTalk.unity
Generated
+1217 -45
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/ScenesInGame/4DScene.unity
Generated
+5209 -1126
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/ScenesInGame/5.0TutorialDimShift.unity
Generated
+1796 -309
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/ScenesInGame/8Francois.unity
Generated
+73 -29
View File
@@ -813,13 +813,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 506113448}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -11.81, y: 2.0367157, z: -0.00097334036}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -18.836546, y: 1.5858439, z: 1.3475506}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_Father: {fileID: 896148195}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &543499019
GameObject:
@@ -947,7 +947,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &614150785
GameObject:
@@ -1197,6 +1197,39 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &896148194
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 896148195}
m_Layer: 0
m_Name: Barrieren
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &896148195
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 896148194}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.026545, y: 0.4508718, z: -1.348524}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 506113450}
- {fileID: 1557538027}
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &904302804
GameObject:
m_ObjectHideFlags: 0
@@ -4053,7 +4086,7 @@ GameObject:
m_Component:
- component: {fileID: 1469582996}
- component: {fileID: 1469582995}
- component: {fileID: 1469582994}
- component: {fileID: 1469582997}
m_Layer: 0
m_Name: SceneLoader
m_TagString: Untagged
@@ -4061,19 +4094,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1469582994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1469582993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ca90d16c544e534db98f0e088afac9f, type: 3}
m_Name:
m_EditorClassIdentifier:
newGameScene: 4DScene
--- !u!61 &1469582995
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -4107,14 +4127,26 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1469582993}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.7, y: -0.24, z: -1.244063}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 11.7, y: -0.23999998, z: -1.244063}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1469582997
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1469582993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d4c28211ac36e1548b54a009b7b0b10e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1487269268
GameObject:
m_ObjectHideFlags: 0
@@ -4374,13 +4406,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1557538025}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5.07, y: 2.0367157, z: -0.00097334036}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.096545, y: 1.5858439, z: 1.3475506}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_Father: {fileID: 896148195}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1597833789
GameObject:
@@ -4562,6 +4594,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1557538025}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
animatorWhenTalking: {fileID: 0}
actualAnimator: {fileID: 0}
animatorBooleanName: talking
@@ -4627,7 +4671,7 @@ Transform:
- {fileID: 2056319320}
- {fileID: 614150786}
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1730066489
GameObject:
@@ -5687,7 +5731,7 @@ Transform:
m_Children:
- {fileID: 1981567203}
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2089310989
GameObject:
@@ -6090,5 +6134,5 @@ Transform:
m_Children:
- {fileID: 2089310990}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}