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
bb111fe7
Commit
bb111fe7
authored
Feb 03, 2019
by
18류지석
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
아이템 하이라이트 기능 추가, 일단 스프라이트가 있는 단검만 적용. 버그 찾음
parent
3568fa26
Changes
35
Show whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
453 additions
and
23 deletions
+453
-23
DroppedItem.prefab
Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
+78
-1
Baculus.png.meta
Assets/Resources/Sprites/Items/Baculus.png.meta
+13
-2
Festo.png.meta
Assets/Resources/Sprites/Items/Festo.png.meta
+13
-2
Frost Shield.png.meta
Assets/Resources/Sprites/Items/Frost Shield.png.meta
+13
-2
Morgenstern.png.meta
Assets/Resources/Sprites/Items/Morgenstern.png.meta
+13
-2
bamboo spear.png.meta
Assets/Resources/Sprites/Items/bamboo spear.png.meta
+13
-2
chain sickle.png.meta
Assets/Resources/Sprites/Items/chain sickle.png.meta
+13
-2
dagger.png
Assets/Resources/Sprites/Items/dagger.png
+0
-0
dagger.png.meta
Assets/Resources/Sprites/Items/dagger.png.meta
+97
-0
dagger_border.png
Assets/Resources/Sprites/Items/dagger_border.png
+0
-0
dagger_border.png.meta
Assets/Resources/Sprites/Items/dagger_border.png.meta
+97
-0
explosion gloves.png.meta
Assets/Resources/Sprites/Items/explosion gloves.png.meta
+13
-2
ksanife.png.meta
Assets/Resources/Sprites/Items/ksanife.png.meta
+13
-2
meteor sword.png.meta
Assets/Resources/Sprites/Items/meteor sword.png.meta
+13
-2
Addon.cs
Assets/Scripts/Item/Addon.cs
+2
-0
ApprenticesMark.cs
Assets/Scripts/Item/Addons/ApprenticesMark.cs
+1
-0
CoollyPride.cs
Assets/Scripts/Item/Addons/CoollyPride.cs
+1
-0
GlowingHerb.cs
Assets/Scripts/Item/Addons/GlowingHerb.cs
+1
-0
KnightsStirrup.cs
Assets/Scripts/Item/Addons/KnightsStirrup.cs
+1
-0
ParchmentPiece.cs
Assets/Scripts/Item/Addons/ParchmentPiece.cs
+1
-0
DroppedItem.cs
Assets/Scripts/Item/DroppedItem.cs
+8
-3
InventoryManager.cs
Assets/Scripts/Item/InventoryManager.cs
+2
-1
Item.cs
Assets/Scripts/Item/Item.cs
+2
-0
Baculus.cs
Assets/Scripts/Item/Items/Baculus.cs
+1
-0
BambooSpear.cs
Assets/Scripts/Item/Items/BambooSpear.cs
+1
-0
Bow.cs
Assets/Scripts/Item/Items/Bow.cs
+1
-0
ChainSickle.cs
Assets/Scripts/Item/Items/ChainSickle.cs
+1
-0
Dagger.cs
Assets/Scripts/Item/Items/Dagger.cs
+24
-0
Dagger.cs.meta
Assets/Scripts/Item/Items/Dagger.cs.meta
+11
-0
ExplosionGloves.cs
Assets/Scripts/Item/Items/ExplosionGloves.cs
+1
-0
Festo.cs
Assets/Scripts/Item/Items/Festo.cs
+1
-0
FrostShield.cs
Assets/Scripts/Item/Items/FrostShield.cs
+1
-0
Ksanife.cs
Assets/Scripts/Item/Items/Ksanife.cs
+1
-0
MeteorSword.cs
Assets/Scripts/Item/Items/MeteorSword.cs
+1
-0
Morgenstern.cs
Assets/Scripts/Item/Items/Morgenstern.cs
+1
-0
No files found.
Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
View file @
bb111fe7
...
...
@@ -30,6 +30,35 @@ GameObject:
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1886512004533810
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4161324837726830
}
-
component
:
{
fileID
:
212809307172866322
}
m_Layer
:
13
m_Name
:
Highlight
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4161324837726830
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1886512004533810
}
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
:
4490692399716652
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4490692399716652
Transform
:
m_ObjectHideFlags
:
1
...
...
@@ -39,7 +68,8 @@ Transform:
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
203.65184
,
y
:
44.907085
,
z
:
-0.060713544
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Children
:
-
{
fileID
:
4161324837726830
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -100,6 +130,7 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
itemAddon
:
0
highlight
:
{
fileID
:
1886512004533810
}
---
!u!212
&212078234558260036
SpriteRenderer
:
m_ObjectHideFlags
:
1
...
...
@@ -146,3 +177,49 @@ SpriteRenderer:
m_WasSpriteAssigned
:
0
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
---
!u!212
&212809307172866322
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1886512004533810
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
996861525
m_SortingLayer
:
8
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
1
,
y
:
1
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
0
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
Assets/Resources/Sprites/Items/Baculus.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/Festo.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/Frost Shield.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/Morgenstern.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/bamboo spear.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/chain sickle.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/dagger.png
0 → 100644
View file @
bb111fe7
1.02 KB
Assets/Resources/Sprites/Items/dagger.png.meta
0 → 100644
View file @
bb111fe7
fileFormatVersion: 2
guid: c6e7c50fdf2c1e34487f8ed145d97ecf
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: 9a381f72a64930741969d7b3102139b0
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Sprites/Items/dagger_border.png
0 → 100644
View file @
bb111fe7
410 Bytes
Assets/Resources/Sprites/Items/dagger_border.png.meta
0 → 100644
View file @
bb111fe7
fileFormatVersion: 2
guid: e30bda849e89c2b4687b76d15c3f45e3
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: 26aff9fc2c5f7ca48864fb117cff5f85
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Sprites/Items/explosion gloves.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/ksanife.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Resources/Sprites/Items/meteor sword.png.meta
View file @
bb111fe7
...
...
@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode:
-1
filterMode:
0
aniso: -1
mipBias: -100
wrapU: 1
...
...
@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 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
...
...
Assets/Scripts/Item/Addon.cs
View file @
bb111fe7
...
...
@@ -8,6 +8,7 @@ public abstract class Addon {
public
ItemQuality
quality
;
public
AddonType
type
;
public
Sprite
sprite
;
public
Sprite
highlight
;
public
Vector2
sizeInventory
;
public
Addon
()
...
...
@@ -20,6 +21,7 @@ public abstract class Addon {
quality
=
ItemQuality
.
Study
;
type
=
AddonType
.
Prop
;
sprite
=
null
;
highlight
=
null
;
sizeInventory
=
new
Vector2
(
0
,
0
);
}
}
Assets/Scripts/Item/Addons/ApprenticesMark.cs
View file @
bb111fe7
...
...
@@ -13,6 +13,7 @@ public class ApprenticesMark : Addon
quality
=
ItemQuality
.
Study
;
type
=
AddonType
.
Prop
;
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/apprentice's mark"
);
;
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/apprentice's mark"
);
;
sizeInventory
=
new
Vector2
(
80
,
80
);
}
}
Assets/Scripts/Item/Addons/CoollyPride.cs
View file @
bb111fe7
...
...
@@ -13,6 +13,7 @@ public class CoollyPride : Addon
quality
=
ItemQuality
.
Ordinary
;
type
=
AddonType
.
Theory
;
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/Coolly Pride"
);
;
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/Coolly Pride"
);
;
sizeInventory
=
new
Vector2
(
80
,
80
);
}
}
Assets/Scripts/Item/Addons/GlowingHerb.cs
View file @
bb111fe7
...
...
@@ -13,6 +13,7 @@ public class GlowingHerb : Addon
quality
=
ItemQuality
.
Ordinary
;
type
=
AddonType
.
Matter
;
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/Glowing Herb"
);
;
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/Glowing Herb"
);
;
sizeInventory
=
new
Vector2
(
80
,
80
);
}
}
Assets/Scripts/Item/Addons/KnightsStirrup.cs
View file @
bb111fe7
...
...
@@ -13,6 +13,7 @@ public class KnightsStirrup : Addon
quality
=
ItemQuality
.
Study
;
type
=
AddonType
.
Prop
;
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/Knight's stirrup"
);
;
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/Knight's stirrup"
);
;
sizeInventory
=
new
Vector2
(
80
,
80
);
}
}
Assets/Scripts/Item/Addons/ParchmentPiece.cs
View file @
bb111fe7
...
...
@@ -13,6 +13,7 @@ public class ParchmentPiece : Addon
quality
=
ItemQuality
.
Study
;
type
=
AddonType
.
Prop
;
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/parchment piece"
);
;
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Addons/parchment piece"
);
;
sizeInventory
=
new
Vector2
(
80
,
80
);
}
}
\ No newline at end of file
Assets/Scripts/Item/DroppedItem.cs
View file @
bb111fe7
...
...
@@ -8,6 +8,7 @@ public class DroppedItem : MonoBehaviour
public
bool
itemAddon
;
//false: item true: addon
public
Item
item
;
public
Addon
addon
;
public
GameObject
highlight
;
float
itemSizeMultiplier
=
0.0077f
;
Rigidbody2D
rb2D
;
BoxCollider2D
bc2D
;
...
...
@@ -23,9 +24,13 @@ public class DroppedItem : MonoBehaviour
transform
.
position
=
pos
;
sprt
.
sprite
=
item
.
sprite
;
highlight
.
GetComponent
<
SpriteRenderer
>().
sprite
=
item
.
highlight
;
highlight
.
SetActive
(
false
);
bc2D
.
size
=
sprt
.
size
;
transform
.
localScale
=
new
Vector3
((
item
.
sizeInventory
.
x
*
itemSizeMultiplier
)
/
sprt
.
size
.
x
,
(
item
.
sizeInventory
.
y
*
itemSizeMultiplier
)
/
sprt
.
size
.
y
,
1
);
}
public
void
Init
(
Addon
_addon
,
Vector3
pos
)
{
...
...
@@ -38,7 +43,8 @@ public class DroppedItem : MonoBehaviour
transform
.
position
=
pos
;
sprt
.
sprite
=
addon
.
sprite
;
sprt
.
size
=
addon
.
sizeInventory
/
100f
;
highlight
.
GetComponent
<
SpriteRenderer
>().
sprite
=
addon
.
highlight
;
highlight
.
SetActive
(
false
);
bc2D
.
size
=
sprt
.
size
;
transform
.
localScale
=
new
Vector3
((
addon
.
sizeInventory
.
x
*
itemSizeMultiplier
)
/
sprt
.
size
.
x
,
(
addon
.
sizeInventory
.
y
*
itemSizeMultiplier
)
/
sprt
.
size
.
y
,
1
);
}
...
...
@@ -58,7 +64,6 @@ public class DroppedItem : MonoBehaviour
}
public
void
HighlightSwitch
(
bool
enabled
)
{
if
(
itemAddon
)
Debug
.
Log
(
addon
.
name
+
(
enabled
?
"on"
:
"off"
));
else
Debug
.
Log
(
item
.
name
+
(
enabled
?
"on"
:
"off"
));
highlight
.
SetActive
(
enabled
);
}
}
Assets/Scripts/Item/InventoryManager.cs
View file @
bb111fe7
...
...
@@ -35,6 +35,7 @@ public class InventoryManager : MonoBehaviour {
}
itemPool
[
0
].
Add
(
"Bow"
);
itemPool
[
0
].
Add
(
"Dagger"
);
itemPool
[
1
].
Add
(
"Baculus"
);
itemPool
[
1
].
Add
(
"BambooSpear"
);
...
...
@@ -82,7 +83,7 @@ public class InventoryManager : MonoBehaviour {
IEnumerator
TestCoroutine
()
{
yield
return
null
;
ItemInstantiate
(
ItemQuality
.
Ordinar
y
,
player
.
transform
.
position
);
ItemInstantiate
(
ItemQuality
.
Stud
y
,
player
.
transform
.
position
);
/*PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2])));
yield return new WaitForSeconds(1.5f);
...
...
Assets/Scripts/Item/Item.cs
View file @
bb111fe7
...
...
@@ -12,6 +12,7 @@ public abstract class Item {
public
bool
[]
attachable
=
new
bool
[
4
];
//0: prop 1: matter 2: component 3:theory
public
Addon
[]
addons
=
new
Addon
[
4
];
//0: prop 1: matter 2: component 3:theory
public
Sprite
sprite
;
public
Sprite
highlight
;
public
Vector2
sizeInventory
;
public
bool
ComboAction
(
string
currentCombo
)
...
...
@@ -47,6 +48,7 @@ public abstract class Item {
combo
=
new
string
[
3
]
{
""
,
""
,
""
};
attachable
=
new
bool
[
4
]
{
false
,
false
,
false
,
false
};
sprite
=
null
;
highlight
=
null
;
animation
[
0
]
=
null
;
animation
[
1
]
=
null
;
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/Baculus.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class Baculus : Item
combo
=
new
string
[
3
]
{
"BCB"
,
"ACBC"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
true
,
false
,
true
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/Baculus"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/Baculus"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/baculusAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/baculusAttack2"
);
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/BambooSpear.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class BambooSpear : Item
combo
=
new
string
[
3
]
{
"BAA"
,
"BAC"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
false
,
true
,
true
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/bamboo spear"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/bamboo spear"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/bambooSpearAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/bambooSpearAttack2"
);
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/Bow.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class Bow : Item {
combo
=
new
string
[
3
]
{
"BB"
,
"BC"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
true
,
true
,
true
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/bow"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/bow"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/bowAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/bowAttack2"
);
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/ChainSickle.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class ChainSickle : Item
combo
=
new
string
[
3
]
{
"AAB"
,
"AABC"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
false
,
true
,
true
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/chain sickle"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/chain sickle"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/chainSickleAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/chainSickleAttack2"
);
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/Dagger.cs
0 → 100644
View file @
bb111fe7
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
/// <summary>
/// 아이템명: 단검
/// 번호: 1
/// </summary>
public
class
Dagger
:
Item
{
public
override
void
Declare
()
{
id
=
1
;
name
=
"dagger"
;
quality
=
ItemQuality
.
Study
;
skillNum
=
2
;
combo
=
new
string
[
3
]
{
"A"
,
"AA"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
true
,
true
,
true
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/dagger"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/dagger_border"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/chainSickleAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/chainSickleAttack2"
);
animation
[
2
]
=
null
;
sizeInventory
=
new
Vector2
(
127.5f
,
125
);
}
}
Assets/Scripts/Item/Items/Dagger.cs.meta
0 → 100644
View file @
bb111fe7
fileFormatVersion: 2
guid: db9d637015c6fae4c86e21cb6fa6a516
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Item/Items/ExplosionGloves.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class ExplosionGloves : Item
combo
=
new
string
[
3
]
{
"CAC"
,
"CA"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
false
,
true
,
true
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/explosion gloves"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/explosion gloves"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/explosionGlovesAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/explosionGlovesAttack2"
);
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/Festo.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class Festo : Item
combo
=
new
string
[
3
]
{
""
,
""
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
true
,
false
,
false
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/Festo"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/Festo"
);
sizeInventory
=
new
Vector2
(
90
,
160
);
}
}
Assets/Scripts/Item/Items/FrostShield.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class FrostShield : Item
combo
=
new
string
[
3
]
{
"C"
,
""
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
true
,
true
,
false
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/frost shield"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/frost shield"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/frostShieldAttack1"
);
animation
[
1
]
=
null
;
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/Ksanife.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class Ksanife : Item
combo
=
new
string
[
3
]
{
"A"
,
"AABAA"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
true
,
false
,
false
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/ksanife"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/ksanife"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/ksanifeAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/ksanifeAttack2"
);
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/MeteorSword.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class MeteorSword : Item
combo
=
new
string
[
3
]
{
"ABAAC"
,
"ABACC"
,
""
};
attachable
=
new
bool
[
4
]
{
true
,
false
,
false
,
false
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/meteor sword"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/meteor sword"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/meteorSwordAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/meteorSwordAttack2"
);
animation
[
2
]
=
null
;
...
...
Assets/Scripts/Item/Items/Morgenstern.cs
View file @
bb111fe7
...
...
@@ -15,6 +15,7 @@ public class Morgenstern : Item
combo
=
new
string
[
3
]
{
"BBCAA"
,
"BBB"
,
""
};
attachable
=
new
bool
[
4
]
{
false
,
true
,
false
,
true
};
sprite
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/Morgenstern"
);
highlight
=
Resources
.
Load
<
Sprite
>(
"Sprites/Items/Morgenstern"
);
animation
[
0
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/morgensternAttack1"
);
animation
[
1
]
=
Resources
.
Load
<
AnimationClip
>(
"Animations/morgensternAttack2"
);
animation
[
2
]
=
null
;
...
...
18류지석
@RoadMageB
mentioned in commit
6057cd7b
·
Feb 03, 2019
mentioned in commit
6057cd7b
mentioned in commit 6057cd7b76a3fed22a985968f3038b43a37d7f59
Toggle commit list
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