Patch 2

OpenTibia/.collabignore

@@ -31,3 +31,9 @@ ehthumbs.db
 [Bb]uild
 sysinfo.txt
 *.stackdump
+
+# Streaming assets
+# ================
+[Aa]ssets/StreamingAssets/*
+!Assets/StreamingAssets/.gitignore
+!Assets/StreamingAssets/readme.md

OpenTibia/Assets/Editor/Core/Components/DraggableEditor.cs

@@ -1,7 +1,7 @@
-using UnityEditor;
-using UnityEngine;
+using OpenTibiaUnity.Core.Components;
+using UnityEditor;
 
-namespace OpenTibiaUnity.Core.Components
+namespace OpenTibiaUnityEditor.Core.Components
 {
     [CustomEditor(typeof(Draggable), true)]
     [CanEditMultipleObjects]

OpenTibia/Assets/Editor/Modules/Battle/BattleWidgetEditor.cs

@@ -0,0 +1,66 @@
+using UnityEngine;
+using UnityEditor;
+
+namespace OpenTibiaUnityEditor.Modules.Battle
+{
+    [CustomEditor(typeof(OpenTibiaUnity.Modules.Battle.BattleWidget), true)]
+    [CanEditMultipleObjects]
+    public class BattleWidgetEditor : UI.Legacy.SidebarWidgetEditor
+    {
+
+        SerializedProperty _filtersPanel;
+        SerializedProperty _showSortTypesButton;
+        SerializedProperty _filtersPanelToggle;
+        SerializedProperty _filterPlayersToggle;
+        SerializedProperty _filterNPCsToggle;
+        SerializedProperty _filterMonstersToggle;
+        SerializedProperty _filterNonSkulledToggle;
+        SerializedProperty _filterPartyToggle;
+        SerializedProperty _filterSummonsToggle;
+        SerializedProperty _battleList;
+
+        protected override void OnEnable() {
+            base.OnEnable();
+
+            _filtersPanel = serializedObject.FindProperty("_filtersPanel");
+            _showSortTypesButton = serializedObject.FindProperty("_showSortTypesButton");
+            _filtersPanelToggle = serializedObject.FindProperty("_filtersPanelToggle");
+
+            _filterPlayersToggle = serializedObject.FindProperty("_filterPlayersToggle");
+            _filterNPCsToggle = serializedObject.FindProperty("_filterNPCsToggle");
+            _filterMonstersToggle = serializedObject.FindProperty("_filterMonstersToggle");
+            _filterNonSkulledToggle = serializedObject.FindProperty("_filterNonSkulledToggle");
+            _filterPartyToggle = serializedObject.FindProperty("_filterPartyToggle");
+            _filterSummonsToggle = serializedObject.FindProperty("_filterSummonsToggle");
+            _battleList = serializedObject.FindProperty("_battleList");
+        }
+
+        bool filtersPanelActive = false;
+
+        public override void OnInspectorGUI() {
+            base.OnInspectorGUI();
+
+            EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);
+            EditorGUILayout.LabelField("Battle Widget", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(_filtersPanel, new GUIContent("Filters Panel"));
+            EditorGUILayout.PropertyField(_showSortTypesButton, new GUIContent("ShowSortTypes Button"));
+            EditorGUILayout.PropertyField(_filtersPanelToggle, new GUIContent("FilterPanels Toggle"));
+            EditorGUILayout.PropertyField(_battleList, new GUIContent("Battle List"));
+
+            EditorGUI.indentLevel++;
+            filtersPanelActive = EditorGUILayout.Foldout(filtersPanelActive, "Filters Panel", true);
+            if (filtersPanelActive) {
+
+                EditorGUILayout.PropertyField(_filterPlayersToggle, new GUIContent("Players Toggle"));
+                EditorGUILayout.PropertyField(_filterNPCsToggle, new GUIContent("NPCs Toggle"));
+                EditorGUILayout.PropertyField(_filterMonstersToggle, new GUIContent("Monsters Toggle"));
+                EditorGUILayout.PropertyField(_filterNonSkulledToggle, new GUIContent("NonSkulled Toggle"));
+                EditorGUILayout.PropertyField(_filterPartyToggle, new GUIContent("Party Toggle"));
+                EditorGUILayout.PropertyField(_filterSummonsToggle, new GUIContent("Summons Toggle"));
+            }
+            EditorGUI.indentLevel--;
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

OpenTibia/Assets/Editor/Modules/Console/ChannelSelectionWidgetEditor.cs

@@ -0,0 +1,35 @@
+using UnityEngine;
+using UnityEditor;
+
+namespace OpenTibiaUnityEditor.Modules.Console
+{
+    [CustomEditor(typeof(OpenTibiaUnity.Modules.Console.ChannelSelectionWidget), true)]
+    [CanEditMultipleObjects]
+    public class ChannelSelectionWidgetEditor : UI.Legacy.PopUpBaseEditor
+    {
+
+        SerializedProperty _channelScrollRect;
+        SerializedProperty _channelInput;
+        SerializedProperty _channelToggleGroup;
+
+        protected override void OnEnable() {
+            base.OnEnable();
+
+            _channelScrollRect = serializedObject.FindProperty("_channelScrollRect");
+            _channelInput = serializedObject.FindProperty("_channelInput");
+            _channelToggleGroup = serializedObject.FindProperty("_channelToggleGroup");
+        }
+
+        public override void OnInspectorGUI() {
+            base.OnInspectorGUI();
+
+            EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);
+            EditorGUILayout.LabelField("Channel Selection Widget", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(_channelScrollRect, new GUIContent("Channel ScrollRect"));
+            EditorGUILayout.PropertyField(_channelInput, new GUIContent("Channel Input"));
+            EditorGUILayout.PropertyField(_channelToggleGroup, new GUIContent("Channel ToggleGroup"));
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

OpenTibia/Assets/Editor/Modules/Console/ChannelTabEditor.cs

@@ -0,0 +1,29 @@
+using UnityEngine;
+using UnityEditor;
+
+namespace OpenTibiaUnityEditor.Modules.Console
+{
+    [CustomEditor(typeof(OpenTibiaUnity.Modules.Console.ChannelTab), true)]
+    [CanEditMultipleObjects]
+    public class ChannelTabEditor : UI.Legacy.ButtonEditor
+    {
+
+        SerializedProperty _activeFixImage;
+
+        protected override void OnEnable() {
+            base.OnEnable();
+
+            _activeFixImage = serializedObject.FindProperty("_activeFixImage");
+        }
+
+        public override void OnInspectorGUI() {
+            base.OnInspectorGUI();
+
+            EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);
+            EditorGUILayout.LabelField("Channel TabButton", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(_activeFixImage, new GUIContent("Active Fix Image"));
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

OpenTibia/Assets/Editor/Modules/Container/ContainerWidgetEditor.cs

@@ -0,0 +1,34 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace OpenTibiaUnityEditor.Modules.Container
+{
+    [CustomEditor(typeof(OpenTibiaUnity.Modules.Container.ContainerWidget), true)]
+    [CanEditMultipleObjects]
+    public class ContainerWidgetEditor : UI.Legacy.SidebarWidgetEditor
+    {
+        SerializedProperty _iconImage;
+        SerializedProperty _itemsScrollRect;
+        SerializedProperty _upButton;
+
+        protected override void OnEnable() {
+            base.OnEnable();
+
+            _iconImage = serializedObject.FindProperty("_iconImage");
+            _itemsScrollRect = serializedObject.FindProperty("_itemsScrollRect");
+            _upButton = serializedObject.FindProperty("_upButton");
+        }
+
+        public override void OnInspectorGUI() {
+            base.OnInspectorGUI();
+
+            EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);
+            EditorGUILayout.LabelField("Container Widget", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(_iconImage, new GUIContent("Icon"));
+            EditorGUILayout.PropertyField(_itemsScrollRect, new GUIContent("Items ScrollRect"));
+            EditorGUILayout.PropertyField(_upButton, new GUIContent("UP Button"));
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}

OpenTibia/Assets/Editor/Modules/HealthInfo/HealthInfoWidgetEditor.cs

@@ -0,0 +1,31 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace OpenTibiaUnityEditor.Modules.ToggleButtons
+{
+    [CustomEditor(typeof(OpenTibiaUnity.Modules.HealthInfo.HealthInfoWidget), true)]
+    [CanEditMultipleObjects]
+    public class HealthInfoWidgetEditor : UI.Legacy.SidebarWidgetEditor
+    {
+        SerializedProperty _healthBar;
+        SerializedProperty _manaBar;
+
+        protected override void OnEnable() {
+            base.OnEnable();
+
+            _healthBar = serializedObject.FindProperty("_healthBar");
+            _manaBar = serializedObject.FindProperty("_manaBar");
+        }
+
+        public override void OnInspectorGUI() {
+            base.OnInspectorGUI();
+
+            EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);
+            EditorGUILayout.LabelField("HealthInfo Widget", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(_healthBar, new GUIContent("Health Bar"));
+            EditorGUILayout.PropertyField(_manaBar, new GUIContent("Mana Bar"));
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}