From 661aa6704bd4644e911297ac786fb2ea65bd5782 Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Fri, 29 Dec 2023 16:39:53 +0100 Subject: [PATCH] cleaned project, added death stats --- Assets/IMG/Aseprite/Actions.meta | 8 + Assets/IMG/Aseprite/Archive.meta | 8 + .../IMG/Aseprite/{ => Archive}/Chain.aseprite | Bin .../{ => Archive}/Chain.aseprite.meta | 0 .../CharacterSheetButton.aseprite | Bin .../CharacterSheetButton.aseprite.meta | 0 .../IMG/Aseprite/{ => Archive}/Chest.aseprite | Bin .../{ => Archive}/Chest.aseprite.meta | 0 .../IMG/Aseprite/{ => Archive}/Door.aseprite | Bin .../Aseprite/{ => Archive}/Door.aseprite.meta | 0 .../IMG/Aseprite/{ => Archive}/Grass.aseprite | Bin .../{ => Archive}/Grass.aseprite.meta | 0 .../Aseprite/{ => Archive}/HouseIdle.aseprite | Bin .../{ => Archive}/HouseIdle.aseprite.meta | 0 .../Aseprite/{ => Archive}/Inv_Trash.aseprite | Bin .../{ => Archive}/Inv_Trash.aseprite.meta | 0 .../{ => Archive}/Inv_Trash_Open.aseprite | Bin .../Inv_Trash_Open.aseprite.meta | 0 .../{ => Archive}/LakeSecondary1.aseprite | Bin .../LakeSecondary1.aseprite.meta | 0 .../{ => Archive}/LakeSecondary2.aseprite | Bin .../LakeSecondary2.aseprite.meta | 0 .../{ => Archive}/LakeSecondary3.aseprite | Bin .../LakeSecondary3.aseprite.meta | 0 .../Aseprite/{ => Archive}/LifeGauge.aseprite | Bin .../{ => Archive}/LifeGauge.aseprite.meta | 0 .../Aseprite/{ => Archive}/MapCity.aseprite | Bin .../{ => Archive}/MapCity.aseprite.meta | 0 .../{ => Archive}/MapDefault.aseprite | Bin .../{ => Archive}/MapDefault.aseprite.meta | 0 .../Aseprite/{ => Archive}/MapForest.aseprite | Bin .../{ => Archive}/MapForest.aseprite.meta | 0 .../Aseprite/{ => Archive}/MapLake.aseprite | Bin .../{ => Archive}/MapLake.aseprite.meta | 0 .../Aseprite/{ => Archive}/MapRiver.aseprite | Bin .../{ => Archive}/MapRiver.aseprite.meta | 0 .../Aseprite/{ => Archive}/MapRiver2.aseprite | Bin .../{ => Archive}/MapRiver2.aseprite.meta | 0 .../Aseprite/{ => Archive}/MapRiver3.aseprite | Bin .../{ => Archive}/MapRiver3.aseprite.meta | 0 .../Aseprite/{ => Archive}/MapStone.aseprite | Bin .../{ => Archive}/MapStone.aseprite.meta | 0 .../{ => Archive}/MenuStyling.aseprite | Bin .../{ => Archive}/MenuStyling.aseprite.meta | 0 .../Aseprite/{ => Archive}/OakTree.aseprite | Bin .../{ => Archive}/OakTree.aseprite.meta | 0 .../Aseprite/{ => Archive}/PineTree.aseprite | Bin .../{ => Archive}/PineTree.aseprite.meta | 0 .../{ => Archive}/QuestlogButton.aseprite | Bin .../QuestlogButton.aseprite.meta | 0 .../{ => Archive}/RiverSecondary1.aseprite | Bin .../RiverSecondary1.aseprite.meta | 0 .../{ => Archive}/RiverSecondary2.aseprite | Bin .../RiverSecondary2.aseprite.meta | 0 .../{ => Archive}/RiverSecondary3.aseprite | Bin .../RiverSecondary3.aseprite.meta | 0 .../IMG/Aseprite/{ => Archive}/Road.aseprite | Bin .../Aseprite/{ => Archive}/Road.aseprite.meta | 0 .../{ => Archive}/RoadCorner.aseprite | Bin .../{ => Archive}/RoadCorner.aseprite.meta | 0 .../IMG/Aseprite/{ => Archive}/Roof.aseprite | Bin .../Aseprite/{ => Archive}/Roof.aseprite.meta | 0 .../{ => Archive}/SaplingOak.aseprite | Bin .../{ => Archive}/SaplingOak.aseprite.meta | 0 .../{ => Archive}/SaplingPine.aseprite | Bin .../{ => Archive}/SaplingPine.aseprite.meta | 0 .../IMG/Aseprite/{ => Archive}/Sign.aseprite | Bin .../Aseprite/{ => Archive}/Sign.aseprite.meta | 0 .../Aseprite/{ => Archive}/Signpost.aseprite | Bin .../{ => Archive}/Signpost.aseprite.meta | 0 .../Aseprite/{ => Archive}/SlimeBase.aseprite | Bin .../{ => Archive}/SlimeBase.aseprite.meta | 0 .../{ => Archive}/SlimeBaseIdle.aseprite | Bin .../{ => Archive}/SlimeBaseIdle.aseprite.meta | 0 .../{ => Archive}/SlimeBossIdle.aseprite | Bin .../{ => Archive}/SlimeBossIdle.aseprite.meta | 0 .../Aseprite/{ => Archive}/SlimeIdle.aseprite | Bin .../{ => Archive}/SlimeIdle.aseprite.meta | 0 .../Aseprite/{ => Archive}/SlimeMage.aseprite | Bin .../{ => Archive}/SlimeMage.aseprite.meta | 0 .../{ => Archive}/SlimeMageIdle.aseprite | Bin .../{ => Archive}/SlimeMageIdle.aseprite.meta | 0 .../{ => Archive}/SlimeMageIdle_New.aseprite | Bin .../SlimeMageIdle_New.aseprite.meta | 0 .../{ => Archive}/SlimeMetalIdle.aseprite | Bin .../SlimeMetalIdle.aseprite.meta | 0 .../{ => Archive}/SlimeMiniBossIdle.aseprite | Bin .../SlimeMiniBossIdle.aseprite.meta | 0 .../{ => Archive}/SlimeWarriorIdle.aseprite | Bin .../SlimeWarriorIdle.aseprite.meta | 0 .../{ => Archive}/SlimeWaterIdle.aseprite | Bin .../SlimeWaterIdle.aseprite.meta | 0 .../{ => Archive}/StoneBasic.aseprite | Bin .../{ => Archive}/StoneBasic.aseprite.meta | 0 .../{ => Archive}/StoneBasic2.aseprite | Bin .../{ => Archive}/StoneBasic2.aseprite.meta | 0 .../{ => Archive}/StoneBasic3.aseprite | Bin .../{ => Archive}/StoneBasic3.aseprite.meta | 0 .../{ => Archive}/StonePillar.aseprite | Bin .../{ => Archive}/StonePillar.aseprite.meta | 0 .../Aseprite/{ => Archive}/TileFrame.aseprite | Bin .../{ => Archive}/TileFrame.aseprite.meta | 0 .../Aseprite/{ => Archive}/TileMain.aseprite | Bin .../{ => Archive}/TileMain.aseprite.meta | 0 .../IMG/Aseprite/{ => Archive}/Wall.aseprite | Bin .../Aseprite/{ => Archive}/Wall.aseprite.meta | 0 .../Aseprite/{ => Archive}/Window.aseprite | Bin .../{ => Archive}/Window.aseprite.meta | 0 .../Aseprite/{ => Archive}/chimney.aseprite | Bin .../{ => Archive}/chimney.aseprite.meta | 0 .../Aseprite/{ => Archive}/cityWall.aseprite | Bin .../{ => Archive}/cityWall.aseprite.meta | 0 Assets/IMG/Aseprite/Items.meta | 8 + Assets/IMG/Aseprite/NEW_Action_Basic.aseprite | Bin 0 -> 1834 bytes .../Aseprite/NEW_Action_Basic.aseprite.meta | 7 + Assets/IMG/Aseprite/NEW_Dice.aseprite | Bin 0 -> 2067 bytes Assets/IMG/Aseprite/NEW_Dice.aseprite.meta | 7 + Assets/IMG/Aseprite/NEW_Flee.aseprite | Bin 0 -> 1867 bytes Assets/IMG/Aseprite/NEW_Flee.aseprite.meta | 7 + Assets/IMG/Aseprite/TalesOfNovariel.gpl | 12 + Assets/IMG/Aseprite/TalesOfNovariel.gpl.meta | 7 + .../StringTable/MyTexts Shared Data.asset | 4 + Assets/Locals/StringTable/MyTexts_de.asset | 6 +- Assets/Locals/StringTable/MyTexts_en.asset | 4 + Assets/Scenes/GameScene.unity | 851 +++--------------- Assets/Scripts/Controls.cs | 2 + Assets/Scripts/Handler/UIHandler.cs | 21 + Assets/Scripts/Player/PlayerGameObject.cs | 29 +- Assets/Scripts/Player/PlayerObject.cs | 12 +- .../Layouts/CurrentMaximizeLayout.dwlt | 241 +++-- UserSettings/Layouts/default-2022.dwlt | 367 +++++--- UserSettings/Search.settings | 16 +- 132 files changed, 655 insertions(+), 962 deletions(-) create mode 100644 Assets/IMG/Aseprite/Actions.meta create mode 100644 Assets/IMG/Aseprite/Archive.meta rename Assets/IMG/Aseprite/{ => Archive}/Chain.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Chain.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/CharacterSheetButton.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/CharacterSheetButton.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Chest.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Chest.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Door.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Door.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Grass.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Grass.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/HouseIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/HouseIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Inv_Trash.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Inv_Trash.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Inv_Trash_Open.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Inv_Trash_Open.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/LakeSecondary1.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/LakeSecondary1.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/LakeSecondary2.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/LakeSecondary2.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/LakeSecondary3.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/LakeSecondary3.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/LifeGauge.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/LifeGauge.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapCity.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapCity.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapDefault.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapDefault.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapForest.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapForest.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapLake.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapLake.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapRiver.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapRiver.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapRiver2.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapRiver2.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapRiver3.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapRiver3.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapStone.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MapStone.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/MenuStyling.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/MenuStyling.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/OakTree.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/OakTree.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/PineTree.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/PineTree.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/QuestlogButton.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/QuestlogButton.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/RiverSecondary1.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/RiverSecondary1.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/RiverSecondary2.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/RiverSecondary2.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/RiverSecondary3.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/RiverSecondary3.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Road.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Road.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/RoadCorner.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/RoadCorner.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Roof.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Roof.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SaplingOak.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SaplingOak.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SaplingPine.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SaplingPine.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Sign.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Sign.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Signpost.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Signpost.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeBase.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeBase.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeBaseIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeBaseIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeBossIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeBossIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMage.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMage.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMageIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMageIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMageIdle_New.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMageIdle_New.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMetalIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMetalIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMiniBossIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeMiniBossIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeWarriorIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeWarriorIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeWaterIdle.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/SlimeWaterIdle.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/StoneBasic.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/StoneBasic.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/StoneBasic2.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/StoneBasic2.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/StoneBasic3.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/StoneBasic3.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/StonePillar.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/StonePillar.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/TileFrame.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/TileFrame.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/TileMain.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/TileMain.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Wall.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Wall.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/Window.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/Window.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/chimney.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/chimney.aseprite.meta (100%) rename Assets/IMG/Aseprite/{ => Archive}/cityWall.aseprite (100%) rename Assets/IMG/Aseprite/{ => Archive}/cityWall.aseprite.meta (100%) create mode 100644 Assets/IMG/Aseprite/Items.meta create mode 100644 Assets/IMG/Aseprite/NEW_Action_Basic.aseprite create mode 100644 Assets/IMG/Aseprite/NEW_Action_Basic.aseprite.meta create mode 100644 Assets/IMG/Aseprite/NEW_Dice.aseprite create mode 100644 Assets/IMG/Aseprite/NEW_Dice.aseprite.meta create mode 100644 Assets/IMG/Aseprite/NEW_Flee.aseprite create mode 100644 Assets/IMG/Aseprite/NEW_Flee.aseprite.meta create mode 100755 Assets/IMG/Aseprite/TalesOfNovariel.gpl create mode 100644 Assets/IMG/Aseprite/TalesOfNovariel.gpl.meta diff --git a/Assets/IMG/Aseprite/Actions.meta b/Assets/IMG/Aseprite/Actions.meta new file mode 100644 index 0000000..c39e299 --- /dev/null +++ b/Assets/IMG/Aseprite/Actions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e04483a75a6c8493bf015e119a814d7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Archive.meta b/Assets/IMG/Aseprite/Archive.meta new file mode 100644 index 0000000..0670d14 --- /dev/null +++ b/Assets/IMG/Aseprite/Archive.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a553b19c0fb02b2abf71fba326356b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Chain.aseprite b/Assets/IMG/Aseprite/Archive/Chain.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Chain.aseprite rename to Assets/IMG/Aseprite/Archive/Chain.aseprite diff --git a/Assets/IMG/Aseprite/Chain.aseprite.meta b/Assets/IMG/Aseprite/Archive/Chain.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Chain.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Chain.aseprite.meta diff --git a/Assets/IMG/Aseprite/CharacterSheetButton.aseprite b/Assets/IMG/Aseprite/Archive/CharacterSheetButton.aseprite similarity index 100% rename from Assets/IMG/Aseprite/CharacterSheetButton.aseprite rename to Assets/IMG/Aseprite/Archive/CharacterSheetButton.aseprite diff --git a/Assets/IMG/Aseprite/CharacterSheetButton.aseprite.meta b/Assets/IMG/Aseprite/Archive/CharacterSheetButton.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/CharacterSheetButton.aseprite.meta rename to Assets/IMG/Aseprite/Archive/CharacterSheetButton.aseprite.meta diff --git a/Assets/IMG/Aseprite/Chest.aseprite b/Assets/IMG/Aseprite/Archive/Chest.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Chest.aseprite rename to Assets/IMG/Aseprite/Archive/Chest.aseprite diff --git a/Assets/IMG/Aseprite/Chest.aseprite.meta b/Assets/IMG/Aseprite/Archive/Chest.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Chest.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Chest.aseprite.meta diff --git a/Assets/IMG/Aseprite/Door.aseprite b/Assets/IMG/Aseprite/Archive/Door.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Door.aseprite rename to Assets/IMG/Aseprite/Archive/Door.aseprite diff --git a/Assets/IMG/Aseprite/Door.aseprite.meta b/Assets/IMG/Aseprite/Archive/Door.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Door.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Door.aseprite.meta diff --git a/Assets/IMG/Aseprite/Grass.aseprite b/Assets/IMG/Aseprite/Archive/Grass.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Grass.aseprite rename to Assets/IMG/Aseprite/Archive/Grass.aseprite diff --git a/Assets/IMG/Aseprite/Grass.aseprite.meta b/Assets/IMG/Aseprite/Archive/Grass.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Grass.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Grass.aseprite.meta diff --git a/Assets/IMG/Aseprite/HouseIdle.aseprite b/Assets/IMG/Aseprite/Archive/HouseIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/HouseIdle.aseprite rename to Assets/IMG/Aseprite/Archive/HouseIdle.aseprite diff --git a/Assets/IMG/Aseprite/HouseIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/HouseIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/HouseIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/HouseIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/Inv_Trash.aseprite b/Assets/IMG/Aseprite/Archive/Inv_Trash.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Inv_Trash.aseprite rename to Assets/IMG/Aseprite/Archive/Inv_Trash.aseprite diff --git a/Assets/IMG/Aseprite/Inv_Trash.aseprite.meta b/Assets/IMG/Aseprite/Archive/Inv_Trash.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Inv_Trash.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Inv_Trash.aseprite.meta diff --git a/Assets/IMG/Aseprite/Inv_Trash_Open.aseprite b/Assets/IMG/Aseprite/Archive/Inv_Trash_Open.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Inv_Trash_Open.aseprite rename to Assets/IMG/Aseprite/Archive/Inv_Trash_Open.aseprite diff --git a/Assets/IMG/Aseprite/Inv_Trash_Open.aseprite.meta b/Assets/IMG/Aseprite/Archive/Inv_Trash_Open.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Inv_Trash_Open.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Inv_Trash_Open.aseprite.meta diff --git a/Assets/IMG/Aseprite/LakeSecondary1.aseprite b/Assets/IMG/Aseprite/Archive/LakeSecondary1.aseprite similarity index 100% rename from Assets/IMG/Aseprite/LakeSecondary1.aseprite rename to Assets/IMG/Aseprite/Archive/LakeSecondary1.aseprite diff --git a/Assets/IMG/Aseprite/LakeSecondary1.aseprite.meta b/Assets/IMG/Aseprite/Archive/LakeSecondary1.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/LakeSecondary1.aseprite.meta rename to Assets/IMG/Aseprite/Archive/LakeSecondary1.aseprite.meta diff --git a/Assets/IMG/Aseprite/LakeSecondary2.aseprite b/Assets/IMG/Aseprite/Archive/LakeSecondary2.aseprite similarity index 100% rename from Assets/IMG/Aseprite/LakeSecondary2.aseprite rename to Assets/IMG/Aseprite/Archive/LakeSecondary2.aseprite diff --git a/Assets/IMG/Aseprite/LakeSecondary2.aseprite.meta b/Assets/IMG/Aseprite/Archive/LakeSecondary2.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/LakeSecondary2.aseprite.meta rename to Assets/IMG/Aseprite/Archive/LakeSecondary2.aseprite.meta diff --git a/Assets/IMG/Aseprite/LakeSecondary3.aseprite b/Assets/IMG/Aseprite/Archive/LakeSecondary3.aseprite similarity index 100% rename from Assets/IMG/Aseprite/LakeSecondary3.aseprite rename to Assets/IMG/Aseprite/Archive/LakeSecondary3.aseprite diff --git a/Assets/IMG/Aseprite/LakeSecondary3.aseprite.meta b/Assets/IMG/Aseprite/Archive/LakeSecondary3.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/LakeSecondary3.aseprite.meta rename to Assets/IMG/Aseprite/Archive/LakeSecondary3.aseprite.meta diff --git a/Assets/IMG/Aseprite/LifeGauge.aseprite b/Assets/IMG/Aseprite/Archive/LifeGauge.aseprite similarity index 100% rename from Assets/IMG/Aseprite/LifeGauge.aseprite rename to Assets/IMG/Aseprite/Archive/LifeGauge.aseprite diff --git a/Assets/IMG/Aseprite/LifeGauge.aseprite.meta b/Assets/IMG/Aseprite/Archive/LifeGauge.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/LifeGauge.aseprite.meta rename to Assets/IMG/Aseprite/Archive/LifeGauge.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapCity.aseprite b/Assets/IMG/Aseprite/Archive/MapCity.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapCity.aseprite rename to Assets/IMG/Aseprite/Archive/MapCity.aseprite diff --git a/Assets/IMG/Aseprite/MapCity.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapCity.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapCity.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapCity.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapDefault.aseprite b/Assets/IMG/Aseprite/Archive/MapDefault.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapDefault.aseprite rename to Assets/IMG/Aseprite/Archive/MapDefault.aseprite diff --git a/Assets/IMG/Aseprite/MapDefault.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapDefault.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapDefault.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapDefault.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapForest.aseprite b/Assets/IMG/Aseprite/Archive/MapForest.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapForest.aseprite rename to Assets/IMG/Aseprite/Archive/MapForest.aseprite diff --git a/Assets/IMG/Aseprite/MapForest.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapForest.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapForest.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapForest.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapLake.aseprite b/Assets/IMG/Aseprite/Archive/MapLake.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapLake.aseprite rename to Assets/IMG/Aseprite/Archive/MapLake.aseprite diff --git a/Assets/IMG/Aseprite/MapLake.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapLake.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapLake.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapLake.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapRiver.aseprite b/Assets/IMG/Aseprite/Archive/MapRiver.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapRiver.aseprite rename to Assets/IMG/Aseprite/Archive/MapRiver.aseprite diff --git a/Assets/IMG/Aseprite/MapRiver.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapRiver.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapRiver.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapRiver.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapRiver2.aseprite b/Assets/IMG/Aseprite/Archive/MapRiver2.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapRiver2.aseprite rename to Assets/IMG/Aseprite/Archive/MapRiver2.aseprite diff --git a/Assets/IMG/Aseprite/MapRiver2.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapRiver2.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapRiver2.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapRiver2.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapRiver3.aseprite b/Assets/IMG/Aseprite/Archive/MapRiver3.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapRiver3.aseprite rename to Assets/IMG/Aseprite/Archive/MapRiver3.aseprite diff --git a/Assets/IMG/Aseprite/MapRiver3.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapRiver3.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapRiver3.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapRiver3.aseprite.meta diff --git a/Assets/IMG/Aseprite/MapStone.aseprite b/Assets/IMG/Aseprite/Archive/MapStone.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MapStone.aseprite rename to Assets/IMG/Aseprite/Archive/MapStone.aseprite diff --git a/Assets/IMG/Aseprite/MapStone.aseprite.meta b/Assets/IMG/Aseprite/Archive/MapStone.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MapStone.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MapStone.aseprite.meta diff --git a/Assets/IMG/Aseprite/MenuStyling.aseprite b/Assets/IMG/Aseprite/Archive/MenuStyling.aseprite similarity index 100% rename from Assets/IMG/Aseprite/MenuStyling.aseprite rename to Assets/IMG/Aseprite/Archive/MenuStyling.aseprite diff --git a/Assets/IMG/Aseprite/MenuStyling.aseprite.meta b/Assets/IMG/Aseprite/Archive/MenuStyling.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/MenuStyling.aseprite.meta rename to Assets/IMG/Aseprite/Archive/MenuStyling.aseprite.meta diff --git a/Assets/IMG/Aseprite/OakTree.aseprite b/Assets/IMG/Aseprite/Archive/OakTree.aseprite similarity index 100% rename from Assets/IMG/Aseprite/OakTree.aseprite rename to Assets/IMG/Aseprite/Archive/OakTree.aseprite diff --git a/Assets/IMG/Aseprite/OakTree.aseprite.meta b/Assets/IMG/Aseprite/Archive/OakTree.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/OakTree.aseprite.meta rename to Assets/IMG/Aseprite/Archive/OakTree.aseprite.meta diff --git a/Assets/IMG/Aseprite/PineTree.aseprite b/Assets/IMG/Aseprite/Archive/PineTree.aseprite similarity index 100% rename from Assets/IMG/Aseprite/PineTree.aseprite rename to Assets/IMG/Aseprite/Archive/PineTree.aseprite diff --git a/Assets/IMG/Aseprite/PineTree.aseprite.meta b/Assets/IMG/Aseprite/Archive/PineTree.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/PineTree.aseprite.meta rename to Assets/IMG/Aseprite/Archive/PineTree.aseprite.meta diff --git a/Assets/IMG/Aseprite/QuestlogButton.aseprite b/Assets/IMG/Aseprite/Archive/QuestlogButton.aseprite similarity index 100% rename from Assets/IMG/Aseprite/QuestlogButton.aseprite rename to Assets/IMG/Aseprite/Archive/QuestlogButton.aseprite diff --git a/Assets/IMG/Aseprite/QuestlogButton.aseprite.meta b/Assets/IMG/Aseprite/Archive/QuestlogButton.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/QuestlogButton.aseprite.meta rename to Assets/IMG/Aseprite/Archive/QuestlogButton.aseprite.meta diff --git a/Assets/IMG/Aseprite/RiverSecondary1.aseprite b/Assets/IMG/Aseprite/Archive/RiverSecondary1.aseprite similarity index 100% rename from Assets/IMG/Aseprite/RiverSecondary1.aseprite rename to Assets/IMG/Aseprite/Archive/RiverSecondary1.aseprite diff --git a/Assets/IMG/Aseprite/RiverSecondary1.aseprite.meta b/Assets/IMG/Aseprite/Archive/RiverSecondary1.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/RiverSecondary1.aseprite.meta rename to Assets/IMG/Aseprite/Archive/RiverSecondary1.aseprite.meta diff --git a/Assets/IMG/Aseprite/RiverSecondary2.aseprite b/Assets/IMG/Aseprite/Archive/RiverSecondary2.aseprite similarity index 100% rename from Assets/IMG/Aseprite/RiverSecondary2.aseprite rename to Assets/IMG/Aseprite/Archive/RiverSecondary2.aseprite diff --git a/Assets/IMG/Aseprite/RiverSecondary2.aseprite.meta b/Assets/IMG/Aseprite/Archive/RiverSecondary2.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/RiverSecondary2.aseprite.meta rename to Assets/IMG/Aseprite/Archive/RiverSecondary2.aseprite.meta diff --git a/Assets/IMG/Aseprite/RiverSecondary3.aseprite b/Assets/IMG/Aseprite/Archive/RiverSecondary3.aseprite similarity index 100% rename from Assets/IMG/Aseprite/RiverSecondary3.aseprite rename to Assets/IMG/Aseprite/Archive/RiverSecondary3.aseprite diff --git a/Assets/IMG/Aseprite/RiverSecondary3.aseprite.meta b/Assets/IMG/Aseprite/Archive/RiverSecondary3.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/RiverSecondary3.aseprite.meta rename to Assets/IMG/Aseprite/Archive/RiverSecondary3.aseprite.meta diff --git a/Assets/IMG/Aseprite/Road.aseprite b/Assets/IMG/Aseprite/Archive/Road.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Road.aseprite rename to Assets/IMG/Aseprite/Archive/Road.aseprite diff --git a/Assets/IMG/Aseprite/Road.aseprite.meta b/Assets/IMG/Aseprite/Archive/Road.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Road.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Road.aseprite.meta diff --git a/Assets/IMG/Aseprite/RoadCorner.aseprite b/Assets/IMG/Aseprite/Archive/RoadCorner.aseprite similarity index 100% rename from Assets/IMG/Aseprite/RoadCorner.aseprite rename to Assets/IMG/Aseprite/Archive/RoadCorner.aseprite diff --git a/Assets/IMG/Aseprite/RoadCorner.aseprite.meta b/Assets/IMG/Aseprite/Archive/RoadCorner.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/RoadCorner.aseprite.meta rename to Assets/IMG/Aseprite/Archive/RoadCorner.aseprite.meta diff --git a/Assets/IMG/Aseprite/Roof.aseprite b/Assets/IMG/Aseprite/Archive/Roof.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Roof.aseprite rename to Assets/IMG/Aseprite/Archive/Roof.aseprite diff --git a/Assets/IMG/Aseprite/Roof.aseprite.meta b/Assets/IMG/Aseprite/Archive/Roof.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Roof.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Roof.aseprite.meta diff --git a/Assets/IMG/Aseprite/SaplingOak.aseprite b/Assets/IMG/Aseprite/Archive/SaplingOak.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SaplingOak.aseprite rename to Assets/IMG/Aseprite/Archive/SaplingOak.aseprite diff --git a/Assets/IMG/Aseprite/SaplingOak.aseprite.meta b/Assets/IMG/Aseprite/Archive/SaplingOak.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SaplingOak.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SaplingOak.aseprite.meta diff --git a/Assets/IMG/Aseprite/SaplingPine.aseprite b/Assets/IMG/Aseprite/Archive/SaplingPine.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SaplingPine.aseprite rename to Assets/IMG/Aseprite/Archive/SaplingPine.aseprite diff --git a/Assets/IMG/Aseprite/SaplingPine.aseprite.meta b/Assets/IMG/Aseprite/Archive/SaplingPine.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SaplingPine.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SaplingPine.aseprite.meta diff --git a/Assets/IMG/Aseprite/Sign.aseprite b/Assets/IMG/Aseprite/Archive/Sign.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Sign.aseprite rename to Assets/IMG/Aseprite/Archive/Sign.aseprite diff --git a/Assets/IMG/Aseprite/Sign.aseprite.meta b/Assets/IMG/Aseprite/Archive/Sign.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Sign.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Sign.aseprite.meta diff --git a/Assets/IMG/Aseprite/Signpost.aseprite b/Assets/IMG/Aseprite/Archive/Signpost.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Signpost.aseprite rename to Assets/IMG/Aseprite/Archive/Signpost.aseprite diff --git a/Assets/IMG/Aseprite/Signpost.aseprite.meta b/Assets/IMG/Aseprite/Archive/Signpost.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Signpost.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Signpost.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeBase.aseprite b/Assets/IMG/Aseprite/Archive/SlimeBase.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeBase.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeBase.aseprite diff --git a/Assets/IMG/Aseprite/SlimeBase.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeBase.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeBase.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeBase.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeBaseIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeBaseIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeBaseIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeBaseIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeBaseIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeBaseIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeBaseIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeBaseIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeBossIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeBossIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeBossIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeBossIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeBossIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeBossIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeBossIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeBossIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeMage.aseprite b/Assets/IMG/Aseprite/Archive/SlimeMage.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeMage.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeMage.aseprite diff --git a/Assets/IMG/Aseprite/SlimeMage.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeMage.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeMage.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeMage.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeMageIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeMageIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeMageIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeMageIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeMageIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeMageIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeMageIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeMageIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeMageIdle_New.aseprite b/Assets/IMG/Aseprite/Archive/SlimeMageIdle_New.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeMageIdle_New.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeMageIdle_New.aseprite diff --git a/Assets/IMG/Aseprite/SlimeMageIdle_New.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeMageIdle_New.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeMageIdle_New.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeMageIdle_New.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeMetalIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeMetalIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeMetalIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeMetalIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeMetalIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeMetalIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeMetalIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeMetalIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeMiniBossIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeMiniBossIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeMiniBossIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeMiniBossIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeMiniBossIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeMiniBossIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeMiniBossIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeMiniBossIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeWarriorIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeWarriorIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeWarriorIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeWarriorIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeWarriorIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeWarriorIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeWarriorIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeWarriorIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/SlimeWaterIdle.aseprite b/Assets/IMG/Aseprite/Archive/SlimeWaterIdle.aseprite similarity index 100% rename from Assets/IMG/Aseprite/SlimeWaterIdle.aseprite rename to Assets/IMG/Aseprite/Archive/SlimeWaterIdle.aseprite diff --git a/Assets/IMG/Aseprite/SlimeWaterIdle.aseprite.meta b/Assets/IMG/Aseprite/Archive/SlimeWaterIdle.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/SlimeWaterIdle.aseprite.meta rename to Assets/IMG/Aseprite/Archive/SlimeWaterIdle.aseprite.meta diff --git a/Assets/IMG/Aseprite/StoneBasic.aseprite b/Assets/IMG/Aseprite/Archive/StoneBasic.aseprite similarity index 100% rename from Assets/IMG/Aseprite/StoneBasic.aseprite rename to Assets/IMG/Aseprite/Archive/StoneBasic.aseprite diff --git a/Assets/IMG/Aseprite/StoneBasic.aseprite.meta b/Assets/IMG/Aseprite/Archive/StoneBasic.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/StoneBasic.aseprite.meta rename to Assets/IMG/Aseprite/Archive/StoneBasic.aseprite.meta diff --git a/Assets/IMG/Aseprite/StoneBasic2.aseprite b/Assets/IMG/Aseprite/Archive/StoneBasic2.aseprite similarity index 100% rename from Assets/IMG/Aseprite/StoneBasic2.aseprite rename to Assets/IMG/Aseprite/Archive/StoneBasic2.aseprite diff --git a/Assets/IMG/Aseprite/StoneBasic2.aseprite.meta b/Assets/IMG/Aseprite/Archive/StoneBasic2.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/StoneBasic2.aseprite.meta rename to Assets/IMG/Aseprite/Archive/StoneBasic2.aseprite.meta diff --git a/Assets/IMG/Aseprite/StoneBasic3.aseprite b/Assets/IMG/Aseprite/Archive/StoneBasic3.aseprite similarity index 100% rename from Assets/IMG/Aseprite/StoneBasic3.aseprite rename to Assets/IMG/Aseprite/Archive/StoneBasic3.aseprite diff --git a/Assets/IMG/Aseprite/StoneBasic3.aseprite.meta b/Assets/IMG/Aseprite/Archive/StoneBasic3.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/StoneBasic3.aseprite.meta rename to Assets/IMG/Aseprite/Archive/StoneBasic3.aseprite.meta diff --git a/Assets/IMG/Aseprite/StonePillar.aseprite b/Assets/IMG/Aseprite/Archive/StonePillar.aseprite similarity index 100% rename from Assets/IMG/Aseprite/StonePillar.aseprite rename to Assets/IMG/Aseprite/Archive/StonePillar.aseprite diff --git a/Assets/IMG/Aseprite/StonePillar.aseprite.meta b/Assets/IMG/Aseprite/Archive/StonePillar.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/StonePillar.aseprite.meta rename to Assets/IMG/Aseprite/Archive/StonePillar.aseprite.meta diff --git a/Assets/IMG/Aseprite/TileFrame.aseprite b/Assets/IMG/Aseprite/Archive/TileFrame.aseprite similarity index 100% rename from Assets/IMG/Aseprite/TileFrame.aseprite rename to Assets/IMG/Aseprite/Archive/TileFrame.aseprite diff --git a/Assets/IMG/Aseprite/TileFrame.aseprite.meta b/Assets/IMG/Aseprite/Archive/TileFrame.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/TileFrame.aseprite.meta rename to Assets/IMG/Aseprite/Archive/TileFrame.aseprite.meta diff --git a/Assets/IMG/Aseprite/TileMain.aseprite b/Assets/IMG/Aseprite/Archive/TileMain.aseprite similarity index 100% rename from Assets/IMG/Aseprite/TileMain.aseprite rename to Assets/IMG/Aseprite/Archive/TileMain.aseprite diff --git a/Assets/IMG/Aseprite/TileMain.aseprite.meta b/Assets/IMG/Aseprite/Archive/TileMain.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/TileMain.aseprite.meta rename to Assets/IMG/Aseprite/Archive/TileMain.aseprite.meta diff --git a/Assets/IMG/Aseprite/Wall.aseprite b/Assets/IMG/Aseprite/Archive/Wall.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Wall.aseprite rename to Assets/IMG/Aseprite/Archive/Wall.aseprite diff --git a/Assets/IMG/Aseprite/Wall.aseprite.meta b/Assets/IMG/Aseprite/Archive/Wall.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Wall.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Wall.aseprite.meta diff --git a/Assets/IMG/Aseprite/Window.aseprite b/Assets/IMG/Aseprite/Archive/Window.aseprite similarity index 100% rename from Assets/IMG/Aseprite/Window.aseprite rename to Assets/IMG/Aseprite/Archive/Window.aseprite diff --git a/Assets/IMG/Aseprite/Window.aseprite.meta b/Assets/IMG/Aseprite/Archive/Window.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/Window.aseprite.meta rename to Assets/IMG/Aseprite/Archive/Window.aseprite.meta diff --git a/Assets/IMG/Aseprite/chimney.aseprite b/Assets/IMG/Aseprite/Archive/chimney.aseprite similarity index 100% rename from Assets/IMG/Aseprite/chimney.aseprite rename to Assets/IMG/Aseprite/Archive/chimney.aseprite diff --git a/Assets/IMG/Aseprite/chimney.aseprite.meta b/Assets/IMG/Aseprite/Archive/chimney.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/chimney.aseprite.meta rename to Assets/IMG/Aseprite/Archive/chimney.aseprite.meta diff --git a/Assets/IMG/Aseprite/cityWall.aseprite b/Assets/IMG/Aseprite/Archive/cityWall.aseprite similarity index 100% rename from Assets/IMG/Aseprite/cityWall.aseprite rename to Assets/IMG/Aseprite/Archive/cityWall.aseprite diff --git a/Assets/IMG/Aseprite/cityWall.aseprite.meta b/Assets/IMG/Aseprite/Archive/cityWall.aseprite.meta similarity index 100% rename from Assets/IMG/Aseprite/cityWall.aseprite.meta rename to Assets/IMG/Aseprite/Archive/cityWall.aseprite.meta diff --git a/Assets/IMG/Aseprite/Items.meta b/Assets/IMG/Aseprite/Items.meta new file mode 100644 index 0000000..dffaf26 --- /dev/null +++ b/Assets/IMG/Aseprite/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b600ac3e11f737caad2ff6630a56709 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/NEW_Action_Basic.aseprite b/Assets/IMG/Aseprite/NEW_Action_Basic.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..ebe7b9bb03b16de35b848f148ccc7a5c765fa547 GIT binary patch literal 1834 zcmdO5XJB}+l#zjfk%3VGNH8#@05JlvGcbY#83cfk7GM<{1H-S6>|k4gPGJxOVs-_v zl}OgP0NIiXAbAh~YC#4685jh;~T0`eiq z7@%^XTA)IpDv*-@|CK<}3QR}_1NAX*F*qeAXQvnCm*%B_4Nzc4Q^C&QlUSKrq+s|F zsFzg%BKsd<4lrCR=DfXZ$k<>Yz_2mAZKBj6Q;!$_rYi~=8Q%w~);wR`u=G#6-v5QC z>tB45-!;k{4Tr&+2zLDiWu9+88BIOIh2Mh{JS3}PCU{3)1_ho22Y#CKDplw#Dfd(@ zNjv8;NyQTjT5_NH+YeyE=a2md%m&WWfjQy-g{Q#GU|;fcRCqK@=#n6A{fozvG(qXr Lwv2J+@#AFxQZB}q literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/NEW_Action_Basic.aseprite.meta b/Assets/IMG/Aseprite/NEW_Action_Basic.aseprite.meta new file mode 100644 index 0000000..1572846 --- /dev/null +++ b/Assets/IMG/Aseprite/NEW_Action_Basic.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51d73643f29a526ff8bd8d45d11e92d4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/NEW_Dice.aseprite b/Assets/IMG/Aseprite/NEW_Dice.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..6d976760f974169dd5d40b4021b268f49318642c GIT binary patch literal 2067 zcmeHGZAg<*6u!%B5oVTP_=T%vVxeebr85(>C{yW|iIvs-=yfx)WbRGpnh{!HX(eGZ zx1r#~Z|0I}Gbcg}l6=+SoL@}vM}EvLQ?{CJxBIGK;P0fsbGgrbxc52d@SgV^&%FRl z)l&eV016EO0GViS8Wm8;OW=Xl->^z50QN=dT2@4X7urC)Zt%k0+oXt9_ud(Gd{)BfQH2tjVcYT z&4%v*JpeWQ$RzhfxLe6!7fg`FSzBt)ncfn1-!gZ9iO}v1v4PrVWwWKdS{pqjG55E13EnO8`=Poqlk;{`rIY6vfwD5TqHLQh@Ik& zIHdWqacOOeUeK{s3IQ>NgX>2OMcFkx(`ccUuW8b#LjrR=+&%j`zVam;1=&?<;sor zYW(nR172}iZM$A*SSrNFZFlsF>HH>@?U`ON&b-oTi5%`2VJ?gI2wLB(ghW%hL_fzh zE;X@boy#Jxl@{G(H^!Hx=?7tfsiWLUWK=QbW3~yiLhECXsf^YSK(R?t>LfBNP!PJH zr4}+qGyE51+R*tKc!r;P0e(~TT^)-l6Y7Uxs!1ue66}VYZ0KfHA+KBQ^VuR1UoAD; zvb53fG(iG${mLhU&F?Fr6l`nFw*H~iWT??-h3O@8{pKQ~Id#JIcq`eS4_Ot0p3^MW c$}$7T@~9u`{`VG5hFC=TbOa`a+)HBYHz8&}e*gdg literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/NEW_Dice.aseprite.meta b/Assets/IMG/Aseprite/NEW_Dice.aseprite.meta new file mode 100644 index 0000000..c22aeac --- /dev/null +++ b/Assets/IMG/Aseprite/NEW_Dice.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 876bd8267d70a39bc93b8ab2d3e9b892 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/NEW_Flee.aseprite b/Assets/IMG/Aseprite/NEW_Flee.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..ec33056edca1edc346f0b4a283fa45b51632f435 GIT binary patch literal 1867 zcmeH`dq`7J9LLWp9TcJ!R2sQif0-C96%8>lG88R?lA$IkGhd~ZIV}cWBYF{O_CRw! z%AC@4S}ip1^@05}$mL^e&N&~0B%fOuYv%Oc+wWMQ(Z31(;cwjE{qp;Me&?K>drkxw zA(M=Q5C?JikPu3OXF0ftgNw)oeyb5(jtJRjxl6OcQqVSdxcsFlS4?*Vv@0L`IH2Xv zU=i9JaRzc|+I`5f0T%M1+i{S+2d+V8A$ZWU0slih4B)^52oy$Gb~m>9>sJg6eP|;( zoG3b%l666xnY1*(Uj!FLCSE<8#TU%3L&$;utDgn^J78b0l$o^xPX2xu^h$WM$nBk9 z*aTDTvE_izC}uo+B>A$%Tl?5&UBtvU9=Rsh_Thg$1SE|wk8Pgg7cSiD0++=BuBrL=TrSC34F#A~L$UCb&i( zsO6p1-J2|YG1YEWof5}k%nM_WFcyxnYK&().getPlayer().getStat("TreeCount").changeAmount(1); GameObject.Find("Inventory").GetComponent().addItem(new Item("Wood")); break; case "Stone": @@ -174,6 +175,7 @@ public class Controls : MonoBehaviour { GameObject.Find("Inventory").GetComponent().addItem(new Item("Tin ore")); } + player.GetComponent().getPlayer().getStat("OreCount").changeAmount(1); StartCoroutine(playAnimation(target, "Mining")); break; } diff --git a/Assets/Scripts/Handler/UIHandler.cs b/Assets/Scripts/Handler/UIHandler.cs index dc90dfa..cb039bf 100644 --- a/Assets/Scripts/Handler/UIHandler.cs +++ b/Assets/Scripts/Handler/UIHandler.cs @@ -311,6 +311,27 @@ namespace Assets.Scripts public void showDeathScreen() { state = UIState.DEATH; + + PlayerObject player = GameObject.Find("Player").GetComponent().getPlayer(); + GameObject statText = GameObject.Find("txtDeathStats"); + string text = statText.GetComponent().text; + + text = text.Replace("NAME", player.getPlayerName()); + text = text.Replace("RACE", player.getRace().racename); + text = text.Replace("CLASS", player.getClass().classname); + text = text.Replace("LEVEL", player.getStat("Level").getAmount().ToString()); + text = text.Replace("KILLS", player.getStat("Killcount").getAmount().ToString()); + text = text.Replace("HEALTH", player.getStat("MaxHealth").getAmount().ToString()); + text = text.Replace("SECONDARY", player.getStat("MaxSecondary").getAmount().ToString()); + text = text.Replace("INT", player.getStat("Intelligence").getAmount().ToString()); + text = text.Replace("STR", player.getStat("Strength").getAmount().ToString()); + text = text.Replace("DEX", player.getStat("Dexterity").getAmount().ToString()); + text = text.Replace("TREES", player.getStat("TreeCount").getAmount().ToString()); + text = text.Replace("ORES", player.getStat("OreCount").getAmount().ToString()); + text = text.Replace("DIFFICULTY", player.getDifficulty() == 0 ? "Easy" : player.getDifficulty() == 1 ? "Normal" : "Hard"); + + statText.GetComponent().text = text; + hideOtherElements(deathscreen); EventSystem.current.SetSelectedGameObject(GameObject.Find("btnMenu")); } diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index d987356..2c5e9b8 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -51,15 +51,26 @@ namespace Assets.Scripts.Player // Update is called once per frame void Update() { - if (player.getStat("Killcount").getAmount() != -1) + if (player.getStat("Killcount").getAmount() == -1) { - getRotation(); - regeneratePlayer(); - uihandler.adjustInformation(this); - if (!finishedGame) - { - gameFinished(); - } + return; + } + + if(uihandler.state == UIState.DEATH){ + return; + } + + getRotation(); + regeneratePlayer(); + uihandler.adjustInformation(this); + if (!finishedGame) + { + gameFinished(); + } + if (player.isDead()) + { + SteamWorksHandler.getStandardAchievement("DeathAchievement"); + uihandler.showDeathScreen(); } } @@ -77,7 +88,7 @@ namespace Assets.Scripts.Player { now = DateTime.Now; player.regainSecondary(inventory.getEquipmentBonus()["MPR"], inventory.getEquipmentBonus()["MP"]); - player.healPlayer(4 - difficulty * 2, inventory.getEquipmentBonus()["HP"]); + player.healPlayer(/*4 - difficulty * 2*/-20, inventory.getEquipmentBonus()["HP"]); } } } diff --git a/Assets/Scripts/Player/PlayerObject.cs b/Assets/Scripts/Player/PlayerObject.cs index 48e8b19..ce83ada 100644 --- a/Assets/Scripts/Player/PlayerObject.cs +++ b/Assets/Scripts/Player/PlayerObject.cs @@ -50,6 +50,8 @@ namespace Assets.Scripts.Player stats.Add("Luck", new PlayerStat("Luck", 20 - (difficulty * 5), "The current luck of the player")); stats.Add("Killcount", new PlayerStat("Killcount", -1, "The current killcount of the player")); stats.Add("Points", new PlayerStat("Points", 0, "The current skillpoints of the player")); + stats.Add("TreeCount", new PlayerStat("TreeCount",0,"The amount of trees the player chopped")); + stats.Add("OreCount", new PlayerStat("OreCount",0,"The amount of ores the player mined")); if (!isLoad) { @@ -108,6 +110,8 @@ namespace Assets.Scripts.Player stats["Luck"].setAmount((int)json["luck"]); stats["SecondaryRegen"].setAmount((int)json["secondaryRegen"]); stats["Killcount"].setAmount((int)json["killcount"]); + stats["TreeCount"].setAmount((int)json["treecount"]); + stats["OreCount"].setAmount((int)json["orecount"]); loadRole(json["role"].ToString()); loadRace(json["race"].ToString()); @@ -283,7 +287,7 @@ namespace Assets.Scripts.Player if (amount <= 0 || EasterEggHandler.isGodMode(this)) { - return stats["Health"].getAmount() <= 0; + return isDead(); } if (isDodging) @@ -298,6 +302,10 @@ namespace Assets.Scripts.Player stats["Health"].changeAmount(-amount); } } + return isDead(); + } + + public bool isDead(){ return stats["Health"].getAmount() <= 0; } @@ -369,6 +377,8 @@ namespace Assets.Scripts.Player result = result + FileHandler.generateJSON("secondaryRegen", stats["SecondaryRegen"].getAmount()) + ",\r\n"; result = result + FileHandler.generateJSON("isDodging", "\"" + isDodging + "\"") + ",\r\n"; result = result + FileHandler.generateJSON("killcount", stats["Killcount"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("treecount", stats["TreeCount"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("orecount", stats["OreCount"].getAmount()) + ",\r\n"; result = result + FileHandler.generateJSON("luck", stats["Luck"].getAmount()) + ",\r\n"; result = result + FileHandler.generateJSON("difficulty", difficulty); return result; diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 8fb3f65..0cbc24d 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -23,7 +23,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 43 + controlID: 5926 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -47,7 +47,7 @@ MonoBehaviour: x: 2226 y: 118 width: 1212 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -362,14 +362,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -1.12699, y: -0.20633137, z: -1.9598122} + m_Target: {x: 947.713, y: 536.93695, z: 7.3250403} speed: 2 - m_Value: {x: -1.12699, y: -0.20633137, z: -1.9598122} + m_Value: {x: 947.713, y: 536.93695, z: 7.3250403} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -397,7 +397,7 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} @@ -405,9 +405,9 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -415,17 +415,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.0542671, y: 0.9448148, z: -0.24827406, w: -0.20633337} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.055262774, y: 0.94387805, z: -0.2505395, w: -0.2080151} + m_Value: {x: 0.000000029802322, y: -0.000000014901161, z: 0.0000000037252903, w: 1} m_Size: - m_Target: 3.6111107 + m_Target: 550.9807 speed: 2 - m_Value: 3.6111107 + m_Value: 550.9807 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 0.9452999 m_SpeedNormalized: 0.46999997 @@ -439,7 +439,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.23847914, y: 0.68729335, z: -0.25777218, w: -0.6358526} + m_LastSceneViewRotation: {x: 0.27346417, y: -0.139174, z: 0.03998256, w: 0.95080763} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -460,7 +460,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 16} + - {fileID: 17} m_Position: serializedVersion: 2 x: 0 @@ -470,7 +470,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 44 + controlID: 5927 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -485,7 +485,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 5} - - {fileID: 13} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -495,7 +495,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 45 + controlID: 5928 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -516,11 +516,11 @@ MonoBehaviour: x: 0 y: 0 width: 1520 - height: 665 + height: 652 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 46 + controlID: 5929 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -539,9 +539,9 @@ MonoBehaviour: x: 0 y: 0 width: 306 - height: 665 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 652 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -570,7 +570,7 @@ MonoBehaviour: x: 1920 y: 118 width: 305 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -584,9 +584,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9ae6ffff - m_LastClickedID: -6502 - m_ExpandedIDs: 2cfbffff14600000 + m_SelectedIDs: 1ef7fcff + m_LastClickedID: -198882 + m_ExpandedIDs: 58ccfeff94cdfeff2cfbffff14600000e0c302007ec8020074d4020098d7020056d9020060d90200d2d9020040da0200dadc02004ade0200b0de0200d0de020022df02000ae00200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -602,7 +602,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -628,7 +628,7 @@ MonoBehaviour: x: 306 y: 0 width: 1214 - height: 665 + height: 652 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -638,9 +638,110 @@ MonoBehaviour: - {fileID: 10} - {fileID: 11} - {fileID: 12} + - {fileID: 13} m_Selected: 0 - m_LastSelected: 4 + m_LastSelected: 1 --- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2226 + y: 118 + width: 1212 + height: 631 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /home/nicola/Schreibtisch/TalesOfNovariel/Library/PlayModeViewStates/8c07e338a3375881eb377e4bdb98cd97 + m_PlayModeViewName: GameView + m_ShowGizmos: 1 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 1 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1212 + height: 610 + m_Scale: {x: 0.5648148, y: 0.5648148} + m_Translation: {x: 606, y: 305} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1072.9181 + y: -540 + width: 2145.8362 + height: 1080 + m_MinimalGUI: 1 + m_defaultScale: 0.5648148 + m_LastWindowPixelSize: {x: 1212, y: 631} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -663,7 +764,7 @@ MonoBehaviour: x: 2226 y: 118 width: 1212 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -698,8 +799,8 @@ MonoBehaviour: m_SearchString: m_ActionsTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7f681926 - m_LastClickedID: 639199359 + m_SelectedIDs: dab265dc + m_LastClickedID: -597314854 m_ExpandedIDs: 71f36b8d3ecfad9feb02e1a0dd8938a4190353a9bb00a4a9403893bd402ec6c0a3bbefc3240ffec3f8e146d4e74fd8d41bb032d560c274d6e6ecf4db0161a3e00c4d1de9698c8af5b26490f5ae166efdf46bf20cdc82a21116a40c237c371f247f681926c7ab262c5602c737de49913b102bd243b044d04d0df6274e4cf289554fd69156a712cc5d125f496396ab02714c14b37240bb7e7bab03247c m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1177,7 +1278,7 @@ MonoBehaviour: m_Text: Input (Input Actions) m_Image: {fileID: 0} m_Tooltip: ---- !u!114 &10 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1198,9 +1299,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2226 - y: 90 - width: 1210 - height: 661 + y: 118 + width: 1212 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1233,7 +1334,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1254,9 +1355,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2226 - y: 94 - width: 1211 - height: 656 + y: 118 + width: 1212 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1267,7 +1368,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1290,7 +1391,7 @@ MonoBehaviour: x: 2226 y: 118 width: 1212 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1337,7 +1438,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1353,18 +1454,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 665 + y: 652 width: 1520 - height: 277 + height: 290 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1385,9 +1486,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 783 + y: 770 width: 1519 - height: 256 + height: 269 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1409,7 +1510,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/IMG/Animations/Player + - Assets/Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1417,16 +1518,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/IMG/Animations/Player + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 56} - m_SelectedIDs: 50d20000 - m_LastClickedID: 53840 - m_ExpandedIDs: 00000000566a0000586a0000fe6a0000026b0000226b000000ca9a3b + scrollPos: {x: 0, y: 187} + m_SelectedIDs: 066b0000 + m_LastClickedID: 27398 + m_ExpandedIDs: 00000000566a0000fe6a0000226b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1454,7 +1555,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000566a0000586a0000 + m_ExpandedIDs: 00000000566a0000586a0000fe6a0000026b0000226b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1479,9 +1580,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 9ae6ffff - m_LastClickedInstanceID: -6502 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: 1ef7fcff + m_LastClickedInstanceID: -198882 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1510,7 +1611,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1530,10 +1631,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 775 + x: 1920 + y: 770 width: 1519 - height: 264 + height: 269 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1544,7 +1645,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1565,12 +1666,12 @@ MonoBehaviour: height: 942 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 579e6ef..8315dee 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,12 +19,83 @@ MonoBehaviour: width: 1920 height: 992 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 3} + m_Title: Hierarchy + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 992 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 972 + width: 1920 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -47,78 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 68 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 2} - - {fileID: 5} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 992 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 972 - width: 1920 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} + controlID: 21 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -143,7 +143,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 69 + controlID: 22 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,7 +168,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 70 + controlID: 23 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,11 +189,11 @@ MonoBehaviour: x: 0 y: 0 width: 1520 - height: 665 + height: 652 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 45 + controlID: 24 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -212,7 +212,7 @@ MonoBehaviour: x: 0 y: 0 width: 306 - height: 665 + height: 652 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -230,7 +230,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -238,17 +238,18 @@ MonoBehaviour: x: 306 y: 0 width: 1214 - height: 665 - m_MinSize: {x: 202, y: 221} + height: 652 + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 13} - - {fileID: 16} - {fileID: 15} + - {fileID: 16} - {fileID: 17} - {fileID: 18} - m_Selected: 0 + - {fileID: 19} + m_Selected: 1 m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: @@ -260,23 +261,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 665 + y: 652 width: 1520 - height: 277 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + height: 290 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 19} - {fileID: 20} - m_Selected: 0 - m_LastSelected: 1 + - {fileID: 21} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -296,11 +297,11 @@ MonoBehaviour: y: 0 width: 400 height: 942 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 21} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 21} + - {fileID: 22} m_Selected: 0 m_LastSelected: 0 --- !u!114 &13 @@ -326,7 +327,7 @@ MonoBehaviour: x: 2226 y: 118 width: 1212 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -641,14 +642,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.1264353, y: -3.5449042, z: -0.7932298} + m_Target: {x: 974.54596, y: 547.15674, z: 7.1235957} speed: 2 - m_Value: {x: 985.51117, y: 542.1973, z: -293.29828} + m_Value: {x: 974.54596, y: 547.15674, z: 7.1235957} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -676,17 +677,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -694,17 +695,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.009152747, y: 0.980144, z: -0.19220214, w: -0.046377912} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.00903823, y: -0.003717085, z: 0.00017100993, w: -0.99995226} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 13.108301 + m_Target: 571.1252 speed: 2 - m_Value: 125.05943 + m_Value: 571.1252 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 0.9452999 m_SpeedNormalized: 0.46999997 @@ -718,7 +719,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.23847914, y: 0.68729335, z: -0.25777218, w: -0.6358526} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -748,7 +749,7 @@ MonoBehaviour: x: 1920 y: 118 width: 305 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -764,7 +765,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 20fbffffae5b0000746400007e650000 + m_ExpandedIDs: 2cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -780,7 +781,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -811,7 +812,7 @@ MonoBehaviour: x: 2226 y: 118 width: 1212 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -867,22 +868,22 @@ MonoBehaviour: x: 0 y: 21 width: 1212 - height: 623 - m_Scale: {x: 0.57685184, y: 0.57685184} - m_Translation: {x: 606, y: 311.5} + height: 610 + m_Scale: {x: 0.5648148, y: 0.5648148} + m_Translation: {x: 606, y: 305} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1050.5297 + x: -1072.9181 y: -540 - width: 2101.0593 + width: 2145.8362 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.57685184 - m_LastWindowPixelSize: {x: 1212, y: 644} + m_defaultScale: 0.5648148 + m_LastWindowPixelSize: {x: 1212, y: 631} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -911,7 +912,7 @@ MonoBehaviour: x: 2226 y: 118 width: 1212 - height: 644 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -946,8 +947,8 @@ MonoBehaviour: m_SearchString: m_ActionsTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7f681926 - m_LastClickedID: 639199359 + m_SelectedIDs: dab265dc + m_LastClickedID: -597314854 m_ExpandedIDs: 71f36b8d3ecfad9feb02e1a0dd8938a4190353a9bb00a4a9403893bd402ec6c0a3bbefc3240ffec3f8e146d4e74fd8d41bb032d560c274d6e6ecf4db0161a3e00c4d1de9698c8af5b26490f5ae166efdf46bf20cdc82a21116a40c237c371f247f681926c7ab262c5602c737de49913b102bd243b044d04d0df6274e4cf289554fd69156a712cc5d125f496396ab02714c14b37240bb7e7bab03247c m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1446,9 +1447,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2226 - y: 90 - width: 1210 - height: 661 + y: 118 + width: 1212 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1502,9 +1503,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2226 - y: 94 - width: 1211 - height: 656 + y: 118 + width: 1212 + height: 631 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1516,6 +1517,76 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 --- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2226 + y: 118 + width: 1212 + height: 631 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_ValueSerializationHelper: + - e00: 0.8063158 + e01: 0 + e02: 0 + e03: -25.315796 + e10: 0 + e11: 0.8063158 + e12: 0 + e13: 225.9 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1536,9 +1607,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 783 + y: 770 width: 1519 - height: 256 + height: 269 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1560,7 +1631,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Sounds + - Assets/Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1568,16 +1639,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Sounds + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 56} - m_SelectedIDs: 726b0000 - m_LastClickedID: 27506 - m_ExpandedIDs: 00000000be6a00005448010000ca9a3b + scrollPos: {x: 0, y: 178} + m_SelectedIDs: 066b0000 + m_LastClickedID: 27398 + m_ExpandedIDs: 00000000746a0000766a0000786a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1605,7 +1676,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000be6a0000 + m_ExpandedIDs: 00000000746a0000766a0000786a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1632,7 +1703,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1661,7 +1732,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &20 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1681,10 +1752,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 775 + x: 1920 + y: 770 width: 1519 - height: 264 + height: 269 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1695,7 +1766,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &21 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index d99bcb8..2c3c3da 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1,4 +1,5 @@ trackSelection = true +refreshSearchWindowsInPlayMode = false fetchPreview = true defaultFlags = 0 keepOpen = false @@ -13,6 +14,11 @@ scopes = { "last_search.B655092D" = "st:desc" "OpenInspectorPreview.B655092D" = "0" "currentGroup.B655092D" = "all" + "picker_window_position_offset.45F317DD" = "80;358;320;551" + "picker_search_text.45F317DD" = "" + "last_search.45F317DD" = "" + "OpenInspectorPreview.45F317DD" = "0" + "currentGroup.45F317DD" = "all" } providers = { packages = { @@ -65,6 +71,11 @@ providers = { priority = 100 defaultAction = null } + profilermarkers = { + active = false + priority = 100 + defaultAction = null + } } objectSelectors = { } @@ -74,9 +85,12 @@ searchItemFavorites = [ ] savedSearchesSortOrder = 0 showSavedSearchPanel = false +hideTabs = false expandedQueries = [ ] queryBuilder = false ignoredProperties = "id;name;classname;imagecontentshash" helperWidgetCurrentArea = "all" -disabledIndexers = "" \ No newline at end of file +disabledIndexers = "" +minIndexVariations = 2 +findProviderIndexHelper = true \ No newline at end of file