From 8013366e64776a623b1cea098e8c55d2f6f90977 Mon Sep 17 00:00:00 2001 From: capers Date: Thu, 24 Oct 2024 16:57:08 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=86=90=EB=8B=98=20=EB=8C=80=EA=B8=B0=20?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=88=98=EC=A0=95,=20EXP=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EB=93=B1=EC=9E=A5=20=EC=86=8D=EB=8F=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(=EC=97=91=EC=85=80,=20json,=20SO=20?= =?UTF-8?q?=EB=AA=A8=EB=91=90=20=EC=88=98=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScriptableObject/LevelDataTable.asset | 170 +++++++++--------- Assets/Resources/Excel/LevelDataTable.xlsx | Bin 10232 -> 10210 bytes Assets/Resources/JSON/LevelDataTable.json | 170 +++++++++--------- 3 files changed, 170 insertions(+), 170 deletions(-) diff --git a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset index aadb5728c..9370c7172 100644 --- a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset @@ -30,9 +30,9 @@ MonoBehaviour: k__BackingField: 15 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 100 + k__BackingField: 200 k__BackingField: 20 - k__BackingField: 19 + k__BackingField: 20 k__BackingField: 10 k__BackingField: - k__BackingField: 3 @@ -43,7 +43,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 200 k__BackingField: 20 - k__BackingField: 18 + k__BackingField: 20 k__BackingField: 10 k__BackingField: - k__BackingField: 4 @@ -54,7 +54,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 200 k__BackingField: 20 - k__BackingField: 17 + k__BackingField: 20 k__BackingField: 10 k__BackingField: - k__BackingField: 5 @@ -65,227 +65,227 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 200 k__BackingField: 20 - k__BackingField: 16 + k__BackingField: 20 k__BackingField: 10 k__BackingField: Upgrade1 - k__BackingField: 6 k__BackingField: k__BackingField: 6 - k__BackingField: 13 + k__BackingField: 10 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 200 - k__BackingField: 20 - k__BackingField: 15 + k__BackingField: 300 + k__BackingField: 18 + k__BackingField: 18 k__BackingField: 10 k__BackingField: - k__BackingField: 7 k__BackingField: k__BackingField: 7 - k__BackingField: 13 + k__BackingField: 10 k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 19 - k__BackingField: 15 + k__BackingField: 18 + k__BackingField: 18 k__BackingField: 10 k__BackingField: - k__BackingField: 8 k__BackingField: k__BackingField: 8 - k__BackingField: 13 + k__BackingField: 10 k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 k__BackingField: 18 - k__BackingField: 15 + k__BackingField: 18 k__BackingField: 10 k__BackingField: - k__BackingField: 9 k__BackingField: k__BackingField: 9 - k__BackingField: 13 + k__BackingField: 10 k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 17 - k__BackingField: 15 + k__BackingField: 18 + k__BackingField: 18 k__BackingField: 10 k__BackingField: - k__BackingField: 10 k__BackingField: k__BackingField: 10 - k__BackingField: 13 + k__BackingField: 10 k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 16 - k__BackingField: 15 + k__BackingField: 18 + k__BackingField: 18 k__BackingField: 10 k__BackingField: Upgrade2 - k__BackingField: 11 k__BackingField: k__BackingField: 11 - k__BackingField: 11 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 300 - k__BackingField: 15 - k__BackingField: 14 + k__BackingField: 400 + k__BackingField: 16 + k__BackingField: 16 k__BackingField: 8 k__BackingField: - k__BackingField: 12 k__BackingField: k__BackingField: 12 - k__BackingField: 11 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 15 - k__BackingField: 13 + k__BackingField: 16 + k__BackingField: 16 k__BackingField: 8 k__BackingField: - k__BackingField: 13 k__BackingField: k__BackingField: 13 - k__BackingField: 11 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 15 - k__BackingField: 12 + k__BackingField: 16 + k__BackingField: 16 k__BackingField: 8 k__BackingField: - k__BackingField: 14 k__BackingField: k__BackingField: 14 - k__BackingField: 11 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 15 - k__BackingField: 11 + k__BackingField: 16 + k__BackingField: 16 k__BackingField: 8 k__BackingField: - k__BackingField: 15 k__BackingField: k__BackingField: 15 - k__BackingField: 11 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 15 - k__BackingField: 10 + k__BackingField: 16 + k__BackingField: 16 k__BackingField: 8 k__BackingField: Upgrade3 - k__BackingField: 16 k__BackingField: k__BackingField: 16 - k__BackingField: 9 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 400 - k__BackingField: 15 - k__BackingField: 10 + k__BackingField: 500 + k__BackingField: 14 + k__BackingField: 14 k__BackingField: 8 k__BackingField: - k__BackingField: 17 k__BackingField: k__BackingField: 17 - k__BackingField: 9 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 k__BackingField: 14 - k__BackingField: 10 + k__BackingField: 14 k__BackingField: 8 k__BackingField: - k__BackingField: 18 k__BackingField: k__BackingField: 18 - k__BackingField: 9 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 13 - k__BackingField: 10 + k__BackingField: 14 + k__BackingField: 14 k__BackingField: 8 k__BackingField: - k__BackingField: 19 k__BackingField: k__BackingField: 19 - k__BackingField: 9 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 12 - k__BackingField: 10 + k__BackingField: 14 + k__BackingField: 14 k__BackingField: 8 k__BackingField: - k__BackingField: 20 k__BackingField: k__BackingField: 20 - k__BackingField: 9 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 11 - k__BackingField: 10 + k__BackingField: 14 + k__BackingField: 14 k__BackingField: 8 k__BackingField: Upgrade4 - k__BackingField: 21 k__BackingField: k__BackingField: 21 - k__BackingField: 7 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 500 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 600 + k__BackingField: 12 + k__BackingField: 12 k__BackingField: 6 k__BackingField: - k__BackingField: 22 k__BackingField: k__BackingField: 22 - k__BackingField: 7 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 10 - k__BackingField: 9 + k__BackingField: 12 + k__BackingField: 12 k__BackingField: 6 k__BackingField: - k__BackingField: 23 k__BackingField: k__BackingField: 23 - k__BackingField: 7 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 10 - k__BackingField: 8 + k__BackingField: 12 + k__BackingField: 12 k__BackingField: 6 k__BackingField: - k__BackingField: 24 k__BackingField: k__BackingField: 24 - k__BackingField: 7 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 10 - k__BackingField: 7 + k__BackingField: 12 + k__BackingField: 12 k__BackingField: 6 k__BackingField: - k__BackingField: 25 k__BackingField: k__BackingField: 25 - k__BackingField: 7 + k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 10 - k__BackingField: 6 + k__BackingField: 12 + k__BackingField: 12 k__BackingField: 6 k__BackingField: Upgrade5 - k__BackingField: 26 @@ -294,9 +294,9 @@ MonoBehaviour: k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 600 + k__BackingField: 700 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 27 @@ -307,7 +307,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 700 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 28 @@ -318,7 +318,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 700 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 29 @@ -329,7 +329,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 700 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 30 @@ -340,7 +340,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 700 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: Upgrade6 - k__BackingField: 31 @@ -349,9 +349,9 @@ MonoBehaviour: k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 700 + k__BackingField: 800 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 32 @@ -362,7 +362,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 800 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 33 @@ -373,7 +373,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 800 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 34 @@ -384,7 +384,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 800 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 35 @@ -395,7 +395,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 800 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 36 @@ -404,9 +404,9 @@ MonoBehaviour: k__BackingField: 5 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 800 + k__BackingField: 900 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 37 @@ -417,7 +417,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 900 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 38 @@ -428,7 +428,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 900 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 39 @@ -439,7 +439,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 900 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: - k__BackingField: 40 @@ -450,6 +450,6 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 900 k__BackingField: 10 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: 6 k__BackingField: diff --git a/Assets/Resources/Excel/LevelDataTable.xlsx b/Assets/Resources/Excel/LevelDataTable.xlsx index 23f1e4defe30188d07ba74a92f13b549d1074152..03d831d24be76a27642e8baebfb76177f0e5912c 100644 GIT binary patch delta 3324 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 OBw_?AL~SJe2lyZBRBoOC delta 3328 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 diff --git a/Assets/Resources/JSON/LevelDataTable.json b/Assets/Resources/JSON/LevelDataTable.json index f45657853..b142e4ebd 100644 --- a/Assets/Resources/JSON/LevelDataTable.json +++ b/Assets/Resources/JSON/LevelDataTable.json @@ -15,9 +15,9 @@ "CustomerRespawn": 15, "Gold": 100, "Exp": 100, - "RequiredExp": 100, + "RequiredExp": 200, "WaitTime": 20, - "HurryTime": 19, + "HurryTime": 20, "EatingTime": 10, "OpenUpgrade": "" }, @@ -28,7 +28,7 @@ "Exp": 100, "RequiredExp": 200, "WaitTime": 20, - "HurryTime": 18, + "HurryTime": 20, "EatingTime": 10, "OpenUpgrade": "" }, @@ -39,7 +39,7 @@ "Exp": 100, "RequiredExp": 200, "WaitTime": 20, - "HurryTime": 17, + "HurryTime": 20, "EatingTime": 10, "OpenUpgrade": "" }, @@ -50,227 +50,227 @@ "Exp": 100, "RequiredExp": 200, "WaitTime": 20, - "HurryTime": 16, + "HurryTime": 20, "EatingTime": 10, "OpenUpgrade": "Upgrade1" }, { "Idx": 6, - "CustomerRespawn": 13, + "CustomerRespawn": 10, "Gold": 100, "Exp": 100, - "RequiredExp": 200, - "WaitTime": 20, - "HurryTime": 15, + "RequiredExp": 300, + "WaitTime": 18, + "HurryTime": 18, "EatingTime": 10, "OpenUpgrade": "" }, { "Idx": 7, - "CustomerRespawn": 13, + "CustomerRespawn": 10, "Gold": 100, "Exp": 100, "RequiredExp": 300, - "WaitTime": 19, - "HurryTime": 15, + "WaitTime": 18, + "HurryTime": 18, "EatingTime": 10, "OpenUpgrade": "" }, { "Idx": 8, - "CustomerRespawn": 13, + "CustomerRespawn": 10, "Gold": 100, "Exp": 100, "RequiredExp": 300, "WaitTime": 18, - "HurryTime": 15, + "HurryTime": 18, "EatingTime": 10, "OpenUpgrade": "" }, { "Idx": 9, - "CustomerRespawn": 13, + "CustomerRespawn": 10, "Gold": 100, "Exp": 100, "RequiredExp": 300, - "WaitTime": 17, - "HurryTime": 15, + "WaitTime": 18, + "HurryTime": 18, "EatingTime": 10, "OpenUpgrade": "" }, { "Idx": 10, - "CustomerRespawn": 13, + "CustomerRespawn": 10, "Gold": 100, "Exp": 100, "RequiredExp": 300, - "WaitTime": 16, - "HurryTime": 15, + "WaitTime": 18, + "HurryTime": 18, "EatingTime": 10, "OpenUpgrade": "Upgrade2" }, { "Idx": 11, - "CustomerRespawn": 11, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, - "RequiredExp": 300, - "WaitTime": 15, - "HurryTime": 14, + "RequiredExp": 400, + "WaitTime": 16, + "HurryTime": 16, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 12, - "CustomerRespawn": 11, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 400, - "WaitTime": 15, - "HurryTime": 13, + "WaitTime": 16, + "HurryTime": 16, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 13, - "CustomerRespawn": 11, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 400, - "WaitTime": 15, - "HurryTime": 12, + "WaitTime": 16, + "HurryTime": 16, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 14, - "CustomerRespawn": 11, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 400, - "WaitTime": 15, - "HurryTime": 11, + "WaitTime": 16, + "HurryTime": 16, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 15, - "CustomerRespawn": 11, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 400, - "WaitTime": 15, - "HurryTime": 10, + "WaitTime": 16, + "HurryTime": 16, "EatingTime": 8, "OpenUpgrade": "Upgrade3" }, { "Idx": 16, - "CustomerRespawn": 9, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, - "RequiredExp": 400, - "WaitTime": 15, - "HurryTime": 10, + "RequiredExp": 500, + "WaitTime": 14, + "HurryTime": 14, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 17, - "CustomerRespawn": 9, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 500, "WaitTime": 14, - "HurryTime": 10, + "HurryTime": 14, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 18, - "CustomerRespawn": 9, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 500, - "WaitTime": 13, - "HurryTime": 10, + "WaitTime": 14, + "HurryTime": 14, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 19, - "CustomerRespawn": 9, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 500, - "WaitTime": 12, - "HurryTime": 10, + "WaitTime": 14, + "HurryTime": 14, "EatingTime": 8, "OpenUpgrade": "" }, { "Idx": 20, - "CustomerRespawn": 9, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 500, - "WaitTime": 11, - "HurryTime": 10, + "WaitTime": 14, + "HurryTime": 14, "EatingTime": 8, "OpenUpgrade": "Upgrade4" }, { "Idx": 21, - "CustomerRespawn": 7, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, - "RequiredExp": 500, - "WaitTime": 10, - "HurryTime": 10, + "RequiredExp": 600, + "WaitTime": 12, + "HurryTime": 12, "EatingTime": 6, "OpenUpgrade": "" }, { "Idx": 22, - "CustomerRespawn": 7, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 600, - "WaitTime": 10, - "HurryTime": 9, + "WaitTime": 12, + "HurryTime": 12, "EatingTime": 6, "OpenUpgrade": "" }, { "Idx": 23, - "CustomerRespawn": 7, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 600, - "WaitTime": 10, - "HurryTime": 8, + "WaitTime": 12, + "HurryTime": 12, "EatingTime": 6, "OpenUpgrade": "" }, { "Idx": 24, - "CustomerRespawn": 7, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 600, - "WaitTime": 10, - "HurryTime": 7, + "WaitTime": 12, + "HurryTime": 12, "EatingTime": 6, "OpenUpgrade": "" }, { "Idx": 25, - "CustomerRespawn": 7, + "CustomerRespawn": 5, "Gold": 100, "Exp": 100, "RequiredExp": 600, - "WaitTime": 10, - "HurryTime": 6, + "WaitTime": 12, + "HurryTime": 12, "EatingTime": 6, "OpenUpgrade": "Upgrade5" }, @@ -279,9 +279,9 @@ "CustomerRespawn": 5, "Gold": 100, "Exp": 100, - "RequiredExp": 600, + "RequiredExp": 700, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -292,7 +292,7 @@ "Exp": 100, "RequiredExp": 700, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -303,7 +303,7 @@ "Exp": 100, "RequiredExp": 700, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -314,7 +314,7 @@ "Exp": 100, "RequiredExp": 700, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -325,7 +325,7 @@ "Exp": 100, "RequiredExp": 700, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "Upgrade6" }, @@ -334,9 +334,9 @@ "CustomerRespawn": 5, "Gold": 100, "Exp": 100, - "RequiredExp": 700, + "RequiredExp": 800, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -347,7 +347,7 @@ "Exp": 100, "RequiredExp": 800, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -358,7 +358,7 @@ "Exp": 100, "RequiredExp": 800, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -369,7 +369,7 @@ "Exp": 100, "RequiredExp": 800, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -380,7 +380,7 @@ "Exp": 100, "RequiredExp": 800, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -389,9 +389,9 @@ "CustomerRespawn": 5, "Gold": 100, "Exp": 100, - "RequiredExp": 800, + "RequiredExp": 900, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -402,7 +402,7 @@ "Exp": 100, "RequiredExp": 900, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -413,7 +413,7 @@ "Exp": 100, "RequiredExp": 900, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -424,7 +424,7 @@ "Exp": 100, "RequiredExp": 900, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" }, @@ -435,7 +435,7 @@ "Exp": 100, "RequiredExp": 900, "WaitTime": 10, - "HurryTime": 5, + "HurryTime": 10, "EatingTime": 6, "OpenUpgrade": "" } From 9ca698b56fe51ff3870ce2cbd77946744172be5d Mon Sep 17 00:00:00 2001 From: capers Date: Thu, 24 Oct 2024 16:57:34 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=ED=86=A0=20=ED=99=95=EB=A5=A0,=20=EC=B1=85?= =?UTF-8?q?=EC=83=81=20=EB=8D=94=EB=9F=AC=EC=9B=8C=20=ED=99=95=EB=A5=A0=20?= =?UTF-8?q?=EC=A6=9D=EA=B0=80=20(SO=20=EC=88=98=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/02.Scripts/ScriptableObject/StageData.asset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/02.Scripts/ScriptableObject/StageData.asset b/Assets/02.Scripts/ScriptableObject/StageData.asset index 900047734..e997ce587 100644 --- a/Assets/02.Scripts/ScriptableObject/StageData.asset +++ b/Assets/02.Scripts/ScriptableObject/StageData.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: StageData m_EditorClassIdentifier: k__BackingField: 5 - k__BackingField: 10 + k__BackingField: 20 k__BackingField: 30 - k__BackingField: 20 + k__BackingField: 40 k__BackingField: 30 From b54b4a8b4325ea7e1763db6df5ed0d826dae0f55 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Thu, 24 Oct 2024 17:05:32 +0900 Subject: [PATCH 3/5] =?UTF-8?q?0.3.2.4=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01.Scenes/01.Tycoon.unity | 189 ++++++++---------- .../Character/Npc/Customer/Customer.cs | 19 +- Assets/02.Scripts/EventManager.cs | 8 +- .../Prop/Tycoon/InteractionFuniture.cs | 3 + Assets/02.Scripts/Prop/Tycoon/TableSeat.cs | 25 ++- Assets/02.Scripts/Prop/Tycoon/Vomiting.cs | 26 ++- .../ScriptableObject/CardDataTable.asset | 4 +- Assets/02.Scripts/Ui/InteractionUi.cs | 4 +- Assets/02.Scripts/Ui/Tycoon/Bill.cs | 10 +- Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs | 10 +- .../02.Scripts/Ui/Tycoon/TycoonSelectCard.cs | 28 +-- Assets/Resources/Excel/CardDataTable.xlsx | Bin 9607 -> 9616 bytes Assets/Resources/JSON/CardDataTable.json | 4 +- 13 files changed, 170 insertions(+), 160 deletions(-) diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 3a8bd1736..aa2248500 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -2554,13 +2554,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 737939132} + - {fileID: 1621314686} m_Father: {fileID: 1049919592} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &186139409 MonoBehaviour: @@ -7651,112 +7651,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &737939131 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 186139408} - m_Modifications: - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_Name - value: Card - objectReference: {fileID: 0} - - target: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2116ffd228314c745b8615652b11d19e, type: 3} ---- !u!224 &737939132 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 725714798138964366, guid: 2116ffd228314c745b8615652b11d19e, type: 3} - m_PrefabInstance: {fileID: 737939131} - m_PrefabAsset: {fileID: 0} --- !u!1 &738101929 GameObject: m_ObjectHideFlags: 0 @@ -18345,6 +18239,81 @@ MonoBehaviour: m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 +--- !u!1 &1621314685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1621314686} + - component: {fileID: 1621314688} + - component: {fileID: 1621314687} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1621314686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1621314685} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 186139408} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1621314687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1621314685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1621314688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1621314685} + m_CullTransparentMesh: 1 --- !u!1001 &1627308700 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 0a16ec50c..460e78556 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -33,7 +33,7 @@ namespace BlueWater.Npcs.Customers public enum CustomerInteractionType { None = 0, - OrderCocktail + ServedCocktail } public class Customer : MonoBehaviour, IPlayerInteraction, ICrewInteraction @@ -273,9 +273,16 @@ namespace BlueWater.Npcs.Customers public void ServedItem(CocktailData cocktailData) { - CurrentTableSeat.SetFood(); BalloonUi.ReceiveItem(cocktailData); - StateMachineController.TransitionToState(IsOrderedSucceed ? HappyState : UpsetState, this); + if (IsOrderedSucceed) + { + CurrentTableSeat.SetFood(); + StateMachineController.TransitionToState(HappyState, this); + } + else + { + StateMachineController.TransitionToState(UpsetState, this); + } } public void Interaction() @@ -284,7 +291,7 @@ namespace BlueWater.Npcs.Customers { case CustomerInteractionType.None: break; - case CustomerInteractionType.OrderCocktail: + case CustomerInteractionType.ServedCocktail: var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); var servedCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(currentPickupItem.Idx); IsOrderedSucceed = currentPickupItem.Idx == OrderedCocktailData.Idx; @@ -306,7 +313,7 @@ namespace BlueWater.Npcs.Customers { case CustomerInteractionType.None: return false; - case CustomerInteractionType.OrderCocktail: + case CustomerInteractionType.ServedCocktail: var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); return currentPickupItem != null; default: @@ -438,7 +445,7 @@ namespace BlueWater.Npcs.Customers InteractionMessage = "칵테일 전달"; OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); BalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, CurrentLevelData.HurryTime); - _customerInteractionType = CustomerInteractionType.OrderCocktail; + _customerInteractionType = CustomerInteractionType.ServedCocktail; RegisterPlayerInteraction(); EventManager.InvokeOrderedCocktail(this); diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 7c1c06b20..1f9079496 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -57,8 +57,12 @@ namespace BlueWater OnHideInteractionUi?.Invoke(); } - // 플레이어 상호작용중 이벤트 - public static Action OnInteracting; + // 플레이어 홀딩 상호작용중 이벤트 + public static Action OnHoldInteracting; + public static void InvokeHoldInteracting(float value) + { + OnHoldInteracting?.Invoke(value); + } #endregion diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index 181e2e581..2dec64a81 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -37,6 +37,7 @@ namespace BlueWater.Tycoons protected TycoonPlayer CurrentTycoonPlayer; protected bool IsQuitting; + protected bool IsShowing; protected Material OriginalMaterial; private void OnDrawGizmosSelected() @@ -100,6 +101,7 @@ namespace BlueWater.Tycoons { VisualLook.material = OutlineMaterial; EventManager.InvokeShowInteractionUi(InteractionMessage); + IsShowing = true; } public virtual void HideInteractionUi() @@ -109,6 +111,7 @@ namespace BlueWater.Tycoons VisualLook.material = OriginalMaterial; } EventManager.InvokeHideInteractionUi(); + IsShowing = false; } protected void RegisterPlayerInteraction() diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index cfbffda69..b265aa671 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -68,8 +68,6 @@ namespace BlueWater.Tycoons if (_isPlayerInteracting) { - var clamp = Mathf.Clamp(_playerElapsedTime / _interactionHoldingTime, 0f, 1f); - EventManager.OnInteracting?.Invoke(clamp); if (_playerElapsedTime > _interactionHoldingTime) { CleanTable(); @@ -77,6 +75,24 @@ namespace BlueWater.Tycoons _playerElapsedTime += Time.deltaTime; } + else + { + if (_playerElapsedTime > 0f) + { + _playerElapsedTime -= Time.deltaTime; + } + } + + var holdingGauge = 0f; + if (_playerElapsedTime > 0f) + { + holdingGauge = Mathf.Clamp(_playerElapsedTime / _interactionHoldingTime, 0f, 1f); + } + + if (IsShowing) + { + EventManager.InvokeHoldInteracting(holdingGauge); + } if (_isCrewInteracting) { @@ -110,16 +126,12 @@ namespace BlueWater.Tycoons public override void Interaction() { - _playerElapsedTime = 0f; - EventManager.OnInteracting?.Invoke(_playerElapsedTime); GameManager.Instance.CurrentTycoonPlayer.IsCleaningTable = true; _isPlayerInteracting = true; } public override void CancelInteraction() { - _playerElapsedTime = 0f; - EventManager.OnInteracting?.Invoke(_playerElapsedTime); GameManager.Instance.CurrentTycoonPlayer.IsCleaningTable = false; _isPlayerInteracting = false; } @@ -143,6 +155,7 @@ namespace BlueWater.Tycoons _isCrewInteracting = false; InteractionCanvas.BalloonUi.HideUi(); InteractionCanvas.BalloonUi.ResetUi(); + _playerElapsedTime = 0f; } public void DirtyTable() diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index 5ff1f9c2f..d9f42fa34 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -40,8 +40,6 @@ namespace BlueWater.Tycoons if (_isPlayerInteracting) { - var clamp = Mathf.Clamp(_playerElapsedTime / _interactionHoldingTime, 0f, 1f); - EventManager.OnInteracting?.Invoke(clamp); if (_playerElapsedTime > _interactionHoldingTime) { Destroy(); @@ -49,6 +47,24 @@ namespace BlueWater.Tycoons _playerElapsedTime += Time.deltaTime; } + else + { + if (_playerElapsedTime > 0f) + { + _playerElapsedTime -= Time.deltaTime; + } + } + + var holdingGauge = 0f; + if (_playerElapsedTime > 0f) + { + holdingGauge = Mathf.Clamp(_playerElapsedTime / _interactionHoldingTime, 0f, 1f); + } + + if (IsShowing) + { + EventManager.InvokeHoldInteracting(holdingGauge); + } if (_isCrewInteracting) { @@ -75,16 +91,12 @@ namespace BlueWater.Tycoons public override void Interaction() { - _playerElapsedTime = 0f; - EventManager.OnInteracting?.Invoke(_playerElapsedTime); GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = true; _isPlayerInteracting = true; } public override void CancelInteraction() { - _playerElapsedTime = 0f; - EventManager.OnInteracting?.Invoke(_playerElapsedTime); GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = false; _isPlayerInteracting = false; } @@ -102,14 +114,12 @@ namespace BlueWater.Tycoons public void InteractionCrew(Crew crew) { - _crewElapsedTime = 0f; _isCrewInteracting = true; ((CleanerCrew)crew).SetIsCleaningFloor(true); } public void CancelInteractionCrew() { - _crewElapsedTime = 0f; _isCrewInteracting = false; } diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index b90d7cd6d..cc6a9106e 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -130,7 +130,7 @@ MonoBehaviour: k__BackingField: k__BackingField: ExpGetUp k__BackingField: ExpGetUpImg - k__BackingField: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD 5% \uC99D\uAC00" + k__BackingField: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD 20% \uC99D\uAC00" k__BackingField: 10 k__BackingField: 5 k__BackingField: {fileID: 21300000, guid: 400a47b8bcd0a1e4b823160ce9f40232, type: 3} @@ -138,7 +138,7 @@ MonoBehaviour: k__BackingField: k__BackingField: GoldGetUp k__BackingField: GoldGetUpImg - k__BackingField: "\uACE8\uB4DC \uD68D\uB4DD 5% \uC99D\uAC00" + k__BackingField: "\uACE8\uB4DC \uD68D\uB4DD 20% \uC99D\uAC00" k__BackingField: 10 k__BackingField: 5 k__BackingField: {fileID: 21300000, guid: 121ed7da4e55d2a43ba798a00f95a474, type: 3} diff --git a/Assets/02.Scripts/Ui/InteractionUi.cs b/Assets/02.Scripts/Ui/InteractionUi.cs index 94912fc20..143e393d6 100644 --- a/Assets/02.Scripts/Ui/InteractionUi.cs +++ b/Assets/02.Scripts/Ui/InteractionUi.cs @@ -23,14 +23,14 @@ namespace BlueWater.Uis { EventManager.OnShowInteractionUi += ShowUi; EventManager.OnHideInteractionUi += HideUi; - EventManager.OnInteracting += SetFillAmount; + EventManager.OnHoldInteracting += SetFillAmount; } private void OnDestroy() { EventManager.OnShowInteractionUi -= ShowUi; EventManager.OnHideInteractionUi -= HideUi; - EventManager.OnInteracting -= SetFillAmount; + EventManager.OnHoldInteracting -= SetFillAmount; } public void ShowUi(string message) diff --git a/Assets/02.Scripts/Ui/Tycoon/Bill.cs b/Assets/02.Scripts/Ui/Tycoon/Bill.cs index 0dae25614..2d4595784 100644 --- a/Assets/02.Scripts/Ui/Tycoon/Bill.cs +++ b/Assets/02.Scripts/Ui/Tycoon/Bill.cs @@ -108,7 +108,7 @@ namespace BlueWater var rotationAngle = Mathf.Lerp(8f, 40f, distance / _maxDistance); var punchStrength = Mathf.Lerp(1f, 5f, distance / _maxDistance); - var moveSequence = DOTween.Sequence(); + var moveSequence = DOTween.Sequence().SetAutoKill(true); moveSequence.Append(_rect.DOLocalMoveX(CurrentBillInfo.Position.x, moveTime)); moveSequence.Join(_rect.DOLocalRotate(new Vector3(0, 0, rotationAngle), moveTime / 5f)); moveSequence.Join(_rect.DOPunchRotation(new Vector3(0f, 0f, punchStrength), moveTime * 4f / 5f, 3, 0.2f) @@ -174,14 +174,14 @@ namespace BlueWater public void BartenderMakingCocktail() { - _makingCocktailPivotObject.gameObject.SetActive(true); + _makingCocktailPivotObject?.gameObject.SetActive(true); } public void BartenderCompleteMakingCocktail() { - _makingCocktailPivotObject.gameObject.SetActive(false); - _checkImageObject.gameObject.SetActive(true); - _animationController.SetAnimationParameter("isBartenderChecked", true); + _makingCocktailPivotObject?.gameObject.SetActive(false); + _checkImageObject?.gameObject.SetActive(true); + _animationController?.SetAnimationParameter("isBartenderChecked", true); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs index 34b8a6829..a0436728f 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCardArea.cs @@ -36,7 +36,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH private float _maxRotationAngle; private float _returnSpeed; - private TycoonCard _parent; //부모 + private TycoonCard _tycoonCard; //부모 private float _returnSpeedTime = 0.0f; // 복원속도를 더할 메서드 private bool _isPointerInside; // 이미지 안에 마우스가 있는지 여부를 추적 private Coroutine _startRotationCoroutine; @@ -49,12 +49,12 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH private void Awake() { - _parent = transform.parent.GetComponent(); + _tycoonCard = transform.parent.GetComponent(); _rectTransform = this.GetComponent(); _cardComTransform = transform.parent.Find("CardCom").GetComponent(); _image = _cardComTransform.Find("Image").GetComponent(); - _maxRotationAngle = _parent.maxRotationAngle; - _returnSpeed = _parent.returnSpeed; + _maxRotationAngle = _tycoonCard.maxRotationAngle; + _returnSpeed = _tycoonCard.returnSpeed; } void Start() @@ -120,7 +120,7 @@ public class TycoonCardArea : MonoBehaviour, IPointerEnterHandler, IPointerExitH { if (_enable) { - _parent.transform.parent.GetComponent().SelectedCard(_parent); + _tycoonCard.transform.parent.parent.GetComponent().SelectedCard(_tycoonCard); //해당 밑줄은 따로 메소드를 만들어주자... 여기서 호출하는게 아니라 SelectCardUi에서 호출받는 방식으로... this.SetEnable(false); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 08e6a7f08..b5d08cb0a 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -1,10 +1,5 @@ -using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using BlueWater.Players.Tycoons; using BlueWater.Tycoons; -using Mono.Cecil.Cil; using Sirenix.OdinInspector; using UnityEngine; using Random = UnityEngine.Random; @@ -13,7 +8,7 @@ namespace BlueWater.Uis { public class TycoonSelectCard : MonoBehaviour { - + private GameObject _panel; private Camera uiCamera; [field: SerializeField, CLabel("카드 1")] @@ -36,6 +31,9 @@ namespace BlueWater.Uis private void Awake() { EventManager.OnLevelUp += Test; + + _panel = transform.Find("Panel").gameObject; + HideUi(); } void Start() @@ -70,13 +68,13 @@ namespace BlueWater.Uis Destroy(_currentCard03); } - _currentCard01 = Instantiate(card01, this.transform); + _currentCard01 = Instantiate(card01, _panel.transform); _currentCard01.name = "Card01"; - _currentCard02 = Instantiate(card02, this.transform); + _currentCard02 = Instantiate(card02, _panel.transform); _currentCard02.name = "Card02"; - _currentCard03 = Instantiate(card03, this.transform); + _currentCard03 = Instantiate(card03, _panel.transform); _currentCard03.name = "Card03"; _currentCard01.transform.localPosition = new Vector3(-550, 0, 0); @@ -86,7 +84,8 @@ namespace BlueWater.Uis _tycoonCard01Componet = _currentCard01.GetComponent(); _tycoonCard02Componet = _currentCard02.GetComponent(); _tycoonCard03Componet = _currentCard03.GetComponent(); - + + ShowUi(); //----카드 값 지정 및 초기화---- @@ -181,9 +180,9 @@ namespace BlueWater.Uis case "SpeedUp": TycoonManager.Instance.TycoonStatus.PlayerMoveSpeedMultiplier += 0.05f; break; case "ExpGetUp": - TycoonManager.Instance.TycoonStatus.ExpMultiplier += 0.05f; break; + TycoonManager.Instance.TycoonStatus.ExpMultiplier += 0.2f; break; case "GoldGetUp": - TycoonManager.Instance.TycoonStatus.GoldMultiplier += 0.05f; break; + TycoonManager.Instance.TycoonStatus.GoldMultiplier += 0.2f; break; // case "CleanUp": return; break; // case "GaugeReset": return; break; default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return; break; @@ -290,7 +289,12 @@ namespace BlueWater.Uis Destroy(_currentCard03); } + HideUi(); + VisualFeedbackManager.Instance.ResetTimeScale(); } + + public void ShowUi() => _panel.SetActive(true); + public void HideUi() => _panel.SetActive(false); } } diff --git a/Assets/Resources/Excel/CardDataTable.xlsx b/Assets/Resources/Excel/CardDataTable.xlsx index ff314a0c0cb718b4928cbdbc7266d8c30413d6ef..ee43ce23c16edf3592b4cecd01578fb1c45af589 100644 GIT binary patch delta 2620 zcmV-C3d8k>OOQ*j$_5FbB8h_U0ssKglhXzze}s?(l~f@YZKd5R>h&d3-;v&NehGK2YLQovb z4}?;crMBxhzMWx~n+-xBlZFQ`e=gTK7kHV1+ZE~>m4Mra2RYEV?M`4i*(zg1aLHHd z4500X^ojq-u@O27L3J8~k0E)spifNaaL-EkpJe6lvHSxVa=wg)Kw7m{0tntG(YkwX zt~oqkv6S97(lu~VT;WV-Dm9H1OEry|qH$>UV92-hFachPvWQBSg4OLie{R>bhkH5C z1q>kfqf}9mV@1b2S0J?=^{>jR#vUgeL~LBsKP3|s&JIWj+<_L8059bntHdZp8k*x^ zahHQ8=Ys#HM9IY!-9~9iAAp!xjHIM6cTFWP1)*{=tq4sQZ-j|YPr*M(6B8X78=}!L zZr0%?zT=k*dIjyjJy5dnI9amF)$F!mh_MZJ#Y zjk=LF7*8T=gxmo_-mKS)#;@Rv@B_kesghl;HFRitkk}K`FI=@2Vq!-DTO9x<9UjAn3Ix;bKGzoAsuPoP%!MqX?FM%PpXg{ef%sy^d>*y@@;R_NJ3* z)YbXX^*{I@Rj@t+Awm0N(JT`z)UCi|1HYqdx{9y_K{XBmU(jRA+HSuZ{sohf0~C|E zBM!6l2_*s!3+C*=t^@!8z7hZc7yy$TBpS0p3|RqxCK>kl?_MR?D8a58FYSxoqVMT1 zmQ+ylt@2;Z{xisR<574L4fFpltUR<%Q5~Pb3G7)+B^m`0VH6T^BwB`l4_l5OPPxm< zH)u_xIG<$WEFDuKw$2;<>+CtlpCa+7`beDjXMYxDd7dWI2}Z8K`GpM0y-L9|>M1y% zDd{9a8ejEar?9@5e*gdg|Nj600RR7#ms@TEF$_hwf@T2)&x1!bMe0mg2%<>+YO4N=mvhNOSKjy#{H?HgM>Yb?|9jbCni)*UxeY<$`o;kmlZ5dJEE$?Lb;G zv~zwClfgTLYU!kTr2jqM+#AOOk6J>)0ap+wyvu5bYMeARA8Ug(_eN_Nfmf*BnZ z#0gnvtwXh7y)jsGZ?wh@!Q+>iAc9ODM zhGa=g-yGd>v1p3Zu4sef&NSYcbXzSEN-_x>%ur2Xq(()%WZ*+!rt)`#lq^X}>YL|@Z!nY; zZDFQIMLUcorumb#)F2RN4vx$33-iQE?Le!7=_z;P&8{%L?eA!b_ zj%*)01RUU<3N*suFR|HD8(|r*0ng8#N&sWygHF7$7uN?$!&?b4b_*fMo>K{E1MjqW zzae@f@o9wQ8{d^q-Q3~3bu{}3iPIi`uyN*UVIDJBq&FJCQ1gNBf>~}wpjUyb42EsX zb@~=U2?DjaG{E*ryxHf+A5px2BwL3#kY(yRt05NUKY#FcU;1f}H@m!jB6?jkxft-~ z2|v9=V$_fi@nHw@6K@>Q$TaV|$(0iVajRl0QOPP%$pKYvu1acT(m)w`-IyLg6htSP zR;0znSPm`Vso;M-`1F%^swKRPDF#j8cPhZTFd6=h54vL9m4n?5Z}(8zP|*@5=dvms zsnXQtzcbc9lhFwk1dOwf_p_%RDFJ`OAQ*=4P5ciH_Z_r5I7!!K9_Ec(OzfiZj=;CA zu}}hN-M^Q%TkWFp65f}Ghc6`aFIfbiU~FEh8Hxr31)z8-a;K`I4jLX3Wo}?`0dWQDSX^OGsdyvcyd_(zgTN=rnUz&d%){MWi z9pIRd36|iPV2t^O%_8Q$JyOO(bW8i!;Ol5rMI zX>?78qqq9@v-7oJyCIJb{}SU-7?Cg@W#ozuCp0EK;t7y8-shhp{gaRb6|*fMP6G*` zB8h_U0ssKglY}FD2@B@zz^()U0KSt6Bv%3NlVK!445SwT0C;RKb98xZWs~nD6&y+Q zV86ry007((000yK000000000000000s2Y>O8WxlEBoG^nvyb;v0RRAD0ssIJ00000 e00000000000G^W{B|ZTtlU^kw2KpiZ0002J+Qr}i delta 2567 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 diff --git a/Assets/Resources/JSON/CardDataTable.json b/Assets/Resources/JSON/CardDataTable.json index dfe1eba30..0493e324a 100644 --- a/Assets/Resources/JSON/CardDataTable.json +++ b/Assets/Resources/JSON/CardDataTable.json @@ -100,14 +100,14 @@ { "Idx": "ExpGetUp", "Img": "ExpGetUpImg", - "ScriptText": "경험치 획득 5% 증가", + "ScriptText": "경험치 획득 20% 증가", "Max": 10, "Ratio": 5 }, { "Idx": "GoldGetUp", "Img": "GoldGetUpImg", - "ScriptText": "골드 획득 5% 증가", + "ScriptText": "골드 획득 20% 증가", "Max": 10, "Ratio": 5 }, From 87f6ddf1ea08ebe1f55cde63414fb16da8c54cb7 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Sun, 27 Oct 2024 18:44:22 +0900 Subject: [PATCH 4/5] =?UTF-8?q?0.3.2.5=20=EB=B2=84=EC=A0=84=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01.Scenes/01.Tycoon.unity | 2 +- .../BehaviorTree/Npc/Crew/Action/Refind.cs | 5 +- .../Npc/Crew/Conditional/OnMission.cs | 2 +- .../Npc/Crew/Conditional/Serving.cs | 2 +- .../Npc/Crew/Conditional/TakeServingItem.cs | 5 +- .../Character/Npc/Crew/Server/ServerCrew.cs | 16 +++- .../Character/Npc/Customer/Customer.cs | 4 +- Assets/02.Scripts/EventManager.cs | 7 -- .../02.Scripts/Interface/ICrewInteraction.cs | 2 +- Assets/02.Scripts/Prop/Tycoon/Barrel.cs | 23 +++-- .../02.Scripts/Prop/Tycoon/BartenderTable.cs | 15 +++- .../Prop/Tycoon/InteractionFuniture.cs | 9 +- Assets/02.Scripts/Prop/Tycoon/ServingTable.cs | 33 +++++--- Assets/02.Scripts/Prop/Tycoon/TableSeat.cs | 81 +++++++++--------- Assets/02.Scripts/Prop/Tycoon/Vomiting.cs | 51 ++++++------ .../ScriptableObject/SpriteData.asset | 3 + Assets/02.Scripts/SpriteDataSo.cs | 8 +- Assets/02.Scripts/Tycoon/CrewController.cs | 6 +- Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs | 9 +- Assets/02.Scripts/Ui/Tycoon/Bill.cs | 5 ++ .../Npcs/Crews/BartenderCrew.prefab | 21 ++++- .../Characters/Npcs/Crews/CleanerCrew.prefab | 21 ++++- .../Characters/Npcs/Crews/ServerCrew.prefab | 21 ++++- .../Characters/Npcs/Customer.prefab | 34 ++++++-- .../Characters/Players/TycoonPlayer.prefab | 6 +- .../Interactions/BartenderTable.prefab | 2 +- .../Interactions/CustomerTable3.prefab | 10 +-- .../Interactions/ServingTable.prefab | 6 +- .../Characters/Npcs/Crews/Crew_Crew.mat | 2 +- .../Characters/Npcs/Crews/Crew_Crew_2.mat | 2 +- .../Sprites/Icons Colored/Basic/Lock.png.meta | 83 +++++++++++++++---- ProjectSettings/ProjectSettings.asset | 2 +- 32 files changed, 326 insertions(+), 172 deletions(-) diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index aa2248500..7965d774f 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -20747,7 +20747,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIeyASX/muwIAAAEGAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI56VKoKVlb7tA2z20RaWrHjY9OPGEWBg78keBVvz3HTuGBEBIid58vXkzk2/CpamhsEo/aM6eFAPys0f8O/nRa42PsKVLJRf8Cw4+75zZyjvR4PNKLVeIpz7MqDVYzYtfcim8c4Kgk7xUej1jS5goYw3CJRUG0KSV9dESoe8e2caAXXx++Wdvj28FSAv60qufXKXRsZ8Or8bhFyKcLARd18A88zZwcIgcNIkl9hQ9kqsbX0kJwU2kROyuDi1PaG0cNoQOjFNsMZBpilfAl5W9TPBSlgYaPPEGTXdTrlGwJjn5rRoV19SsGoKfVDhfbnh3Hcg1mZ8u7KPGXGq1fjwUTxPfma14sXqlu4Ia25G5C09b/mnQaUPFiuYC3iuQz+pBKycZGq12PtQZGEw7qY7tTSooVq1fw/UMdPXlyNJ2sPvQ/XZhoX5sRbxu0b8GzEKoMIOY0lsiMvYpQeME/2A/YY9MLISo54jxb3TZXbhouOfaWDRFPhH1vnOcEDCQBUTd+95Benq5ctrnIrPA1Yvh7ERpCQGOBGuQVNjdHDPaky24tHV4nVnuqb+9yC7aDid1FhLg1j9JzkxztTkOW+MOm7DYh7d/H34IplKbJzDVi7OCy47a3vCMAk+UlM3mdsU8hC2cLmnRCbOwtU7DlFoaqiEdXDDWDUUtQ4R0QvhdDg0ERtiA/394fSuKdUWAybOS4QBPnoH+0nF2eiEkobd0zPLyZpDmo9u7vD/Mh5AXMMyTEYPROCXhhLhEuamYN3rFKeF2ybYXiefiM76CsdRpKsPkmaabB/61Vp3Jc1mqRaEB5EuT4dgsaCyCXxk2YxzbXIC1XIa9JN8ZEapYAcuOibIg7GxrNc3aLBmp+aeyHsnIJHwPM+Lh40Xi6n5y2PjiJ8lA4OiAvXEBa1p7U7In+/9QSwMEFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw1TPUM9RRUEovSizIKAYKgDmlmSkgdrSSQaJ5omVKUpqpkWGSmblFkq5xknFqUnKqcZKBWUqqmaWhUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAABIIeyASX/muwIAAAEGAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAABIIez9o8lSawAAAHcAAAAJACQAAAAAAAAAAAAAAAgDAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAvgMAAAAA + dataString: UEsDBBQAAAgIAABIIeyIBIXztwIAAPUFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI56WC0tKyt12g7R7aotJVD0sPTjwhFsaO/FGgFf99ZxxDApUiJXrzZubNV76Y1K6C3Bt7b6V4NALYzw6jb/aj0xgfYMuXRs/lJxw4b1L4kkg8cl64lwbxPrk5swZvZf5LLxWRewgGLQtj11OxhLFx3iFccOUATdZ48tYIfXXYNjns0vuT3p09fuWgPdjvrG7vop+I3dHFdeQGnSu+rkCQ5salf5N8RpGlsZhEqGPkRinpkhbmd1WsdcwrF7ASJAjJsbaogvglyGXpo/t12/25KBz4pNHy3URabFIdl/02defW3K1qaR9cBco0uL2Kuuqwj9/sw9pcWLN+OGTu9yiHL2W+euG7nDvfam0bnpxKD3rD1YpnCt5K0E/m3pqgBRq9DeQaHFxOWqGOtY1LyFcNr9Z6Bobq+5j6zTD3sfrt3EP10HTwqkH/OnBzZWL7U0iyJGREIcHi8P5gPXF3XEqEKGlE/1e+bC9ZMtxJ6zyakp6EEneGEwIBOofU9y4RNMnLTLAUi02jVmpG8GNjNUQ4CaxAc+V3M4zoz1fgzNbSdWa543RvSV2yHc7ozCXCDb/XOzPNzOY4bIvr6+JOH77+vdMQXGk2j+DK5+CV1K1uk+EJGzw2Wteb227mwW0ebMHzlpuHrQ8WJtzzmA3l4IKJtiv2MnrooBTtciwgKsIC6Hmn/pYc86oIsyej4+2dvKP8ZZDi9EJYj9/wkciK68t+Nry5zbqDbABZDoOsNxQwHPVZPCGpsd1czep+pSnhdummFo3nQhFfwHkeLNdx8sLyzb38XJvW5KUuzDy3APq5jnAsFiwmwR+MmAqJZc7Be6njXrKvBVMmX4FYHAMtYmOnW2/5oomyYJX8MJ6QBRvHf+CCEXy8SFzdDwkbSn4SDBSODsSrVLDmFZl6e7b/D1BLAwQUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAatWKkstKs7Mz1OyUjDVM9Qz1FFQSi9KLMgoBgqAOaWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7IgEhfO3AgAA9QUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJAAAAAAAAAAAAAAABAMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAAC6AwAAAAA= file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs index d1590edfe..b785deab3 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs @@ -21,7 +21,7 @@ namespace BlueWater.BehaviorTrees.Actions var orderedCustomer = tycoonManager.CustomerController.FindCustomerMatchingItem(_serverCrew.CurrentPickupItem); if (orderedCustomer) { - _serverCrew.OnMission(orderedCustomer, orderedCustomer); + _serverCrew.OnMission(orderedCustomer, orderedCustomer, ActionType.ServingToCustomer); return TaskStatus.Success; } @@ -29,8 +29,7 @@ namespace BlueWater.BehaviorTrees.Actions var emptyServingTable = tycoonManager.ServingTableController.FindEmptyServingTable(); if (emptyServingTable) { - _serverCrew.OnMission(emptyServingTable); - _serverCrew.AIMovement.Move(emptyServingTable.CenterTransform.position); + _serverCrew.OnMission(emptyServingTable, null, ActionType.PlaceOnServingTable); return TaskStatus.Success; } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs index 66f475681..cbf4ca932 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs @@ -23,7 +23,7 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - if (_crew.CrewInteraction == null || !_crew.CrewInteraction.CanInteractionCrew()) + if (_crew.CrewInteraction == null || !_crew.CrewInteraction.CanInteractionCrew(_crew)) { _crew.AIMovement.StopMove(); _crew.ResetMission(); diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs index e9ed1d550..8c5b2460e 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs @@ -29,7 +29,7 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - if (!_serverCrew.CrewInteraction.CanInteractionCrew()) + if (!_serverCrew.CrewInteraction.CanInteractionCrew(_serverCrew)) { _serverCrew.AIMovement.StopMove(); _serverCrew.CanNotServing(); diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs index 1114ec6ae..1b6e5932a 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs @@ -15,7 +15,7 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - if (_serverCrew.CrewInteraction != null && _serverCrew.CurrentPickupItem == null) + if (_serverCrew.CrewInteraction != null) { _serverCrew.AIMovement.Move(_serverCrew.CrewInteraction.CenterTransform.position); } @@ -25,7 +25,8 @@ namespace BlueWater.BehaviorTrees.Actions { if (_serverCrew.CurrentPickupItem != null) return TaskStatus.Success; - if (_serverCrew.CrewInteraction == null || !_serverCrew.CrewInteraction.CanInteractionCrew() || !_serverCrew.OrderedCustomer.CanInteractionCrew()) + if (_serverCrew.CrewInteraction == null || !_serverCrew.CrewInteraction.CanInteractionCrew(_serverCrew) || + _serverCrew.OrderedCustomer == null || !_serverCrew.OrderedCustomer.CanInteractionCrew()) { _serverCrew.AIMovement.StopMove(); _serverCrew.ResetMission(); diff --git a/Assets/02.Scripts/Character/Npc/Crew/Server/ServerCrew.cs b/Assets/02.Scripts/Character/Npc/Crew/Server/ServerCrew.cs index 4247978a3..38b7a208f 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/Server/ServerCrew.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/Server/ServerCrew.cs @@ -3,11 +3,21 @@ using BlueWater.Npcs.Customers; namespace BlueWater.Npcs.Crews.Server { + public enum ActionType + { + None = 0, + Patrol, + TakeCocktail, + PlaceOnServingTable, + ServingToCustomer + } + public class ServerCrew : Crew { public Customer OrderedCustomer { get; private set; } public IPickup CurrentPickupItem { get; private set; } public bool IsServing { get; private set; } + public ActionType CurrentActionType { get; private set; } public StateMachineController StateMachineController { get; private set; } public IStateMachine IdleState { get; private set; } @@ -22,6 +32,7 @@ namespace BlueWater.Npcs.Crews.Server public override void Initialize() { + CurrentActionType = ActionType.Patrol; IdleState = new IdleState(); WalkingState = new WalkingState(); ServingState = new ServingState(); @@ -33,6 +44,8 @@ namespace BlueWater.Npcs.Crews.Server public override void ResetMission() { + CurrentActionType = ActionType.Patrol; + CrewInteraction = null; IsOnMission = false; BalloonUi.DiscardItem(); @@ -53,10 +66,11 @@ namespace BlueWater.Npcs.Crews.Server return CrewInteraction == null && !OrderedCustomer && CurrentPickupItem == null && !IsServing; } - public void OnMission(ICrewInteraction crewInteraction, Customer orderedCustomer) + public void OnMission(ICrewInteraction crewInteraction, Customer orderedCustomer, ActionType actionType) { base.OnMission(crewInteraction); OrderedCustomer = orderedCustomer; + CurrentActionType = actionType; } public void TakeFromServingTable(IPickup pickupItem, Customer orderedCustomer) diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 460e78556..78ae41ca7 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -339,9 +339,9 @@ namespace BlueWater.Npcs.Customers throw new NotImplementedException(); } - public bool CanInteractionCrew() + public bool CanInteractionCrew(Crew crew = null) { - return !IsReceivedItem; + return !IsReceivedItem && CurrentTableSeat; } public virtual void ShowInteractionUi() diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 1f9079496..a8df35bca 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -133,13 +133,6 @@ namespace BlueWater OnPlaceOnServingTable?.Invoke(); } - // 플레이어가 서빙테이블에 있는 칵테일을 가져오는 이벤트 - public static Action OnTakeFromServingTable; - public static void InvokeTakeFromServingTable() - { - OnTakeFromServingTable?.Invoke(); - } - // Npc // 손님 생성 이벤트 public static Action OnCreateCustomer; diff --git a/Assets/02.Scripts/Interface/ICrewInteraction.cs b/Assets/02.Scripts/Interface/ICrewInteraction.cs index f0e69c519..0fc5d3d68 100644 --- a/Assets/02.Scripts/Interface/ICrewInteraction.cs +++ b/Assets/02.Scripts/Interface/ICrewInteraction.cs @@ -14,7 +14,7 @@ namespace BlueWater.Interfaces void InteractionCrew(Crew crew); void CancelInteractionCrew(); - bool CanInteractionCrew(); + bool CanInteractionCrew(Crew crew = null); event Action OnInteractionCompleted; } diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index 1cfb4cf5a..aa891e86f 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -1,6 +1,5 @@ using System; using BlueWater.Items; -using BlueWater.Players.Tycoons; using Sirenix.OdinInspector; using UnityEngine; @@ -25,9 +24,19 @@ namespace BlueWater.Tycoons [field: SerializeField] public int CurrentAmount { get; private set; } - - [field: SerializeField] - public bool IsActivated { get; private set; } + + [SerializeField] + private bool _isActivated; + public bool IsActivated + { + get => _isActivated; + private set + { + _isActivated = value; + + _liquidImage.sprite = _isActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock; + } + } private Material _instanceMaterial; @@ -49,10 +58,12 @@ namespace BlueWater.Tycoons SetCurrentAmount(0); } - private void Start() + protected override void Start() { + base.Start(); + + _liquidImage.sprite = _isActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock; InteractionMessage = $"{_liquidData.Name} 따르기"; - _liquidImage.sprite = _liquidData.Sprite; _instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity); } diff --git a/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs index e6dc8c965..046e98bd4 100644 --- a/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs @@ -1,4 +1,7 @@ +using System; using BlueWater.Interfaces; +using BlueWater.Npcs.Crews; +using BlueWater.Npcs.Crews.Server; namespace BlueWater.Tycoons { @@ -9,12 +12,12 @@ namespace BlueWater.Tycoons // 테이블의 칵테일을 가져가는 경우 if (CurrentPickupItem != null) { - EventManager.InvokeTakeFromServingTable(); CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(CurrentPickupItem); CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); CocktailGlassImage.enabled = false; InteractionCanvas.BalloonUi.DiscardItem(); CurrentPickupItem = null; + OrderedCustomer = null; } } @@ -23,9 +26,15 @@ namespace BlueWater.Tycoons return CurrentPickupItem != null && !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpCocktail(); } - public override bool CanInteractionCrew() + public override bool CanInteractionCrew(Crew crew = null) { - return CurrentPickupItem != null && _orderedCustomer != null; + var servingCrew = (ServerCrew)crew; + if (!servingCrew) + { + throw new Exception("상호작용 오브젝트 오류"); + } + + return servingCrew.CurrentActionType == ActionType.TakeCocktail && CurrentPickupItem != null && OrderedCustomer; } public void CompleteMakingCocktail(IPickup cocktailData) diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index 2dec64a81..c07ed1c96 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -36,9 +36,10 @@ namespace BlueWater.Tycoons protected bool IsOpened; protected TycoonPlayer CurrentTycoonPlayer; + protected Material OriginalMaterial; protected bool IsQuitting; protected bool IsShowing; - protected Material OriginalMaterial; + protected float HoldingElapsedTime; private void OnDrawGizmosSelected() { @@ -61,6 +62,11 @@ namespace BlueWater.Tycoons RegisterPlayerInteraction(); } + + protected virtual void Start() + { + + } protected virtual void OnDisable() { @@ -101,6 +107,7 @@ namespace BlueWater.Tycoons { VisualLook.material = OutlineMaterial; EventManager.InvokeShowInteractionUi(InteractionMessage); + EventManager.InvokeHoldInteracting(HoldingElapsedTime); IsShowing = true; } diff --git a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs index 7039ee1dd..3f722df7e 100644 --- a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs @@ -45,10 +45,10 @@ namespace BlueWater.Tycoons } } + protected Customer OrderedCustomer; private Material _originalCocktailGlassMaterial; private Coroutine _findCustomerMatchingItemInstance; private Coroutine _findServerCrewInstance; - protected Customer _orderedCustomer; public event Action OnInteractionCompleted; @@ -64,21 +64,21 @@ namespace BlueWater.Tycoons // 테이블의 칵테일을 가져가는 경우 if (CurrentPickupItem != null) { - EventManager.InvokeTakeFromServingTable(); CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(CurrentPickupItem); CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); CocktailGlassImage.enabled = false; InteractionCanvas.BalloonUi.DiscardItem(); CurrentPickupItem = null; + OrderedCustomer = null; } // 테이블에 칵테일을 놓는 경우 else { EventManager.InvokePlaceOnServingTable(); CurrentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); - CurrentTycoonPlayer.TycoonPickupHandler.GiveItem(CurrentPickupItem); - CurrentTycoonPlayer.InteractionCanvas.BalloonUi.DiscardItem(); InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + CurrentTycoonPlayer.TycoonPickupHandler.DiscardItem(); + CurrentTycoonPlayer.InteractionCanvas.BalloonUi.DiscardItem(); CocktailGlassImage.enabled = true; } } @@ -108,15 +108,17 @@ namespace BlueWater.Tycoons public void InteractionCrew(Crew crew) { - // 테이블의 칵테일을 가져가는 경우 + // 종업원이 테이블의 칵테일을 가져가는 경우 if (CurrentPickupItem != null) { var serverCrew = (ServerCrew)crew; - serverCrew.TakeFromServingTable(CurrentPickupItem, _orderedCustomer); + serverCrew.TakeFromServingTable(CurrentPickupItem, OrderedCustomer); CocktailGlassImage.enabled = false; InteractionCanvas.BalloonUi.DiscardItem(); CurrentPickupItem = null; + OrderedCustomer = null; } + // 종업원이 테이블에 칵테일을 놓는 경우 else { var serverCrew = (ServerCrew)crew; @@ -132,10 +134,16 @@ namespace BlueWater.Tycoons throw new NotImplementedException(); } - public virtual bool CanInteractionCrew() + public virtual bool CanInteractionCrew(Crew crew = null) { - return (CurrentPickupItem != null && _orderedCustomer != null) || - CurrentPickupItem == null; + var servingCrew = (ServerCrew)crew; + if (!servingCrew) + { + throw new Exception("상호작용 오브젝트 오류"); + } + + return (servingCrew.CurrentActionType == ActionType.TakeCocktail && CurrentPickupItem != null && OrderedCustomer) || + servingCrew.CurrentActionType == ActionType.PlaceOnServingTable && CurrentPickupItem == null; } private IEnumerator FindCustomerMatchingItem() @@ -143,12 +151,13 @@ namespace BlueWater.Tycoons var waitTime = new WaitForSeconds(2f); while (true) { - _orderedCustomer = TycoonManager.Instance.CustomerController.FindCustomerMatchingItem(_currentPickupItem); - if (_orderedCustomer && _orderedCustomer.CanInteractionCrew()) + OrderedCustomer = TycoonManager.Instance.CustomerController.FindCustomerMatchingItem(_currentPickupItem); + if (OrderedCustomer && OrderedCustomer.CanInteractionCrew()) { var crewController = TycoonManager.Instance.CrewController; Utils.StartUniqueCoroutine(this, ref _findServerCrewInstance, - crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.ServerCrews, crew => crew.OnMission(this, _orderedCustomer))); + crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.ServerCrews, + crew => crew.OnMission(this, OrderedCustomer, ActionType.TakeCocktail))); } yield return waitTime; diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index b265aa671..11ef10790 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -1,6 +1,4 @@ using System; -using System.Collections; -using System.Linq; using BlueWater.Interfaces; using BlueWater.Npcs.Crews; using BlueWater.Npcs.Crews.Cleaner; @@ -32,21 +30,15 @@ namespace BlueWater.Tycoons [field: SerializeField] public int TableNumber; - - [SerializeField] - private Sprite _foodImage; - - [SerializeField] - private Sprite _dirtyImage; [SerializeField] private float _interactionHoldingTime = 3f; - + + private Sprite _fullBeerGlass; + private Sprite _emptyBeerGlass; private Coroutine _findCleanerCrewInstance; private bool _isPlayerInteracting; private bool _isCrewInteracting; - private float _playerElapsedTime; - private float _crewElapsedTime; public event Action OnInteractionCompleted; @@ -57,6 +49,14 @@ namespace BlueWater.Tycoons Initialize(); } + protected override void Start() + { + base.Start(); + + _fullBeerGlass = DataManager.Instance.SpriteDataSo.FullBeerGlass; + _emptyBeerGlass = DataManager.Instance.SpriteDataSo.EmptyBeerGlass; + } + private void Update() { if (InteractionCanvas.BalloonUi.IsWaitTimeOver()) @@ -65,28 +65,13 @@ namespace BlueWater.Tycoons damageable?.TakeDamage(1); CleanTable(); } - - if (_isPlayerInteracting) - { - if (_playerElapsedTime > _interactionHoldingTime) - { - CleanTable(); - } - _playerElapsedTime += Time.deltaTime; - } - else - { - if (_playerElapsedTime > 0f) - { - _playerElapsedTime -= Time.deltaTime; - } - } + if (IsCleaned) return; var holdingGauge = 0f; - if (_playerElapsedTime > 0f) + if (HoldingElapsedTime > 0f) { - holdingGauge = Mathf.Clamp(_playerElapsedTime / _interactionHoldingTime, 0f, 1f); + holdingGauge = Mathf.Clamp(HoldingElapsedTime / _interactionHoldingTime, 0f, 1f); } if (IsShowing) @@ -94,16 +79,32 @@ namespace BlueWater.Tycoons EventManager.InvokeHoldInteracting(holdingGauge); } - if (_isCrewInteracting) + if (HoldingElapsedTime > _interactionHoldingTime) { - if (_crewElapsedTime > _interactionHoldingTime) + if (_isCrewInteracting) { OnInteractionCompleted?.Invoke(); OnInteractionCompleted = null; - CleanTable(); } + + CleanTable(); + } + + if (_isPlayerInteracting) + { + HoldingElapsedTime += Time.deltaTime; + } + if (_isCrewInteracting) + { + HoldingElapsedTime += Time.deltaTime; + } - _crewElapsedTime += Time.deltaTime; + if (!_isPlayerInteracting && !_isCrewInteracting) + { + if (HoldingElapsedTime > 0f) + { + HoldingElapsedTime -= Time.deltaTime; + } } } @@ -120,7 +121,7 @@ namespace BlueWater.Tycoons public void SetFood() { - Food.sprite = _foodImage; + Food.sprite = _fullBeerGlass; Food.enabled = true; } @@ -155,14 +156,14 @@ namespace BlueWater.Tycoons _isCrewInteracting = false; InteractionCanvas.BalloonUi.HideUi(); InteractionCanvas.BalloonUi.ResetUi(); - _playerElapsedTime = 0f; + HoldingElapsedTime = 0f; } public void DirtyTable() { - Food.sprite = _dirtyImage; + Food.sprite = _emptyBeerGlass; Food.enabled = true; - InteractionCanvas.BalloonUi.OrderItem(_dirtyImage, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTableWaitTime); + InteractionCanvas.BalloonUi.OrderItem(_emptyBeerGlass, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTableWaitTime); IsCleaned = false; var crewController = TycoonManager.Instance.CrewController; @@ -172,20 +173,18 @@ namespace BlueWater.Tycoons public void InteractionCrew(Crew crew) { - _crewElapsedTime = 0f; _isCrewInteracting = true; ((CleanerCrew)crew).SetIsCleaningTable(true); } public void CancelInteractionCrew() { - _crewElapsedTime = 0f; _isCrewInteracting = false; } - public bool CanInteractionCrew() + public bool CanInteractionCrew(Crew crew = null) { - return !_isPlayerInteracting; + return !IsCleaned; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index d9f42fa34..8c3d181ab 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -17,8 +17,6 @@ namespace BlueWater.Tycoons private Coroutine _findCleanerCrewInstance; private bool _isPlayerInteracting; private bool _isCrewInteracting; - private float _playerElapsedTime; - private float _crewElapsedTime; public event Action OnInteractionCompleted; @@ -38,27 +36,10 @@ namespace BlueWater.Tycoons Destroy(); } - if (_isPlayerInteracting) - { - if (_playerElapsedTime > _interactionHoldingTime) - { - Destroy(); - } - - _playerElapsedTime += Time.deltaTime; - } - else - { - if (_playerElapsedTime > 0f) - { - _playerElapsedTime -= Time.deltaTime; - } - } - var holdingGauge = 0f; - if (_playerElapsedTime > 0f) + if (HoldingElapsedTime > 0f) { - holdingGauge = Mathf.Clamp(_playerElapsedTime / _interactionHoldingTime, 0f, 1f); + holdingGauge = Mathf.Clamp(HoldingElapsedTime / _interactionHoldingTime, 0f, 1f); } if (IsShowing) @@ -66,16 +47,32 @@ namespace BlueWater.Tycoons EventManager.InvokeHoldInteracting(holdingGauge); } - if (_isCrewInteracting) + if (HoldingElapsedTime > _interactionHoldingTime) { - if (_crewElapsedTime > _interactionHoldingTime) + if (_isCrewInteracting) { OnInteractionCompleted?.Invoke(); OnInteractionCompleted = null; - Destroy(); } + + Destroy(); + } + + if (_isPlayerInteracting) + { + HoldingElapsedTime += Time.deltaTime; + } + if (_isCrewInteracting) + { + HoldingElapsedTime += Time.deltaTime; + } - _crewElapsedTime += Time.deltaTime; + if (!_isPlayerInteracting && !_isCrewInteracting) + { + if (HoldingElapsedTime > 0f) + { + HoldingElapsedTime -= Time.deltaTime; + } } } @@ -123,9 +120,9 @@ namespace BlueWater.Tycoons _isCrewInteracting = false; } - public bool CanInteractionCrew() + public bool CanInteractionCrew(Crew crew = null) { - return !_isPlayerInteracting; + return true; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/SpriteData.asset b/Assets/02.Scripts/ScriptableObject/SpriteData.asset index c2f8c190a..8d098b871 100644 --- a/Assets/02.Scripts/ScriptableObject/SpriteData.asset +++ b/Assets/02.Scripts/ScriptableObject/SpriteData.asset @@ -13,3 +13,6 @@ MonoBehaviour: m_Name: SpriteData m_EditorClassIdentifier: k__BackingField: {fileID: 21300000, guid: 51c11bee66d04f64d8d44afcb9975321, type: 3} + k__BackingField: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + k__BackingField: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} + k__BackingField: {fileID: 21300000, guid: 8ef64d8ac85ff4681987c8b621bef86b, type: 3} diff --git a/Assets/02.Scripts/SpriteDataSo.cs b/Assets/02.Scripts/SpriteDataSo.cs index 6a3a882e8..b28b19d15 100644 --- a/Assets/02.Scripts/SpriteDataSo.cs +++ b/Assets/02.Scripts/SpriteDataSo.cs @@ -9,6 +9,12 @@ namespace BlueWater public Sprite Gold { get; private set; } [field: SerializeField] - public Sprite UnfinishedCocktail { get; private set; } + public Sprite EmptyBeerGlass { get; private set; } + + [field: SerializeField] + public Sprite FullBeerGlass { get; private set; } + + [field: SerializeField] + public Sprite Lock { get; private set; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/CrewController.cs b/Assets/02.Scripts/Tycoon/CrewController.cs index 237e7f261..7a711bd5b 100644 --- a/Assets/02.Scripts/Tycoon/CrewController.cs +++ b/Assets/02.Scripts/Tycoon/CrewController.cs @@ -136,12 +136,12 @@ namespace BlueWater.Tycoons { foreach (var element in BartenderCrews) { - if (orderedCustomer.IsReceivedItem) yield break; + if (element.MyBartenderTable.CurrentPickupItem != null || element.IsOnMission) continue; var orderedCocktailIngredients = orderedCustomer.OrderedCocktailData.ValidIngredients; if (!tycoonIngredientController.IsMakingCocktail(orderedCocktailIngredients)) break; - - if (element.MyBartenderTable.CurrentPickupItem != null || element.IsOnMission) continue; + + if (orderedCustomer.IsReceivedItem || orderedCustomer.IsMatchedServer) yield break; element.SetOrderedCustomer(orderedCustomer); tycoonIngredientController.ConsumeMakingCocktailIngredient(orderedCocktailIngredients); diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index e174a4403..93fa81131 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -69,18 +69,11 @@ namespace BlueWater.Uis public void SetItemImage(IPickup item) { - //_orderItemData = ItemManager.Instance.GetItemDataByIdx(foodIdx); - // if (_orderItemData == null) - // { - // Debug.LogError($"{foodIdx} 해당 음식을 등록할 수 없습니다."); - // return; - // } - if (!item.Sprite) { Debug.LogWarning($"{item.Sprite} 해당 음식의 이미지가 없습니다."); } - + _isUnfinishedCocktailPickedUp = false; SetItemSprite(item.Sprite); ShowUi(); diff --git a/Assets/02.Scripts/Ui/Tycoon/Bill.cs b/Assets/02.Scripts/Ui/Tycoon/Bill.cs index 2d4595784..a3d36a44d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/Bill.cs +++ b/Assets/02.Scripts/Ui/Tycoon/Bill.cs @@ -85,6 +85,7 @@ namespace BlueWater private void OnDestroy() { _slider.onValueChanged.RemoveListener(OnSliderValueChanged); + DOTween.Kill(_rect); } private void OnSliderValueChanged(float value) @@ -94,6 +95,8 @@ namespace BlueWater public void Move(BillInfo billInfo) { + if (!_rect) return; + if (CurrentBillInfo != null) { CurrentBillInfo.IsEmpty = true; @@ -119,6 +122,8 @@ namespace BlueWater private void OnArrivedTarget() { + if (!_rect) return; + CurrentBillInfo.IsMoving = false; var randomZ = Random.Range(-15f, 15f); var arrivedSequence = DOTween.Sequence(); diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab index 1508e3ff9..677867c2e 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab @@ -200,6 +200,7 @@ GameObject: - component: {fileID: 479823629690914954} - component: {fileID: 2588384133887034894} - component: {fileID: 2961986041977982893} + - component: {fileID: 2322101151879677010} m_Layer: 14 m_Name: VisualLook m_TagString: Untagged @@ -319,6 +320,18 @@ MonoBehaviour: _animationName: Idle loop: 1 timeScale: 1 +--- !u!210 &2322101151879677010 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_SortAtRoot: 0 --- !u!1 &2781393898199067900 GameObject: m_ObjectHideFlags: 0 @@ -604,13 +617,13 @@ CapsuleCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 256 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.1 + m_Radius: 0.25 m_Height: 0.5 m_Direction: 1 m_Center: {x: 0, y: 0.25, z: 0} @@ -655,7 +668,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1073741824 - radius: 0.1 + radius: 0.25 height: 0.5 canMove: 1 maxSpeed: 2 @@ -663,7 +676,7 @@ MonoBehaviour: groundMask: serializedVersion: 2 m_Bits: 4294967295 - endReachedDistance: 0.5 + endReachedDistance: 0.2 whenCloseToDestination: 0 rvoDensityBehavior: enabled: 1 diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/CleanerCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/CleanerCrew.prefab index 5c2b0b27c..fadb9fba2 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Crews/CleanerCrew.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/CleanerCrew.prefab @@ -200,6 +200,7 @@ GameObject: - component: {fileID: 479823629690914954} - component: {fileID: 2588384133887034894} - component: {fileID: 2961986041977982893} + - component: {fileID: 1143287283172291005} m_Layer: 14 m_Name: VisualLook m_TagString: Untagged @@ -319,6 +320,18 @@ MonoBehaviour: _animationName: Idle loop: 1 timeScale: 1 +--- !u!210 &1143287283172291005 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_SortAtRoot: 0 --- !u!1 &2781393898199067900 GameObject: m_ObjectHideFlags: 0 @@ -604,13 +617,13 @@ CapsuleCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 256 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.1 + m_Radius: 0.25 m_Height: 0.5 m_Direction: 1 m_Center: {x: 0, y: 0.25, z: 0} @@ -655,7 +668,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1073741824 - radius: 0.1 + radius: 0.25 height: 0.5 canMove: 1 maxSpeed: 2 @@ -663,7 +676,7 @@ MonoBehaviour: groundMask: serializedVersion: 2 m_Bits: 4294967295 - endReachedDistance: 0.5 + endReachedDistance: 0.2 whenCloseToDestination: 0 rvoDensityBehavior: enabled: 1 diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab index 7e47a386a..fe4043f8b 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab @@ -200,6 +200,7 @@ GameObject: - component: {fileID: 479823629690914954} - component: {fileID: 2588384133887034894} - component: {fileID: 2961986041977982893} + - component: {fileID: 1333026624613754047} m_Layer: 14 m_Name: VisualLook m_TagString: Untagged @@ -319,6 +320,18 @@ MonoBehaviour: _animationName: Idle loop: 1 timeScale: 1 +--- !u!210 &1333026624613754047 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_SortAtRoot: 0 --- !u!1 &2781393898199067900 GameObject: m_ObjectHideFlags: 0 @@ -604,13 +617,13 @@ CapsuleCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 256 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.1 + m_Radius: 0.25 m_Height: 0.5 m_Direction: 1 m_Center: {x: 0, y: 0.25, z: 0} @@ -655,7 +668,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1073741824 - radius: 0.1 + radius: 0.25 height: 0.5 canMove: 1 maxSpeed: 2 @@ -663,7 +676,7 @@ MonoBehaviour: groundMask: serializedVersion: 2 m_Bits: 4294967295 - endReachedDistance: 0.5 + endReachedDistance: 0.2 whenCloseToDestination: 0 rvoDensityBehavior: enabled: 1 diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab index 66fe37a5f..f45925f7d 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -200,6 +200,7 @@ GameObject: - component: {fileID: 479823629690914954} - component: {fileID: 2588384133887034894} - component: {fileID: 2961986041977982893} + - component: {fileID: 4034770193240481967} m_Layer: 14 m_Name: VisualLook m_TagString: Untagged @@ -318,6 +319,18 @@ MonoBehaviour: _animationName: Idle loop: 1 timeScale: 1 +--- !u!210 &4034770193240481967 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_SortAtRoot: 0 --- !u!1 &2781393898199067900 GameObject: m_ObjectHideFlags: 0 @@ -913,13 +926,13 @@ CapsuleCollider: m_Bits: 0 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 256 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.1 + m_Radius: 0.25 m_Height: 0.5 m_Direction: 1 m_Center: {x: 0, y: 0.25, z: 0} @@ -964,7 +977,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1073741824 - radius: 0.1 + radius: 0.25 height: 0.5 canMove: 1 maxSpeed: 2 @@ -972,7 +985,7 @@ MonoBehaviour: groundMask: serializedVersion: 2 m_Bits: 4294967295 - endReachedDistance: 0.5 + endReachedDistance: 0.2 whenCloseToDestination: 0 rvoDensityBehavior: enabled: 1 @@ -1134,16 +1147,19 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} + k__BackingField: [] + k__BackingField: {fileID: 0} + k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 _customerInteractionType: 0 diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index d442d0a50..8e20e1af3 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -320,9 +320,9 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.25 - m_Height: 1 + m_Height: 0.5 m_Direction: 1 - m_Center: {x: 0, y: 0.5, z: 0} + m_Center: {x: 0, y: 0.25, z: 0} --- !u!114 &6054159730444663926 MonoBehaviour: m_ObjectHideFlags: 0 @@ -585,7 +585,9 @@ MonoBehaviour: _replacementMaterial: {fileID: 0} _initialSkinName: Basic _isRandomSkin: 0 + _isRandomRange: 0 _randomRange: {x: 0, y: 0} + _randomStrings: [] --- !u!114 &3359549505901716120 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab index 892c7b8a0..75d14d18b 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab @@ -107,7 +107,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 6 - m_Sprite: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab index ca4e66c08..a1090dccd 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab @@ -53,7 +53,7 @@ MonoBehaviour: k__BackingField: {fileID: 3099553823688037663} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 - k__BackingField: 0.7 + k__BackingField: 0.5 k__BackingField: IsOpened: 0 k__BackingField: 0 @@ -63,8 +63,6 @@ MonoBehaviour: k__BackingField: {fileID: 8752266548893034047} TableDirection: {x: -1, y: 0, z: 0} TableNumber: 0 - _foodImage: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} - _dirtyImage: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} _interactionHoldingTime: 3 --- !u!1 &1352874222752200122 GameObject: @@ -380,7 +378,7 @@ MonoBehaviour: k__BackingField: {fileID: 1675779991655778469} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 - k__BackingField: 0.7 + k__BackingField: 0.5 k__BackingField: IsOpened: 0 k__BackingField: 0 @@ -390,8 +388,6 @@ MonoBehaviour: k__BackingField: {fileID: 4724775134085759924} TableDirection: {x: 1, y: 0, z: 0} TableNumber: 0 - _foodImage: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} - _dirtyImage: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} _interactionHoldingTime: 3 --- !u!1 &6493535781353555306 GameObject: @@ -741,7 +737,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Center.z - value: 0.2 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab index 6882d786f..f386a713c 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab @@ -76,7 +76,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 6 - m_Sprite: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -103,6 +103,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.z + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 1 diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat index be78ec497..a24732363 100644 --- a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat @@ -18,7 +18,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat index b1c65e86f..e20ea9b38 100644 --- a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat @@ -18,7 +18,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/UltimateCleanGUIPack/Common/Sprites/Icons Colored/Basic/Lock.png.meta b/Assets/UltimateCleanGUIPack/Common/Sprites/Icons Colored/Basic/Lock.png.meta index 681db49c9..f5fc9d692 100644 --- a/Assets/UltimateCleanGUIPack/Common/Sprites/Icons Colored/Basic/Lock.png.meta +++ b/Assets/UltimateCleanGUIPack/Common/Sprites/Icons Colored/Basic/Lock.png.meta @@ -1,9 +1,16 @@ fileFormatVersion: 2 guid: 8ef64d8ac85ff4681987c8b621bef86b +AssetOrigin: + serializedVersion: 1 + productId: 154574 + packageName: Ultimate Clean GUI Pack + packageVersion: 2.1.3 + assetPath: Assets/UltimateCleanGUIPack/Common/Sprites/Icons Colored/Basic/Lock.png + uploadId: 621733 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,9 +27,12 @@ TextureImporter: 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 @@ -31,9 +41,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -43,9 +53,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 256 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -54,12 +64,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,12 +84,53 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -84,16 +140,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 154574 - packageName: Ultimate Clean GUI Pack - packageVersion: 2.1.3 - assetPath: Assets/UltimateCleanGUIPack/Common/Sprites/Icons Colored/Basic/Lock.png - uploadId: 621733 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bd624f49a..3e10dcba7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.2.0 + bundleVersion: 0.3.2.5 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} metroInputSource: 0 From 18909909feb43a28fd574fc92f47d2f3d6f5ebc3 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 28 Oct 2024 13:09:10 +0900 Subject: [PATCH 5/5] =?UTF-8?q?0.3.2.6=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/02.Scripts/Tycoon/LiquidController.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index 9df0df020..9f051221f 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -169,22 +169,22 @@ namespace BlueWater SetCurrentAmount(0f); } - private void Update() + private void FixedUpdate() { if (_isPouring) { var currentBarrel = _currentBarrel; - - // 술이 완성되었을 때 - if (_instanceLiquidCount >= _maxLiquidCount) - { - StartCoroutine(nameof(CompleteCocktail)); - return; - } - _elapsedTime += Time.deltaTime; - if (_elapsedTime >= _timeInterval) + + while (_elapsedTime >= _timeInterval) { + // 술이 완성되었을 때 + if (_instanceLiquidCount >= _maxLiquidCount) + { + StartCoroutine(nameof(CompleteCocktail)); + return; + } + switch (currentBarrel.GetLiquidData().Type) { case LiquidType.None: