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
cf29de20
Commit
cf29de20
authored
Feb 25, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
디버프시 색 바뀌는것 복구, 인벤토리 임시 이미지 삭제.
parent
b2fe3798
Changes
11
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
18 additions
and
1335 deletions
+18
-1335
Enemy.cs
Assets/Scripts/Characters/Enemy/Enemy.cs
+16
-2
EnemyAir.cs
Assets/Scripts/Characters/Enemy/EnemyAir.cs
+1
-0
EnemyGround.cs
Assets/Scripts/Characters/Enemy/EnemyGround.cs
+1
-0
tmp1.png
Assets/Sprites/Inventory/tmp1.png
+0
-0
tmp1.png.meta
Assets/Sprites/Inventory/tmp1.png.meta
+0
-790
tmp2.png
Assets/Sprites/Inventory/tmp2.png
+0
-0
tmp2.png.meta
Assets/Sprites/Inventory/tmp2.png.meta
+0
-223
tmp3.png
Assets/Sprites/Inventory/tmp3.png
+0
-0
tmp3.png.meta
Assets/Sprites/Inventory/tmp3.png.meta
+0
-139
tmp4.png
Assets/Sprites/Inventory/tmp4.png
+0
-0
tmp4.png.meta
Assets/Sprites/Inventory/tmp4.png.meta
+0
-181
No files found.
Assets/Scripts/Characters/Enemy/Enemy.cs
View file @
cf29de20
...
@@ -93,6 +93,8 @@ public abstract class Enemy : MonoBehaviour {
...
@@ -93,6 +93,8 @@ public abstract class Enemy : MonoBehaviour {
{
{
Invisible
=
true
;
Invisible
=
true
;
animator
.
SetTrigger
(
"DeadTrigger"
);
animator
.
SetTrigger
(
"DeadTrigger"
);
StopCoroutine
(
"OnFire"
);
GetComponent
<
SpriteRenderer
>().
color
=
Color
.
white
;
return
;
return
;
}
}
...
@@ -130,6 +132,8 @@ public abstract class Enemy : MonoBehaviour {
...
@@ -130,6 +132,8 @@ public abstract class Enemy : MonoBehaviour {
{
{
Invisible
=
true
;
Invisible
=
true
;
animator
.
SetTrigger
(
"DeadTrigger"
);
animator
.
SetTrigger
(
"DeadTrigger"
);
StopCoroutine
(
"OnFire"
);
GetComponent
<
SpriteRenderer
>().
color
=
Color
.
white
;
return
;
return
;
}
}
...
@@ -198,17 +202,26 @@ public abstract class Enemy : MonoBehaviour {
...
@@ -198,17 +202,26 @@ public abstract class Enemy : MonoBehaviour {
{
{
fireDuration
=
duration
;
fireDuration
=
duration
;
float
dotGap
=
1.0f
;
float
dotGap
=
1.0f
;
while
(
true
)
while
(
true
)
{
{
yield
return
new
WaitForSeconds
(
dotGap
);
yield
return
new
WaitForSeconds
(
dotGap
);
for
(
float
timer
=
0
;
timer
<
dotGap
;
timer
+=
Time
.
deltaTime
)
{
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1f
,
0.5f
+
0.5f
*
timer
/
dotGap
,
0.5f
+
0.5f
*
timer
/
dotGap
);
yield
return
null
;
}
fireDuration
-=
dotGap
;
fireDuration
-=
dotGap
;
if
(
fireDuration
<
0.0f
)
{
if
(
fireDuration
<
0.0f
)
{
fireDuration
=
0.0f
;
fireDuration
=
0.0f
;
break
;
break
;
}
}
GetDamaged
(
lifeStoneManager
.
lifeStoneRowNum
*
0.3f
);
GetDamaged
(
lifeStoneManager
.
lifeStoneRowNum
*
0.3f
);
EffectManager
.
Instance
.
StartNumber
(
0
,
gameObject
.
transform
.
parent
.
position
,
lifeStoneManager
.
lifeStoneRowNum
*
0.3f
);
}
}
debuffState
[(
int
)
EnemyDebuffCase
.
Fire
]
=
DebuffState
.
Off
;
debuffState
[(
int
)
EnemyDebuffCase
.
Fire
]
=
DebuffState
.
Off
;
GetComponent
<
SpriteRenderer
>().
color
=
Color
.
white
;
}
}
IEnumerator
ImmuneTimer
(
EnemyDebuffCase
Case
,
float
duration
)
IEnumerator
ImmuneTimer
(
EnemyDebuffCase
Case
,
float
duration
)
...
@@ -224,6 +237,7 @@ public abstract class Enemy : MonoBehaviour {
...
@@ -224,6 +237,7 @@ public abstract class Enemy : MonoBehaviour {
switch
(
Case
)
switch
(
Case
)
{
{
case
EnemyDebuffCase
.
Ice
:
case
EnemyDebuffCase
.
Ice
:
GetComponent
<
SpriteRenderer
>().
color
=
Color
.
white
;
StopCoroutine
(
"OnIce"
);
StopCoroutine
(
"OnIce"
);
KnockbackLock
=
false
;
KnockbackLock
=
false
;
animator
.
speed
=
1.0f
;
animator
.
speed
=
1.0f
;
...
...
Assets/Scripts/Characters/Enemy/EnemyAir.cs
View file @
cf29de20
...
@@ -59,6 +59,7 @@ public class EnemyAir : Enemy {
...
@@ -59,6 +59,7 @@ public class EnemyAir : Enemy {
protected
override
IEnumerator
OnIce
(
float
duration
)
protected
override
IEnumerator
OnIce
(
float
duration
)
{
{
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
0.5f
,
0.5f
,
1f
);
ChangeVelocityXY
(
Vector2
.
zero
,
new
bool
[]
{
});
ChangeVelocityXY
(
Vector2
.
zero
,
new
bool
[]
{
});
KnockbackLock
=
true
;
KnockbackLock
=
true
;
animator
.
SetTrigger
(
"StunnedTrigger"
);
animator
.
SetTrigger
(
"StunnedTrigger"
);
...
...
Assets/Scripts/Characters/Enemy/EnemyGround.cs
View file @
cf29de20
...
@@ -123,6 +123,7 @@ public class EnemyGround : Enemy {
...
@@ -123,6 +123,7 @@ public class EnemyGround : Enemy {
protected
override
IEnumerator
OnIce
(
float
duration
)
protected
override
IEnumerator
OnIce
(
float
duration
)
{
{
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
0.5f
,
0.5f
,
1f
);
ChangeVelocityX
(
0.0f
,
new
bool
[]
{
});
ChangeVelocityX
(
0.0f
,
new
bool
[]
{
});
KnockbackLock
=
true
;
KnockbackLock
=
true
;
animator
.
SetTrigger
(
"StunnedTrigger"
);
animator
.
SetTrigger
(
"StunnedTrigger"
);
...
...
Assets/Sprites/Inventory/tmp1.png
deleted
100644 → 0
View file @
b2fe3798
64.8 KB
Assets/Sprites/Inventory/tmp1.png.meta
deleted
100644 → 0
View file @
b2fe3798
This diff is collapsed.
Click to expand it.
Assets/Sprites/Inventory/tmp2.png
deleted
100644 → 0
View file @
b2fe3798
7.62 KB
Assets/Sprites/Inventory/tmp2.png.meta
deleted
100644 → 0
View file @
b2fe3798
fileFormatVersion: 2
guid: 01116b23700d9114dbc3620954b10d7f
TextureImporter:
fileIDToRecycleName:
21300000: tmp2_0
21300002: tmp2_1
21300004: tmp2_2
21300006: tmp2_3
21300008: tmp2_4
21300010: tmp2_5
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: tmp2_0
rect:
serializedVersion: 2
x: 0
y: 634
width: 601
height: 202
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 74916e2b287ad3c4da04ed8f951c2bd6
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp2_1
rect:
serializedVersion: 2
x: 616
y: 634
width: 601
height: 202
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 735e9385bc93e7540887ffd9274ec36e
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp2_2
rect:
serializedVersion: 2
x: 0
y: 382
width: 601
height: 202
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3631f82898531c744a8934ae9468d6b1
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp2_3
rect:
serializedVersion: 2
x: 616
y: 382
width: 601
height: 202
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b976d325469726a46b727db523bf65bb
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp2_4
rect:
serializedVersion: 2
x: 0
y: 150
width: 601
height: 202
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f0673421a265f0b49abfee5965efd8d0
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp2_5
rect:
serializedVersion: 2
x: 617
y: 0
width: 625
height: 351
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6b160764c798f854197e60cf502162ed
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: cc14ee455ddc4c347aeb4188e373dc74
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Inventory/tmp3.png
deleted
100644 → 0
View file @
b2fe3798
1.74 KB
Assets/Sprites/Inventory/tmp3.png.meta
deleted
100644 → 0
View file @
b2fe3798
fileFormatVersion: 2
guid: 726417bbac5d59e4ca46df0c81e62fa8
TextureImporter:
fileIDToRecycleName:
21300000: tmp3_0
21300002: tmp3_1
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: tmp3_0
rect:
serializedVersion: 2
x: 0
y: 127
width: 1050
height: 129
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 94830bfb5b28b8a49a805ae7ec8c71de
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp3_1
rect:
serializedVersion: 2
x: 0
y: 0
width: 622
height: 78
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 01f048ccc100ad74aaadf7db7550895e
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 3dd24610f597c204ab004b747b5972e0
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Inventory/tmp4.png
deleted
100644 → 0
View file @
b2fe3798
28.9 KB
Assets/Sprites/Inventory/tmp4.png.meta
deleted
100644 → 0
View file @
b2fe3798
fileFormatVersion: 2
guid: c448ed0a4ef1fc24a95611d602eca458
TextureImporter:
fileIDToRecycleName:
21300000: tmp4_0
21300002: tmp4_1
21300004: tmp4_2
21300006: tmp4_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: tmp4_0
rect:
serializedVersion: 2
x: 11
y: 690
width: 297
height: 170
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3e0086043c2678544b0633c277147292
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp4_1
rect:
serializedVersion: 2
x: 0
y: 461
width: 297
height: 171
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 246d20c1aa63dc64787908fae8fcce5f
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp4_2
rect:
serializedVersion: 2
x: 0
y: 215
width: 297
height: 170
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 916b395af1ce47c4b98e277076c8109f
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tmp4_3
rect:
serializedVersion: 2
x: 0
y: 0
width: 297
height: 170
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d531b4f42e967e044b7509118568a7c2
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 207a8f096d05e3945b73a2d6dbe34e4c
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
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