Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
tetra-tower
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Oenos
tetra-tower
Commits
a7e38cce
Commit
a7e38cce
authored
6 years ago
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
생명석 신규 스프라이트 적용
parent
80920f75
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
247 additions
and
475 deletions
+247
-475
Amethyst.anim
Assets/Animation/LifeStone/Animation/Amethyst.anim
+2
-2
Gold.anim
Assets/Animation/LifeStone/Animation/Gold.anim
+2
-2
Gold_Normal.anim
Assets/Animation/LifeStone/Animation/Gold_Normal.anim
+12
-12
Normal.anim
Assets/Animation/LifeStone/Animation/Normal.anim
+2
-2
Normal_Gold.anim
Assets/Animation/LifeStone/Animation/Normal_Gold.anim
+12
-12
LifeStoneUnit.prefab
.../Prefabs/UI/In-Game UI/LifeCrystalUI/LifeStoneUnit.prefab
+1
-1
LifeUnitSprite.prefab
...Prefabs/UI/In-Game UI/LifeCrystalUI/LifeUnitSprite.prefab
+2
-2
Addons.meta
Assets/Scripts/Item/Addons.meta
+8
-0
LifeStoneManager.cs
...Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
+1
-1
droppedlifestone.png
Assets/Sprites/LifeStone/droppedlifestone.png
+0
-0
droppedlifestone.png.meta
Assets/Sprites/LifeStone/droppedlifestone.png.meta
+8
-28
lifestone.png
Assets/Sprites/LifeStone/lifestone.png
+0
-0
lifestone.png.meta
Assets/Sprites/LifeStone/lifestone.png.meta
+14
-411
lifestoneframe.png.meta
Assets/Sprites/LifeStone/lifestoneframe.png.meta
+2
-2
normalgold.png
Assets/Sprites/LifeStone/normalgold.png
+0
-0
normalgold.png.meta
Assets/Sprites/LifeStone/normalgold.png.meta
+181
-0
No files found.
Assets/Animation/LifeStone/Animation/Amethyst.anim
View file @
a7e38cce
...
...
@@ -19,7 +19,7 @@ AnimationClip:
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
213000
16
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
value
:
{
fileID
:
213000
54
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
114
...
...
@@ -39,7 +39,7 @@ AnimationClip:
customType
:
0
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
213000
16
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
54
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Animation/LifeStone/Animation/Gold.anim
View file @
a7e38cce
...
...
@@ -19,7 +19,7 @@ AnimationClip:
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
213000
06
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
value
:
{
fileID
:
213000
52
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
114
...
...
@@ -39,7 +39,7 @@ AnimationClip:
customType
:
0
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
213000
06
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
52
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Animation/LifeStone/Animation/Gold_Normal.anim
View file @
a7e38cce
...
...
@@ -19,13 +19,13 @@ AnimationClip:
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
213000
14
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
time
:
0.0
83333336
value
:
{
fileID
:
213000
12
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
time
:
0.
1
6666667
value
:
{
fileID
:
213000
10
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
time
:
0.
25
value
:
{
fileID
:
2130000
8
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
value
:
{
fileID
:
213000
06
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
time
:
0.0
33333335
value
:
{
fileID
:
213000
04
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
time
:
0.
0
6666667
value
:
{
fileID
:
213000
02
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
time
:
0.
1
value
:
{
fileID
:
2130000
0
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
114
...
...
@@ -45,16 +45,16 @@ AnimationClip:
customType
:
0
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
213000
14
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
12
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
10
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
2130000
8
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
06
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
{
fileID
:
213000
04
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
{
fileID
:
213000
02
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
{
fileID
:
2130000
0
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
m_AdditiveReferencePoseTime
:
0
m_StartTime
:
0
m_StopTime
:
0.
26666668
m_StopTime
:
0.
11666667
m_OrientationOffsetY
:
0
m_Level
:
0
m_CycleOffset
:
0
...
...
This diff is collapsed.
Click to expand it.
Assets/Animation/LifeStone/Animation/Normal.anim
View file @
a7e38cce
...
...
@@ -19,7 +19,7 @@ AnimationClip:
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
213000
04
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
value
:
{
fileID
:
213000
50
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
114
...
...
@@ -39,7 +39,7 @@ AnimationClip:
customType
:
0
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
213000
04
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
50
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Animation/LifeStone/Animation/Normal_Gold.anim
View file @
a7e38cce
...
...
@@ -19,13 +19,13 @@ AnimationClip:
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
2130000
8
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
time
:
0.0
83333336
value
:
{
fileID
:
213000
10
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
time
:
0.
1
6666667
value
:
{
fileID
:
213000
12
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
time
:
0.
25
value
:
{
fileID
:
213000
14
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
value
:
{
fileID
:
2130000
0
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
time
:
0.0
33333335
value
:
{
fileID
:
213000
02
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
time
:
0.
0
6666667
value
:
{
fileID
:
213000
04
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
time
:
0.
1
value
:
{
fileID
:
213000
06
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
114
...
...
@@ -45,16 +45,16 @@ AnimationClip:
customType
:
0
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
2130000
8
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
10
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
12
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
213000
14
,
guid
:
c8304f5a15856324fa6a4c5ae11bd279
,
type
:
3
}
-
{
fileID
:
2130000
0
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
{
fileID
:
213000
02
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
{
fileID
:
213000
04
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
-
{
fileID
:
213000
06
,
guid
:
2098b6231bfd3804392af0a3b505a2bd
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
m_AdditiveReferencePoseTime
:
0
m_StartTime
:
0
m_StopTime
:
0.
26666668
m_StopTime
:
0.
11666667
m_OrientationOffsetY
:
0
m_Level
:
0
m_CycleOffset
:
0
...
...
This diff is collapsed.
Click to expand it.
Assets/Prefabs/UI/In-Game UI/LifeCrystalUI/LifeStoneUnit.prefab
View file @
a7e38cce
...
...
@@ -108,6 +108,6 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
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_Pivot
:
{
x
:
0
,
y
:
0
}
This diff is collapsed.
Click to expand it.
Assets/Prefabs/UI/In-Game UI/LifeCrystalUI/LifeUnitSprite.prefab
View file @
a7e38cce
...
...
@@ -73,14 +73,14 @@ SpriteRenderer:
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
2145601713
m_SortingLayer
:
3
m_SortingLayer
:
9
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
2e1b4071b5b523642aadd7947b85676e
,
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.2
,
y
:
0.2
}
m_Size
:
{
x
:
0.2
5
,
y
:
0.25
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
...
...
This diff is collapsed.
Click to expand it.
Assets/Scripts/Item/Addons.meta
0 → 100644
View file @
a7e38cce
fileFormatVersion: 2
guid: 3eeb43e73bfaf1f48901afcdbe4f6d11
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
Click to expand it.
Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs
View file @
a7e38cce
...
...
@@ -416,7 +416,7 @@ public class LifeStoneManager : MonoBehaviour {
Vector2Int
vtmp
=
(
Vector2Int
)
candArray
[
tmp
];
lifeStoneUnit
[
vtmp
.
y
,
vtmp
.
x
].
GetComponent
<
LifeUnitInFrame
>().
ChangeType
(
type
);
candArray
.
RemoveAt
(
tmp
);
yield
return
new
WaitForSeconds
(
0.
1
f
);
yield
return
new
WaitForSeconds
(
0.
02
f
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Sprites/LifeStone/droppedlifestone.png
View replaced file @
80920f75
View file @
a7e38cce
2.91 KB
|
W:
0px
|
H:
0px
702 Bytes
|
W:
0px
|
H:
0px
2-up
Swipe
Onion skin
This diff is collapsed.
Click to expand it.
Assets/Sprites/LifeStone/droppedlifestone.png.meta
View file @
a7e38cce
...
...
@@ -67,7 +67,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression:
1
textureCompression:
0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
...
...
@@ -78,7 +78,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression:
1
textureCompression:
0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
...
...
@@ -92,7 +92,7 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
y:
4
y:
0
width: 20
height: 20
alignment: 6
...
...
@@ -102,7 +102,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID:
fbe607b9b2046bd44a0016d4a39070be
spriteID:
36efa5415210b5d4fae334cc53053368
vertices: []
indices:
edges: []
...
...
@@ -112,7 +112,7 @@ TextureImporter:
rect:
serializedVersion: 2
x: 20
y:
4
y:
0
width: 20
height: 20
alignment: 6
...
...
@@ -122,7 +122,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID:
b09caa56b3578474a9faf9b09c8bf1d
6
spriteID:
3a513a673f160b24ca93a116f332ca0
6
vertices: []
indices:
edges: []
...
...
@@ -132,7 +132,7 @@ TextureImporter:
rect:
serializedVersion: 2
x: 40
y:
4
y:
0
width: 20
height: 20
alignment: 6
...
...
@@ -142,27 +142,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b9bcc22852c1ed74b8ec2b07eb705257
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
spriteID: bea29332cf2c8eb4eb23dd14d64f380d
vertices: []
indices:
edges: []
...
...
This diff is collapsed.
Click to expand it.
Assets/Sprites/LifeStone/lifestone.png
View replaced file @
80920f75
View file @
a7e38cce
4.3 KB
|
W:
0px
|
H:
0px
702 Bytes
|
W:
0px
|
H:
0px
2-up
Swipe
Onion skin
This diff is collapsed.
Click to expand it.
Assets/Sprites/LifeStone/lifestone.png.meta
View file @
a7e38cce
This diff is collapsed.
Click to expand it.
Assets/Sprites/LifeStone/lifestoneframe.png.meta
View file @
a7e38cce
...
...
@@ -66,7 +66,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression:
1
textureCompression:
0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
...
...
@@ -77,7 +77,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression:
1
textureCompression:
0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
...
...
This diff is collapsed.
Click to expand it.
Assets/Sprites/LifeStone/normalgold.png
0 → 100644
View file @
a7e38cce
955 Bytes
This diff is collapsed.
Click to expand it.
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:
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment