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
4f8c9083
Commit
4f8c9083
authored
Feb 23, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ABABAB 연타했을 때 강해지는것처럼 고의적으로 콤보 실패해서 이득보는거 없앰
parent
438734f7
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
314 additions
and
4 deletions
+314
-4
ComboUI.prefab
Assets/Prefabs/UI/In-Game UI/ComboUI.prefab
+4
-0
PlayerAttack.cs
Assets/Scripts/Characters/PlayerAttack.cs
+14
-2
ComboUI.cs
Assets/Scripts/UI/In-game UI/ComboUI.cs
+5
-2
comboCharBlackA.png
Assets/Sprites/Inventory/comboCharBlackA.png
+0
-0
comboCharBlackA.png.meta
Assets/Sprites/Inventory/comboCharBlackA.png.meta
+97
-0
comboCharBlackB.png
Assets/Sprites/Inventory/comboCharBlackB.png
+0
-0
comboCharBlackB.png.meta
Assets/Sprites/Inventory/comboCharBlackB.png.meta
+97
-0
comboCharBlackC.png
Assets/Sprites/Inventory/comboCharBlackC.png
+0
-0
comboCharBlackC.png.meta
Assets/Sprites/Inventory/comboCharBlackC.png.meta
+97
-0
No files found.
Assets/Prefabs/UI/In-Game UI/ComboUI.prefab
View file @
4f8c9083
...
@@ -104,6 +104,10 @@ MonoBehaviour:
...
@@ -104,6 +104,10 @@ MonoBehaviour:
-
{
fileID
:
21300000
,
guid
:
0f9aa2df06e79a64d8981a956eb12226
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
0f9aa2df06e79a64d8981a956eb12226
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
8a73c5ced4d09b74f89078836b9bd890
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
8a73c5ced4d09b74f89078836b9bd890
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
eff9d90dcca182243875912722e0cec7
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
eff9d90dcca182243875912722e0cec7
,
type
:
3
}
comboCancel
:
-
{
fileID
:
21300000
,
guid
:
a5e78d356e3459c4082372d961927dcd
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
c33e296b4b0bd4e429fa80b48b2d49c3
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
642e96523b3ac3a439c7ee479bfa7038
,
type
:
3
}
charSpaceR
:
0.4
charSpaceR
:
0.4
---
!u!222
&222456733401175092
---
!u!222
&222456733401175092
CanvasRenderer
:
CanvasRenderer
:
...
...
Assets/Scripts/Characters/PlayerAttack.cs
View file @
4f8c9083
...
@@ -65,7 +65,19 @@ public class PlayerAttack : MonoBehaviour {
...
@@ -65,7 +65,19 @@ public class PlayerAttack : MonoBehaviour {
public
void
SetComboText
()
public
void
SetComboText
()
{
{
comboUI
.
SetCombo
(
comboArray
);
bool
comboFail
=
true
;
List
<
Item
>
itemList
=
inventoryManager
.
itemList
;
foreach
(
Item
item
in
itemList
)
for
(
int
i
=
0
;
i
<
item
.
skillNum
;
i
++)
if
(
comboArray
.
Equals
(
item
.
combo
[
i
]))
comboFail
=
false
;
if
(
CheckLongerCombo
())
comboFail
=
false
;
if
(
comboArray
.
Length
==
1
)
comboFail
=
false
;
comboUI
.
SetCombo
(
comboArray
,
comboFail
);
}
}
public
void
SetTimeText
(
float
fullTime
,
float
currentTime
)
public
void
SetTimeText
(
float
fullTime
,
float
currentTime
)
...
@@ -153,7 +165,7 @@ public class PlayerAttack : MonoBehaviour {
...
@@ -153,7 +165,7 @@ public class PlayerAttack : MonoBehaviour {
if
(
playerController
.
playerState
!=
PlayerState
.
GoingUp
&&
playerController
.
playerState
!=
PlayerState
.
GoingDown
)
if
(
playerController
.
playerState
!=
PlayerState
.
GoingUp
&&
playerController
.
playerState
!=
PlayerState
.
GoingDown
)
GetComponent
<
Rigidbody2D
>().
velocity
=
new
Vector2
(
Mathf
.
Clamp
(
GetComponent
<
Rigidbody2D
>().
velocity
.
x
,
-
0.5f
,
0.5f
),
GetComponent
<
Rigidbody2D
>().
velocity
.
y
);
GetComponent
<
Rigidbody2D
>().
velocity
=
new
Vector2
(
Mathf
.
Clamp
(
GetComponent
<
Rigidbody2D
>().
velocity
.
x
,
-
0.5f
,
0.5f
),
GetComponent
<
Rigidbody2D
>().
velocity
.
y
);
playerController
.
playerState
=
PlayerState
.
Attack
;
playerController
.
playerState
=
PlayerState
.
Attack
;
if
(!
CheckLongerCombo
())
comboArray
=
comboArray
[
comboArray
.
Length
-
1
]
+
""
;
}
}
bool
CheckLongerCombo
()
bool
CheckLongerCombo
()
...
...
Assets/Scripts/UI/In-game UI/ComboUI.cs
View file @
4f8c9083
...
@@ -11,6 +11,7 @@ public class ComboUI : MonoBehaviour {
...
@@ -11,6 +11,7 @@ public class ComboUI : MonoBehaviour {
public
GameObject
charPrefab
;
public
GameObject
charPrefab
;
public
Sprite
[]
normalCombo
=
new
Sprite
[
3
];
public
Sprite
[]
normalCombo
=
new
Sprite
[
3
];
public
Sprite
[]
comboCancel
=
new
Sprite
[
3
];
public
float
charSpaceR
;
public
float
charSpaceR
;
...
@@ -41,10 +42,11 @@ public class ComboUI : MonoBehaviour {
...
@@ -41,10 +42,11 @@ public class ComboUI : MonoBehaviour {
}
}
public
void
SetCombo
(
string
combo
)
public
void
SetCombo
(
string
combo
,
bool
comboFail
)
{
{
for
(
int
i
=
0
;
i
<
8
;
i
++)
for
(
int
i
=
0
;
i
<
8
;
i
++)
{
{
if
(
combo
.
Length
<=
i
&&
currentCombo
.
Length
<=
i
)
if
(
combo
.
Length
<=
i
&&
currentCombo
.
Length
<=
i
)
{
{
break
;
break
;
...
@@ -55,7 +57,8 @@ public class ComboUI : MonoBehaviour {
...
@@ -55,7 +57,8 @@ public class ComboUI : MonoBehaviour {
}
}
else
else
{
{
Sprite
currentSprite
=
normalCombo
[
combo
[
i
]
-
'A'
];
Sprite
currentSprite
=
i
==
combo
.
Length
-
1
&&
comboFail
?
comboCancel
[
combo
[
i
]
-
'A'
]:
normalCombo
[
combo
[
i
]
-
'A'
];
charObj
[
i
].
SetActive
(
true
);
charObj
[
i
].
SetActive
(
true
);
charObj
[
i
].
GetComponent
<
Image
>().
sprite
=
currentSprite
;
charObj
[
i
].
GetComponent
<
Image
>().
sprite
=
currentSprite
;
charObj
[
i
].
GetComponent
<
RectTransform
>().
sizeDelta
=
new
Vector2
(
charObj
[
i
].
GetComponent
<
RectTransform
>().
sizeDelta
=
new
Vector2
(
...
...
Assets/Sprites/Inventory/comboCharBlackA.png
0 → 100644
View file @
4f8c9083
157 Bytes
Assets/Sprites/Inventory/comboCharBlackA.png.meta
0 → 100644
View file @
4f8c9083
fileFormatVersion: 2
guid: a5e78d356e3459c4082372d961927dcd
TextureImporter:
fileIDToRecycleName: {}
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: 1
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: []
outline: []
physicsShape: []
bones: []
spriteID: 121283db61803be489bb25aef8eff14e
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Inventory/comboCharBlackB.png
0 → 100644
View file @
4f8c9083
171 Bytes
Assets/Sprites/Inventory/comboCharBlackB.png.meta
0 → 100644
View file @
4f8c9083
fileFormatVersion: 2
guid: c33e296b4b0bd4e429fa80b48b2d49c3
TextureImporter:
fileIDToRecycleName: {}
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: 1
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: []
outline: []
physicsShape: []
bones: []
spriteID: a3ec56b4f67fd1d42aaba7ce3a4e8815
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Inventory/comboCharBlackC.png
0 → 100644
View file @
4f8c9083
145 Bytes
Assets/Sprites/Inventory/comboCharBlackC.png.meta
0 → 100644
View file @
4f8c9083
fileFormatVersion: 2
guid: 642e96523b3ac3a439c7ee479bfa7038
TextureImporter:
fileIDToRecycleName: {}
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: 1
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: []
outline: []
physicsShape: []
bones: []
spriteID: acccde7a215b7d641a3726e713058677
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