Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
34e6432261
File diff suppressed because it is too large
Load Diff
@ -15,19 +15,13 @@ MonoBehaviour:
|
||||
itemInstanceList:
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 50
|
||||
<Count>k__BackingField: {x: 1, y: 1}
|
||||
<Probability>k__BackingField: 80
|
||||
<Count>k__BackingField: {x: 1, y: 100}
|
||||
prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,
|
||||
type: 3}
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 30
|
||||
<Count>k__BackingField: {x: 1, y: 1}
|
||||
prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,
|
||||
type: 3}
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: 53c414221cf3e8b4f851d61aead8fd50,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 20
|
||||
<Probability>k__BackingField: 20
|
||||
<Count>k__BackingField: {x: 1, y: 1}
|
||||
prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,
|
||||
type: 3}
|
||||
|
@ -15,13 +15,13 @@ MonoBehaviour:
|
||||
itemInstanceList:
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 75
|
||||
<Count>k__BackingField: {x: 1, y: 1}
|
||||
<Probability>k__BackingField: 80
|
||||
<Count>k__BackingField: {x: 1, y: 100}
|
||||
prefab: {fileID: 4185765918994780331, guid: 8ab179a0b6cfa1740a787520a9d2c722,
|
||||
type: 3}
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 25
|
||||
<Probability>k__BackingField: 20
|
||||
<Count>k__BackingField: {x: 1, y: 1}
|
||||
prefab: {fileID: 4185765918994780331, guid: 8ab179a0b6cfa1740a787520a9d2c722,
|
||||
type: 3}
|
||||
|
@ -15,13 +15,13 @@ MonoBehaviour:
|
||||
itemInstanceList:
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 75
|
||||
<Count>k__BackingField: {x: 1, y: 1}
|
||||
<Probability>k__BackingField: 80
|
||||
<Count>k__BackingField: {x: 1, y: 100}
|
||||
prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,
|
||||
type: 3}
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 25
|
||||
<Probability>k__BackingField: 20
|
||||
<Count>k__BackingField: {x: 1, y: 1}
|
||||
prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,
|
||||
type: 3}
|
||||
|
@ -1,22 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6864b0bdcf8edb441bea59200141b76b, type: 3}
|
||||
m_Name: 500Coin
|
||||
m_EditorClassIdentifier:
|
||||
id: Currency002
|
||||
name: "500\uCF54\uC778"
|
||||
icon: {fileID: 21300000, guid: d06e32d389f004b02b646c7e8967d1e6, type: 3}
|
||||
description:
|
||||
price: 500
|
||||
weight: 0
|
||||
rarity: 0
|
||||
prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3}
|
@ -10,13 +10,12 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6864b0bdcf8edb441bea59200141b76b, type: 3}
|
||||
m_Name: 100Coin
|
||||
m_Name: Coin
|
||||
m_EditorClassIdentifier:
|
||||
id: Currency001
|
||||
name: "100\uCF54\uC778"
|
||||
name: "\uB3D9\uC804"
|
||||
icon: {fileID: 21300000, guid: 1e68d32ca9d274421aa1325f2e9fc380, type: 3}
|
||||
description:
|
||||
price: 100
|
||||
description: "\uB3D9\uC804\uC785\uB2C8\uB2E4."
|
||||
price: 1
|
||||
weight: 0
|
||||
rarity: 0
|
||||
prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3}
|
@ -10,13 +10,12 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6864b0bdcf8edb441bea59200141b76b, type: 3}
|
||||
m_Name: 1000Coin
|
||||
m_Name: TreasureBox
|
||||
m_EditorClassIdentifier:
|
||||
id: Currency003
|
||||
name: "1000\uCF54\uC778"
|
||||
id: Currency002
|
||||
name: "\uBCF4\uBB3C\uC0C1\uC790"
|
||||
icon: {fileID: 21300000, guid: 42166f232ee914f4997bc503de7c4ab7, type: 3}
|
||||
description:
|
||||
description: "\uBCF4\uBB3C\uC0C1\uC790\uC785\uB2C8\uB2E4."
|
||||
price: 1000
|
||||
weight: 0
|
||||
rarity: 0
|
||||
prefab: {fileID: 4185765918994780331, guid: cded349812c1d624d9cc649e63d1b868, type: 3}
|
||||
weight: 10
|
||||
rarity: 1
|
@ -10,36 +10,49 @@ namespace BlueWaterProject
|
||||
{
|
||||
public List<ItemInstance> itemInstanceList = new();
|
||||
|
||||
private ItemInstance PickItem()
|
||||
{
|
||||
var count = itemInstanceList.Count;
|
||||
|
||||
if (count == 0) return null;
|
||||
|
||||
var sumRatio = itemInstanceList.Sum(element => element.Ratio);
|
||||
var randomRatio = Random.Range(0, sumRatio);
|
||||
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
randomRatio -= itemInstanceList[i].Ratio;
|
||||
|
||||
if (randomRatio < 0)
|
||||
{
|
||||
return itemInstanceList[i];
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
// private ItemInstance PickItem()
|
||||
// {
|
||||
// var count = itemInstanceList.Count;
|
||||
//
|
||||
// if (count == 0) return null;
|
||||
//
|
||||
// var sumRatio = itemInstanceList.Sum(element => element.Probability);
|
||||
// var randomRatio = Random.Range(0, sumRatio);
|
||||
//
|
||||
// for (var i = 0; i < count; i++)
|
||||
// {
|
||||
// randomRatio -= itemInstanceList[i].Probability;
|
||||
//
|
||||
// if (randomRatio < 0)
|
||||
// {
|
||||
// return itemInstanceList[i];
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// public void ItemDrop(Vector3 dropPosition)
|
||||
// {
|
||||
// var dropItem = PickItem();
|
||||
// if (dropItem == null) return;
|
||||
//
|
||||
// var dropCount = Random.Range((int)dropItem.Count.x, (int)dropItem.Count.y + 1);
|
||||
// var instantiateItem = dropItem.Item.InstantiateItem(dropItem.prefab, dropPosition);
|
||||
// instantiateItem.GetComponentInChildren<DropItemController>().Init(dropItem, dropCount);
|
||||
// }
|
||||
|
||||
public void ItemDrop(Vector3 dropPosition)
|
||||
{
|
||||
var dropItem = PickItem();
|
||||
if (dropItem == null) return;
|
||||
|
||||
var dropCount = Random.Range((int)dropItem.Count.x, (int)dropItem.Count.y + 1);
|
||||
var instantiateItem = dropItem.Item.InstantiateItem(dropItem.prefab, dropPosition);
|
||||
instantiateItem.GetComponentInChildren<DropItemController>().Init(dropItem, dropCount);
|
||||
foreach (var element in itemInstanceList)
|
||||
{
|
||||
var dropChance = Random.Range(0, 101);
|
||||
if (dropChance > element.Probability) continue;
|
||||
|
||||
var dropCount = Random.Range((int)element.Count.x, (int)element.Count.y + 1);
|
||||
var instantiateItem = element.Item.InstantiateItem(element.prefab, dropPosition);
|
||||
instantiateItem.GetComponentInChildren<DropItemController>().Init(element, dropCount);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -15,7 +15,7 @@ MonoBehaviour:
|
||||
itemInstanceList:
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: 5adade6dd915b424e8de993bea9e3eb1,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 1
|
||||
<Probability>k__BackingField: 100
|
||||
<Count>k__BackingField: {x: 1, y: 10}
|
||||
prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0,
|
||||
type: 3}
|
||||
|
@ -15,7 +15,7 @@ MonoBehaviour:
|
||||
itemInstanceList:
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: e67e7a41d059c6747960d8e91b37b29d,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 1
|
||||
<Probability>k__BackingField: 100
|
||||
<Count>k__BackingField: {x: 1, y: 3}
|
||||
prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0,
|
||||
type: 3}
|
||||
|
@ -15,7 +15,7 @@ MonoBehaviour:
|
||||
itemInstanceList:
|
||||
- <Item>k__BackingField: {fileID: 11400000, guid: 0205e1f648508a547b6cc1a05030c7eb,
|
||||
type: 2}
|
||||
<Ratio>k__BackingField: 1
|
||||
<Probability>k__BackingField: 100
|
||||
<Count>k__BackingField: {x: 1, y: 5}
|
||||
prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0,
|
||||
type: 3}
|
||||
|
@ -10,8 +10,8 @@ namespace BlueWaterProject
|
||||
[field: Tooltip("아이템 데이터")]
|
||||
[field: SerializeField] public Item Item { get; set; }
|
||||
|
||||
[field: Tooltip("아이템 드롭 비율")]
|
||||
[field: SerializeField] public int Ratio { get; set; }
|
||||
[field: Tooltip("아이템 드롭 비율"), Range(0, 100)]
|
||||
[field: SerializeField] public int Probability { get; set; }
|
||||
|
||||
[field: Tooltip("아이템 랜덤 드롭 갯수")]
|
||||
[field: SerializeField] public Vector2 Count { get; set; }
|
||||
@ -19,10 +19,10 @@ namespace BlueWaterProject
|
||||
[Tooltip("프리팹")]
|
||||
public GameObject prefab;
|
||||
|
||||
public ItemInstance(Item item, int ratio, Vector2 count)
|
||||
public ItemInstance(Item item, int probability, Vector2 count)
|
||||
{
|
||||
Item = item;
|
||||
Ratio = ratio;
|
||||
Probability = probability;
|
||||
Count = count;
|
||||
}
|
||||
}
|
||||
|
8
BlueWater/Assets/03.Images/Characters/Npcs/X.meta
Normal file
8
BlueWater/Assets/03.Images/Characters/Npcs/X.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 60d6fc67e8d070d49ba42f18c16bd2cc
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
BlueWater/Assets/03.Images/Characters/Npcs/X/06_.png
Normal file
BIN
BlueWater/Assets/03.Images/Characters/Npcs/X/06_.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 598 KiB |
114
BlueWater/Assets/03.Images/Characters/Npcs/X/06_.png.meta
Normal file
114
BlueWater/Assets/03.Images/Characters/Npcs/X/06_.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: da2a91b301af4f34387db73af9c9531d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
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
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 53509732dcacb704caa7a72b206530e5
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
137
BlueWater/Assets/03.Images/Characters/Npcs/X/Materials/06_.mat
Normal file
137
BlueWater/Assets/03.Images/Characters/Npcs/X/Materials/06_.mat
Normal file
@ -0,0 +1,137 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: 06_
|
||||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _ALPHATEST_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 2450
|
||||
stringTagMap:
|
||||
RenderType: TransparentCutout
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BaseMap:
|
||||
m_Texture: {fileID: 2800000, guid: da2a91b301af4f34387db73af9c9531d, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: da2a91b301af4f34387db73af9c9531d, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _SpecGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_Lightmaps:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_LightmapsInd:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_ShadowMasks:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AddPrecomputedVelocity: 0
|
||||
- _AlphaClip: 1
|
||||
- _AlphaToMask: 1
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _DstBlendAlpha: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 0
|
||||
- _Glossiness: 0
|
||||
- _GlossyReflections: 0
|
||||
- _Metallic: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.005
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
- _Smoothness: 0.5
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _SrcBlendAlpha: 1
|
||||
- _Surface: 0
|
||||
- _WorkflowMode: 1
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!114 &4466064245883132771
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 9
|
@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 53c414221cf3e8b4f851d61aead8fd50
|
||||
guid: a56918f16f9905442aba78cbfb5d83ad
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
BlueWater/Assets/Resources/Excel/food_ingredient.xlsx
Normal file
BIN
BlueWater/Assets/Resources/Excel/food_ingredient.xlsx
Normal file
Binary file not shown.
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 961736e00e6d3884da5f586d5ba02cf5
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
BlueWater/Assets/Resources/Excel/food_table.xlsx
Normal file
BIN
BlueWater/Assets/Resources/Excel/food_table.xlsx
Normal file
Binary file not shown.
7
BlueWater/Assets/Resources/Excel/food_table.xlsx.meta
Normal file
7
BlueWater/Assets/Resources/Excel/food_table.xlsx.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d329a78ae6fd1bb43b1c4cfd0e09f745
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
BlueWater/Assets/Resources/Excel/item_drop_table.xlsx
Normal file
BIN
BlueWater/Assets/Resources/Excel/item_drop_table.xlsx
Normal file
Binary file not shown.
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 345812049ef08e7448c90d5beeeddf46
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
261
BlueWater/Assets/Resources/JSON/food_ingredient.json
Normal file
261
BlueWater/Assets/Resources/JSON/food_ingredient.json
Normal file
@ -0,0 +1,261 @@
|
||||
[
|
||||
{
|
||||
"idx": 101,
|
||||
"name": "킹크랩",
|
||||
"type": 1,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 102,
|
||||
"name": "공룡 고기",
|
||||
"type": 1,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 103,
|
||||
"name": "램고기",
|
||||
"type": 1,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 104,
|
||||
"name": "닭고기",
|
||||
"type": 1,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 105,
|
||||
"name": "뱀고기",
|
||||
"type": 1,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 106,
|
||||
"name": "코뿔소 뿔",
|
||||
"type": 1,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 107,
|
||||
"name": "코뿔소 다리살",
|
||||
"type": 1,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 201,
|
||||
"name": "백상어",
|
||||
"type": 2,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 202,
|
||||
"name": "니모",
|
||||
"type": 2,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 203,
|
||||
"name": "해파리",
|
||||
"type": 2,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 204,
|
||||
"name": "가오리",
|
||||
"type": 2,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 205,
|
||||
"name": "우럭",
|
||||
"type": 2,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 301,
|
||||
"name": "데스도어의 알",
|
||||
"type": 3,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 302,
|
||||
"name": "공룡알",
|
||||
"type": 3,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 401,
|
||||
"name": "메론",
|
||||
"type": 4,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 402,
|
||||
"name": "토마토",
|
||||
"type": 4,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 403,
|
||||
"name": "사과",
|
||||
"type": 4,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 404,
|
||||
"name": "레몬",
|
||||
"type": 4,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 405,
|
||||
"name": "토마토",
|
||||
"type": 4,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 501,
|
||||
"name": "마늘",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 502,
|
||||
"name": "양파",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 503,
|
||||
"name": "대파",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 504,
|
||||
"name": "파슬리",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 505,
|
||||
"name": "다시마",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 506,
|
||||
"name": "파프리카",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 507,
|
||||
"name": "배추",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 508,
|
||||
"name": "브로콜리",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 509,
|
||||
"name": "깻잎",
|
||||
"type": 5,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 601,
|
||||
"name": "진주 조개",
|
||||
"type": 6,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 602,
|
||||
"name": "바다 조개",
|
||||
"type": 6,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 603,
|
||||
"name": "거대 조개",
|
||||
"type": 6,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 701,
|
||||
"name": "소금",
|
||||
"type": 7,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 702,
|
||||
"name": "고춧가루",
|
||||
"type": 7,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 703,
|
||||
"name": "후추",
|
||||
"type": 7,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 704,
|
||||
"name": "간장",
|
||||
"type": 7,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 705,
|
||||
"name": "버터",
|
||||
"type": 7,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
},
|
||||
{
|
||||
"idx": 706,
|
||||
"name": "설탕",
|
||||
"type": 7,
|
||||
"money": 0,
|
||||
"weight": 100
|
||||
}
|
||||
]
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ae149b393d56f964883f9e06c41b068d
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
306
BlueWater/Assets/Resources/JSON/food_table.json
Normal file
306
BlueWater/Assets/Resources/JSON/food_table.json
Normal file
@ -0,0 +1,306 @@
|
||||
[
|
||||
{
|
||||
"idx": 1001,
|
||||
"name": "킹크랩 앞발 구이",
|
||||
"type": 1,
|
||||
"taste": 1,
|
||||
"money": 500,
|
||||
"time": 40,
|
||||
"plate": 10,
|
||||
"ing1": 101,
|
||||
"ing1_count": 1,
|
||||
"ing2": 404,
|
||||
"ing2_count": 1,
|
||||
"ing3": 504,
|
||||
"ing3_count": 1,
|
||||
"ing4": 703,
|
||||
"ing4_count": 1,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 1002,
|
||||
"name": "백상어 통구이",
|
||||
"type": 1,
|
||||
"taste": 1,
|
||||
"money": 150,
|
||||
"time": 20,
|
||||
"plate": 10,
|
||||
"ing1": 201,
|
||||
"ing1_count": 1,
|
||||
"ing2": 404,
|
||||
"ing2_count": 1,
|
||||
"ing3": 508,
|
||||
"ing3_count": 1,
|
||||
"ing4": 704,
|
||||
"ing4_count": 1,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 1003,
|
||||
"name": "우럭 소금 구이",
|
||||
"type": 1,
|
||||
"taste": 3,
|
||||
"money": 140,
|
||||
"time": 25,
|
||||
"plate": 10,
|
||||
"ing1": 205,
|
||||
"ing1_count": 1,
|
||||
"ing2": 509,
|
||||
"ing2_count": 1,
|
||||
"ing3": 701,
|
||||
"ing3_count": 1,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 1004,
|
||||
"name": "공룡 바비큐",
|
||||
"type": 1,
|
||||
"taste": 2,
|
||||
"money": 500,
|
||||
"time": 40,
|
||||
"plate": 10,
|
||||
"ing1": 102,
|
||||
"ing1_count": 1,
|
||||
"ing2": 0,
|
||||
"ing2_count": 0,
|
||||
"ing3": 0,
|
||||
"ing3_count": 0,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 2001,
|
||||
"name": "얼큰해파리스튜",
|
||||
"type": 2,
|
||||
"taste": 2,
|
||||
"money": 150,
|
||||
"time": 20,
|
||||
"plate": 10,
|
||||
"ing1": 203,
|
||||
"ing1_count": 1,
|
||||
"ing2": 702,
|
||||
"ing2_count": 1,
|
||||
"ing3": 0,
|
||||
"ing3_count": 0,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 2002,
|
||||
"name": "짠 얼큰해파리스튜",
|
||||
"type": 2,
|
||||
"taste": 3,
|
||||
"money": 140,
|
||||
"time": 25,
|
||||
"plate": 10,
|
||||
"ing1": 203,
|
||||
"ing1_count": 1,
|
||||
"ing2": 701,
|
||||
"ing2_count": 1,
|
||||
"ing3": 0,
|
||||
"ing3_count": 0,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 2003,
|
||||
"name": "가오리 얼큰 스튜",
|
||||
"type": 2,
|
||||
"taste": 2,
|
||||
"money": 500,
|
||||
"time": 40,
|
||||
"plate": 10,
|
||||
"ing1": 404,
|
||||
"ing1_count": 1,
|
||||
"ing2": 505,
|
||||
"ing2_count": 1,
|
||||
"ing3": 601,
|
||||
"ing3_count": 1,
|
||||
"ing4": 702,
|
||||
"ing4_count": 1,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 2004,
|
||||
"name": "코뿔소 뿔 튀김",
|
||||
"type": 2,
|
||||
"taste": 4,
|
||||
"money": 150,
|
||||
"time": 20,
|
||||
"plate": 10,
|
||||
"ing1": 106,
|
||||
"ing1_count": 1,
|
||||
"ing2": 506,
|
||||
"ing2_count": 1,
|
||||
"ing3": 704,
|
||||
"ing3_count": 1,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 2005,
|
||||
"name": "우럭 매운탕",
|
||||
"type": 2,
|
||||
"taste": 2,
|
||||
"money": 140,
|
||||
"time": 25,
|
||||
"plate": 10,
|
||||
"ing1": 205,
|
||||
"ing1_count": 1,
|
||||
"ing2": 503,
|
||||
"ing2_count": 1,
|
||||
"ing3": 601,
|
||||
"ing3_count": 1,
|
||||
"ing4": 702,
|
||||
"ing4_count": 1,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 3001,
|
||||
"name": "킹크랩 미트",
|
||||
"type": 3,
|
||||
"taste": 1,
|
||||
"money": 200,
|
||||
"time": 30,
|
||||
"plate": 10,
|
||||
"ing1": 101,
|
||||
"ing1_count": 1,
|
||||
"ing2": 0,
|
||||
"ing2_count": 0,
|
||||
"ing3": 0,
|
||||
"ing3_count": 0,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 3002,
|
||||
"name": "매운 킹크랩 미트",
|
||||
"type": 3,
|
||||
"taste": 2,
|
||||
"money": 220,
|
||||
"time": 35,
|
||||
"plate": 10,
|
||||
"ing1": 101,
|
||||
"ing1_count": 1,
|
||||
"ing2": 703,
|
||||
"ing2_count": 1,
|
||||
"ing3": 0,
|
||||
"ing3_count": 0,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 3003,
|
||||
"name": "공룡알 후라이",
|
||||
"type": 3,
|
||||
"taste": 4,
|
||||
"money": 100,
|
||||
"time": 10,
|
||||
"plate": 10,
|
||||
"ing1": 302,
|
||||
"ing1_count": 1,
|
||||
"ing2": 0,
|
||||
"ing2_count": 0,
|
||||
"ing3": 0,
|
||||
"ing3_count": 0,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 3004,
|
||||
"name": "콜뿔소 뒷다리 고기",
|
||||
"type": 3,
|
||||
"taste": 1,
|
||||
"money": 500,
|
||||
"time": 40,
|
||||
"plate": 10,
|
||||
"ing1": 107,
|
||||
"ing1_count": 1,
|
||||
"ing2": 507,
|
||||
"ing2_count": 1,
|
||||
"ing3": 701,
|
||||
"ing3_count": 1,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 3005,
|
||||
"name": "컬트오드더램",
|
||||
"type": 3,
|
||||
"taste": 1,
|
||||
"money": 150,
|
||||
"time": 20,
|
||||
"plate": 10,
|
||||
"ing1": 103,
|
||||
"ing1_count": 1,
|
||||
"ing2": 402,
|
||||
"ing2_count": 1,
|
||||
"ing3": 501,
|
||||
"ing3_count": 1,
|
||||
"ing4": 701,
|
||||
"ing4_count": 1,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 3006,
|
||||
"name": "버터 조개 구이",
|
||||
"type": 3,
|
||||
"taste": 4,
|
||||
"money": 140,
|
||||
"time": 25,
|
||||
"plate": 10,
|
||||
"ing1": 603,
|
||||
"ing1_count": 1,
|
||||
"ing2": 503,
|
||||
"ing2_count": 1,
|
||||
"ing3": 705,
|
||||
"ing3_count": 1,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
},
|
||||
{
|
||||
"idx": 4001,
|
||||
"name": "해파리 젤리",
|
||||
"type": 4,
|
||||
"taste": 4,
|
||||
"money": 0,
|
||||
"time": 0,
|
||||
"plate": 0,
|
||||
"ing1": 0,
|
||||
"ing1_count": 0,
|
||||
"ing2": 0,
|
||||
"ing2_count": 0,
|
||||
"ing3": 0,
|
||||
"ing3_count": 0,
|
||||
"ing4": 0,
|
||||
"ing4_count": 0,
|
||||
"ing5": 0,
|
||||
"ing5_count": 0
|
||||
}
|
||||
]
|
7
BlueWater/Assets/Resources/JSON/food_table.json.meta
Normal file
7
BlueWater/Assets/Resources/JSON/food_table.json.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1e26200cb116dbd48b9abd3c35634651
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
62
BlueWater/Assets/Resources/JSON/item_drop_table.json
Normal file
62
BlueWater/Assets/Resources/JSON/item_drop_table.json
Normal file
@ -0,0 +1,62 @@
|
||||
[
|
||||
{
|
||||
"idx": 10101,
|
||||
"name": "테스트",
|
||||
"item_1": 106,
|
||||
"prob": 100,
|
||||
"min": 1,
|
||||
"max": 1,
|
||||
"item_2": 107,
|
||||
"prob_1": 100,
|
||||
"min_1": 1,
|
||||
"max_1": 1,
|
||||
"item_3": 102,
|
||||
"prob_2": 70,
|
||||
"min_2": 1,
|
||||
"max_2": 10,
|
||||
"item_4": 102,
|
||||
"prob_3": 30,
|
||||
"min_3": 5,
|
||||
"max_3": 10
|
||||
},
|
||||
{
|
||||
"idx": 10102,
|
||||
"name": "상어",
|
||||
"item_1": 201,
|
||||
"prob": 100,
|
||||
"min": 1,
|
||||
"max": 5,
|
||||
"item_2": 202,
|
||||
"prob_1": 50,
|
||||
"min_1": 1,
|
||||
"max_1": 2,
|
||||
"item_3": 0,
|
||||
"prob_2": 0,
|
||||
"min_2": 0,
|
||||
"max_2": 0,
|
||||
"item_4": 0,
|
||||
"prob_3": 0,
|
||||
"min_3": 0,
|
||||
"max_3": 0
|
||||
},
|
||||
{
|
||||
"idx": 10103,
|
||||
"name": "가오리",
|
||||
"item_1": 204,
|
||||
"prob": 100,
|
||||
"min": 1,
|
||||
"max": 1,
|
||||
"item_2": 204,
|
||||
"prob_1": 50,
|
||||
"min_1": 1,
|
||||
"max_1": 1,
|
||||
"item_3": 203,
|
||||
"prob_2": 50,
|
||||
"min_2": 3,
|
||||
"max_2": 5,
|
||||
"item_4": 0,
|
||||
"prob_3": 0,
|
||||
"min_3": 0,
|
||||
"max_3": 0
|
||||
}
|
||||
]
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0d1812ace34fd604d9ebd88cfd031b6e
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Loading…
Reference in New Issue
Block a user