From 0fe6f1f8dde9869f9b5dff553fb492104be05ed0 Mon Sep 17 00:00:00 2001 From: j-weissen Date: Fri, 24 Jun 2022 08:53:52 +0200 Subject: [PATCH] fixed cow --- Assets/Scripts/Actions/NextDayActionHandlers.cs | 9 +++++++++ Assets/Scripts/Cow.cs | 10 +++++++--- Packages/packages-lock.json | 13 ++----------- ProjectSettings/ProjectVersion.txt | 4 ++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Assets/Scripts/Actions/NextDayActionHandlers.cs b/Assets/Scripts/Actions/NextDayActionHandlers.cs index e5c19b4..c7decfd 100644 --- a/Assets/Scripts/Actions/NextDayActionHandlers.cs +++ b/Assets/Scripts/Actions/NextDayActionHandlers.cs @@ -89,6 +89,13 @@ namespace Actions { return rv; } } + + public abstract class AbstractCowNextDayActionHandler : AbstractAnimalNextDayActionHandler { + public override bool Matches(GameObject gameObject) { + bool rv = base.Matches(gameObject); + return rv; + } + } public class FarmlandTileNextDayActionHandler : AbstractFarmlandTileNextDayActionHandler { public override void InvokeAction(GameObject gameObject) { @@ -120,4 +127,6 @@ namespace Actions { return rv; } } + + } \ No newline at end of file diff --git a/Assets/Scripts/Cow.cs b/Assets/Scripts/Cow.cs index af749ec..a0a2c01 100644 --- a/Assets/Scripts/Cow.cs +++ b/Assets/Scripts/Cow.cs @@ -6,14 +6,18 @@ public class Cow : Animal { private void Awake() { _canBeMilked = true; - HouseController.NewDayEvent.AddListener(UpdateCanBeMilked); + HouseController.NewDayEvent.AddListener(NextDay); + } + + private void NextDay() { + UpdateCanBeMilked(); + //ActionManager.Instance.NextDayAction(gameObject); } /** * Update the _canBeMilked bool */ - private void UpdateCanBeMilked() { - Debug.Log("_ca" + _canBeMilked); + public void UpdateCanBeMilked() { _canBeMilked = true; } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 40769bb..4f0557e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -137,21 +137,12 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.services.core": { - "version": "1.3.1", + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 3dcb827..90d6509 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.2f1 -m_EditorVersionWithRevision: 2021.3.2f1 (d6360bedb9a0) +m_EditorVersion: 2021.3.1f1 +m_EditorVersionWithRevision: 2021.3.1f1 (3b70a0754835)