From f4996d6987c9045c486d920cdc802b3172556af8 Mon Sep 17 00:00:00 2001 From: capers Date: Thu, 26 Dec 2024 17:25:19 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EB=93=9C=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=ED=85=8C=EC=9D=B4=EB=B8=94=20(=EC=9E=90=EB=8F=99?= =?UTF-8?q?=20=EC=B6=A9=EC=A0=84=20Max3=EC=9C=BC=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScriptableObject/CardDataTable.asset | 8 ++++---- Assets/Resources/Excel/CardDataTable.xlsx | Bin 10417 -> 10433 bytes Assets/Resources/JSON/CardDataTable.json | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index e2e71c697..9120ed701 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -74,7 +74,7 @@ MonoBehaviour: k__BackingField: k__BackingField: AllLiquidAdd k__BackingField: "\uBAA8\uB4E0 \uCE75\uD14C\uC77C \uC7AC\uB8CC - +1L \uCDA9\uC804" + +1000ml \uCDA9\uC804" k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: dd95462c72930b94db1a265e022135dc, type: 3} - k__BackingField: ServerNpcAdd @@ -190,7 +190,7 @@ MonoBehaviour: - k__BackingField: PassiveServingBonus k__BackingField: k__BackingField: PassiveServingBonus - k__BackingField: "\uC11C\uBE59 3\uBC88 \uC131\uACF5\uC2DC \uD558\uD2B8 + k__BackingField: "\uC11C\uBE59 6\uBC88 \uC131\uACF5\uC2DC \uD558\uD2B8 \uBC18 \uAC1C \uD68C\uBCF5" k__BackingField: 1 k__BackingField: {fileID: 21300000, guid: 26117dc80d7e49a4886a6752a6c33bdc, type: 3} @@ -205,8 +205,8 @@ MonoBehaviour: k__BackingField: k__BackingField: BarrelAutoSupply k__BackingField: "\uBAA8\uB4E0 \uCE75\uD14C\uC77C \uC7AC\uB8CC\uAC00 - \uCD08\uB2F9 +1ml \uC790\uB3D9 \uCDA9\uC804" - k__BackingField: 5 + \uCD08\uB2F9 +5ml \uC790\uB3D9 \uCDA9\uC804" + k__BackingField: 3 k__BackingField: {fileID: 21300000, guid: facba79682d930d4684990d6f2d538c2, type: 3} - k__BackingField: PassiveDoubleServing k__BackingField: diff --git a/Assets/Resources/Excel/CardDataTable.xlsx b/Assets/Resources/Excel/CardDataTable.xlsx index 8e53252573ce2cbe40fa093338f6d04ae64c7520..2bee024f2136592df67ff1229793c7081f2d9b0d 100644 GIT binary patch delta 3797 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 H|7!goew!7{ delta 3772 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 diff --git a/Assets/Resources/JSON/CardDataTable.json b/Assets/Resources/JSON/CardDataTable.json index 8657acd69..873544676 100644 --- a/Assets/Resources/JSON/CardDataTable.json +++ b/Assets/Resources/JSON/CardDataTable.json @@ -46,7 +46,7 @@ }, { "Idx": "AllLiquidAdd", - "ScriptText": "모든 칵테일 재료 +1L 충전", + "ScriptText": "모든 칵테일 재료 +1000ml 충전", "Max": 0 }, { @@ -116,8 +116,8 @@ }, { "Idx": "BarrelAutoSupply", - "ScriptText": "모든 칵테일 재료가 초당 +1ml 자동 충전", - "Max": 5 + "ScriptText": "모든 칵테일 재료가 초당 +5ml 자동 충전", + "Max": 3 }, { "Idx": "ServerNpcUpgrade", @@ -156,7 +156,7 @@ }, { "Idx": "PassiveServingBonus", - "ScriptText": "서빙 3번 성공시 하트 반 개 회복", + "ScriptText": "서빙 6번 성공시 하트 반 개 회복", "Max": 1 }, {