Art folder reorg

3 年前 · 3854e2ed
--- a/UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons.meta
-fileFormatVersion: 2
-guid: b8237cd98842d4793a9e10051e895be9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Background.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Background.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Background.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Background.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/CheckBox.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/CheckBox.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/CheckBox.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/CheckBox.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Disabled.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Disabled.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Frame.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Frame.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Frame.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Frame.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Frame1.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Frame1.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Frame1.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Frame1.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Frame2.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Frame2.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Frame2.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Frame2.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Handle.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Handle.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Handle.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Handle.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Highlighted.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Highlighted.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Highlighted.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Highlighted.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Normal.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Normal.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Normal.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Normal.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Pressed.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Pressed.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Pressed.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Pressed.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Tab.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Tab.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Tab.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Tab.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/RecipeBG.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/RecipeBG.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/RecipeBG.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/RecipeBG.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Selected.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Selected.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Disabled.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Disabled.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/Selected.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/Selected.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png.meta
--- a//UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png
--- a//UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png.meta
+++ b//UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Fork.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Fork.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Fork.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Fork.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Ginger.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Ginger.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Ginger.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Ginger.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hammer.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hammer.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hammer.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hammer.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hawaii.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hawaii.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hawaii.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Hawaii.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Knife.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Knife.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Knife.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Knife.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lemon.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lemon.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lemon.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lemon.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lobster.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lobster.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lobster.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Lobster.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_LobsterSoup.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_LobsterSoup.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_LobsterSoup.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_LobsterSoup.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Margherita.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Margherita.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Margherita.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Margherita.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_SlimeCritterEgg.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_SlimeCritterEgg.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_SlimeCritterEgg.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_SlimeCritterEgg.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_RockCritterEgg.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_RockCritterEgg.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_RockCritterEgg.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_RockCritterEgg.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Seed.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Seed.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Seed.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Seed.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Almonds.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Almonds.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Almonds.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Almonds.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Artichoke.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Artichoke.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Artichoke.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Artichoke.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Cucumber.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Cucumber.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Cucumber.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Cucumber.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Onion.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Onion.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Onion.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Onion.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Orange.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Orange.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Orange.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Orange.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Shiitake.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Shiitake.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Shiitake.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Shiitake.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Vanilla.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Vanilla.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Vanilla.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Icon_Vanilla.png.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Item-Icons_0000s_0014_Lemon.png
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Item-Icons_0000s_0014_Lemon.png
--- a//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Item-Icons_0000s_0014_Lemon.png.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Icons/Item-Icons_0000s_0014_Lemon.png.meta