From 2bb0d5e2f3216609ad8e9e9dc034514cd86d676c Mon Sep 17 00:00:00 2001 From: Jiaqi Liu Date: Thu, 17 Oct 2024 21:37:38 -0700 Subject: [PATCH] Upgrade to Unity 6 LTS --- .../Combat/Actor/Controllers/CombatActorController.cs | 11 ++++++++--- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- ProjectSettings/ProjectVersion.txt | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/Pal3.Game/GameSystems/Combat/Actor/Controllers/CombatActorController.cs b/Assets/Scripts/Pal3.Game/GameSystems/Combat/Actor/Controllers/CombatActorController.cs index 475d3060..84da1acd 100644 --- a/Assets/Scripts/Pal3.Game/GameSystems/Combat/Actor/Controllers/CombatActorController.cs +++ b/Assets/Scripts/Pal3.Game/GameSystems/Combat/Actor/Controllers/CombatActorController.cs @@ -18,7 +18,8 @@ namespace Pal3.Game.GameSystems.Combat.Actor.Controllers public sealed class CombatActorController : GameEntityScript { - private const string COMBAT_ANIMATION_ATTACK_EVENT_NAME_PREFIX = "work"; + private const string COMBAT_ANIMATION_NORMAL_ATTACK_EVENT_NAME_PREFIX = "work"; + private const string COMBAT_ANIMATION_JUMP_ATTACK_EVENT_NAME_PREFIX = "flydown"; private CombatActor _actor; private ActorActionController _actionController; @@ -47,9 +48,13 @@ public void Init(CombatActor actor, private void AnimationEventTriggered(object sender, string eventName) { - if (eventName.StartsWith(COMBAT_ANIMATION_ATTACK_EVENT_NAME_PREFIX, StringComparison.Ordinal)) + if (eventName.StartsWith(COMBAT_ANIMATION_NORMAL_ATTACK_EVENT_NAME_PREFIX, StringComparison.Ordinal)) { - // TODO: Impl attack behavior + // TODO: Impl normal attack behavior + } + else if (eventName.StartsWith(COMBAT_ANIMATION_JUMP_ATTACK_EVENT_NAME_PREFIX, StringComparison.Ordinal)) + { + // TODO: Impl jump attack behavior } } diff --git a/Packages/manifest.json b/Packages/manifest.json index 8776a087..bc5a8bdd 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.feature.development": "1.0.2", "com.unity.ide.rider": "3.0.31", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.10.0", + "com.unity.inputsystem": "1.11.1", "com.unity.memoryprofiler": "1.1.1", "com.unity.mobile.android-logcat": "1.4.3", "com.unity.postprocessing": "3.4.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e29d64b2..1ad79593 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -62,7 +62,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.10.0", + "version": "1.11.1", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b75375e6..11b73a4b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.20f1 -m_EditorVersionWithRevision: 6000.0.20f1 (05208a74e9aa) +m_EditorVersion: 6000.0.23f1 +m_EditorVersionWithRevision: 6000.0.23f1 (1c4764c07fb4)