Version 3

Yunasawa-Studio · May 18, 2024 · 65cc4b6 · 65cc4b6
1 parent 7dfa7b1
commit 65cc4b6
Show file tree

Hide file tree

Showing 26 changed files with 108 additions and 20 deletions.
diff --git a/Editor/Elements/AI Behaviour Editor/EActionBox.cs b/Editor/Elements/AI Behaviour Editor/EActionBox.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System;
 using System.Reflection;
 using UnityEngine;
@@ -136,4 +138,6 @@ private void DeleteBox()
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Elements/AI Behaviour Editor/EBoxPanel.cs b/Editor/Elements/AI Behaviour Editor/EBoxPanel.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using UnityEngine.UIElements;
 using YNL.Editors.Windows.Utilities;
 using YNL.Editors.Windows;
@@ -84,4 +86,6 @@ public void CreateBox()
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Elements/AI Behaviour Editor/ESearchBox.cs b/Editor/Elements/AI Behaviour Editor/ESearchBox.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using UnityEngine;
 using UnityEngine.UIElements;
 using YNL.Editors.Windows.Utilities;
@@ -39,4 +41,6 @@ public ESearchBox(string label, bool isAction) : base()
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Elements/AI Behaviour Editor/EStateBox.cs b/Editor/Elements/AI Behaviour Editor/EStateBox.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -94,4 +96,6 @@ private void RemoveState()
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Elements/AI Behaviour Editor/EStatePanel.cs b/Editor/Elements/AI Behaviour Editor/EStatePanel.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System;
 using System.Linq;
 using UnityEngine.UIElements;
@@ -80,4 +82,6 @@ public void SelectState(string stateName)
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Elements/AI Behaviour Editor/ETransitionBox.cs b/Editor/Elements/AI Behaviour Editor/ETransitionBox.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -181,4 +183,6 @@ private void DeleteBox()
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Elements/AI Icon Editor/EIconBox.cs b/Editor/Elements/AI Icon Editor/EIconBox.cs
@@ -0,0 +1,7 @@
+#if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
+
+#endif
+#endif
+#endif
diff --git a/Editor/Elements/AI Icon Editor/EIconPanel.cs b/Editor/Elements/AI Icon Editor/EIconPanel.cs
@@ -1,3 +1,6 @@
+#if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using UnityEngine;
 using UnityEngine.UIElements;
 using YNL.Editors.UIElements;
@@ -20,4 +23,7 @@ public EIconPanel()
             this.AddElements(Wrapper);
         }
     }
-}
+}
+#endif
+#endif
+#endif
diff --git a/Editor/Utilities/EAIUtilities.cs b/Editor/Utilities/EAIUtilities.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System.Reflection;
 using System;
 using UnityEngine.UIElements;
@@ -95,4 +97,6 @@ public static VisualElement CustomField(FieldInfo fieldInfo, string label, strin
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/WSimpleAIEditor.cs b/Editor/WSimpleAIEditor.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using UnityEditor;
 using UnityEngine;
 using YNL.Editors.UIElements;
@@ -98,3 +100,5 @@ public enum WRPGWindowTag
     }
 }
 #endif
+#endif
+#endif
diff --git a/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Handler.cs b/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Handler.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System.Collections.Generic;
 using System.Linq;
 using YNL.Extensions.Methods;
@@ -82,4 +84,6 @@ public void UpdateTrueFalseState()
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Main.cs b/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Main.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System;
 using UnityEditor;
 using UnityEngine;
@@ -45,4 +47,6 @@ public static class WAIBehaviourEditor_Action
         public static Action<AIStateKey> RemoveState;
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Popup.cs b/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Popup.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor.UIElements;
@@ -104,6 +106,6 @@ private void SearchingChanged(ChangeEvent<string> evt)
         }
     }
 }
-
-
+#endif
+#endif
 #endif
diff --git a/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Visual.cs b/Editor/Windows/AI Behaviour Editor/WAIBehaviourEditor_Visual.cs
@@ -1,4 +1,6 @@
 #if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using UnityEngine;
 using UnityEngine.UIElements;
 using YNL.Editors.UIElements;
@@ -109,4 +111,6 @@ private void MainWindowHandler()
         public void AddTransitionBoxes(params ETransitionBox[] boxes) => TransitionPanel.AddBoxes(boxes);
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Windows/AI Icon Editor/WAIIconEditor_Handler.cs b/Editor/Windows/AI Icon Editor/WAIIconEditor_Handler.cs
@@ -1,7 +1,13 @@
+#if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
 namespace YNL.SimpleAISystem.Editors
 {
     public class WAIIconEditor_Handler
     {
 
     }
-}
+}
+#endif
+#endif
+#endif
diff --git a/Editor/Windows/AI Icon Editor/WAIIconEditor_Main.cs b/Editor/Windows/AI Icon Editor/WAIIconEditor_Main.cs
@@ -1,5 +1,6 @@
 #if UNITY_EDITOR
