Skip to content

tetra-tower
tetra-tower
Commit bc819408 authored by 18손재민's avatar 18손재민
Browse files
Options

재머지함

parent 90424df3
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 69 deletions
Assets/Prefabs/Characters/Enemy/NotDyingScarecrow.prefab
View file @ bc819408
...@@ -135,7 +135,7 @@ BoxCollider2D: ...@@ -135,7 +135,7 @@ BoxCollider2D:
m_IsTrigger: 0 m_IsTrigger: 0
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: 0, y: -0.040684164} m_Offset: {x: 0, y: 0.89}
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0} pivot: {x: 0, y: 0}
...@@ -186,6 +186,7 @@ MonoBehaviour: ...@@ -186,6 +186,7 @@ MonoBehaviour:
patrolSpeed: 0 patrolSpeed: 0
trackSpeed: 0 trackSpeed: 0
knockbackPercentage: [] knockbackPercentage: []
animator: {fileID: 0}
movementLock: 0 movementLock: 0
scarecrow_or_statue: 1 scarecrow_or_statue: 1
--- !u!114 &114799009846635808 --- !u!114 &114799009846635808
...@@ -201,7 +202,7 @@ MonoBehaviour: ...@@ -201,7 +202,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
width: 0.5 width: 0.5
height: 0.1 height: 0.1
yOffset: 0.92 yOffset: 2
barPrefab: {fileID: 1489501648010076, guid: bd708b07601179842bbd803b54afda40, type: 2} barPrefab: {fileID: 1489501648010076, guid: bd708b07601179842bbd803b54afda40, type: 2}
bor: {fileID: 21300000, guid: f978754916ff69444aa0bd613b44f2c5, type: 3} bor: {fileID: 21300000, guid: f978754916ff69444aa0bd613b44f2c5, type: 3}
red: {fileID: 21300000, guid: 014c5204ddcb6e54e86aadaa34227552, type: 3} red: {fileID: 21300000, guid: 014c5204ddcb6e54e86aadaa34227552, type: 3}
......
Assets/Prefabs/Characters/Enemy/StatueTest.prefab
View file @ bc819408
...@@ -11,22 +11,6 @@ Prefab: ...@@ -11,22 +11,6 @@ Prefab:
m_SourcePrefab: {fileID: 0} m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1401848893116652} m_RootGameObject: {fileID: 1401848893116652}
m_IsPrefabAsset: 1 m_IsPrefabAsset: 1
--- !u!1 &1162659259063058
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4005902780579934}
- component: {fileID: 114561536863273304}
m_Layer: 0
m_Name: HPBar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1298248310005788 --- !u!1 &1298248310005788
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -79,19 +63,6 @@ GameObject: ...@@ -79,19 +63,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &4005902780579934
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1162659259063058}
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_Children: []
m_Father: {fileID: 4836495397386794}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4202602386941338 --- !u!4 &4202602386941338
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -112,11 +83,10 @@ Transform: ...@@ -112,11 +83,10 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1401848893116652} m_GameObject: {fileID: 1401848893116652}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 11.29, y: -17.94, z: 0} m_LocalPosition: {x: 11.038, y: -21.531, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4995664760293086} - {fileID: 4995664760293086}
- {fileID: 4005902780579934}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -127,7 +97,7 @@ Transform: ...@@ -127,7 +97,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1917537518207390} m_GameObject: {fileID: 1917537518207390}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.142, y: 0.626, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4202602386941338} - {fileID: 4202602386941338}
...@@ -191,7 +161,7 @@ BoxCollider2D: ...@@ -191,7 +161,7 @@ BoxCollider2D:
m_IsTrigger: 0 m_IsTrigger: 0
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: -0.170115, y: 0.378891} m_Offset: {x: 0, y: 0.85}
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0} pivot: {x: 0, y: 0}
...@@ -234,23 +204,6 @@ MonoBehaviour: ...@@ -234,23 +204,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pushForce: 0 pushForce: 0
--- !u!114 &114561536863273304
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1162659259063058}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 493db5529c03fce44a56a2211507667e, type: 3}
m_Name:
m_EditorClassIdentifier:
width: 0.4
height: 0.1
yOffset: 1.3
barPrefab: {fileID: 1489501648010076, guid: bd708b07601179842bbd803b54afda40, type: 2}
bor: {fileID: 21300000, guid: f978754916ff69444aa0bd613b44f2c5, type: 3}
red: {fileID: 21300000, guid: 014c5204ddcb6e54e86aadaa34227552, type: 3}
--- !u!114 &114639627468642258 --- !u!114 &114639627468642258
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -271,6 +224,7 @@ MonoBehaviour: ...@@ -271,6 +224,7 @@ MonoBehaviour:
patrolSpeed: 0 patrolSpeed: 0
trackSpeed: 0 trackSpeed: 0
knockbackPercentage: [] knockbackPercentage: []
animator: {fileID: 0}
movementLock: 0 movementLock: 0
scarecrow_or_statue: 0 scarecrow_or_statue: 0
--- !u!212 &212389034539557544 --- !u!212 &212389034539557544
......
Assets/Sprites/Enemy/scarecrow 1/hit/Sprite-0001.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/scarecrow 1/hit/Sprite-0002.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/scarecrow 1/hit/Sprite-0003.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/scarecrow 1/idle/dummy_scarecrow_idle1.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/scarecrow 1/idle/dummy_scarecrow_idle2.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/scarecrow 1/idle/dummy_scarecrow_idle3.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/scarecrow 1/idle/dummy_scarecrow_idle4.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/scarecrow 1/idle/dummy_scarecrow_idle5.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle1.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle2.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle3.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle4.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle5.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle6.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle7.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle8.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Assets/Sprites/Enemy/stone/idle9.png.meta
View file @ bc819408
...@@ -43,7 +43,7 @@ TextureImporter: ...@@ -43,7 +43,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 7
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64 spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment