From ecd52b20c85e97564f0c3134c740cddfc70bd484 Mon Sep 17 00:00:00 2001 From: Reinier Vens Date: Tue, 27 Apr 2021 16:44:44 +0100 Subject: [PATCH] UI Improvements Target box now has bars for visibility and HP Hit indicator appears when target is damaged by player's weapons WIP narrative integration --- Aetheria.Shared.Unity.csproj | 7 + Assets/Materials/UI/Map Gravity Lines.mat | 2 +- Assets/Plugins/Ink/Ink.asmdef | 14 + Assets/Plugins/Ink/Ink.asmdef.meta | 7 + .../Sprites/Indicators/Indicator.Corner.png | 3 + .../Indicators/Indicator.Corner.png.meta | 108 ++ .../Indicators/Indicator.Target.png.meta | 104 +- Assets/Scenes/ARPG.unity | 1291 +++++++++++++++-- Assets/Scenes/Main Menu.unity | 8 +- Assets/Scripts/Gameplay/ActionGameManager.cs | 56 +- Assets/Scripts/Gameplay/EntityInstance.cs | 1 + .../ServerShared/Aetheria.Shared.Unity.asmdef | 3 +- Assets/Scripts/ServerShared/Entity.cs | 3 +- .../Scripts/ServerShared/EntitySerializer.cs | 13 + Assets/Scripts/ServerShared/Narrative.meta | 3 + .../ServerShared/Narrative/StoryProcessor.cs | 176 +++ .../Narrative/StoryProcessor.cs.meta | 3 + .../ServerShared/Narrative/ZoneConstraints.cs | 89 ++ .../Narrative/ZoneConstraints.cs.meta | 3 + .../ServerShared/Narrative/ZoneSelectors.cs | 51 + .../Narrative/ZoneSelectors.cs.meta | 3 + Assets/Scripts/ServerShared/PlayerSettings.cs | 2 + Assets/Scripts/ServerShared/Sector.cs | 18 +- Assets/Scripts/ServerShared/ZoneData.cs | 2 + Assets/Scripts/UI/MainMenu.cs | 6 +- GameData/AetherDB.msgpack | 2 +- GameData/Narrative/HeroOrZero.json | 1 + GameData/PlayerSettings.msgpack | 4 +- Ink.csproj | 543 +++++++ UserSettings/EditorUserSettings.asset | 2 +- 30 files changed, 2397 insertions(+), 131 deletions(-) create mode 100644 Assets/Plugins/Ink/Ink.asmdef create mode 100644 Assets/Plugins/Ink/Ink.asmdef.meta create mode 100644 Assets/Resources/Sprites/Indicators/Indicator.Corner.png create mode 100644 Assets/Resources/Sprites/Indicators/Indicator.Corner.png.meta create mode 100644 Assets/Scripts/ServerShared/Narrative.meta create mode 100644 Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs create mode 100644 Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs.meta create mode 100644 Assets/Scripts/ServerShared/Narrative/ZoneConstraints.cs create mode 100644 Assets/Scripts/ServerShared/Narrative/ZoneConstraints.cs.meta create mode 100644 Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs create mode 100644 Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs.meta create mode 100644 GameData/Narrative/HeroOrZero.json create mode 100644 Ink.csproj diff --git a/Aetheria.Shared.Unity.csproj b/Aetheria.Shared.Unity.csproj index 985828c98..d5db0a087 100644 --- a/Aetheria.Shared.Unity.csproj +++ b/Aetheria.Shared.Unity.csproj @@ -253,6 +253,9 @@ + + + @@ -653,6 +656,10 @@ {f2483ebc-e82f-a58f-b987-c7502f9ab5d9} RethinkDB + + {04594220-ca80-0caf-e34a-5898755a01bd} + Ink + + diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index bc307be86..29995cccf 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caf20eb516bc53f1774f3a147124ab3b7e9869c889cf6083eba3f4507444845a +oid sha256:ddf9f0c22847dc8893a39a7d9afc9b90b2fa13176fb5c4da0a1d8f16a85ee649 size 1699