-using System;
+#if YNL_EDITOR
+#if YNL_UTILITIES
 using YNL.Editors.UIElements;
 using YNL.Editors.Windows;
 using YNL.Extensions.Methods;
@@ -21,4 +22,6 @@ public WAIIconEditor_Main(EWindowTagPanel tagPanel) : base()
         }
     }
 }
+#endif
+#endif
 #endif
diff --git a/Editor/Windows/AI Icon Editor/WAIIconEditor_Visual.cs b/Editor/Windows/AI Icon Editor/WAIIconEditor_Visual.cs
@@ -1,4 +1,7 @@
-using UnityEngine;
+#if UNITY_EDITOR
+#if YNL_EDITOR
+#if YNL_UTILITIES
+using UnityEngine;
 using UnityEngine.UIElements;
 using YNL.Editors.UIElements;
 using YNL.Editors.Windows.Utilities;
@@ -74,4 +77,7 @@ private void PanelMarginHandler()
             };
         }
     }
-}
+}
+#endif
+#endif
+#endif
diff --git a/Main/AI Behaviours/AIActionKey.cs b/Main/AI Behaviours/AIActionKey.cs
@@ -1,3 +1,4 @@
+#if YNL_UTILITIES
 using System.Reflection;
 using System;
 using YNL.Utilities.Addons;
@@ -35,4 +36,5 @@ public void Update(string label)
             }
         }
     }
-}
+}
+#endif
diff --git a/Main/AI Behaviours/AIBehaviour.cs b/Main/AI Behaviours/AIBehaviour.cs
@@ -1,8 +1,7 @@
-using System.Collections.Generic;
+#if YNL_UTILITIES
+using System.Collections.Generic;
 using YNL.Extensions.Methods;
-
 using YNL.Utilities.Addons;
-
 #if UNITY_EDITOR
 using UnityEditor.Callbacks;
 using UnityEditor;
@@ -96,4 +95,5 @@ public SerializableDictionary<string, AIAction> GetActions(AIController controll
         }
         #endregion
     }
-}
+}
+#endif
diff --git a/Main/AI Behaviours/AITransitionKey.cs b/Main/AI Behaviours/AITransitionKey.cs
@@ -1,3 +1,4 @@
+#if YNL_UTILITIES
 using System.Reflection;
 using System;
 using YNL.Utilities.Addons;
@@ -39,4 +40,5 @@ public void Update(string label)
             }
         }
     }
-}
+}
+#endif
diff --git a/Main/AI Decisions/Decisions/AIDecisionDistanceToTarget.cs b/Main/AI Decisions/Decisions/AIDecisionDistanceToTarget.cs
@@ -1,3 +1,4 @@
+#if YNL_UTILITIES
 using UnityEngine;
 using YNL.Extensions.Methods;
 using YNL.Utilities.Addons;
@@ -42,4 +43,5 @@ public enum NotEqualComparison
     {
         Greater, GreaterOrEqual, Lower, LowerOrEqual
     }
-}
+}
+#endif
diff --git a/Main/AI Decisions/Decisions/AIDecisionTimeInState.cs b/Main/AI Decisions/Decisions/AIDecisionTimeInState.cs
@@ -1,3 +1,4 @@
+#if YNL_UTILITIES
 using System.Collections;
 using UnityEngine;
 using YNL.Extensions.Methods;
@@ -54,4 +55,5 @@ private IEnumerator GetAnimationLengthAfterOneFrame()
             LimitTime = _animator.GetCurrentAnimatorStateInfo(0).length;
         }
     }
-}
+}
+#endif
diff --git a/Main/AI Objects/AIState.cs b/Main/AI Objects/AIState.cs
@@ -1,3 +1,4 @@
+#if YNL_UTILITIES
 using System.Collections.Generic;
 using YNL.Extensions.Methods;
 
@@ -66,4 +67,5 @@ public void Exit()
             foreach (AITransition transition in Transitions) if (!transition.Decision.IsNull()) transition.Decision.OnExitState();
         }
     }
-}
+}
+#endif
diff --git a/Main/AI Objects/AIUtilities.cs b/Main/AI Objects/AIUtilities.cs
@@ -1,3 +1,4 @@
+#if YNL_UTILITIES
 using YNL.Extensions.Methods;
 
 namespace YNL.SimpleAISystem
@@ -16,4 +17,5 @@ public static AIDecision GetDecision(this AIController controller, string label)
             return (AIDecision)MType.CreateInstance($"YNL.SimpleAISystem.AIDecision{label}", controller);
         }
     }
-}
+}
+#endif
diff --git a/Main/AIController.cs b/Main/AIController.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+#if YNL_UTILITIES
+using System.Linq;
 using Unity.Collections;
 using UnityEngine;
 using YNL.Attributes;
@@ -134,4 +135,5 @@ protected virtual void ResetController()
         }
         #endregion
     }
-}
+}
+#endif
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.yunasawa.ynl.simpleaisystem",
     "displayName": "YNL - Simple AI System",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "unity": "2022.3",
     "description": "YNL - Simple AI System provides you a simple system to handle objects' behaviours as an AI.",
     "keywords": [