Commit ce128779 authored by 18류지석's avatar 18류지석

Revert "Revert "아이템 하이라이트 기능 추가, 일단 스프라이트가 있는 단검만 적용. 버그 찾음""

This reverts commit 6057cd7b.
parent 6057cd7b
...@@ -30,6 +30,35 @@ GameObject: ...@@ -30,6 +30,35 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 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 --- !u!4 &4490692399716652
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -39,7 +68,8 @@ Transform: ...@@ -39,7 +68,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 203.65184, y: 44.907085, z: -0.060713544} m_LocalPosition: {x: 203.65184, y: 44.907085, z: -0.060713544}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 4161324837726830}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -100,6 +130,7 @@ MonoBehaviour: ...@@ -100,6 +130,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
itemAddon: 0 itemAddon: 0
highlight: {fileID: 1886512004533810}
--- !u!212 &212078234558260036 --- !u!212 &212078234558260036
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -146,3 +177,49 @@ SpriteRenderer: ...@@ -146,3 +177,49 @@ SpriteRenderer:
m_WasSpriteAssigned: 0 m_WasSpriteAssigned: 0
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 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
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
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:
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:
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 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 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
...@@ -8,6 +8,7 @@ public abstract class Addon { ...@@ -8,6 +8,7 @@ public abstract class Addon {
public ItemQuality quality; public ItemQuality quality;
public AddonType type; public AddonType type;
public Sprite sprite; public Sprite sprite;
public Sprite highlight;
public Vector2 sizeInventory; public Vector2 sizeInventory;
public Addon() public Addon()
...@@ -20,6 +21,7 @@ public abstract class Addon { ...@@ -20,6 +21,7 @@ public abstract class Addon {
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = null; sprite = null;
highlight = null;
sizeInventory = new Vector2(0, 0); sizeInventory = new Vector2(0, 0);
} }
} }
...@@ -13,6 +13,7 @@ public class ApprenticesMark : Addon ...@@ -13,6 +13,7 @@ public class ApprenticesMark : Addon
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
...@@ -13,6 +13,7 @@ public class CoollyPride : Addon ...@@ -13,6 +13,7 @@ public class CoollyPride : Addon
quality = ItemQuality.Ordinary; quality = ItemQuality.Ordinary;
type = AddonType.Theory; type = AddonType.Theory;
sprite = Resources.Load<Sprite>("Sprites/Addons/Coolly Pride"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/Coolly Pride"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/Coolly Pride"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
...@@ -13,6 +13,7 @@ public class GlowingHerb : Addon ...@@ -13,6 +13,7 @@ public class GlowingHerb : Addon
quality = ItemQuality.Ordinary; quality = ItemQuality.Ordinary;
type = AddonType.Matter; type = AddonType.Matter;
sprite = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
...@@ -13,6 +13,7 @@ public class KnightsStirrup : Addon ...@@ -13,6 +13,7 @@ public class KnightsStirrup : Addon
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = Resources.Load<Sprite>("Sprites/Addons/Knight's stirrup"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/Knight's stirrup"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/Knight's stirrup"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
...@@ -13,6 +13,7 @@ public class ParchmentPiece : Addon ...@@ -13,6 +13,7 @@ public class ParchmentPiece : Addon
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
\ No newline at end of file
...@@ -8,6 +8,7 @@ public class DroppedItem : MonoBehaviour ...@@ -8,6 +8,7 @@ public class DroppedItem : MonoBehaviour
public bool itemAddon; //false: item true: addon public bool itemAddon; //false: item true: addon
public Item item; public Item item;
public Addon addon; public Addon addon;
public GameObject highlight;
float itemSizeMultiplier = 0.0077f; float itemSizeMultiplier = 0.0077f;
Rigidbody2D rb2D; Rigidbody2D rb2D;
BoxCollider2D bc2D; BoxCollider2D bc2D;
...@@ -23,8 +24,12 @@ public class DroppedItem : MonoBehaviour ...@@ -23,8 +24,12 @@ public class DroppedItem : MonoBehaviour
transform.position = pos; transform.position = pos;
sprt.sprite = item.sprite; sprt.sprite = item.sprite;
highlight.GetComponent<SpriteRenderer>().sprite = item.highlight;
highlight.SetActive(false);
bc2D.size = sprt.size; bc2D.size = sprt.size;
transform.localScale = new Vector3((item.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (item.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1); 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) public void Init(Addon _addon, Vector3 pos)
...@@ -38,7 +43,8 @@ public class DroppedItem : MonoBehaviour ...@@ -38,7 +43,8 @@ public class DroppedItem : MonoBehaviour
transform.position = pos; transform.position = pos;
sprt.sprite = addon.sprite; sprt.sprite = addon.sprite;
sprt.size = addon.sizeInventory / 100f; highlight.GetComponent<SpriteRenderer>().sprite = addon.highlight;
highlight.SetActive(false);
bc2D.size = sprt.size; bc2D.size = sprt.size;
transform.localScale = new Vector3((addon.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (addon.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1); 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 ...@@ -58,7 +64,6 @@ public class DroppedItem : MonoBehaviour
} }
public void HighlightSwitch(bool enabled) public void HighlightSwitch(bool enabled)
{ {
if (itemAddon) Debug.Log(addon.name + (enabled ? "on" : "off")); highlight.SetActive(enabled);
else Debug.Log(item.name + (enabled ? "on" : "off"));
} }
} }
...@@ -35,6 +35,7 @@ public class InventoryManager : MonoBehaviour { ...@@ -35,6 +35,7 @@ public class InventoryManager : MonoBehaviour {
} }
itemPool[0].Add("Bow"); itemPool[0].Add("Bow");
itemPool[0].Add("Dagger");
itemPool[1].Add("Baculus"); itemPool[1].Add("Baculus");
itemPool[1].Add("BambooSpear"); itemPool[1].Add("BambooSpear");
...@@ -82,7 +83,7 @@ public class InventoryManager : MonoBehaviour { ...@@ -82,7 +83,7 @@ public class InventoryManager : MonoBehaviour {
IEnumerator TestCoroutine() IEnumerator TestCoroutine()
{ {
yield return null; yield return null;
ItemInstantiate(ItemQuality.Ordinary, player.transform.position); ItemInstantiate(ItemQuality.Study, player.transform.position);
/*PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0]))); /*PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2]))); PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2])));
yield return new WaitForSeconds(1.5f); yield return new WaitForSeconds(1.5f);
......
...@@ -12,6 +12,7 @@ public abstract class Item { ...@@ -12,6 +12,7 @@ public abstract class Item {
public bool[] attachable = new bool[4]; //0: prop 1: matter 2: component 3:theory 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 Addon[] addons = new Addon[4]; //0: prop 1: matter 2: component 3:theory
public Sprite sprite; public Sprite sprite;
public Sprite highlight;
public Vector2 sizeInventory; public Vector2 sizeInventory;
public bool ComboAction(string currentCombo) public bool ComboAction(string currentCombo)
...@@ -47,6 +48,7 @@ public abstract class Item { ...@@ -47,6 +48,7 @@ public abstract class Item {
combo = new string[3] { "", "", "" }; combo = new string[3] { "", "", "" };
attachable = new bool[4] { false, false, false, false }; attachable = new bool[4] { false, false, false, false };
sprite = null; sprite = null;
highlight = null;
animation[0] = null; animation[0] = null;
animation[1] = null; animation[1] = null;
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class Baculus : Item ...@@ -15,6 +15,7 @@ public class Baculus : Item
combo = new string[3] { "BCB", "ACBC", "" }; combo = new string[3] { "BCB", "ACBC", "" };
attachable = new bool[4] { true, true, false, true }; attachable = new bool[4] { true, true, false, true };
sprite = Resources.Load<Sprite>("Sprites/Items/Baculus"); sprite = Resources.Load<Sprite>("Sprites/Items/Baculus");
highlight = Resources.Load<Sprite>("Sprites/Items/Baculus");
animation[0] = Resources.Load<AnimationClip>("Animations/baculusAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/baculusAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/baculusAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/baculusAttack2");
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class BambooSpear : Item ...@@ -15,6 +15,7 @@ public class BambooSpear : Item
combo = new string[3] { "BAA", "BAC", "" }; combo = new string[3] { "BAA", "BAC", "" };
attachable = new bool[4] { true, false, true, true }; attachable = new bool[4] { true, false, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/bamboo spear"); sprite = Resources.Load<Sprite>("Sprites/Items/bamboo spear");
highlight = Resources.Load<Sprite>("Sprites/Items/bamboo spear");
animation[0] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack2");
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class Bow : Item { ...@@ -15,6 +15,7 @@ public class Bow : Item {
combo = new string[3] { "BB", "BC", "" }; combo = new string[3] { "BB", "BC", "" };
attachable = new bool[4] { true, true, true, true }; attachable = new bool[4] { true, true, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/bow"); sprite = Resources.Load<Sprite>("Sprites/Items/bow");
highlight = Resources.Load<Sprite>("Sprites/Items/bow");
animation[0] = Resources.Load<AnimationClip>("Animations/bowAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/bowAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/bowAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/bowAttack2");
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class ChainSickle : Item ...@@ -15,6 +15,7 @@ public class ChainSickle : Item
combo = new string[3] { "AAB", "AABC", "" }; combo = new string[3] { "AAB", "AABC", "" };
attachable = new bool[4] { true, false, true, true }; attachable = new bool[4] { true, false, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/chain sickle"); sprite = Resources.Load<Sprite>("Sprites/Items/chain sickle");
highlight = Resources.Load<Sprite>("Sprites/Items/chain sickle");
animation[0] = Resources.Load<AnimationClip>("Animations/chainSickleAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/chainSickleAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/chainSickleAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/chainSickleAttack2");
animation[2] = null; animation[2] = null;
......
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);
}
}
fileFormatVersion: 2
guid: db9d637015c6fae4c86e21cb6fa6a516
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
...@@ -15,6 +15,7 @@ public class ExplosionGloves : Item ...@@ -15,6 +15,7 @@ public class ExplosionGloves : Item
combo = new string[3] { "CAC", "CA", "" }; combo = new string[3] { "CAC", "CA", "" };
attachable = new bool[4] { true, false, true, true }; attachable = new bool[4] { true, false, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/explosion gloves"); sprite = Resources.Load<Sprite>("Sprites/Items/explosion gloves");
highlight = Resources.Load<Sprite>("Sprites/Items/explosion gloves");
animation[0] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack2");
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class Festo : Item ...@@ -15,6 +15,7 @@ public class Festo : Item
combo = new string[3] { "", "", "" }; combo = new string[3] { "", "", "" };
attachable = new bool[4] { true, true, false, false }; attachable = new bool[4] { true, true, false, false };
sprite = Resources.Load<Sprite>("Sprites/Items/Festo"); sprite = Resources.Load<Sprite>("Sprites/Items/Festo");
highlight = Resources.Load<Sprite>("Sprites/Items/Festo");
sizeInventory = new Vector2(90, 160); sizeInventory = new Vector2(90, 160);
} }
} }
...@@ -15,6 +15,7 @@ public class FrostShield : Item ...@@ -15,6 +15,7 @@ public class FrostShield : Item
combo = new string[3] { "C", "", "" }; combo = new string[3] { "C", "", "" };
attachable = new bool[4] { true, true, true, false }; attachable = new bool[4] { true, true, true, false };
sprite = Resources.Load<Sprite>("Sprites/Items/frost shield"); sprite = Resources.Load<Sprite>("Sprites/Items/frost shield");
highlight = Resources.Load<Sprite>("Sprites/Items/frost shield");
animation[0] = Resources.Load<AnimationClip>("Animations/frostShieldAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/frostShieldAttack1");
animation[1] = null; animation[1] = null;
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class Ksanife : Item ...@@ -15,6 +15,7 @@ public class Ksanife : Item
combo = new string[3] { "A", "AABAA", "" }; combo = new string[3] { "A", "AABAA", "" };
attachable = new bool[4] { true, true, false, false }; attachable = new bool[4] { true, true, false, false };
sprite = Resources.Load<Sprite>("Sprites/Items/ksanife"); sprite = Resources.Load<Sprite>("Sprites/Items/ksanife");
highlight = Resources.Load<Sprite>("Sprites/Items/ksanife");
animation[0] = Resources.Load<AnimationClip>("Animations/ksanifeAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/ksanifeAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/ksanifeAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/ksanifeAttack2");
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class MeteorSword : Item ...@@ -15,6 +15,7 @@ public class MeteorSword : Item
combo = new string[3] { "ABAAC", "ABACC", "" }; combo = new string[3] { "ABAAC", "ABACC", "" };
attachable = new bool[4] { true, false, false, false }; attachable = new bool[4] { true, false, false, false };
sprite = Resources.Load<Sprite>("Sprites/Items/meteor sword"); sprite = Resources.Load<Sprite>("Sprites/Items/meteor sword");
highlight = Resources.Load<Sprite>("Sprites/Items/meteor sword");
animation[0] = Resources.Load<AnimationClip>("Animations/meteorSwordAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/meteorSwordAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/meteorSwordAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/meteorSwordAttack2");
animation[2] = null; animation[2] = null;
......
...@@ -15,6 +15,7 @@ public class Morgenstern : Item ...@@ -15,6 +15,7 @@ public class Morgenstern : Item
combo = new string[3] { "BBCAA", "BBB", "" }; combo = new string[3] { "BBCAA", "BBB", "" };
attachable = new bool[4] { false, true, false, true }; attachable = new bool[4] { false, true, false, true };
sprite = Resources.Load<Sprite>("Sprites/Items/Morgenstern"); sprite = Resources.Load<Sprite>("Sprites/Items/Morgenstern");
highlight = Resources.Load<Sprite>("Sprites/Items/Morgenstern");
animation[0] = Resources.Load<AnimationClip>("Animations/morgensternAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/morgensternAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/morgensternAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/morgensternAttack2");
animation[2] = null; animation[2] = null;
......
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