Skip to content

tetra-tower
tetra-tower
Commit a7e38cce authored by 18류지석's avatar 18류지석
Browse files
Options

생명석 신규 스프라이트 적용

parent 80920f75
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 475 deletions
Assets/Animation/LifeStone/Animation/Amethyst.anim
View file @ a7e38cce
...@@ -19,7 +19,7 @@ AnimationClip: ...@@ -19,7 +19,7 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300016, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300054, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
classID: 114 classID: 114
...@@ -39,7 +39,7 @@ AnimationClip: ...@@ -39,7 +39,7 @@ AnimationClip:
customType: 0 customType: 0
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300016, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300054, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
......
Assets/Animation/LifeStone/Animation/Gold.anim
View file @ a7e38cce
...@@ -19,7 +19,7 @@ AnimationClip: ...@@ -19,7 +19,7 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300006, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300052, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
classID: 114 classID: 114
...@@ -39,7 +39,7 @@ AnimationClip: ...@@ -39,7 +39,7 @@ AnimationClip:
customType: 0 customType: 0
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300006, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300052, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
......
Assets/Animation/LifeStone/Animation/Gold_Normal.anim
View file @ a7e38cce
...@@ -19,13 +19,13 @@ AnimationClip: ...@@ -19,13 +19,13 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300014, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- time: 0.083333336 - time: 0.033333335
value: {fileID: 21300012, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- time: 0.16666667 - time: 0.06666667
value: {fileID: 21300010, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- time: 0.25 - time: 0.1
value: {fileID: 21300008, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
classID: 114 classID: 114
...@@ -45,16 +45,16 @@ AnimationClip: ...@@ -45,16 +45,16 @@ AnimationClip:
customType: 0 customType: 0
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300014, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- {fileID: 21300012, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- {fileID: 21300010, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- {fileID: 21300008, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 0.26666668 m_StopTime: 0.11666667
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
......
Assets/Animation/LifeStone/Animation/Normal.anim
View file @ a7e38cce
...@@ -19,7 +19,7 @@ AnimationClip: ...@@ -19,7 +19,7 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300004, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300050, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
classID: 114 classID: 114
...@@ -39,7 +39,7 @@ AnimationClip: ...@@ -39,7 +39,7 @@ AnimationClip:
customType: 0 customType: 0
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300004, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300050, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
......
Assets/Animation/LifeStone/Animation/Normal_Gold.anim
View file @ a7e38cce
...@@ -19,13 +19,13 @@ AnimationClip: ...@@ -19,13 +19,13 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300008, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- time: 0.083333336 - time: 0.033333335
value: {fileID: 21300010, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- time: 0.16666667 - time: 0.06666667
value: {fileID: 21300012, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- time: 0.25 - time: 0.1
value: {fileID: 21300014, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} value: {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
classID: 114 classID: 114
...@@ -45,16 +45,16 @@ AnimationClip: ...@@ -45,16 +45,16 @@ AnimationClip:
customType: 0 customType: 0
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300008, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300000, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- {fileID: 21300010, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300002, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- {fileID: 21300012, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300004, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
- {fileID: 21300014, guid: c8304f5a15856324fa6a4c5ae11bd279, type: 3} - {fileID: 21300006, guid: 2098b6231bfd3804392af0a3b505a2bd, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 0.26666668 m_StopTime: 0.11666667
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
......
Assets/Prefabs/UI/In-Game UI/LifeCrystalUI/LifeStoneUnit.prefab
View file @ a7e38cce
...@@ -108,6 +108,6 @@ RectTransform: ...@@ -108,6 +108,6 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 474.7, y: 106.3} m_AnchoredPosition: {x: 474.7, y: 106.55}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
Assets/Prefabs/UI/In-Game UI/LifeCrystalUI/LifeUnitSprite.prefab
View file @ a7e38cce
...@@ -73,14 +73,14 @@ SpriteRenderer: ...@@ -73,14 +73,14 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 2145601713 m_SortingLayerID: 2145601713
m_SortingLayer: 3 m_SortingLayer: 9
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 2e1b4071b5b523642aadd7947b85676e, type: 3} m_Sprite: {fileID: 21300000, guid: 2e1b4071b5b523642aadd7947b85676e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 0.2, y: 0.2} m_Size: {x: 0.25, y: 0.25}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
......
Assets/Scripts/Item/Addons.meta 0 → 100644
View file @ a7e38cce
fileFormatVersion: 2
guid: 3eeb43e73bfaf1f48901afcdbe4f6d11
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
View file @ a7e38cce
...@@ -416,7 +416,7 @@ public class LifeStoneManager : MonoBehaviour { ...@@ -416,7 +416,7 @@ public class LifeStoneManager : MonoBehaviour {
Vector2Int vtmp = (Vector2Int)candArray[tmp]; Vector2Int vtmp = (Vector2Int)candArray[tmp];
lifeStoneUnit[vtmp.y, vtmp.x].GetComponent<LifeUnitInFrame>().ChangeType(type); lifeStoneUnit[vtmp.y, vtmp.x].GetComponent<LifeUnitInFrame>().ChangeType(type);
candArray.RemoveAt(tmp); candArray.RemoveAt(tmp);
yield return new WaitForSeconds(0.1f); yield return new WaitForSeconds(0.02f);
} }
} }
......
Assets/Sprites/LifeStone/droppedlifestone.png.meta
View file @ a7e38cce
...@@ -67,7 +67,7 @@ TextureImporter: ...@@ -67,7 +67,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
...@@ -78,7 +78,7 @@ TextureImporter: ...@@ -78,7 +78,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
...@@ -92,7 +92,7 @@ TextureImporter: ...@@ -92,7 +92,7 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 4 y: 0
width: 20 width: 20
height: 20 height: 20
alignment: 6 alignment: 6
...@@ -102,7 +102,7 @@ TextureImporter: ...@@ -102,7 +102,7 @@ TextureImporter:
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: 0
bones: [] bones: []
spriteID: fbe607b9b2046bd44a0016d4a39070be spriteID: 36efa5415210b5d4fae334cc53053368
vertices: [] vertices: []
indices: indices:
edges: [] edges: []
...@@ -112,7 +112,7 @@ TextureImporter: ...@@ -112,7 +112,7 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 20 x: 20
y: 4 y: 0
width: 20 width: 20
height: 20 height: 20
alignment: 6 alignment: 6
...@@ -122,7 +122,7 @@ TextureImporter: ...@@ -122,7 +122,7 @@ TextureImporter:
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: 0
bones: [] bones: []
spriteID: b09caa56b3578474a9faf9b09c8bf1d6 spriteID: 3a513a673f160b24ca93a116f332ca06
vertices: [] vertices: []
indices: indices:
edges: [] edges: []
...@@ -132,7 +132,7 @@ TextureImporter: ...@@ -132,7 +132,7 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 40 x: 40
y: 4 y: 0
width: 20 width: 20
height: 20 height: 20
alignment: 6 alignment: 6
...@@ -142,27 +142,7 @@ TextureImporter: ...@@ -142,27 +142,7 @@ TextureImporter:
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: 0
bones: [] bones: []
spriteID: b9bcc22852c1ed74b8ec2b07eb705257 spriteID: bea29332cf2c8eb4eb23dd14d64f380d
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: droppedlifestone_3
rect:
serializedVersion: 2
x: 60
y: 0
width: 24
height: 24
alignment: 9
pivot: {x: 0.083333336, y: 0.083333336}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 18cb4633a5e8fd94dbdfbc2d0e9f3a07
vertices: [] vertices: []
indices: indices:
edges: [] edges: []
......
Assets/Sprites/LifeStone/lifestone.png
View replaced file @ 80920f75 View file @ a7e38cce
Assets/Sprites/LifeStone/lifestone.png

4.3 KB | W: | H:

Assets/Sprites/LifeStone/lifestone.png

702 Bytes | W: | H:

Assets/Sprites/LifeStone/lifestone.png
Assets/Sprites/LifeStone/lifestone.png
Assets/Sprites/LifeStone/lifestone.png
Assets/Sprites/LifeStone/lifestone.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Sprites/LifeStone/lifestone.png.meta
View file @ a7e38cce
This diff is collapsed.
Assets/Sprites/LifeStone/lifestoneframe.png.meta
View file @ a7e38cce
...@@ -66,7 +66,7 @@ TextureImporter: ...@@ -66,7 +66,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
...@@ -77,7 +77,7 @@ TextureImporter: ...@@ -77,7 +77,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Sprites/LifeStone/normalgold.png.meta 0 → 100644
View file @ a7e38cce
fileFormatVersion: 2
guid: 2098b6231bfd3804392af0a3b505a2bd
TextureImporter:
fileIDToRecycleName:
21300000: normalgold_0
21300002: normalgold_1
21300004: normalgold_2
21300006: normalgold_3
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: normalgold_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 20
height: 20
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 39e52a06ce6821245bd30ebf6b55d32f
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: normalgold_1
rect:
serializedVersion: 2
x: 20
y: 0
width: 20
height: 20
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: e3df1eaf90f65df42b3d8a0b0714d77d
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: normalgold_2
rect:
serializedVersion: 2
x: 40
y: 0
width: 20
height: 20
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8eb8b0776191d8e43bb995b8512bff50
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: normalgold_3
rect:
serializedVersion: 2
x: 60
y: 0
width: 20
height: 20
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8bb4b26943169bf418d44984e8699ece
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: b5c6500f0f21877418a2d68d4934852d
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
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