From 4c4e671921127bf64d51e3b74b5b7fc24b5d2b1b Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 8 Feb 2025 19:01:23 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=EA=B0=90=EC=A7=80=20=EC=BD=9C=EB=9D=BC=EC=9D=B4=EB=8D=94=20?= =?UTF-8?q?=ED=94=8C=EB=9E=AB=ED=8F=BC=EA=B3=BC=20=EC=B6=A9=EB=8F=8C?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Personal Scenes/dev_mingu/Ingame.unity | 542 ++++++++---------- .../Gameton/Scripts/Monster/MonsterBase.cs | 24 +- .../Common/Animation/Controller.controller | 87 ++- .../ProjectSettings/Physics2DSettings.asset | 4 +- .../ProjectSettings/QualitySettings.asset | 4 +- Gameton-06/ProjectSettings/TagManager.asset | 4 +- 6 files changed, 346 insertions(+), 319 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity index bb924874..969791dd 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Ingame.unity @@ -6075,14 +6075,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - hp: 0 - damage: 0 + currentHP: 0 + name: bluedragron + monsterType: melee speed: 3 _spriteRenderer: {fileID: 135546803} _idleTime: 2 walkingTime: 2 - _target: {fileID: 392344606} - defencePower: 0 + _target: {fileID: 0} + _collider: {fileID: 0} + defencePower: 10 --- !u!4 &141676838 stripped Transform: m_CorrespondingSourceObject: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} @@ -15904,125 +15906,6 @@ MonoBehaviour: m_InstancedGameObject: {fileID: 0} m_Flags: 3 m_ColliderType: 1 ---- !u!1 &392344606 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 392344608} - - component: {fileID: 392344607} - - component: {fileID: 392344609} - - component: {fileID: 392344610} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &392344607 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 392344606} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: e97790fd30502d741b479ab8db466373, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!4 &392344608 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 392344606} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 10} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &392344609 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 392344606} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 3766655669116587342, guid: 06e11f99937f3f940bcf4f4bbb0a9fad, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.13, y: 0.18} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &392344610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 392344606} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 42cacd7efc665ca49952258bfab50cc8, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!213 &395514155 Sprite: m_ObjectHideFlags: 0 @@ -25299,15 +25182,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 866829734583457878, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_labelHash - value: 8.840178e-23 + value: 0.00000040954276 objectReference: {fileID: 0} - target: {fileID: 866829734583457878, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_SpriteHash - value: 1061124833 + value: 27503621 objectReference: {fileID: 0} - target: {fileID: 866829734583457878, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_CategoryHash - value: 9.932601e-39 + value: 0.009161512 objectReference: {fileID: 0} - target: {fileID: 866829734583457880, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_FlipX @@ -25316,7 +25199,7 @@ PrefabInstance: - target: {fileID: 866829734583457880, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 3234629978573100161, guid: 8c818873fb8d4ad3bb40ebb62d906a1d, type: 3} + objectReference: {fileID: 4723107735738678597, guid: 8c818873fb8d4ad3bb40ebb62d906a1d, type: 3} - target: {fileID: 866829735663616562, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_Name value: BlueDragon @@ -25325,6 +25208,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 866829735663616562, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -25339,7 +25226,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_LocalPosition.x - value: 15.2 + value: 12.55 objectReference: {fileID: 0} - target: {fileID: 866829735663616565, guid: 1e126f96ebcf4245a3328353992d46f6, type: 3} propertyPath: m_LocalPosition.y @@ -29269,9 +29156,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 173 - m_TileSpriteIndex: 219 + m_TileSpriteIndex: 218 m_TileMatrixIndex: 0 - m_TileColorIndex: 219 + m_TileColorIndex: 218 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29279,9 +29166,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 172 - m_TileSpriteIndex: 220 + m_TileSpriteIndex: 219 m_TileMatrixIndex: 0 - m_TileColorIndex: 220 + m_TileColorIndex: 219 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29289,9 +29176,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 171 - m_TileSpriteIndex: 221 + m_TileSpriteIndex: 220 m_TileMatrixIndex: 0 - m_TileColorIndex: 221 + m_TileColorIndex: 220 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29299,9 +29186,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 170 - m_TileSpriteIndex: 222 + m_TileSpriteIndex: 221 m_TileMatrixIndex: 0 - m_TileColorIndex: 222 + m_TileColorIndex: 221 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29309,9 +29196,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 169 - m_TileSpriteIndex: 223 + m_TileSpriteIndex: 222 m_TileMatrixIndex: 0 - m_TileColorIndex: 223 + m_TileColorIndex: 222 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29319,9 +29206,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 168 - m_TileSpriteIndex: 224 + m_TileSpriteIndex: 223 m_TileMatrixIndex: 0 - m_TileColorIndex: 224 + m_TileColorIndex: 223 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29329,9 +29216,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 167 - m_TileSpriteIndex: 225 + m_TileSpriteIndex: 224 m_TileMatrixIndex: 0 - m_TileColorIndex: 225 + m_TileColorIndex: 224 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29339,9 +29226,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 166 - m_TileSpriteIndex: 226 + m_TileSpriteIndex: 225 m_TileMatrixIndex: 0 - m_TileColorIndex: 226 + m_TileColorIndex: 225 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29349,9 +29236,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 165 - m_TileSpriteIndex: 227 + m_TileSpriteIndex: 226 m_TileMatrixIndex: 0 - m_TileColorIndex: 227 + m_TileColorIndex: 226 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29359,9 +29246,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 164 - m_TileSpriteIndex: 228 + m_TileSpriteIndex: 227 m_TileMatrixIndex: 0 - m_TileColorIndex: 228 + m_TileColorIndex: 227 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29369,9 +29256,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 163 - m_TileSpriteIndex: 229 + m_TileSpriteIndex: 228 m_TileMatrixIndex: 0 - m_TileColorIndex: 229 + m_TileColorIndex: 228 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29379,9 +29266,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 162 - m_TileSpriteIndex: 230 + m_TileSpriteIndex: 229 m_TileMatrixIndex: 0 - m_TileColorIndex: 230 + m_TileColorIndex: 229 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29389,9 +29276,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 161 - m_TileSpriteIndex: 231 + m_TileSpriteIndex: 230 m_TileMatrixIndex: 0 - m_TileColorIndex: 231 + m_TileColorIndex: 230 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29399,9 +29286,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 160 - m_TileSpriteIndex: 232 + m_TileSpriteIndex: 231 m_TileMatrixIndex: 0 - m_TileColorIndex: 232 + m_TileColorIndex: 231 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29409,9 +29296,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 159 - m_TileSpriteIndex: 233 + m_TileSpriteIndex: 232 m_TileMatrixIndex: 0 - m_TileColorIndex: 233 + m_TileColorIndex: 232 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29439,9 +29326,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 158 - m_TileSpriteIndex: 234 + m_TileSpriteIndex: 233 m_TileMatrixIndex: 0 - m_TileColorIndex: 234 + m_TileColorIndex: 233 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29449,9 +29336,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 157 - m_TileSpriteIndex: 235 + m_TileSpriteIndex: 234 m_TileMatrixIndex: 0 - m_TileColorIndex: 235 + m_TileColorIndex: 234 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29459,9 +29346,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 156 - m_TileSpriteIndex: 236 + m_TileSpriteIndex: 235 m_TileMatrixIndex: 0 - m_TileColorIndex: 236 + m_TileColorIndex: 235 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29469,9 +29356,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 155 - m_TileSpriteIndex: 237 + m_TileSpriteIndex: 236 m_TileMatrixIndex: 0 - m_TileColorIndex: 237 + m_TileColorIndex: 236 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29479,9 +29366,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 154 - m_TileSpriteIndex: 238 + m_TileSpriteIndex: 237 m_TileMatrixIndex: 0 - m_TileColorIndex: 238 + m_TileColorIndex: 237 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29489,9 +29376,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 153 - m_TileSpriteIndex: 239 + m_TileSpriteIndex: 238 m_TileMatrixIndex: 0 - m_TileColorIndex: 239 + m_TileColorIndex: 238 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29499,9 +29386,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 152 - m_TileSpriteIndex: 240 + m_TileSpriteIndex: 239 m_TileMatrixIndex: 0 - m_TileColorIndex: 240 + m_TileColorIndex: 239 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29509,9 +29396,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 151 - m_TileSpriteIndex: 241 + m_TileSpriteIndex: 240 m_TileMatrixIndex: 0 - m_TileColorIndex: 241 + m_TileColorIndex: 240 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29519,9 +29406,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 150 - m_TileSpriteIndex: 242 + m_TileSpriteIndex: 241 m_TileMatrixIndex: 0 - m_TileColorIndex: 242 + m_TileColorIndex: 241 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29529,9 +29416,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 149 - m_TileSpriteIndex: 243 + m_TileSpriteIndex: 242 m_TileMatrixIndex: 0 - m_TileColorIndex: 243 + m_TileColorIndex: 242 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29539,9 +29426,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 148 - m_TileSpriteIndex: 244 + m_TileSpriteIndex: 243 m_TileMatrixIndex: 0 - m_TileColorIndex: 244 + m_TileColorIndex: 243 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29549,9 +29436,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 147 - m_TileSpriteIndex: 245 + m_TileSpriteIndex: 244 m_TileMatrixIndex: 0 - m_TileColorIndex: 245 + m_TileColorIndex: 244 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29559,9 +29446,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 146 - m_TileSpriteIndex: 246 + m_TileSpriteIndex: 245 m_TileMatrixIndex: 0 - m_TileColorIndex: 246 + m_TileColorIndex: 245 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29569,9 +29456,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 145 - m_TileSpriteIndex: 247 + m_TileSpriteIndex: 246 m_TileMatrixIndex: 0 - m_TileColorIndex: 247 + m_TileColorIndex: 246 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29579,9 +29466,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 144 - m_TileSpriteIndex: 248 + m_TileSpriteIndex: 247 m_TileMatrixIndex: 0 - m_TileColorIndex: 248 + m_TileColorIndex: 247 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29589,9 +29476,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 143 - m_TileSpriteIndex: 249 + m_TileSpriteIndex: 248 m_TileMatrixIndex: 0 - m_TileColorIndex: 249 + m_TileColorIndex: 248 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29599,9 +29486,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 142 - m_TileSpriteIndex: 250 + m_TileSpriteIndex: 249 m_TileMatrixIndex: 0 - m_TileColorIndex: 250 + m_TileColorIndex: 249 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29609,9 +29496,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 141 - m_TileSpriteIndex: 251 + m_TileSpriteIndex: 250 m_TileMatrixIndex: 0 - m_TileColorIndex: 251 + m_TileColorIndex: 250 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29619,9 +29506,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 140 - m_TileSpriteIndex: 252 + m_TileSpriteIndex: 251 m_TileMatrixIndex: 0 - m_TileColorIndex: 252 + m_TileColorIndex: 251 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29629,9 +29516,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 139 - m_TileSpriteIndex: 253 + m_TileSpriteIndex: 252 m_TileMatrixIndex: 0 - m_TileColorIndex: 253 + m_TileColorIndex: 252 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29639,9 +29526,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 138 - m_TileSpriteIndex: 254 + m_TileSpriteIndex: 253 m_TileMatrixIndex: 0 - m_TileColorIndex: 254 + m_TileColorIndex: 253 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29649,9 +29536,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 137 - m_TileSpriteIndex: 255 + m_TileSpriteIndex: 254 m_TileMatrixIndex: 0 - m_TileColorIndex: 255 + m_TileColorIndex: 254 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29659,9 +29546,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 136 - m_TileSpriteIndex: 256 + m_TileSpriteIndex: 255 m_TileMatrixIndex: 0 - m_TileColorIndex: 256 + m_TileColorIndex: 255 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29669,9 +29556,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 135 - m_TileSpriteIndex: 257 + m_TileSpriteIndex: 256 m_TileMatrixIndex: 0 - m_TileColorIndex: 257 + m_TileColorIndex: 256 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29679,9 +29566,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 134 - m_TileSpriteIndex: 258 + m_TileSpriteIndex: 257 m_TileMatrixIndex: 0 - m_TileColorIndex: 258 + m_TileColorIndex: 257 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -29689,9 +29576,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 133 - m_TileSpriteIndex: 259 + m_TileSpriteIndex: 258 m_TileMatrixIndex: 0 - m_TileColorIndex: 259 + m_TileColorIndex: 258 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30119,9 +30006,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 174 - m_TileSpriteIndex: 218 + m_TileSpriteIndex: 259 m_TileMatrixIndex: 0 - m_TileColorIndex: 218 + m_TileColorIndex: 259 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30129,9 +30016,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 173 - m_TileSpriteIndex: 219 + m_TileSpriteIndex: 218 m_TileMatrixIndex: 0 - m_TileColorIndex: 219 + m_TileColorIndex: 218 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30139,9 +30026,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 172 - m_TileSpriteIndex: 220 + m_TileSpriteIndex: 219 m_TileMatrixIndex: 0 - m_TileColorIndex: 220 + m_TileColorIndex: 219 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30149,9 +30036,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 171 - m_TileSpriteIndex: 221 + m_TileSpriteIndex: 220 m_TileMatrixIndex: 0 - m_TileColorIndex: 221 + m_TileColorIndex: 220 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30159,9 +30046,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 170 - m_TileSpriteIndex: 222 + m_TileSpriteIndex: 221 m_TileMatrixIndex: 0 - m_TileColorIndex: 222 + m_TileColorIndex: 221 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30169,9 +30056,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 169 - m_TileSpriteIndex: 223 + m_TileSpriteIndex: 222 m_TileMatrixIndex: 0 - m_TileColorIndex: 223 + m_TileColorIndex: 222 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30179,9 +30066,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 168 - m_TileSpriteIndex: 224 + m_TileSpriteIndex: 223 m_TileMatrixIndex: 0 - m_TileColorIndex: 224 + m_TileColorIndex: 223 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30189,9 +30076,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 167 - m_TileSpriteIndex: 225 + m_TileSpriteIndex: 224 m_TileMatrixIndex: 0 - m_TileColorIndex: 225 + m_TileColorIndex: 224 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30199,9 +30086,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 166 - m_TileSpriteIndex: 226 + m_TileSpriteIndex: 225 m_TileMatrixIndex: 0 - m_TileColorIndex: 226 + m_TileColorIndex: 225 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30209,9 +30096,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 165 - m_TileSpriteIndex: 227 + m_TileSpriteIndex: 226 m_TileMatrixIndex: 0 - m_TileColorIndex: 227 + m_TileColorIndex: 226 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30219,9 +30106,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 164 - m_TileSpriteIndex: 228 + m_TileSpriteIndex: 227 m_TileMatrixIndex: 0 - m_TileColorIndex: 228 + m_TileColorIndex: 227 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30229,9 +30116,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 163 - m_TileSpriteIndex: 229 + m_TileSpriteIndex: 228 m_TileMatrixIndex: 0 - m_TileColorIndex: 229 + m_TileColorIndex: 228 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30239,9 +30126,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 162 - m_TileSpriteIndex: 230 + m_TileSpriteIndex: 229 m_TileMatrixIndex: 0 - m_TileColorIndex: 230 + m_TileColorIndex: 229 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30249,9 +30136,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 161 - m_TileSpriteIndex: 231 + m_TileSpriteIndex: 230 m_TileMatrixIndex: 0 - m_TileColorIndex: 231 + m_TileColorIndex: 230 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30279,9 +30166,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 158 - m_TileSpriteIndex: 234 + m_TileSpriteIndex: 233 m_TileMatrixIndex: 0 - m_TileColorIndex: 234 + m_TileColorIndex: 233 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30289,9 +30176,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 157 - m_TileSpriteIndex: 235 + m_TileSpriteIndex: 234 m_TileMatrixIndex: 0 - m_TileColorIndex: 235 + m_TileColorIndex: 234 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30299,9 +30186,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 156 - m_TileSpriteIndex: 236 + m_TileSpriteIndex: 235 m_TileMatrixIndex: 0 - m_TileColorIndex: 236 + m_TileColorIndex: 235 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30309,9 +30196,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 155 - m_TileSpriteIndex: 237 + m_TileSpriteIndex: 236 m_TileMatrixIndex: 0 - m_TileColorIndex: 237 + m_TileColorIndex: 236 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30319,9 +30206,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 154 - m_TileSpriteIndex: 238 + m_TileSpriteIndex: 237 m_TileMatrixIndex: 0 - m_TileColorIndex: 238 + m_TileColorIndex: 237 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30329,9 +30216,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 153 - m_TileSpriteIndex: 239 + m_TileSpriteIndex: 238 m_TileMatrixIndex: 0 - m_TileColorIndex: 239 + m_TileColorIndex: 238 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30339,9 +30226,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 152 - m_TileSpriteIndex: 240 + m_TileSpriteIndex: 239 m_TileMatrixIndex: 0 - m_TileColorIndex: 240 + m_TileColorIndex: 239 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30349,9 +30236,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 151 - m_TileSpriteIndex: 241 + m_TileSpriteIndex: 240 m_TileMatrixIndex: 0 - m_TileColorIndex: 241 + m_TileColorIndex: 240 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30359,9 +30246,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 150 - m_TileSpriteIndex: 242 + m_TileSpriteIndex: 241 m_TileMatrixIndex: 0 - m_TileColorIndex: 242 + m_TileColorIndex: 241 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30369,9 +30256,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 149 - m_TileSpriteIndex: 243 + m_TileSpriteIndex: 242 m_TileMatrixIndex: 0 - m_TileColorIndex: 243 + m_TileColorIndex: 242 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30379,9 +30266,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 148 - m_TileSpriteIndex: 244 + m_TileSpriteIndex: 243 m_TileMatrixIndex: 0 - m_TileColorIndex: 244 + m_TileColorIndex: 243 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30389,9 +30276,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 147 - m_TileSpriteIndex: 245 + m_TileSpriteIndex: 244 m_TileMatrixIndex: 0 - m_TileColorIndex: 245 + m_TileColorIndex: 244 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30399,9 +30286,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 146 - m_TileSpriteIndex: 246 + m_TileSpriteIndex: 245 m_TileMatrixIndex: 0 - m_TileColorIndex: 246 + m_TileColorIndex: 245 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30409,9 +30296,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 145 - m_TileSpriteIndex: 247 + m_TileSpriteIndex: 246 m_TileMatrixIndex: 0 - m_TileColorIndex: 247 + m_TileColorIndex: 246 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30419,9 +30306,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 144 - m_TileSpriteIndex: 248 + m_TileSpriteIndex: 247 m_TileMatrixIndex: 0 - m_TileColorIndex: 248 + m_TileColorIndex: 247 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30429,9 +30316,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 143 - m_TileSpriteIndex: 249 + m_TileSpriteIndex: 248 m_TileMatrixIndex: 0 - m_TileColorIndex: 249 + m_TileColorIndex: 248 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30439,9 +30326,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 142 - m_TileSpriteIndex: 250 + m_TileSpriteIndex: 249 m_TileMatrixIndex: 0 - m_TileColorIndex: 250 + m_TileColorIndex: 249 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30449,9 +30336,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 141 - m_TileSpriteIndex: 251 + m_TileSpriteIndex: 250 m_TileMatrixIndex: 0 - m_TileColorIndex: 251 + m_TileColorIndex: 250 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30459,9 +30346,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 140 - m_TileSpriteIndex: 252 + m_TileSpriteIndex: 251 m_TileMatrixIndex: 0 - m_TileColorIndex: 252 + m_TileColorIndex: 251 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30469,9 +30356,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 139 - m_TileSpriteIndex: 253 + m_TileSpriteIndex: 252 m_TileMatrixIndex: 0 - m_TileColorIndex: 253 + m_TileColorIndex: 252 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30479,9 +30366,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 138 - m_TileSpriteIndex: 254 + m_TileSpriteIndex: 253 m_TileMatrixIndex: 0 - m_TileColorIndex: 254 + m_TileColorIndex: 253 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30489,9 +30376,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 137 - m_TileSpriteIndex: 255 + m_TileSpriteIndex: 254 m_TileMatrixIndex: 0 - m_TileColorIndex: 255 + m_TileColorIndex: 254 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30499,9 +30386,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 136 - m_TileSpriteIndex: 256 + m_TileSpriteIndex: 255 m_TileMatrixIndex: 0 - m_TileColorIndex: 256 + m_TileColorIndex: 255 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -30509,9 +30396,9 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 135 - m_TileSpriteIndex: 257 + m_TileSpriteIndex: 256 m_TileMatrixIndex: 0 - m_TileColorIndex: 257 + m_TileColorIndex: 256 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741827 @@ -32654,8 +32541,6 @@ Tilemap: m_Data: {fileID: 19823721} - m_RefCount: 2 m_Data: {fileID: 592807993} - - m_RefCount: 1 - m_Data: {fileID: 1326669201} - m_RefCount: 2 m_Data: {fileID: 488069062} - m_RefCount: 2 @@ -32738,6 +32623,8 @@ Tilemap: m_Data: {fileID: 1436405079} - m_RefCount: 1 m_Data: {fileID: 805573220} + - m_RefCount: 1 + m_Data: {fileID: 1326669201} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: fc4c7dc5138a4efb8526779b3d642cd3, type: 3} m_TileMatrixArray: @@ -33196,8 +33083,6 @@ Tilemap: m_Data: {r: 0.92873573, g: 0.3825355, b: 0.5276236, a: 1} - m_RefCount: 2 m_Data: {r: 0.7085796, g: 0.31283444, b: 0.41737303, a: 1} - - m_RefCount: 1 - m_Data: {r: 0.7701709, g: 0.37014878, b: 0.42995396, a: 1} - m_RefCount: 2 m_Data: {r: 0.7036661, g: 0.39987853, b: 0.48737374, a: 1} - m_RefCount: 2 @@ -33280,6 +33165,8 @@ Tilemap: m_Data: {r: 0.89224607, g: 0.61045116, b: 0.6230397, a: 1} - m_RefCount: 1 m_Data: {r: 0.8350197, g: 0.54960674, b: 0.554499, a: 1} + - m_RefCount: 1 + m_Data: {r: 0.7701709, g: 0.37014878, b: 0.42995396, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -52623,7 +52510,7 @@ GameObject: m_Component: - component: {fileID: 1426608642} - component: {fileID: 1426608643} - m_Layer: 0 + m_Layer: 3 m_Name: Collider m_TagString: Untagged m_Icon: {fileID: 0} @@ -52639,8 +52526,8 @@ Transform: m_GameObject: {fileID: 1426608641} 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_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 9, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 141676838} @@ -52674,12 +52561,12 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 1 + m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 5 + m_Radius: 0.5 --- !u!114 &1431442824 MonoBehaviour: m_ObjectHideFlags: 0 @@ -54259,7 +54146,7 @@ GameObject: - component: {fileID: 1490603791} - component: {fileID: 1490603793} - component: {fileID: 1490603795} - m_Layer: 0 + m_Layer: 6 m_Name: Tilemap m_TagString: Ground m_Icon: {fileID: 0} @@ -70154,6 +70041,67 @@ MonoBehaviour: m_InstancedGameObject: {fileID: 0} m_Flags: 3 m_ColliderType: 1 +--- !u!1001 &2026225658 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3656570700648378249, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_Name + value: TON.Player_W + objectReference: {fileID: 0} + - target: {fileID: 3656570700648378249, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalPosition.x + value: -2.36 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalPosition.y + value: -1.5 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8528093570479225059, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f92c93d0d7d455d40b84e993e40acfca, type: 3} --- !u!114 &2028381348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -73334,8 +73282,8 @@ SceneRoots: - {fileID: 2135657552} - {fileID: 535565209} - {fileID: 2067632268} - - {fileID: 392344608} - {fileID: 1555992584} - {fileID: 257363990} - {fileID: 720822433} - {fileID: 1396440215} + - {fileID: 2026225658} diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs index 85dd5c78..47a2831a 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs @@ -56,7 +56,7 @@ namespace TON _spriteRenderer.flipX = !(_direction.x > 0); _collider = GetComponent(); - // TODO: 몬스터 방어력 세팅 임시값 + // TODO: 몬스터 방어력 임시값 defencePower = 10f; } @@ -98,10 +98,13 @@ namespace TON } } - if (_isHit) - { - - } + // if (_isHit) + // { + // _animator.SetBool("Attack", _isDetect); + // + // _isWalking = false; + // + // } _animator.SetBool("Walk", _isWalking); // 걷기 애니메이션 } @@ -155,13 +158,20 @@ namespace TON private void OnCollisionEnter2D(Collision2D other) { + _isDetect = true; + if (other.collider.CompareTag("Player")) { - _isDetect = true; - _animator.SetBool("Attack", _isDetect); // 공격 애니메이션 재생 + + _animator.SetBool("Attack", true); // 공격 애니메이션 재생 MonsterAttack(other.gameObject); // 플레이어에게 공격 Debug.Log("감지됨"); } + + if (!other.collider.CompareTag("Player")) + { + _isDetect = false; + } } } } diff --git a/Gameton-06/Assets/PixelFantasy/PixelMonsters/Common/Animation/Controller.controller b/Gameton-06/Assets/PixelFantasy/PixelMonsters/Common/Animation/Controller.controller index 1dae23e2..ce4f2f10 100644 --- a/Gameton-06/Assets/PixelFantasy/PixelMonsters/Common/Animation/Controller.controller +++ b/Gameton-06/Assets/PixelFantasy/PixelMonsters/Common/Animation/Controller.controller @@ -191,6 +191,28 @@ MonoBehaviour: m_EditorClassIdentifier: Continuous: 0 Active: 0 +--- !u!1101 &-2848854086711600340 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3188460960225426455} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1793952159812074963 AnimatorState: serializedVersion: 6 @@ -561,6 +583,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 20, y: 220, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -1674859921881163369} +--- !u!1101 &3032347272367370037 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -56690746207215259} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &3188460960225426455 AnimatorState: serializedVersion: 6 @@ -571,7 +615,9 @@ AnimatorState: m_Name: Attack m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 4658846137002246010} + - {fileID: 3032347272367370037} m_StateMachineBehaviours: - {fileID: 4517560952412984766} m_Position: {x: 50, y: 50, z: 0} @@ -624,19 +670,19 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 6342953676309033787} - m_Position: {x: 500, y: 60, z: 0} + m_Position: {x: 330, y: 130, z: 0} - serializedVersion: 1 m_State: {fileID: -56690746207215259} - m_Position: {x: 500, y: 160, z: 0} + m_Position: {x: 630, y: 130, z: 0} - serializedVersion: 1 m_State: {fileID: 4602458092277031176} - m_Position: {x: 760, y: 190, z: 0} + m_Position: {x: 1070, y: 280, z: 0} - serializedVersion: 1 m_State: {fileID: -4838633882212068965} - m_Position: {x: 760, y: 110, z: 0} + m_Position: {x: 1060, y: 350, z: 0} - serializedVersion: 1 m_State: {fileID: 3188460960225426455} - m_Position: {x: 760, y: 240, z: 0} + m_Position: {x: 490, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -136569306282141652} m_Position: {x: 760, y: 290, z: 0} @@ -644,13 +690,14 @@ AnimatorStateMachine: m_State: {fileID: -7991831788900291451} m_Position: {x: 760, y: 340, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -2848854086711600340} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 20, y: 180, z: 0} + m_AnyStatePosition: {x: 210, y: 250, z: 0} m_EntryPosition: {x: 20, y: 140, z: 0} - m_ExitPosition: {x: 20, y: 220, z: 0} + m_ExitPosition: {x: 1000, y: 130, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 6342953676309033787} --- !u!114 &4102650195156319639 @@ -707,6 +754,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4658846137002246010 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6342953676309033787} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &6342953676309033787 AnimatorState: serializedVersion: 6 diff --git a/Gameton-06/ProjectSettings/Physics2DSettings.asset b/Gameton-06/ProjectSettings/Physics2DSettings.asset index bfd2526c..7545903d 100644 --- a/Gameton-06/ProjectSettings/Physics2DSettings.asset +++ b/Gameton-06/ProjectSettings/Physics2DSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d57a0fe55659c33879e8b70bc01c5ea9cdf082069dab649905c6c5138531e6eb -size 2028 +oid sha256:f5c002e55b63e91280e069d9029607b2fd7d0e4fa2a02d6e4df916495cef9328 +size 1635 diff --git a/Gameton-06/ProjectSettings/QualitySettings.asset b/Gameton-06/ProjectSettings/QualitySettings.asset index 94770e60..8c7a4c05 100644 --- a/Gameton-06/ProjectSettings/QualitySettings.asset +++ b/Gameton-06/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2666fdbcc78de7e4b6d74fc5afd5ebaf573a2ae562677c1e13fcb7a0f19a95fc -size 6497 +oid sha256:23cbc5bf663e646e79ca4b7699cf4920525e77c6633d4ae99cccc3d0465b1c8a +size 9135 diff --git a/Gameton-06/ProjectSettings/TagManager.asset b/Gameton-06/ProjectSettings/TagManager.asset index adca1fa0..08a557f1 100644 --- a/Gameton-06/ProjectSettings/TagManager.asset +++ b/Gameton-06/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aae850547f0ac77fb03b3a73510dc91648e024a5faee403dbd2d49c2dd7c5c75 -size 398 +oid sha256:9b3bff9403e572fe73946c753ffc41aa1e9ae58068aeb8d2d4e7a60e723e0c84 +size 412