Merge branch 'main' into animation

This commit is contained in:
Walter
2026-01-31 22:48:38 -06:00
22 changed files with 720 additions and 302 deletions
+127 -247
View File
@@ -410,7 +410,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -549,7 +549,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -686,84 +686,6 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!1 &477169534
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 477169536}
- component: {fileID: 477169535}
m_Layer: 0
m_Name: Right Barrier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &477169535
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 477169534}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 1.4146457}
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
m_Size: {x: 1, y: 6.956403}
m_EdgeRadius: 0
--- !u!4 &477169536
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 477169534}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6.8, y: 1.94, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &486463122
GameObject:
m_ObjectHideFlags: 0
@@ -929,7 +851,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -1039,84 +961,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!1 &689117238
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 689117240}
- component: {fileID: 689117239}
m_Layer: 0
m_Name: Left Barrier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &689117239
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 689117238}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 1.4146457}
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
m_Size: {x: 1, y: 6.956403}
m_EdgeRadius: 0
--- !u!4 &689117240
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 689117238}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.82, y: 1.25, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &707098062
GameObject:
m_ObjectHideFlags: 0
@@ -1145,7 +989,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -1340,7 +1184,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -1478,7 +1322,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -1621,6 +1465,7 @@ MonoBehaviour:
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
--- !u!4 &908853550
Transform:
m_ObjectHideFlags: 0
@@ -2120,6 +1965,7 @@ MonoBehaviour:
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
--- !u!4 &1466477813
Transform:
m_ObjectHideFlags: 0
@@ -2135,84 +1981,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1518904086
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1518904088}
- component: {fileID: 1518904087}
m_Layer: 0
m_Name: Top Barrier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &1518904087
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1518904086}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 1.4146457}
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
m_Size: {x: 1, y: 6.956403}
m_EdgeRadius: 0
--- !u!4 &1518904088
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1518904086}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 4.19, y: 5.55, z: 0}
m_LocalScale: {x: 1, y: 2.94, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!1 &1654086541
GameObject:
m_ObjectHideFlags: 0
@@ -2241,7 +2009,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -2481,6 +2249,7 @@ MonoBehaviour:
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
--- !u!4 &1759124604
Transform:
m_ObjectHideFlags: 0
@@ -2529,6 +2298,7 @@ MonoBehaviour:
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
--- !u!4 &1830238253
Transform:
m_ObjectHideFlags: 0
@@ -2572,7 +2342,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -2710,7 +2480,7 @@ BoxCollider2D:
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -2865,9 +2635,68 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 700000000, guid: 8bf8957665594a718535d06aba0cdee7, type: 3}
spawnInterval: 3
spawnInterval: 5
maxAlive: 1
spawnOnStart: 1
repeatSpawns: 1
--- !u!1 &2100000100
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2100000101}
- component: {fileID: 2100000102}
m_Layer: 0
m_Name: Trick Collision Manager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2100000101
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2100000100}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2100000102
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2100000100}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44f2fea877e8498fa4898917356fb2e6, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2100000103
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2100000100}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4eb1753179e848ed8662b6f039a33df9, type: 3}
m_Name:
m_EditorClassIdentifier:
spawner: {fileID: 2100000002}
checkInterval: 1
--- !u!1001 &1760117322204329348
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2941,6 +2770,58 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 99cce68fc82caea44b5a140697be00a8, type: 3}
--- !u!1 &2200000000
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2200000001}
- component: {fileID: 2200000002}
m_Layer: 0
m_Name: Treat Spawner Center
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2200000001
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2200000000}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2200000002
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2200000000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
launchForce: 4
launchRandomAngle: 360
spinSpeed: 180
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -2956,9 +2837,6 @@ SceneRoots:
- {fileID: 808792726}
- {fileID: 495541366}
- {fileID: 1118230347}
- {fileID: 477169536}
- {fileID: 1518904088}
- {fileID: 689117240}
- {fileID: 1760117322204329348}
- {fileID: 1277412258}
- {fileID: 1227312797}
@@ -2972,4 +2850,6 @@ SceneRoots:
- {fileID: 29258076}
- {fileID: 375061916}
- {fileID: 2100000001}
- {fileID: 2100000101}
- {fileID: 2200000001}
- {fileID: 1063739950}