Commit 3973b1f5 authored by 18손재민's avatar 18손재민

Merge branch 'item'

parents e00e12b0 6a631462
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1158438046996312}
m_IsPrefabAsset: 1
--- !u!1 &1063846926563276
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224955074003992326}
- component: {fileID: 222041065703517942}
- component: {fileID: 114984049000047076}
m_Layer: 5
m_Name: AddonPrefab
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1158438046996312
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224412768075781146}
- component: {fileID: 222500364057937250}
- component: {fileID: 114685941471201550}
m_Layer: 5
m_Name: AddonInfoPrefab
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1265116766834632
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224212965343426452}
- component: {fileID: 222028133681344650}
- component: {fileID: 114365590454599560}
m_Layer: 5
m_Name: Sprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &114365590454599560
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1265116766834632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114685941471201550
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1158438046996312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114984049000047076
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1063846926563276}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &222028133681344650
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1265116766834632}
m_CullTransparentMesh: 0
--- !u!222 &222041065703517942
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1063846926563276}
m_CullTransparentMesh: 0
--- !u!222 &222500364057937250
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1158438046996312}
m_CullTransparentMesh: 0
--- !u!224 &224212965343426452
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1265116766834632}
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: 224955074003992326}
m_RootOrder: 0
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224412768075781146
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1158438046996312}
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:
- {fileID: 224955074003992326}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -530, y: 315}
m_SizeDelta: {x: 500, y: 285}
m_Pivot: {x: 1, y: 0}
--- !u!224 &224955074003992326
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1063846926563276}
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:
- {fileID: 224212965343426452}
m_Father: {fileID: 224412768075781146}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -425, y: 210}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -21,6 +21,7 @@ GameObject:
- component: {fileID: 224096546691899896}
- component: {fileID: 222124584186290874}
- component: {fileID: 114522448998657828}
- component: {fileID: 114928680700850466}
m_Layer: 5
m_Name: AddonPrefab
m_TagString: Untagged
......@@ -99,6 +100,18 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114928680700850466
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1238917563857390}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a124b15eafc6d1847979588fabbb0756, type: 3}
m_Name:
m_EditorClassIdentifier:
num: 0
--- !u!222 &222124584186290874
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -127,9 +140,9 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -107, y: 340}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 813, y: 32}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224492316385021048
......
......@@ -51,4 +51,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 674793b622d7c184882dfeb8784bbf92, type: 3}
m_Name:
m_EditorClassIdentifier:
ui: {fileID: 0}
itemPool: []
addonPool: []
......@@ -38,6 +38,7 @@ GameObject:
- component: {fileID: 224433717884737446}
- component: {fileID: 222821308241851390}
- component: {fileID: 114154159159638754}
- component: {fileID: 114318527970448576}
m_Layer: 5
m_Name: ItemPrefab
m_TagString: Untagged
......@@ -72,6 +73,18 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114318527970448576
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1092255009510926}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 869a9dcc81d16d247adf8fc5d51f0a4e, type: 3}
m_Name:
m_EditorClassIdentifier:
num: 0
--- !u!114 &114389172124673674
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -127,9 +140,9 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -246.02, y: 456.2}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 673.98, y: 148.20001}
m_SizeDelta: {x: 175, y: 175}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224463086970414044
......
fileFormatVersion: 2
guid: ec7d4df9cd2ff4648b99ddfd6f8fccb4
NativeFormatImporter:
guid: 3e52428a7001e1f48be99c1b76dea8bf
folderAsset: yes
DefaultImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 13a74e9680bb2e94bbc5e72af7d177a1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5f0f82c8f69752b41934a9f4da66aaad
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e30fa0eb5dba52346b437a19750953a6
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: -1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b106d014c014de14e959afa71c69a0d5
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f2fabf1d66fa6b84488c094cba2c3cc9
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: -1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 0f8b6945a5a9f0a4d8af2b04fdb02750
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5fba86f590af1e54fbb4b13f6fe4805a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1c5da66e44f95ed478fe2db14e5e57f1
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: -1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 7e861dd4e8841304a92c1bda6e1ad6c7
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4e3eaff66b45c4145b9e6eb046e12950
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: 47b471419301bbe448de2921bd77e9f3
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b0d7cea3fcb24274aadf1b76f2a7d5a7
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: -1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5a1813ab014106943a63b32f4e4736b2
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
......@@ -3,7 +3,23 @@ using System.Collections.Generic;
using UnityEngine;
public abstract class Addon {
public int id;
public string name;
public ItemQuality quality;
public AddonType type;
public Sprite sprite;
public Vector2 sizeInventory;
public Addon()
{
Declare();
}
public virtual void Declare()
{
id = 0; name = "itemname";
quality = ItemQuality.Study;
type = AddonType.Prop;
sprite = null;
sizeInventory = new Vector2(0, 0);
}
}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
{
public int num;
InventoryUI ui;
InventoryManager manager;
void Start()
{
ui = GameObject.Find("InventoryCanvas").GetComponent<InventoryUI>();
manager = GameObject.Find("InventoryManager").GetComponent<InventoryManager>();
}
public void OnBeginDrag(PointerEventData eventData)
{
transform.SetAsLastSibling();
}
public void OnDrag(PointerEventData eventData)
{
transform.position = Input.mousePosition;
}
public void OnEndDrag(PointerEventData eventData)
{
if (num < 9)
{
int type = (int)manager.addonList[num].type;
if (manager.itemList[ui.selectedItem].attachable[type])
{
if (CheckBetween(Input.mousePosition, ui.infoAddonsFrame[type].transform.position, ui.infoAddonsFrame[type].GetComponent<RectTransform>().sizeDelta))
{
if (manager.itemList[ui.selectedItem].addons[type] != null) manager.DetachAddon(ui.selectedItem, (AddonType)type);
manager.AttachAddon(ui.selectedItem, num);
}
}
}
else
{
if (CheckBetween(Input.mousePosition, ui.gameObject.transform.Find("AddonGroup").position, ui.gameObject.transform.Find("AddonGroup").GetComponent<RectTransform>().sizeDelta))
manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9));
}
manager.SetOnPosition();
}
bool CheckBetween(Vector3 mouse, Vector3 center, Vector2 size)
{
return Mathf.Abs(mouse.x - center.x) <= size.x / 2f && Mathf.Abs(mouse.y - center.y) <= size.y / 2f;
}
}
fileFormatVersion: 2
guid: a124b15eafc6d1847979588fabbb0756
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 애드온명: 수습생의 표식
/// 번호: 1
/// </summary>
public class ApprenticesMark : Addon
{
public override void Declare()
{
id = 0; name = "apprentice's mark";
quality = ItemQuality.Study;
type = AddonType.Theory;
sprite = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ;
sizeInventory = new Vector2(80, 80);
}
}
fileFormatVersion: 2
guid: ac6841f0a5ab82b40a85b0afab5e05e8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 애드온명: 양피지 조각
/// 번호: 1
/// </summary>
public class ParchmentPiece : Addon
{
public override void Declare()
{
id = 0; name = "parchment piece";
quality = ItemQuality.Study;
type = AddonType.Prop;
sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
sizeInventory = new Vector2(80, 80);
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 6e2e50824694ba54784487b4ae354285
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -4,43 +4,85 @@ using UnityEngine;
public class InventoryManager : MonoBehaviour {
List<Item> itemList = new List<Item>();
List<Addon> addonList = new List<Addon>();
public List<Item> itemList = new List<Item>();
public List<Addon> addonList = new List<Addon>();
InventoryUI ui;
public List<string> itemPool = new List<string>();
public List<string> addonPool = new List<string>();
private void Start()
{
//ui = GameObject.Find("")
ui = GameObject.Find("InventoryCanvas").GetComponent<InventoryUI>();
//itemPool
itemPool.Add("Bow");
itemPool.Add("BambooSpear");
itemPool.Add("Ksanife");
//addonPool
addonPool.Add("ApprenticesMark");
addonPool.Add("ParchmentPiece");
StartCoroutine("TestCoroutine");
}
IEnumerator TestCoroutine()
{
yield return null;
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
yield return new WaitForSeconds(1f);
ItemSelect(0);
yield return new WaitForSeconds(1f);
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[1])));
yield return new WaitForSeconds(1f);
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2])));
yield return new WaitForSeconds(1f);
PushAddon((Addon)System.Activator.CreateInstance(System.Type.GetType(addonPool[0])));
yield return new WaitForSeconds(1f);
PushAddon((Addon)System.Activator.CreateInstance(System.Type.GetType(addonPool[1])));
yield return new WaitForSeconds(1f);
AttachAddon(0, 0);
yield return new WaitForSeconds(1f);
}
public void SetOnPosition()
{
ui.SetOnPosition(itemList, addonList);
}
public void ItemSelect(int itemIndex)
{
ui.selectedItem = itemIndex;
ui.SetOnPosition(itemList, addonList);
}
public void PushItem(Item item)
{
if(itemList.Count < 9)
itemList.Add(item);
ui.SetOnPosition(itemList, addonList);
}
public void PushAddon(Addon addon)
{
if (addonList.Count < 9)
addonList.Add(addon);
ui.SetOnPosition(itemList, addonList);
}
public void DiscardItem(int index)
{
if (itemList.Count > index)
itemList.RemoveAt(index);
ui.SetOnPosition(itemList, addonList);
}
public void DiscardAddon(int index)
{
if (addonList.Count > index)
addonList.RemoveAt(index);
ui.SetOnPosition(itemList, addonList);
}
public void DiscardAddon(int itemIndex, AddonType addonType)
{
if (itemList[itemIndex].addons[(int)addonType] != null)
itemList[itemIndex].addons[(int)addonType] = null;
ui.SetOnPosition(itemList, addonList);
}
public void AttachAddon(int itemIndex, int addonIndex)
{
......@@ -49,6 +91,7 @@ public class InventoryManager : MonoBehaviour {
itemList[itemIndex].addons[(int)addonList[addonIndex].type] = addonList[addonIndex];
addonList.RemoveAt(addonIndex);
}
ui.SetOnPosition(itemList, addonList);
}
public void DetachAddon(int itemIndex, AddonType addonType)
{
......@@ -57,6 +100,7 @@ public class InventoryManager : MonoBehaviour {
addonList.Add(itemList[itemIndex].addons[(int)addonType]);
itemList[itemIndex].addons[(int)addonType] = null;
}
ui.SetOnPosition(itemList, addonList);
}
}
......@@ -10,7 +10,6 @@ public class InventoryUI : MonoBehaviour {
public GameObject[] infoAddonSpace;
public GameObject itemPrefab;
public GameObject addonPrefab;
public GameObject infoAddonPrefab;
/// <summary>
/// index: addonType * 2 + a
/// a{
......@@ -25,28 +24,37 @@ public class InventoryUI : MonoBehaviour {
public Sprite[] addonFrameQuality = new Sprite[16];
public Sprite[] itemFrameQuality = new Sprite[4];
public Sprite[] infoFrameQuality = new Sprite[4];
public Sprite[] infoAddonType = new Sprite[4];
GameObject[] items;
GameObject[] addons;
public GameObject[] infoAddonsFrame;
GameObject[] infoAddons;
int selectedItem = -1;
public int selectedItem = -1;
void Start () {
items = new GameObject[9];
addons = new GameObject[9];
infoAddons = new GameObject[4];
for (int i = 0; i < 9; i++)
{
items[i] = Instantiate(itemPrefab, itemCell[i].transform.position, itemCell[i].transform.rotation, transform);
items[i].SetActive(false);
items[i].GetComponent<ItemDrag>().num = i;
addons[i] = Instantiate(addonPrefab, addonCell[i].transform.position, addonCell[i].transform.rotation, transform);
addons[i].SetActive(false);
addons[i].GetComponent<AddonDrag>().num = i;
}
for (int i = 0; i < 4; i++)
{
infoAddons[i] = Instantiate(infoAddonPrefab, infoAddonSpace[i].transform.position, infoAddonSpace[i].transform.rotation, transform);
infoAddonsFrame[i].GetComponent<Image>().sprite = infoAddonType[i];
infoAddonsFrame[i].SetActive(false);
infoAddons[i] = Instantiate(addonPrefab, infoAddonsFrame[i].transform.Find("AddonCell").position, Quaternion.identity, transform);
infoAddons[i].GetComponent<AddonDrag>().num = 9 + i;
infoAddons[i].SetActive(false);
}
infoSpace.transform.Find("Frame").gameObject.SetActive(false);
}
public void SetOnPosition(List<Item> itemList, List<Addon> addonList)
{
for(int i=0; i<itemList.Count; i++)
......@@ -54,6 +62,7 @@ public class InventoryUI : MonoBehaviour {
items[i].transform.position = itemCell[i].transform.position;
items[i].GetComponent<Image>().sprite = itemFrameQuality[(int)itemList[i].quality];
items[i].transform.Find("Sprite").gameObject.GetComponent<Image>().sprite = itemList[i].sprite;
items[i].transform.Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = itemList[i].sizeInventory;
items[i].SetActive(true);
}
for(int i=itemList.Count; i<9; i++)
......@@ -63,31 +72,46 @@ public class InventoryUI : MonoBehaviour {
addons[i].transform.position = addonCell[i].transform.position;
addons[i].GetComponent<Image>().sprite = addonFrameQuality[(int)addonList[i].type * 4 + (int)addonList[i].quality];
addons[i].transform.Find("Sprite").gameObject.GetComponent<Image>().sprite = addonList[i].sprite;
addons[i].transform.Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = addonList[i].sizeInventory;
addons[i].SetActive(true);
}
for (int i = itemList.Count; i < 9; i++)
for (int i = addonList.Count; i < 9; i++)
addons[i].SetActive(false);
GameObject frameObj = infoSpace.transform.Find("Frame").gameObject;
if(selectedItem >= 0)
{
GameObject frameObj = infoSpace.transform.Find("Frame").gameObject;
frameObj.SetActive(true);
frameObj.GetComponent<Image>().sprite = infoFrameQuality[(int)itemList[selectedItem].quality];
frameObj.transform.Find("ItemSprite").gameObject.GetComponent<Image>().sprite = itemFrameQuality[(int)itemList[selectedItem].quality];
frameObj.transform.Find("ItemSprite").Find("Sprite").gameObject.GetComponent<Image>().sprite = itemList[selectedItem].sprite;
frameObj.transform.Find("ItemSprite").Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = itemList[selectedItem].sizeInventory;
for (int i=0; i<4; i++)
{
infoAddonSpace[i].GetComponent<Image>().sprite = addonLockSprite[i * 2 + (itemList[selectedItem].attachable[i] ? 1 : 0)];
if(itemList[selectedItem].addons[i] != null)
{
infoAddonsFrame[i].transform.position = infoAddonSpace[i].transform.position;
infoAddonsFrame[i].SetActive(true);
infoAddons[i].transform.position = infoAddonsFrame[i].transform.Find("AddonCell").position;
infoAddons[i].GetComponent<Image>().sprite = addonFrameQuality[(int)itemList[selectedItem].addons[i].type * 4 + (int)itemList[selectedItem].addons[i].quality];
infoAddons[i].transform.Find("AddonSprite").gameObject.GetComponent<Image>().sprite = itemList[selectedItem].addons[i].sprite;
infoAddons[i].transform.Find("AddonSprite").Find("Sprite").gameObject.GetComponent<Image>().sprite = itemList[selectedItem].addons[i].sprite;
infoAddons[i].transform.Find("Sprite").gameObject.GetComponent<Image>().sprite = itemList[selectedItem].addons[i].sprite;
infoAddons[i].transform.Find("Sprite").gameObject.GetComponent<RectTransform>().sizeDelta = itemList[selectedItem].addons[i].sizeInventory;
infoAddons[i].SetActive(true);
}
else
{
infoAddons[i].SetActive(false);
infoAddonsFrame[i].SetActive(false);
}
}
}
else
{
frameObj.SetActive(false);
}
}
}
......@@ -4,12 +4,14 @@ using UnityEngine;
public abstract class Item {
public int id;
public string name;
public ItemQuality quality;
public int skillNum;
public string[] combo = new string[3]; //Capital Letters A B C
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 Vector2 sizeInventory;
public bool ComboAction(string currentCombo)
{
......@@ -25,14 +27,27 @@ public abstract class Item {
}
return false;
}
protected void PlaySkill1()
public Item()
{
Declare();
}
public virtual void Declare()
{
id = 0; name = "itemname";
quality = ItemQuality.Study;
skillNum = 0;
combo = new string[3] { "", "", "" };
attachable = new bool[4] { false, false, false, false };
sprite = null;
sizeInventory = new Vector2(0, 0);
}
protected virtual void PlaySkill1()
{
}
protected void PlaySkill2()
protected virtual void PlaySkill2()
{
}
protected void PlaySkill3()
protected virtual void PlaySkill3()
{
}
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class ItemDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler, IPointerClickHandler
{
public int num;
InventoryUI ui;
InventoryManager manager;
void Start()
{
ui = GameObject.Find("InventoryCanvas").GetComponent<InventoryUI>();
manager = GameObject.Find("InventoryManager").GetComponent<InventoryManager>();
}
public void OnBeginDrag(PointerEventData eventData)
{
transform.SetAsLastSibling();
}
public void OnDrag(PointerEventData eventData)
{
transform.position = Input.mousePosition;
}
public void OnEndDrag(PointerEventData eventData)
{
manager.SetOnPosition();
}
public void OnPointerClick(PointerEventData eventData)
{
ui.selectedItem = num;
manager.SetOnPosition();
}
}
fileFormatVersion: 2
guid: 869a9dcc81d16d247adf8fc5d51f0a4e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 아이템명: 죽창
/// 번호: 26
/// </summary>
public class BambooSpear : Item
{
public override void Declare()
{
id = 2; name = "bamboo spear";
quality = ItemQuality.Ordinary;
skillNum = 2;
combo = new string[3] { "BAA", "BAC", "" };
attachable = new bool[4] { true, false, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/bamboo spear");
sizeInventory = new Vector2(90, 160);
}
}
fileFormatVersion: 2
guid: fbe0c76081d909e4ea1c811110cb3fec
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 아이템명: 활
/// 번호: 2
/// </summary>
public class Bow : Item {
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
public override void Declare()
{
id = 2; name = "bow";
quality = ItemQuality.Study;
skillNum = 2;
combo = new string[3] { "BB", "BC", "" };
attachable = new bool[4] { true, true, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/bow");
sizeInventory = new Vector2(90, 160);
}
}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 아이템명: 활
/// 번호: 7
/// </summary>
public class Ksanife : Item
{
public override void Declare()
{
id = 2; name = "ksanife";
quality = ItemQuality.Superior;
skillNum = 2;
combo = new string[3] { "A", "AABAA", "" };
attachable = new bool[4] { true, true, false, false };
sprite = Resources.Load<Sprite>("Sprites/Items/ksanife");
sizeInventory = new Vector2(160, 160);
}
}
fileFormatVersion: 2
guid: c4fb4b21420011043b38f8d0cf8bc425
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a3558d7d5929e874da44f7552971fea9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9f2400336ba3dbf4cab6ac985a3a23e9
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: -1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 855ac13c3069bab4284d497eed397d4c
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
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