diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index cc6a9106e..d35d0f9e9 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -9,153 +9,313 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2b2766be55cd5143abce97e8c22303b, type: 3} + m_Script: {fileID: 11500000, guid: 03802f3276c69a348aaa2515377b47cc, type: 3} m_Name: CardDataTable m_EditorClassIdentifier: _serializedDataList: - k__BackingField: HeartPlus k__BackingField: k__BackingField: HeartPlus - k__BackingField: HeartPlusImg - k__BackingField: "\uD558\uD2B8 \uD55C\uCE78 \uCD94\uAC00" - k__BackingField: 3 - k__BackingField: 10 - k__BackingField: {fileID: 21300000, guid: d0b6eba4ac33ece44bccd11e57e415e8, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: HeartHeal k__BackingField: k__BackingField: HeartHeal - k__BackingField: HeartHealImg - k__BackingField: "\uD558\uD2B8 \uD55C\uCE78 \uD68C\uBCF5" - k__BackingField: 10 - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 466393baecf741d449a05f3b63317368, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: HeartAllHeal k__BackingField: k__BackingField: HeartAllHeal - k__BackingField: HeartAllHealImg - k__BackingField: "\uD558\uD2B8 \uC804\uCCB4 \uD68C\uBCF5" - k__BackingField: 0 - k__BackingField: 10 - k__BackingField: {fileID: 21300000, guid: 7579ee4fd1c5ed34d939eeef18c625be, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: AddLiquidB k__BackingField: k__BackingField: AddLiquidB - k__BackingField: LiquidBImg - k__BackingField: "B \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: b1b88ceef90370a4295ed9f58140349a, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: AddLiquidC k__BackingField: k__BackingField: AddLiquidC - k__BackingField: LiquidCImg - k__BackingField: "C \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: d9dbcf5d304083541a40ff4b3cb9048f, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: AddLiquidD k__BackingField: k__BackingField: AddLiquidD - k__BackingField: LiquidDImg - k__BackingField: "D \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 45e4676179dde7e42bb09b8d94935f34, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: AddLiquidE k__BackingField: k__BackingField: AddLiquidE - k__BackingField: LiquidEImg - k__BackingField: "E \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 58964556f1712324b9d9ac4515f965aa, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: AddGarnish1 k__BackingField: k__BackingField: AddGarnish1 - k__BackingField: Garnish1Img - k__BackingField: "1\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 4708f67b3712d4743af7cb6092edf3c7, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: AddGarnish2 k__BackingField: k__BackingField: AddGarnish2 - k__BackingField: Garnish2Img - k__BackingField: "2\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 70238c4151e9085429d18be7f6f8a2ae, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: AddAllLiquid k__BackingField: k__BackingField: AddAllLiquid - k__BackingField: LiquidAllHealImg - k__BackingField: "\uC804\uCCB4 \uC7AC\uB8CC 1000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 10 - k__BackingField: {fileID: 21300000, guid: 284734c4624b35b499152e028f90e6f6, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: ServerNpc k__BackingField: k__BackingField: ServerNpc - k__BackingField: ServerNpcImg - k__BackingField: "\uC11C\uBE59 \uC885\uC5C5\uC6D0 \uCD94\uAC00" - k__BackingField: 5 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 21ac4e0eced0c8c4894e7e26f5d13779, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: CleanerNpc k__BackingField: k__BackingField: CleanerNpc - k__BackingField: CleanerNpcImg - k__BackingField: "\uCCAD\uC18C \uC885\uC5C5\uC6D0 \uCD94\uAC00" - k__BackingField: 5 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 4d0b5b10aaf1d26438a2f013882ad1f6, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: ChefNpc k__BackingField: k__BackingField: ChefNpc - k__BackingField: ChefNpcImg - k__BackingField: "\uBC14\uD150\uD130 \uC885\uC5C5\uC6D0 \uCD94\uAC00" - k__BackingField: 5 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 02ff51bea8718c447bea8470257b6782, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: SpeedUp k__BackingField: k__BackingField: SpeedUp - k__BackingField: SpeedUpImg - k__BackingField: "\uD50C\uB808\uC774\uC5B4 \uC774\uB3D9 \uC18D\uB3C4 - 5% \uC99D\uAC00" - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 8de251475e5862f4b96ba45c2de88bd5, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: ExpGetUp k__BackingField: k__BackingField: ExpGetUp - k__BackingField: ExpGetUpImg - k__BackingField: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD 20% \uC99D\uAC00" - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 400a47b8bcd0a1e4b823160ce9f40232, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: GoldGetUp k__BackingField: k__BackingField: GoldGetUp - k__BackingField: GoldGetUpImg - k__BackingField: "\uACE8\uB4DC \uD68D\uB4DD 20% \uC99D\uAC00" - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 121ed7da4e55d2a43ba798a00f95a474, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: CleanUp k__BackingField: k__BackingField: CleanUp - k__BackingField: CleanUpImgImg - k__BackingField: "\uB808\uC2A4\uD1A0\uB791 \uD55C\uBC88\uC5D0 \uCCAD\uC18C" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 1acb09a93fb040241a17107a288d6f54, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] - k__BackingField: GaugeReset k__BackingField: k__BackingField: GaugeReset - k__BackingField: GaugeResetImg - k__BackingField: "\uBAA8\uB4E0 \uC190\uB2D8\uB4E4\uC758 \uAE30\uB2E4\uB9BC - \uCD08\uAE30\uD654" - k__BackingField: 0 - k__BackingField: 5 - k__BackingField: {fileID: 21300000, guid: 1d6e6fd96eb499f42b79f04f3510af87, type: 3} + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: [] diff --git a/Assets/Resources/Excel/CocktailDataTable.xlsx b/Assets/Resources/Excel/CocktailDataTable.xlsx index c6c4b275f..5f244f5e5 100644 Binary files a/Assets/Resources/Excel/CocktailDataTable.xlsx and b/Assets/Resources/Excel/CocktailDataTable.xlsx differ diff --git a/Assets/Resources/JSON/CocktailDataTable.json b/Assets/Resources/JSON/CocktailDataTable.json index d3853999a..7131758cb 100644 --- a/Assets/Resources/JSON/CocktailDataTable.json +++ b/Assets/Resources/JSON/CocktailDataTable.json @@ -92,7 +92,7 @@ { "Idx": "Cocktail006", "Name": "칵테일AC", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidA", "IngredientRatio1": 50, "IngredientIdx2": "LiquidC", @@ -107,7 +107,7 @@ { "Idx": "Cocktail007", "Name": "칵테일BD", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidB", "IngredientRatio1": 50, "IngredientIdx2": "LiquidD", @@ -122,7 +122,7 @@ { "Idx": "Cocktail008", "Name": "칵테일CD", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidC", "IngredientRatio1": 50, "IngredientIdx2": "LiquidD",