From 8db8d93fb755c7649fd7fd557f34e81b1b0dc7d8 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Tue, 01 Apr 2025 17:16:44 +0000
Subject: [PATCH] cleanup project, moved scripts into folders
---
Assets/Scripts/Controls/PlayerController.cs | 0
Assets/Scripts/Prefab/Damageable.cs.meta | 0
Assets/Scripts/Prefab/Drilling/Dropable.cs.meta | 0
Assets/Scripts/UI.meta | 8 ++++
Assets/Scripts/Controls/TouchingDirections.cs.meta | 0
Assets/Scripts/UI/ParallexEffect.cs | 0
Assets/Scripts/UI/LevelChanger.cs.meta | 0
Assets/UI/Texts/DamageText.prefab | 2
Assets/Scripts/Prefab/PlayerFloatingText.cs | 0
Assets/Scripts/Animation/AnimationStrings.cs.meta | 0
Assets/Scripts/Prefab/Drilling/Dropable.cs | 0
Assets/Scripts/Inventory/InventoryDisplay.cs | 2
Assets/Scripts/UI/SliderLogic.cs | 0
Assets/Scripts/Helpers/UIHelper.cs | 2
Assets/Scripts/Controls.meta | 8 ++++
Assets/Scripts/Prefab/Drilling.meta | 0
Assets/Scripts/Prefab/PlayerFloatingText.cs.meta | 2
Assets/Scripts/UI/HealthDisplay.cs.meta | 0
Assets/UI/Texts/HealText.prefab | 2
Assets/Scripts/Helpers/UIHelper.cs.meta | 2
Assets/Scripts/UI/PauseMenu.cs | 0
Assets/Scripts/Prefab/WorldFloatingText.cs.meta | 2
Assets/Scripts/UI/PauseMenu.cs.meta | 0
Assets/Scripts/UI/SliderLogic.cs.meta | 0
Assets/UI/Texts/LootText.prefab | 2
Assets/Scripts/Prefab.meta | 8 ++++
Assets/Scripts/Controls/TouchingDirections.cs | 0
Assets/Scripts/UI/Tiling.cs.meta | 0
Assets/Scripts/Inventory/ItemUIScript.cs | 2
Assets/Scripts/UI/HealthDisplay.cs | 0
Assets/Scripts/Animation.meta | 8 ++++
Assets/Scripts/Prefab/Damageable.cs | 0
/dev/null | 11 -----
Assets/Scripts/UI/LevelChanger.cs | 0
Assets/Scripts/Prefab/Drilling/Drillable.cs.meta | 0
Assets/Scripts/Managers/GameManager.cs | 2 -
Assets/Scripts/UI/ParallexEffect.cs.meta | 0
Assets/Scripts/Animation/AnimationStrings.cs | 0
Assets/Scripts/Prefab/Drilling/Drillable.cs | 0
Assets/Scripts/UI/Tiling.cs | 0
Assets/Scripts/Prefab/WorldFloatingText.cs | 0
Assets/Scripts/Controls/PlayerController.cs.meta | 0
42 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/Assets/Scripts/Animation.meta b/Assets/Scripts/Animation.meta
new file mode 100644
index 0000000..e3678d7
--- /dev/null
+++ b/Assets/Scripts/Animation.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 94d71be54d8edea4e966df4e9f78305c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/AnimationStrings.cs b/Assets/Scripts/Animation/AnimationStrings.cs
similarity index 100%
rename from Assets/Scripts/AnimationStrings.cs
rename to Assets/Scripts/Animation/AnimationStrings.cs
diff --git a/Assets/Scripts/AnimationStrings.cs.meta b/Assets/Scripts/Animation/AnimationStrings.cs.meta
similarity index 100%
rename from Assets/Scripts/AnimationStrings.cs.meta
rename to Assets/Scripts/Animation/AnimationStrings.cs.meta
diff --git a/Assets/Scripts/Controls.meta b/Assets/Scripts/Controls.meta
new file mode 100644
index 0000000..db1004d
--- /dev/null
+++ b/Assets/Scripts/Controls.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d0c5c1a51f4832f46b2f0b287fd814c4
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/Controls/PlayerController.cs
similarity index 100%
rename from Assets/Scripts/PlayerController.cs
rename to Assets/Scripts/Controls/PlayerController.cs
diff --git a/Assets/Scripts/PlayerController.cs.meta b/Assets/Scripts/Controls/PlayerController.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerController.cs.meta
rename to Assets/Scripts/Controls/PlayerController.cs.meta
diff --git a/Assets/Scripts/TouchingDirections.cs b/Assets/Scripts/Controls/TouchingDirections.cs
similarity index 100%
rename from Assets/Scripts/TouchingDirections.cs
rename to Assets/Scripts/Controls/TouchingDirections.cs
diff --git a/Assets/Scripts/TouchingDirections.cs.meta b/Assets/Scripts/Controls/TouchingDirections.cs.meta
similarity index 100%
rename from Assets/Scripts/TouchingDirections.cs.meta
rename to Assets/Scripts/Controls/TouchingDirections.cs.meta
diff --git a/Assets/Scripts/Helpers/TextMeshProHelper.cs b/Assets/Scripts/Helpers/UIHelper.cs
similarity index 95%
rename from Assets/Scripts/Helpers/TextMeshProHelper.cs
rename to Assets/Scripts/Helpers/UIHelper.cs
index eb3b921..1b51b52 100644
--- a/Assets/Scripts/Helpers/TextMeshProHelper.cs
+++ b/Assets/Scripts/Helpers/UIHelper.cs
@@ -6,7 +6,7 @@
namespace Assets.Scripts.Helpers
{
- internal static class TextMeshProHelper
+ internal static class UIHelper
{
/// <summary>
diff --git a/Assets/Scripts/Helpers/TextMeshProHelper.cs.meta b/Assets/Scripts/Helpers/UIHelper.cs.meta
similarity index 83%
copy from Assets/Scripts/Helpers/TextMeshProHelper.cs.meta
copy to Assets/Scripts/Helpers/UIHelper.cs.meta
index b6647e7..e58c39e 100644
--- a/Assets/Scripts/Helpers/TextMeshProHelper.cs.meta
+++ b/Assets/Scripts/Helpers/UIHelper.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e02839e1c3723074b9545eb763e71e66
+guid: 9c811496d5227ee4a82e47e3286abd68
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/Inventory/InventoryDisplay.cs b/Assets/Scripts/Inventory/InventoryDisplay.cs
index 8036296..0b2690b 100644
--- a/Assets/Scripts/Inventory/InventoryDisplay.cs
+++ b/Assets/Scripts/Inventory/InventoryDisplay.cs
@@ -230,7 +230,7 @@
private void UpdateItemContentList()
{
- TextMeshProHelper.UpdateItemMaxCountText(inventoryMaxAmount.GetComponent<TextMeshProUGUI>(), inventory.items.Count, inventory.maxInventorySize);
+ UIHelper.UpdateItemMaxCountText(inventoryMaxAmount.GetComponent<TextMeshProUGUI>(), inventory.items.Count, inventory.maxInventorySize);
// First, deactivate all existing itemUIs
itemUIs.ForEach(itemUI => itemUI.SetActive(false));
diff --git a/Assets/Scripts/Inventory/ItemUIScript.cs b/Assets/Scripts/Inventory/ItemUIScript.cs
index 17fbae2..3900ff7 100644
--- a/Assets/Scripts/Inventory/ItemUIScript.cs
+++ b/Assets/Scripts/Inventory/ItemUIScript.cs
@@ -30,7 +30,7 @@
gameObject.transform.Find("ItemName").GetComponent<TextMeshProUGUI>().text = inventorySlot.item.itemName;
gameObject.transform.Find("ItemQuantity").GetComponent<TextMeshProUGUI>().text = inventorySlot.quantity.ToString() + "x";
gameObject.transform.Find("ItemIcon").GetComponent<Image>().sprite = inventorySlot.item.itemIcon;
- TextMeshProHelper.UpdateItemMaxCountText(gameObject.transform.Find("ItemQuantity").GetComponent<TextMeshProUGUI>(), inventorySlot.quantity, inventorySlot.item.maxStackSize);
+ UIHelper.UpdateItemMaxCountText(gameObject.transform.Find("ItemQuantity").GetComponent<TextMeshProUGUI>(), inventorySlot.quantity, inventorySlot.item.maxStackSize);
break;
case ItemUIType.ItemDescription:
gameObject.transform.Find("ItemTextDescription").GetComponent<TextMeshProUGUI>().text = inventorySlot.item.itemDescription;
diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index 41e5ace..21fb0d4 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -166,8 +166,6 @@
{
Item item = dropable.dropable;
playerInventory.AddItem(item, dropable.dropAmount);
- Debug.Log("CellWorldPosition: " + cellWorldPosition);
- Debug.Log("TileGameObjectPosition: " + tileGameObject.transform.position);
CharacterLootObtained(tileGameObject.transform.position, item, dropable.dropAmount);
}
}
diff --git a/Assets/Scripts/PlayerFloatingText.cs.meta b/Assets/Scripts/PlayerFloatingText.cs.meta
deleted file mode 100644
index 3e122d7..0000000
--- a/Assets/Scripts/PlayerFloatingText.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 60c2fd908dd4c45468c522f64c368227
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scripts/Prefab.meta b/Assets/Scripts/Prefab.meta
new file mode 100644
index 0000000..f45ede1
--- /dev/null
+++ b/Assets/Scripts/Prefab.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1a23f9ac684b15e4db73957d12487fb2
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Damageable.cs b/Assets/Scripts/Prefab/Damageable.cs
similarity index 100%
rename from Assets/Scripts/Damageable.cs
rename to Assets/Scripts/Prefab/Damageable.cs
diff --git a/Assets/Scripts/Damageable.cs.meta b/Assets/Scripts/Prefab/Damageable.cs.meta
similarity index 100%
rename from Assets/Scripts/Damageable.cs.meta
rename to Assets/Scripts/Prefab/Damageable.cs.meta
diff --git a/Assets/Scripts/Drilling.meta b/Assets/Scripts/Prefab/Drilling.meta
similarity index 100%
rename from Assets/Scripts/Drilling.meta
rename to Assets/Scripts/Prefab/Drilling.meta
diff --git a/Assets/Scripts/Drilling/Drillable.cs b/Assets/Scripts/Prefab/Drilling/Drillable.cs
similarity index 100%
rename from Assets/Scripts/Drilling/Drillable.cs
rename to Assets/Scripts/Prefab/Drilling/Drillable.cs
diff --git a/Assets/Scripts/Drilling/Drillable.cs.meta b/Assets/Scripts/Prefab/Drilling/Drillable.cs.meta
similarity index 100%
rename from Assets/Scripts/Drilling/Drillable.cs.meta
rename to Assets/Scripts/Prefab/Drilling/Drillable.cs.meta
diff --git a/Assets/Scripts/Drilling/Dropable.cs b/Assets/Scripts/Prefab/Drilling/Dropable.cs
similarity index 100%
rename from Assets/Scripts/Drilling/Dropable.cs
rename to Assets/Scripts/Prefab/Drilling/Dropable.cs
diff --git a/Assets/Scripts/Drilling/Dropable.cs.meta b/Assets/Scripts/Prefab/Drilling/Dropable.cs.meta
similarity index 100%
rename from Assets/Scripts/Drilling/Dropable.cs.meta
rename to Assets/Scripts/Prefab/Drilling/Dropable.cs.meta
diff --git a/Assets/Scripts/PlayerFloatingText.cs b/Assets/Scripts/Prefab/PlayerFloatingText.cs
similarity index 100%
rename from Assets/Scripts/PlayerFloatingText.cs
rename to Assets/Scripts/Prefab/PlayerFloatingText.cs
diff --git a/Assets/Scripts/Helpers/TextMeshProHelper.cs.meta b/Assets/Scripts/Prefab/PlayerFloatingText.cs.meta
similarity index 83%
copy from Assets/Scripts/Helpers/TextMeshProHelper.cs.meta
copy to Assets/Scripts/Prefab/PlayerFloatingText.cs.meta
index b6647e7..f9d8dfa 100644
--- a/Assets/Scripts/Helpers/TextMeshProHelper.cs.meta
+++ b/Assets/Scripts/Prefab/PlayerFloatingText.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e02839e1c3723074b9545eb763e71e66
+guid: 1bb32e3e174cc7648bf155d1e36eefe6
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/WorldFloatingText.cs b/Assets/Scripts/Prefab/WorldFloatingText.cs
similarity index 100%
rename from Assets/Scripts/WorldFloatingText.cs
rename to Assets/Scripts/Prefab/WorldFloatingText.cs
diff --git a/Assets/Scripts/Helpers/TextMeshProHelper.cs.meta b/Assets/Scripts/Prefab/WorldFloatingText.cs.meta
similarity index 83%
rename from Assets/Scripts/Helpers/TextMeshProHelper.cs.meta
rename to Assets/Scripts/Prefab/WorldFloatingText.cs.meta
index b6647e7..7d9e6e9 100644
--- a/Assets/Scripts/Helpers/TextMeshProHelper.cs.meta
+++ b/Assets/Scripts/Prefab/WorldFloatingText.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e02839e1c3723074b9545eb763e71e66
+guid: 3f6618c30bdd4184cb77d406daecc53f
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/UI.meta b/Assets/Scripts/UI.meta
new file mode 100644
index 0000000..d2b9e1f
--- /dev/null
+++ b/Assets/Scripts/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 290737008b4af1d4fbf1cf9d99fc8ae3
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/HealthDisplay.cs b/Assets/Scripts/UI/HealthDisplay.cs
similarity index 100%
rename from Assets/Scripts/HealthDisplay.cs
rename to Assets/Scripts/UI/HealthDisplay.cs
diff --git a/Assets/Scripts/HealthDisplay.cs.meta b/Assets/Scripts/UI/HealthDisplay.cs.meta
similarity index 100%
rename from Assets/Scripts/HealthDisplay.cs.meta
rename to Assets/Scripts/UI/HealthDisplay.cs.meta
diff --git a/Assets/Scripts/LevelChanger.cs b/Assets/Scripts/UI/LevelChanger.cs
similarity index 100%
rename from Assets/Scripts/LevelChanger.cs
rename to Assets/Scripts/UI/LevelChanger.cs
diff --git a/Assets/Scripts/LevelChanger.cs.meta b/Assets/Scripts/UI/LevelChanger.cs.meta
similarity index 100%
rename from Assets/Scripts/LevelChanger.cs.meta
rename to Assets/Scripts/UI/LevelChanger.cs.meta
diff --git a/Assets/Scripts/ParallexEffect.cs b/Assets/Scripts/UI/ParallexEffect.cs
similarity index 100%
rename from Assets/Scripts/ParallexEffect.cs
rename to Assets/Scripts/UI/ParallexEffect.cs
diff --git a/Assets/Scripts/ParallexEffect.cs.meta b/Assets/Scripts/UI/ParallexEffect.cs.meta
similarity index 100%
rename from Assets/Scripts/ParallexEffect.cs.meta
rename to Assets/Scripts/UI/ParallexEffect.cs.meta
diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs
similarity index 100%
rename from Assets/Scripts/PauseMenu.cs
rename to Assets/Scripts/UI/PauseMenu.cs
diff --git a/Assets/Scripts/PauseMenu.cs.meta b/Assets/Scripts/UI/PauseMenu.cs.meta
similarity index 100%
rename from Assets/Scripts/PauseMenu.cs.meta
rename to Assets/Scripts/UI/PauseMenu.cs.meta
diff --git a/Assets/Scripts/SliderLogic.cs b/Assets/Scripts/UI/SliderLogic.cs
similarity index 100%
rename from Assets/Scripts/SliderLogic.cs
rename to Assets/Scripts/UI/SliderLogic.cs
diff --git a/Assets/Scripts/SliderLogic.cs.meta b/Assets/Scripts/UI/SliderLogic.cs.meta
similarity index 100%
rename from Assets/Scripts/SliderLogic.cs.meta
rename to Assets/Scripts/UI/SliderLogic.cs.meta
diff --git a/Assets/Scripts/Tiling.cs b/Assets/Scripts/UI/Tiling.cs
similarity index 100%
rename from Assets/Scripts/Tiling.cs
rename to Assets/Scripts/UI/Tiling.cs
diff --git a/Assets/Scripts/Tiling.cs.meta b/Assets/Scripts/UI/Tiling.cs.meta
similarity index 100%
rename from Assets/Scripts/Tiling.cs.meta
rename to Assets/Scripts/UI/Tiling.cs.meta
diff --git a/Assets/Scripts/WorldFloatingText.cs.meta b/Assets/Scripts/WorldFloatingText.cs.meta
deleted file mode 100644
index 6166e0b..0000000
--- a/Assets/Scripts/WorldFloatingText.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 57e7ca40a6c68234d9c2f8677d4a803b
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UI/Texts/DamageText.prefab b/Assets/UI/Texts/DamageText.prefab
index ee0de45..ddd7d8b 100644
--- a/Assets/UI/Texts/DamageText.prefab
+++ b/Assets/UI/Texts/DamageText.prefab
@@ -144,7 +144,7 @@
m_GameObject: {fileID: 456827189715955869}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 60c2fd908dd4c45468c522f64c368227, type: 3}
+ m_Script: {fileID: 11500000, guid: 1bb32e3e174cc7648bf155d1e36eefe6, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: {x: 25, y: 75, z: 0}
diff --git a/Assets/UI/Texts/HealText.prefab b/Assets/UI/Texts/HealText.prefab
index 23e0a77..7dd2a5a 100644
--- a/Assets/UI/Texts/HealText.prefab
+++ b/Assets/UI/Texts/HealText.prefab
@@ -144,7 +144,7 @@
m_GameObject: {fileID: 456827189715955869}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 60c2fd908dd4c45468c522f64c368227, type: 3}
+ m_Script: {fileID: 11500000, guid: 1bb32e3e174cc7648bf155d1e36eefe6, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: {x: 25, y: 75, z: 0}
diff --git a/Assets/UI/Texts/LootText.prefab b/Assets/UI/Texts/LootText.prefab
index 58105c0..c034026 100644
--- a/Assets/UI/Texts/LootText.prefab
+++ b/Assets/UI/Texts/LootText.prefab
@@ -144,7 +144,7 @@
m_GameObject: {fileID: 456827189715955869}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 57e7ca40a6c68234d9c2f8677d4a803b, type: 3}
+ m_Script: {fileID: 11500000, guid: 3f6618c30bdd4184cb77d406daecc53f, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: {x: 0.25, y: 0.75, z: 0}
--
Gitblit v1.9.3