diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index cc6a9106e..26e523c13 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -35,7 +35,7 @@ MonoBehaviour: k__BackingField: HeartAllHealImg k__BackingField: "\uD558\uD2B8 \uC804\uCCB4 \uD68C\uBCF5" k__BackingField: 0 - k__BackingField: 10 + k__BackingField: 5 k__BackingField: {fileID: 21300000, guid: 7579ee4fd1c5ed34d939eeef18c625be, type: 3} - k__BackingField: AddLiquidB k__BackingField: @@ -157,5 +157,5 @@ MonoBehaviour: k__BackingField: "\uBAA8\uB4E0 \uC190\uB2D8\uB4E4\uC758 \uAE30\uB2E4\uB9BC \uCD08\uAE30\uD654" k__BackingField: 0 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: {fileID: 21300000, guid: 1d6e6fd96eb499f42b79f04f3510af87, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index df393f679..886967eca 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -46,10 +46,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 0cf23778fd0b2994c9d608fbbf185468, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail002 k__BackingField: k__BackingField: Cocktail002 @@ -66,10 +63,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} - k__BackingField: - - k__BackingField: LiquidB - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail003 k__BackingField: k__BackingField: Cocktail003 @@ -86,10 +80,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: c55f4b0a55a391d488e54a28dc840509, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail004 k__BackingField: k__BackingField: Cocktail004 @@ -106,10 +97,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 576d6ff3856f8ef419586ff12f2742b5, type: 3} - k__BackingField: - - k__BackingField: LiquidD - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail005 k__BackingField: k__BackingField: Cocktail005 @@ -126,10 +114,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} - k__BackingField: - - k__BackingField: LiquidE - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail006 k__BackingField: k__BackingField: Cocktail006 @@ -146,13 +131,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 6a4cd8cdf11fe024e8ecac8e3d60e10d, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 50 - k__BackingField: 150 - - k__BackingField: LiquidC - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail007 k__BackingField: k__BackingField: Cocktail007 @@ -169,13 +148,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: b38089ff4046ac044ba79dfa5116aa1b, type: 3} - k__BackingField: - - k__BackingField: LiquidB - k__BackingField: 50 - k__BackingField: 150 - - k__BackingField: LiquidD - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail008 k__BackingField: k__BackingField: Cocktail008 @@ -192,74 +165,50 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 71954183dfb02424d835d964c2eb3fc6, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 50 - k__BackingField: 150 - - k__BackingField: LiquidD - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail009 k__BackingField: k__BackingField: Cocktail009 k__BackingField: "\uCE75\uD14C\uC77CABE" - k__BackingField: 10 + k__BackingField: 20 k__BackingField: LiquidA - k__BackingField: 25 + k__BackingField: 30 k__BackingField: LiquidB - k__BackingField: 25 + k__BackingField: 30 k__BackingField: LiquidE - k__BackingField: 50 + k__BackingField: 40 k__BackingField: k__BackingField: 0 k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: d0748411047fc4a41beb1fb8d551e01e, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidB - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidE - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail010 k__BackingField: k__BackingField: Cocktail010 k__BackingField: "\uCE75\uD14C\uC77CCDE" - k__BackingField: 10 + k__BackingField: 20 k__BackingField: LiquidC - k__BackingField: 25 + k__BackingField: 30 k__BackingField: LiquidD - k__BackingField: 25 - k__BackingField: LiquidE - k__BackingField: 50 + k__BackingField: 30 + k__BackingField: Garnish2 + k__BackingField: 40 k__BackingField: k__BackingField: 0 k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 335f1df58cd58914f97fe9ccae7f6c8c, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidD - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidE - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail011 k__BackingField: k__BackingField: Cocktail011 k__BackingField: "\uCE75\uD14C\uC77CB1" k__BackingField: 10 k__BackingField: LiquidB - k__BackingField: 80 + k__BackingField: 50 k__BackingField: Garnish1 - k__BackingField: 20 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -267,22 +216,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} - k__BackingField: - - k__BackingField: LiquidB - k__BackingField: 80 - k__BackingField: 240 - - k__BackingField: Garnish1 - k__BackingField: 20 - k__BackingField: 60 + k__BackingField: [] - k__BackingField: Cocktail012 k__BackingField: k__BackingField: Cocktail012 k__BackingField: "\uCE75\uD14C\uC77CD1" k__BackingField: 10 k__BackingField: LiquidD - k__BackingField: 80 + k__BackingField: 50 k__BackingField: Garnish1 - k__BackingField: 20 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -290,22 +233,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: ee344f47787d148448bd3373235281b6, type: 3} - k__BackingField: - - k__BackingField: LiquidD - k__BackingField: 80 - k__BackingField: 240 - - k__BackingField: Garnish1 - k__BackingField: 20 - k__BackingField: 60 + k__BackingField: [] - k__BackingField: Cocktail013 k__BackingField: k__BackingField: Cocktail013 k__BackingField: "\uCE75\uD14C\uC77CA2" - k__BackingField: 5 + k__BackingField: 10 k__BackingField: LiquidA - k__BackingField: 90 + k__BackingField: 50 k__BackingField: Garnish2 - k__BackingField: 10 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -313,22 +250,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: aef7fd596cbfc854d87f408c14951641, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 90 - k__BackingField: 270 - - k__BackingField: Garnish2 - k__BackingField: 10 - k__BackingField: 30 + k__BackingField: [] - k__BackingField: Cocktail014 k__BackingField: k__BackingField: Cocktail014 k__BackingField: "\uCE75\uD14C\uC77CC2" - k__BackingField: 5 + k__BackingField: 10 k__BackingField: LiquidC - k__BackingField: 90 + k__BackingField: 50 k__BackingField: Garnish2 - k__BackingField: 10 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -336,22 +267,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 91d99e534e5f3c04094b14ed920bec04, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 90 - k__BackingField: 270 - - k__BackingField: Garnish2 - k__BackingField: 10 - k__BackingField: 30 + k__BackingField: [] - k__BackingField: Cocktail015 k__BackingField: k__BackingField: Cocktail015 k__BackingField: "\uCE75\uD14C\uC77CE2" - k__BackingField: 5 + k__BackingField: 10 k__BackingField: LiquidE - k__BackingField: 90 - k__BackingField: Garnish2 - k__BackingField: 10 + k__BackingField: 50 + k__BackingField: Garnish1 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -359,10 +284,4 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} - k__BackingField: - - k__BackingField: LiquidE - k__BackingField: 90 - k__BackingField: 270 - - k__BackingField: Garnish2 - k__BackingField: 10 - k__BackingField: 30 + k__BackingField: [] diff --git a/Assets/Resources/Excel/CardDataTable.xlsx b/Assets/Resources/Excel/CardDataTable.xlsx index ee43ce23c..513686fd5 100644 Binary files a/Assets/Resources/Excel/CardDataTable.xlsx and b/Assets/Resources/Excel/CardDataTable.xlsx differ diff --git a/Assets/Resources/Excel/CocktailDataTable.xlsx b/Assets/Resources/Excel/CocktailDataTable.xlsx index 5f244f5e5..c6372d34b 100644 Binary files a/Assets/Resources/Excel/CocktailDataTable.xlsx and b/Assets/Resources/Excel/CocktailDataTable.xlsx differ diff --git a/Assets/Resources/JSON/CardDataTable.json b/Assets/Resources/JSON/CardDataTable.json index 0493e324a..58872484a 100644 --- a/Assets/Resources/JSON/CardDataTable.json +++ b/Assets/Resources/JSON/CardDataTable.json @@ -18,7 +18,7 @@ "Img": "HeartAllHealImg", "ScriptText": "하트 전체 회복", "Max": 0, - "Ratio": 10 + "Ratio": 5 }, { "Idx": "AddLiquidB", @@ -123,6 +123,6 @@ "Img": "GaugeResetImg", "ScriptText": "모든 손님들의 기다림 초기화", "Max": 0, - "Ratio": 5 + "Ratio": 10 } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/CocktailDataTable.json b/Assets/Resources/JSON/CocktailDataTable.json index 7131758cb..4f962df31 100644 --- a/Assets/Resources/JSON/CocktailDataTable.json +++ b/Assets/Resources/JSON/CocktailDataTable.json @@ -137,13 +137,13 @@ { "Idx": "Cocktail009", "Name": "칵테일ABE", - "RatioRange": 10, + "RatioRange": 20, "IngredientIdx1": "LiquidA", - "IngredientRatio1": 25, + "IngredientRatio1": 30, "IngredientIdx2": "LiquidB", - "IngredientRatio2": 25, + "IngredientRatio2": 30, "IngredientIdx3": "LiquidE", - "IngredientRatio3": 50, + "IngredientRatio3": 40, "IngredientIdx4": "", "IngredientRatio4": 0, "IngredientIdx5": "", @@ -152,13 +152,13 @@ { "Idx": "Cocktail010", "Name": "칵테일CDE", - "RatioRange": 10, + "RatioRange": 20, "IngredientIdx1": "LiquidC", - "IngredientRatio1": 25, + "IngredientRatio1": 30, "IngredientIdx2": "LiquidD", - "IngredientRatio2": 25, - "IngredientIdx3": "LiquidE", - "IngredientRatio3": 50, + "IngredientRatio2": 30, + "IngredientIdx3": "Garnish2", + "IngredientRatio3": 40, "IngredientIdx4": "", "IngredientRatio4": 0, "IngredientIdx5": "", @@ -169,9 +169,9 @@ "Name": "칵테일B1", "RatioRange": 10, "IngredientIdx1": "LiquidB", - "IngredientRatio1": 80, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish1", - "IngredientRatio2": 20, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -184,9 +184,9 @@ "Name": "칵테일D1", "RatioRange": 10, "IngredientIdx1": "LiquidD", - "IngredientRatio1": 80, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish1", - "IngredientRatio2": 20, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -197,11 +197,11 @@ { "Idx": "Cocktail013", "Name": "칵테일A2", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidA", - "IngredientRatio1": 90, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish2", - "IngredientRatio2": 10, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -212,11 +212,11 @@ { "Idx": "Cocktail014", "Name": "칵테일C2", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidC", - "IngredientRatio1": 90, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish2", - "IngredientRatio2": 10, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -227,11 +227,11 @@ { "Idx": "Cocktail015", "Name": "칵테일E2", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidE", - "IngredientRatio1": 90, - "IngredientIdx2": "Garnish2", - "IngredientRatio2": 10, + "IngredientRatio1": 50, + "IngredientIdx2": "Garnish1", + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "",