From 87a13f5b43cb77a152203a8e10ff6099514aa506 Mon Sep 17 00:00:00 2001 From: brausjonas Date: Mon, 27 Feb 2023 21:24:52 +0100 Subject: [PATCH] UI Redisgn --- .../.idea.FlufflParty/.idea/workspace.xml | 4 +- FlufflParty/Assets/BlenderFiles/Dice.blend | Bin 980360 -> 990104 bytes FlufflParty/Assets/BlenderFiles/Dice.blend1 | Bin 0 -> 980360 bytes .../ButtonBack.xcf.meta => Dice.blend1.meta} | 2 +- .../Textures/{Sprites.meta => Button.meta} | 0 .../BlenderFiles/Textures/Button/Button1.png | Bin 0 -> 49566 bytes .../{Sprites => Button}/Button1.png.meta | 0 .../Textures/{Sprites => Button}/Button1.xcf | Bin 19240 -> 19240 bytes .../{Sprites => Button}/Button1.xcf.meta | 0 .../BlenderFiles/Textures/Button/Button2.png | Bin 0 -> 3280 bytes .../{Sprites => Button}/Button2.png.meta | 0 .../Textures/{Sprites => Button}/Button2.xcf | Bin 6106 -> 6106 bytes .../{Sprites => Button}/Button2.xcf.meta | 0 .../Textures/Button/Button2Middle.png | Bin 0 -> 3899 bytes .../Button2Middle.png.meta} | 2 +- .../Textures/Button/Button2Normal.png | Bin 0 -> 2395 bytes .../Textures/Button/Button2Normal.png.meta | 159 +++++ .../Textures/Button/Button2Reverse.png | Bin 0 -> 2748 bytes .../Textures/Button/Button2Reverse.png.meta | 159 +++++ .../Textures/{Sprites => Button}/Button3.png | Bin .../{Sprites => Button}/Button3.png.meta | 0 .../Textures/{Sprites => Button}/Button3.xcf | Bin .../{Sprites => Button}/Button3.xcf.meta | 0 .../Textures/Button/ButtonCopy.png | Bin 0 -> 18967 bytes .../{Sprites => Button}/ButtonCopy.png.meta | 0 .../Textures/Button/ButtonCopy.xcf | Bin 0 -> 81254 bytes .../Textures/Button/ButtonCopy.xcf.meta | 7 + .../BlenderFiles/Textures/DiceSprite.png | Bin 0 -> 841110 bytes .../BlenderFiles/Textures/DiceSprite.png.meta | 159 +++++ .../BlenderFiles/Textures/Sprites/Button1.png | Bin 8050 -> 0 bytes .../BlenderFiles/Textures/Sprites/Button2.png | Bin 2360 -> 0 bytes .../Textures/Sprites/ButtonBack.png | Bin 6848 -> 0 bytes .../Textures/Sprites/ButtonBack.xcf | Bin 9677 -> 0 bytes .../Textures/Sprites/ButtonCopy.png | Bin 8389 -> 0 bytes FlufflParty/Assets/Scenes/Start.unity | 32 +- FlufflParty/Assets/Scenes/WesternMap.unity | 556 ++++++++++++++++-- FlufflParty/Assets/Scripts/Client.cs | 1 + FlufflParty/Assets/Scripts/UIHandler.cs | 4 +- .../ProjectSettings/ProjectSettings.asset | 4 +- .../UserSettings/EditorUserSettings.asset | 4 +- Server/out/artifacts/Server_jar/Server.jar | Bin 10669 -> 10669 bytes Server/out/production/Server/Room.class | Bin 5390 -> 5390 bytes Server/src/Room.java | 2 +- 43 files changed, 1013 insertions(+), 82 deletions(-) create mode 100644 FlufflParty/Assets/BlenderFiles/Dice.blend1 rename FlufflParty/Assets/BlenderFiles/{Textures/Sprites/ButtonBack.xcf.meta => Dice.blend1.meta} (74%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites.meta => Button.meta} (100%) create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/Button1.png rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button1.png.meta (100%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button1.xcf (84%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button1.xcf.meta (100%) create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/Button2.png rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button2.png.meta (100%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button2.xcf (82%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button2.xcf.meta (100%) create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/Button2Middle.png rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites/ButtonBack.png.meta => Button/Button2Middle.png.meta} (98%) create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/Button2Normal.png create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/Button2Normal.png.meta create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/Button2Reverse.png create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/Button2Reverse.png.meta rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button3.png (100%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button3.png.meta (100%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button3.xcf (100%) rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/Button3.xcf.meta (100%) create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/ButtonCopy.png rename FlufflParty/Assets/BlenderFiles/Textures/{Sprites => Button}/ButtonCopy.png.meta (100%) create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/ButtonCopy.xcf create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Button/ButtonCopy.xcf.meta create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/DiceSprite.png create mode 100644 FlufflParty/Assets/BlenderFiles/Textures/DiceSprite.png.meta delete mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Sprites/Button1.png delete mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Sprites/Button2.png delete mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Sprites/ButtonBack.png delete mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Sprites/ButtonBack.xcf delete mode 100644 FlufflParty/Assets/BlenderFiles/Textures/Sprites/ButtonCopy.png diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index c0b29ef..7aed4f1 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -1,9 +1,7 @@ - - - +