From 4149ece4bf9e151ead4ae28f6526ef722928d4a4 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Thu, 14 Dec 2023 22:58:50 +0000
Subject: [PATCH] missed commit
---
Assets/Characters/Player/AC_Player.controller | 18 +++
Assets/Scenes/GameplayScene.unity | 242 ++++++++++++++++++++++++++----------------------
Assets/Characters/Player/AC_Flying.controller | 12 ++
3 files changed, 158 insertions(+), 114 deletions(-)
diff --git a/Assets/Characters/Player/AC_Flying.controller b/Assets/Characters/Player/AC_Flying.controller
index a7e4569..ee515e4 100644
--- a/Assets/Characters/Player/AC_Flying.controller
+++ b/Assets/Characters/Player/AC_Flying.controller
@@ -207,6 +207,18 @@
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
+ - m_Name: IsAtWall
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsAtCeiling
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
diff --git a/Assets/Characters/Player/AC_Player.controller b/Assets/Characters/Player/AC_Player.controller
index 26c2159..964eb59 100644
--- a/Assets/Characters/Player/AC_Player.controller
+++ b/Assets/Characters/Player/AC_Player.controller
@@ -142,19 +142,31 @@
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
- m_Name: IsFlying
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
- m_Name: IsGrounded
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
+ - m_Name: IsAtWall
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsAtCeiling
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index c38f393..9f8aabb 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -1755,46 +1755,6 @@
m_Script: {fileID: 11500000, guid: 1a8a05de0ac134f4f9d01bef6b9da077, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &1837034460 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 3345854317100013954, guid: c220ec455fce341408d66d880b464cad, type: 3}
- m_PrefabInstance: {fileID: 257677327013671455}
- m_PrefabAsset: {fileID: 0}
---- !u!70 &1837034467
-CapsuleCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1837034460}
- m_Enabled: 0
- 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_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_Size: {x: 0.829981, y: 0.93356335}
- m_Direction: 0
--- !u!1 &1919262556
GameObject:
m_ObjectHideFlags: 0
@@ -2279,11 +2239,21 @@
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
+ - first: {x: -4, y: -2, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 11
+ m_TileSpriteIndex: 10
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
- first: {x: -3, y: -2, z: 0}
second:
serializedVersion: 2
- m_TileIndex: 3
- m_TileSpriteIndex: 3
+ m_TileIndex: 14
+ m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -2393,7 +2363,7 @@
second:
serializedVersion: 2
m_TileIndex: 3
- m_TileSpriteIndex: 3
+ m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -2419,6 +2389,76 @@
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
+ - first: {x: -4, y: -1, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 13
+ m_TileSpriteIndex: 12
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: 0, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 13
+ m_TileSpriteIndex: 12
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: 1, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 13
+ m_TileSpriteIndex: 12
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: 2, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 13
+ m_TileSpriteIndex: 12
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: 3, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 13
+ m_TileSpriteIndex: 12
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: 4, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 13
+ m_TileSpriteIndex: 12
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: 5, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 12
+ m_TileSpriteIndex: 11
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 10
@@ -2427,7 +2467,7 @@
m_Data: {fileID: 11400000, guid: 6710ea292eefe0a409010947812e5a30, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 64ff2ae85e189834b9b4c888886420ff, type: 2}
- - m_RefCount: 2
+ - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 45f6756a69eb96b44ba8f63785bcf482, type: 2}
- m_RefCount: 3
m_Data: {fileID: 11400000, guid: 9f954b09168e28446a41aaab42edc51d, type: 2}
@@ -2443,14 +2483,14 @@
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: 3d59b10114dd8374795cb84c123617a9, type: 2}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: 5c4d4b6bc091bf54f89d2cec7f234b99, type: 2}
+ - m_RefCount: 6
+ m_Data: {fileID: 11400000, guid: 4e9d6d19d0ce36a48980f6c99950197d, type: 2}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: f4366b87b66653d41951ee029322b421, type: 2}
m_TileSpriteArray:
- m_RefCount: 10
m_Data: {fileID: -1554015212, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
@@ -2458,8 +2498,8 @@
m_Data: {fileID: 68800321, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
- m_RefCount: 2
m_Data: {fileID: 952801214, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
- - m_RefCount: 2
- m_Data: {fileID: -1200237691, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 3
m_Data: {fileID: -1701200628, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
- m_RefCount: 3
@@ -2472,18 +2512,18 @@
m_Data: {fileID: 1210147125, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
- - m_RefCount: 0
- m_Data: {fileID: 0}
+ - m_RefCount: 1
+ m_Data: {fileID: 663754295, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
+ - m_RefCount: 1
+ m_Data: {fileID: 1397353389, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
+ - m_RefCount: 6
+ m_Data: {fileID: -19378075, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
+ - m_RefCount: 1
+ m_Data: {fileID: -1200237691, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
+ - m_RefCount: 1
+ m_Data: {fileID: 1451081626, guid: 42962cf14c23fee4baaaea0cd52d52e0, type: 3}
m_TileMatrixArray:
- - m_RefCount: 53
+ - m_RefCount: 61
m_Data:
e00: 1
e01: 0
@@ -2502,13 +2542,13 @@
e32: 0
e33: 1
m_TileColorArray:
- - m_RefCount: 53
+ - m_RefCount: 61
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_Origin: {x: -3, y: -5, z: 0}
- m_Size: {x: 16, y: 6, z: 1}
+ m_Origin: {x: -4, y: -5, z: 0}
+ m_Size: {x: 17, y: 11, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@@ -2610,6 +2650,16 @@
- X: -30000000
Y: -10000000
- X: -30000000
+ Y: 55625000
+ - X: -35000000
+ Y: 60000000
+ - X: -40000000
+ Y: 60000000
+ - X: -40000000
+ Y: -20000000
+ - X: -30000000
+ Y: -20000000
+ - X: -30000000
Y: -43750000
- X: -28125000
Y: -47500000
@@ -2633,6 +2683,18 @@
Y: -40000000
m_CompositePaths:
m_Paths:
+ - - {x: 7.624987, y: -5}
+ - {x: 8, y: -4.4999914}
+ - {x: 7.9999704, y: -1}
+ - {x: -3, y: -0.9999706}
+ - {x: -3.0000088, y: 5.5625076}
+ - {x: -3.5000095, y: 6}
+ - {x: -4, y: 5.999971}
+ - {x: -3.999971, y: -2}
+ - {x: -3, y: -2.0000293}
+ - {x: -2.9999971, y: -4.3750057}
+ - {x: -2.8124933, y: -4.750004}
+ - {x: -2.3749933, y: -5}
- - {x: 12.624988, y: -4}
- {x: 13, y: -3.4999917}
- {x: 12.99997, y: -1}
@@ -2640,13 +2702,6 @@
- {x: 10.000003, y: -3.3750057}
- {x: 10.187507, y: -3.7500036}
- {x: 10.625007, y: -4}
- - - {x: 7.624987, y: -5}
- - {x: 8, y: -4.4999914}
- - {x: 7.9999704, y: -1}
- - {x: -3, y: -1.0000293}
- - {x: -2.9999971, y: -4.3750057}
- - {x: -2.8124933, y: -4.750004}
- - {x: -2.3749933, y: -5}
m_VertexDistance: 0.0005
m_OffsetDistance: 0.00005
m_UseDelaunayMesh: 0
@@ -2764,45 +2819,10 @@
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_Size.x
- value: 0.7205616
- objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_Size.y
- value: 0.7178567
- objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_Enabled
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_Offset.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_Offset.y
- value: -0.03
- objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_IsTrigger
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_AutoTiling
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3884295854780712968, guid: c220ec455fce341408d66d880b464cad, type: 3}
- propertyPath: m_EdgeRadius
- value: 0.12
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 3345854317100013954, guid: c220ec455fce341408d66d880b464cad, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1837034467}
+ m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c220ec455fce341408d66d880b464cad, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
--
Gitblit v1.9.3