From 7bd9bbf87609c6b3bf8e2b7d4183df8f2c300533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Buratto?= <46575243+joaoburatto@users.noreply.github.com> Date: Sat, 2 Sep 2023 19:20:04 -0300 Subject: [PATCH] Add missing metas and script fixes --- Assets/Scripts/External/FishNet.meta | 8 ++++++++ Assets/Scripts/External/FishNet/CodeGenerating.meta | 8 ++++++++ .../External/FishNet/CodeGenerating/cecil-0.11.4.meta | 8 ++++++++ .../CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta | 0 Assets/Scripts/External/FishNet/Runtime.meta | 8 ++++++++ Assets/Scripts/External/FishNet/Runtime/Transporting.meta | 8 ++++++++ .../External/FishNet/Runtime/Transporting/Transports.meta | 8 ++++++++ .../FishNet/Runtime/Transporting/Transports/Tugboat.meta | 8 ++++++++ .../Transporting/Transports/Tugboat/LiteNetLib.meta | 8 ++++++++ .../Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta | 0 Assets/Scripts/SS3D/Systems/Inventory/Containers/Hands.cs | 4 ++-- .../SS3D/Systems/Inventory/Containers/HumanInventory.cs | 4 ++-- .../SS3D/Systems/Inventory/Containers/InventoryView.cs | 6 +++--- Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSystem.cs | 2 +- .../SS3D/Systems/Inventory/UI/InventoryDisplayElement.cs | 2 +- Assets/Scripts/SS3D/Systems/Screens/GameScreens.cs | 4 ++-- 16 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 Assets/Scripts/External/FishNet.meta create mode 100644 Assets/Scripts/External/FishNet/CodeGenerating.meta create mode 100644 Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4.meta rename Assets/{ => Scripts/External}/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta (100%) create mode 100644 Assets/Scripts/External/FishNet/Runtime.meta create mode 100644 Assets/Scripts/External/FishNet/Runtime/Transporting.meta create mode 100644 Assets/Scripts/External/FishNet/Runtime/Transporting/Transports.meta create mode 100644 Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat.meta create mode 100644 Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib.meta rename Assets/{ => Scripts/External}/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta (100%) diff --git a/Assets/Scripts/External/FishNet.meta b/Assets/Scripts/External/FishNet.meta new file mode 100644 index 0000000000..4af56ff045 --- /dev/null +++ b/Assets/Scripts/External/FishNet.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c9902a4668e78d4abef1bd35697d5af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/External/FishNet/CodeGenerating.meta b/Assets/Scripts/External/FishNet/CodeGenerating.meta new file mode 100644 index 0000000000..0da94fd112 --- /dev/null +++ b/Assets/Scripts/External/FishNet/CodeGenerating.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbb4974b4302f435b9f4663c64d8f803 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4.meta b/Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4.meta new file mode 100644 index 0000000000..ec9a868aa3 --- /dev/null +++ b/Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f482f18100f20045bd2188d839d9217 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta b/Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta similarity index 100% rename from Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta rename to Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta diff --git a/Assets/Scripts/External/FishNet/Runtime.meta b/Assets/Scripts/External/FishNet/Runtime.meta new file mode 100644 index 0000000000..b353727859 --- /dev/null +++ b/Assets/Scripts/External/FishNet/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf3413dc76bc5ad45904d2f8166257ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/External/FishNet/Runtime/Transporting.meta b/Assets/Scripts/External/FishNet/Runtime/Transporting.meta new file mode 100644 index 0000000000..ed847ec301 --- /dev/null +++ b/Assets/Scripts/External/FishNet/Runtime/Transporting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 693688363b7a8f746a35a5a6168d82b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports.meta b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports.meta new file mode 100644 index 0000000000..a0f770e8ce --- /dev/null +++ b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb8b443596223e84aaca2634238adda3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat.meta b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat.meta new file mode 100644 index 0000000000..eeec7bc6c0 --- /dev/null +++ b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 43760836a07366846a82fe7f158bd84e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib.meta b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib.meta new file mode 100644 index 0000000000..6708b0db77 --- /dev/null +++ b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9af335f3230cff649a5cc0c50e34a206 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta similarity index 100% rename from Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta rename to Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hands.cs b/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hands.cs index 872d463133..644e30a4ee 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hands.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hands.cs @@ -152,13 +152,13 @@ public void CmdSetActiveHand(AttachedContainer selectedContainer) if (hand == selectedContainer) { - Punpun.Warning(this, "Hand already selected"); + Log.Warning(this, "Hand already selected"); return; } if (!HandContainers.Contains(selectedContainer)) { - Punpun.Warning(this, "no hand with the passed container in parameter"); + Log.Warning(this, "no hand with the passed container in parameter"); return; } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Containers/HumanInventory.cs b/Assets/Scripts/SS3D/Systems/Inventory/Containers/HumanInventory.cs index c7a42233f7..1c95dd7e7d 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Containers/HumanInventory.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Containers/HumanInventory.cs @@ -149,7 +149,7 @@ private void SetUpContainers() foreach (var container in attachedContainers) { AddContainer(container); - Punpun.Information(this, "Adding {container} container to inventory", Logs.Generic, container); + Log.Information(this, "Adding {container} container to inventory", Logs.Generic, container); } } @@ -434,7 +434,7 @@ private void HandleTryRemoveContainerOnItemDetached(object sender, Item item) if (ContainersOnPlayer.Contains(container)) { RemoveContainer(container); - Punpun.Warning(this, $"invoke {container} removed"); + Log.Warning(this, $"invoke {container} removed"); } } } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Containers/InventoryView.cs b/Assets/Scripts/SS3D/Systems/Inventory/Containers/InventoryView.cs index 1193220031..357699de5e 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Containers/InventoryView.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Containers/InventoryView.cs @@ -182,7 +182,7 @@ private void HandleInventoryContainerAdded(AttachedContainer container) break; default: - Punpun.Error(this, $"Unknown or missing container type {container.Type} for this container {container}"); + Log.Error(this, $"Unknown or missing container type {container.Type} for this container {container}"); slot = null; break; } @@ -244,7 +244,7 @@ private int PlaceHorizontalLayoutSlot(ContainerType type) return i; } } - Punpun.Warning(this, "returning slot position 0, should not reach this point"); + Log.Warning(this, "returning slot position 0, should not reach this point"); return 0; } @@ -290,7 +290,7 @@ private int LastIndexSlotOfType(ContainerType type) } if (slotOfType == null) { - Punpun.Warning(this, "no slots of type " + type.ToString() + ", returning index 0 "); + Log.Warning(this, "no slots of type " + type.ToString() + ", returning index 0 "); return 0; } else diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSystem.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSystem.cs index b02a01b00d..50f8460b2c 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSystem.cs @@ -46,7 +46,7 @@ private void LoadItemPrefabs() } else { - Punpun.Error(this, $"gameobject {itemObject} doesn't have any item component"); + Log.Error(this, $"gameobject {itemObject} doesn't have any item component"); } } } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryDisplayElement.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryDisplayElement.cs index 9de9215c0b..fd69d715af 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryDisplayElement.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryDisplayElement.cs @@ -37,7 +37,7 @@ public void OnDrop(PointerEventData eventData) ItemDisplay display = drag.GetComponent(); if (display == null) { - Punpun.Warning(this, "dragging on null display"); + Log.Warning(this, "dragging on null display"); return; } diff --git a/Assets/Scripts/SS3D/Systems/Screens/GameScreens.cs b/Assets/Scripts/SS3D/Systems/Screens/GameScreens.cs index 61975a5537..67bec01d47 100644 --- a/Assets/Scripts/SS3D/Systems/Screens/GameScreens.cs +++ b/Assets/Scripts/SS3D/Systems/Screens/GameScreens.cs @@ -57,7 +57,7 @@ public static bool TryGet(ScreenType screenType, [CanBeNull] out T screen) wh string message = $"No screen of type {screenType} found."; // ReSharper disable once Unity.PerformanceCriticalCodeInvocation - Punpun.Error(typeof(GameScreens), message, Logs.Important, typeof(T).Name); + Log.Error(typeof(GameScreens), message, Logs.Important, typeof(T).Name); screen = null; return false; @@ -69,7 +69,7 @@ public static void SwitchTo(ScreenType screenToSwitchTo) LastScreen = ActiveScreen; ActiveScreen = screenToSwitchTo; - Punpun.Information(typeof(GameScreens), $"Switching game screen to {screenToSwitchTo}"); + Log.Information(typeof(GameScreens), $"Switching game screen to {screenToSwitchTo}"); foreach (KeyValuePair screenEntry in Screens) {