Просмотр исходного кода

修复行为树编辑器错误

tanghai 8 лет назад
Родитель
Сommit
d8db21c22f
100 измененных файлов с 283 добавлено и 287 удалено
  1. 1 1
      Unity/Assets/Editor/BehaviorTreeEditor.meta
  2. 1 0
      Unity/Assets/Editor/BehaviorTreeEditor/BTEditor.cs
  3. 18 9
      Unity/Assets/Editor/BehaviorTreeEditor/BTEditorWindow.cs
  4. 11 8
      Unity/Assets/Editor/BehaviorTreeEditor/BehaviorTreeNodeClassPopup.cs
  5. 34 1
      Unity/Assets/Editor/BehaviorTreeEditor/Component/BTDebugComponent.cs
  6. 10 1
      Unity/Assets/Editor/BehaviorTreeEditor/Component/BTNodeInfoComponent.cs
  7. 21 6
      Unity/Assets/Editor/BehaviorTreeEditor/Event/BehaviorTreeRunTreeEvent_ShowDebugInfo.cs
  8. 19 8
      Unity/Assets/Editor/BehaviorTreeEditor/PropertyDesigner.cs
  9. 97 0
      Unity/Assets/Res/BT/BT_Test.prefab
  10. 2 2
      Unity/Assets/Res/BT/BT_Test.prefab.meta
  11. 0 240
      Unity/Assets/Res/BT/BT_创建UI行为树.prefab
  12. 1 1
      Unity/Assets/Scripts/Base/BehaviorTree.meta
  13. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BTEnv.cs
  14. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BTEnv.cs.meta
  15. 3 1
      Unity/Assets/Scripts/Base/BehaviorTree/BTEnvKey.cs
  16. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BTEnvKey.cs.meta
  17. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorNodeConfig.cs
  18. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorNodeConfig.cs.meta
  19. 8 3
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTree.cs
  20. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTree.cs.meta
  21. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeArgsDict.cs
  22. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeArgsDict.cs.meta
  23. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeConfig.cs
  24. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeConfig.cs.meta
  25. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType.meta
  26. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeBaseComponent.cs
  27. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeBaseComponent.cs.meta
  28. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeManager.cs
  29. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeManager.cs.meta
  30. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType.meta
  31. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayDoubleComponent.cs
  32. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayDoubleComponent.cs.meta
  33. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayFloatComponent.cs
  34. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayFloatComponent.cs.meta
  35. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayInt64Component.cs
  36. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayInt64Component.cs.meta
  37. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayIntComponent.cs
  38. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayIntComponent.cs.meta
  39. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayStringComponent.cs
  40. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayStringComponent.cs.meta
  41. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTBoolComponent.cs
  42. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTBoolComponent.cs.meta
  43. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTDoubleComponent.cs
  44. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTDoubleComponent.cs.meta
  45. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTEnumComponent.cs
  46. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTEnumComponent.cs.meta
  47. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTFloatComponent.cs
  48. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTFloatComponent.cs.meta
  49. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTInt64Component.cs
  50. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTInt64Component.cs.meta
  51. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTIntComponent.cs
  52. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTIntComponent.cs.meta
  53. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTStringComponent.cs
  54. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTStringComponent.cs.meta
  55. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType.meta
  56. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayAudioClipComponent.cs
  57. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayAudioClipComponent.cs.meta
  58. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayGameObjectComponent.cs
  59. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayGameObjectComponent.cs.meta
  60. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayMaterialComponent.cs
  61. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayMaterialComponent.cs.meta
  62. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayShaderComponent.cs
  63. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayShaderComponent.cs.meta
  64. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArraySpriteComponent..cs
  65. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArraySpriteComponent..cs.meta
  66. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture2DComponent..cs
  67. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture2DComponent..cs.meta
  68. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture3DComponent.cs
  69. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture3DComponent.cs.meta
  70. 7 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTextureComponent.cs
  71. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTextureComponent.cs.meta
  72. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTAudioClipComponent.cs
  73. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTAudioClipComponent.cs.meta
  74. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTGameObjectComponent.cs
  75. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTGameObjectComponent.cs.meta
  76. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTMaterialComponent.cs
  77. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTMaterialComponent.cs.meta
  78. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTShaderComponent.cs
  79. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTShaderComponent.cs.meta
  80. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTSpriteComponent.cs
  81. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTSpriteComponent.cs.meta
  82. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture2DComponent.cs
  83. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture2DComponent.cs.meta
  84. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture3DComponent.cs
  85. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture3DComponent.cs.meta
  86. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTextureComponent.cs
  87. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTextureComponent.cs.meta
  88. 0 5
      Unity/Assets/Scripts/Base/BehaviorTree/Node.cs
  89. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/Node.cs.meta
  90. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeAttribute.cs
  91. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeAttribute.cs.meta
  92. 1 1
      Unity/Assets/Scripts/Base/BehaviorTree/NodeClassifyType.cs
  93. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeClassifyType.cs.meta
  94. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeDeprecatedAttribute.cs
  95. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeDeprecatedAttribute.cs.meta
  96. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeDesignerProto.cs
  97. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeDesignerProto.cs.meta
  98. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeEngineObjectAttribute.cs
  99. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeEngineObjectAttribute.cs.meta
  100. 0 0
      Unity/Assets/Scripts/Base/BehaviorTree/NodeFieldBaseAttribute.cs

+ 1 - 1
Unity/Assets/Editor/BehaviorTreeEditor.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 3a5857cabaf3b664fb4305495ee65ae8
 folderAsset: yes
-timeCreated: 1498181747
+timeCreated: 1505098710
 licenseType: Free
 DefaultImporter:
   userData: 

+ 1 - 0
Unity/Assets/Editor/BehaviorTreeEditor/BTEditor.cs

@@ -55,6 +55,7 @@ namespace MyEditor
 
 		public static void Reset()
 		{
+			instance?.Dispose();
 			instance = null;
 		}
 

+ 18 - 9
Unity/Assets/Editor/BehaviorTreeEditor/BTEditorWindow.cs

@@ -1,5 +1,4 @@
-using System;
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 
 namespace MyEditor
@@ -9,17 +8,11 @@ namespace MyEditor
 		CreateNode,
 		ReplaceNode
 	}
-
-	public class MessageBoxArgs: EventArgs
-	{
-		public string msg;
-	}
-
+	
 	public class BTEditorWindow: EditorWindow
 	{
 		private PropertyDesigner propDesigner;
 		private BehaviorTreeNodeClassPopup popUpMenu;
-
 		public GraphDesigner GraphDesigner { get; private set; }
 
 		public static BTEditorWindow Instance
@@ -164,5 +157,21 @@ namespace MyEditor
 		{
 			//       mRightDesigner.onDraggingBorder(deltaX);
 		}
+
+		private void OnSelectionChange()
+		{
+			GameObject[] selectedGameObjects = Selection.gameObjects;
+			if (selectedGameObjects.Length == 0)
+			{
+				return;
+			}
+			string[] ss = selectedGameObjects[0].name.Split('@');
+			if (ss.Length < 2)
+			{
+				return;
+			}
+			long id = long.Parse(ss[1]);
+			BTEditor.Instance.GetComponent<BTDebugComponent>().OwnerId = id;
+		}
 	}
 }

+ 11 - 8
Unity/Assets/Editor/BehaviorTreeEditor/BehaviorTreeNodeClassPopup.cs

@@ -63,7 +63,7 @@ namespace MyEditor
 
 			GUILayout.BeginArea(new Rect(0, 0, windowRect.width, windowRect.height));
 			float topSpace = 60;
-			this.mTreeScrollPos = GUI.BeginScrollView(new Rect(0f, topSpace, windowRect.width, windowRect.height - topSpace), this.mTreeScrollPos,
+            mTreeScrollPos = GUI.BeginScrollView(new Rect(0f, topSpace, windowRect.width, windowRect.height - topSpace), mTreeScrollPos,
 			                                          new Rect(0f, 0f, windowRect.width - 20f, nodeNameList.Count * 19), false, true);
 
 			foreach (string name in nodeNameList)
@@ -136,13 +136,16 @@ namespace MyEditor
 		
 		public GUIStyle GetButtonStyle()
 		{
-			GUIStyle style = new GUIStyle();
-			style.fontSize = 15;
-			style.alignment = TextAnchor.MiddleLeft;
-			GUIStyleState onHoverStyleState = new GUIStyleState();
-			//onHoverStyleState.textColor = textHighLightColor;
-			onHoverStyleState.background = BTDesignerUtility.GetTexture("blue");
-			style.hover = onHoverStyleState;
+            GUIStyle style = new GUIStyle()
+            {
+                fontSize = 15,
+                alignment = TextAnchor.MiddleLeft
+            };
+            GUIStyleState onHoverStyleState = new GUIStyleState()
+            {
+                background = BTDesignerUtility.GetTexture("blue")
+            };
+            style.hover = onHoverStyleState;
 
 			GUIStyleState onNormalStyleState = new GUIStyleState();
 			//onNormalStyleState.textColor = textColor;

+ 34 - 1
Unity/Assets/Editor/BehaviorTreeEditor/Component/BTDebugComponent.cs

@@ -5,8 +5,41 @@ namespace MyEditor
 {
 	public class BTDebugComponent: Component
 	{
+		public long OwnerId;
+		public bool IsFrameSelected = false;
 		public List<List<long>> TreePathList = new List<List<long>>();
 
-		public BehaviorTree BehaviorTree { get; set; }
+		public Dictionary<long, List<List<long>>> DictPathList = new Dictionary<long, List<List<long>>>();
+
+		public void Add(long id, List<long> list)
+		{
+			this.TreePathList.Add(list);
+			if (id != 0)
+			{
+				List<List<long>> lst;
+				if (!this.DictPathList.TryGetValue(id, out lst))
+				{
+					lst = new List<List<long>>();
+					this.DictPathList.Add(id, lst);
+				}
+				lst.Add(list);
+			}
+		}
+
+		public List<List<long>> Get(long id)
+		{
+			if (id == 0)
+			{
+				return this.TreePathList;
+			}
+
+			return this.DictPathList[id];
+		}
+
+		public void Clear()
+		{
+			this.TreePathList.Clear();
+			this.DictPathList.Clear();
+		}
 	}
 }

+ 10 - 1
Unity/Assets/Editor/BehaviorTreeEditor/Component/BTNodeInfoComponent.cs

@@ -4,7 +4,16 @@ using Model;
 
 namespace MyEditor
 {
-	public class BTNodeInfoComponent : Component, IAwake
+	[ObjectEvent]
+	public class BTNodeInfoComponentEvent : ObjectEvent<BTNodeInfoComponent>, IAwake
+	{
+		public void Awake()
+		{
+			this.Get().Awake();
+		}
+	}
+
+	public class BTNodeInfoComponent : Component
 	{
 		private Dictionary<string, NodeMeta> nameNodeMetas = new Dictionary<string, NodeMeta>(); //节点类型 name索引
 		private Dictionary<string, List<NodeMeta>> classifyNodeMetas { get; } = new Dictionary<string, List<NodeMeta>>();

+ 21 - 6
Unity/Assets/Editor/BehaviorTreeEditor/Event/BehaviorTreeRunTreeEvent_ShowDebugInfo.cs

@@ -4,16 +4,31 @@ using Model;
 namespace MyEditor
 {
 	[Event((int)EventIdType.BehaviorTreeRunTreeEvent)]
-	public class BehaviorTreeRunTreeEvent_ShowDebugInfo: IEvent<BehaviorTree, List<long>>
+	public class BehaviorTreeRunTreeEvent_ShowDebugInfo: IEvent<BehaviorTree>
 	{
-		public void Run(BehaviorTree tree, List<long> pathList)
+		public void Run(BehaviorTree tree)
 		{
-			if (BTEditor.Instance.BehaviorTreeConfig != null)
+			if (BTEditor.Instance.CurTreeGO == null)
+			{
+				return;
+			}
+			if (BTEditor.Instance.CurTreeGO.GetInstanceID() != tree.GameObjectId)
+			{
+				return;
+			}
+			
+			BTDebugComponent btDebugComponent = BTEditor.Instance.GetComponent<BTDebugComponent>();
+
+			if (btDebugComponent.OwnerId != 0 && tree.Id != 0 && btDebugComponent.OwnerId != tree.Id)
+			{
+				return;
+			}
+
+			btDebugComponent.Add(tree.Id, tree.PathList);
+			if (!btDebugComponent.IsFrameSelected)
 			{
 				BTEditor.Instance.ClearDebugState();
-				BTEditor.Instance.GetComponent<BTDebugComponent>().TreePathList.Add(pathList);
-				BTEditor.Instance.GetComponent<BTDebugComponent>().BehaviorTree = tree;
-				BTEditor.Instance.SetDebugState(pathList);
+				BTEditor.Instance.SetDebugState(tree.PathList);
 			}
 		}
 	}

+ 19 - 8
Unity/Assets/Editor/BehaviorTreeEditor/PropertyDesigner.cs

@@ -704,27 +704,38 @@ namespace MyEditor
 
 		public void DrawDebugView()
 		{
-			BehaviorTree behaviorTree = BTEditor.Instance.GetComponent<BTDebugComponent>().BehaviorTree;
-			List<List<long>> treePathList = BTEditor.Instance.GetComponent<BTDebugComponent>().TreePathList;
-			if (behaviorTree == null)
-			{
-				return;
-			}
+			BTDebugComponent btDebugComponent = BTEditor.Instance.GetComponent<BTDebugComponent>();
+			List<List<long>> treePathList = btDebugComponent.Get(btDebugComponent.OwnerId);
+			GUILayout.BeginHorizontal();
+			GUILayout.Label("行为树Id:");
+			btDebugComponent.OwnerId = EditorGUILayout.LongField(btDebugComponent.OwnerId);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal();
 			if (GUILayout.Button("清空执行记录"))
 			{
 				treePathList.Clear();
 				BTEditor.Instance.ClearDebugState();
 			}
+
+			if (GUILayout.Button("清除帧选择"))
+			{
+				btDebugComponent.IsFrameSelected = false;
+			}
+			GUILayout.EndHorizontal();
+
 			const float offset = 55f;
-			GUILayout.BeginArea(new Rect(0f, 20f, this.mWidth, Screen.height - offset));
+			GUILayout.BeginArea(new Rect(0f, 60f, this.mWidth, Screen.height - offset));
 			this.mTreeScrollPos = GUI.BeginScrollView(
 				new Rect(0f, 0f, this.mWidth, Screen.height - offset), this.mTreeScrollPos,
 			    new Rect(0f, 0f, this.mWidth - 20f, treePathList.Count * 22), false, false);
 
-			for (int i = 0; i < BTEditor.Instance.GetComponent<BTDebugComponent>().TreePathList.Count; i++)
+			
+			for (int i = 0; i < treePathList.Count; i++)
 			{
 				if (GUILayout.Button($"frame{i}"))
 				{
+					btDebugComponent.IsFrameSelected = true;
 					BTEditor.Instance.ClearDebugState();
 					BTEditor.Instance.SetDebugState(treePathList[i]);
 				}

+ 97 - 0
Unity/Assets/Res/BT/BT_Test.prefab

@@ -0,0 +1,97 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1215590972667058}
+  m_IsPrefabParent: 1
+--- !u!1 &1215590972667058
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4289669923132516}
+  - component: {fileID: 114057903236803148}
+  m_Layer: 0
+  m_Name: BT_Test
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1455759261515548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4390556344634816}
+  - component: {fileID: 114721406238124096}
+  m_Layer: 0
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4289669923132516
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1215590972667058}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4390556344634816}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4390556344634816
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1455759261515548}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4289669923132516}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &114057903236803148
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1215590972667058}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f1d451aabfc8454d94cbc4032d6a308, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  RootNodeConfig: {fileID: 114721406238124096}
+--- !u!114 &114721406238124096
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1455759261515548}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 840ecb1e4ef94d2429fcb0ff2696d581, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 100001
+  describe: Test

+ 2 - 2
Unity/Assets/Res/BT/BT_创建UI行为树.prefab.meta → Unity/Assets/Res/BT/BT_Test.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: f9f78e1edb39dfd41a2722b1a53c7ad4
-timeCreated: 1498460809
+guid: 85bb9c0949c401640aa14b2d29d6b9c9
+timeCreated: 1505099395
 licenseType: Free
 NativeFormatImporter:
   mainObjectFileID: 100100000

+ 0 - 240
Unity/Assets/Res/BT/BT_创建UI行为树.prefab

@@ -1,240 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1783477931437860}
-  m_IsPrefabParent: 1
---- !u!1 &1120422365835790
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4465453297948628}
-  - component: {fileID: 114509792806546196}
-  m_Layer: 0
-  m_Name: UICreateRoot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &1279530075351798
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4936977615441378}
-  - component: {fileID: 114626019597701266}
-  m_Layer: 0
-  m_Name: Sequence
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &1731652014909292
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4480680075265146}
-  - component: {fileID: 114176872673644624}
-  - component: {fileID: 114472900551181156}
-  m_Layer: 0
-  m_Name: CreateUIEffect
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &1783477931437860
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4011488779620680}
-  - component: {fileID: 114700535858552550}
-  m_Layer: 0
-  m_Name: "BT_\u521B\u5EFAUI\u884C\u4E3A\u6811"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &1806181600933056
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4646367730243502}
-  - component: {fileID: 114986442712064258}
-  m_Layer: 0
-  m_Name: Selector
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4011488779620680
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1783477931437860}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4465453297948628}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4465453297948628
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1120422365835790}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4646367730243502}
-  m_Father: {fileID: 4011488779620680}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4480680075265146
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1731652014909292}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 4646367730243502}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4646367730243502
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1806181600933056}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4480680075265146}
-  - {fileID: 4936977615441378}
-  m_Father: {fileID: 4465453297948628}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4936977615441378
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1279530075351798}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 4646367730243502}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114176872673644624
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1731652014909292}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 840ecb1e4ef94d2429fcb0ff2696d581, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 100003
-  describe: 
---- !u!114 &114472900551181156
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1731652014909292}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 179b62fdf77cfeb4188878f675b8fffd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  fieldName: effect
-  fieldValue: {fileID: 0}
---- !u!114 &114509792806546196
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1120422365835790}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 840ecb1e4ef94d2429fcb0ff2696d581, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 100001
-  describe: "\u521B\u5EFAUI\u884C\u4E3A\u6811"
---- !u!114 &114626019597701266
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1279530075351798}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 840ecb1e4ef94d2429fcb0ff2696d581, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 100004
-  describe: 
---- !u!114 &114700535858552550
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1783477931437860}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f1d451aabfc8454d94cbc4032d6a308, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  RootNodeConfig: {fileID: 114509792806546196}
---- !u!114 &114986442712064258
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1806181600933056}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 840ecb1e4ef94d2429fcb0ff2696d581, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 100002
-  describe: 

+ 1 - 1
Unity/Assets/Scripts/BehaviorTree.meta → Unity/Assets/Scripts/Base/BehaviorTree.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 58ca433433534ba46b5dfb9d0265417c
 folderAsset: yes
-timeCreated: 1498181748
+timeCreated: 1505098438
 licenseType: Free
 DefaultImporter:
   userData: 

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BTEnv.cs → Unity/Assets/Scripts/Base/BehaviorTree/BTEnv.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BTEnv.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BTEnv.cs.meta


+ 3 - 1
Unity/Assets/Scripts/BehaviorTree/BTEnvKey.cs → Unity/Assets/Scripts/Base/BehaviorTree/BTEnvKey.cs

@@ -19,8 +19,10 @@ namespace Model
 	public static class BTEnvKey
 	{
 		public const string None = "None";
-		public const string OwnerId = "OwnerId";
+		public const string Owner = "Owner";
 		public const string Buff = "Buff";
+		public const string Spell = "Spell";
+		public const string Unit = "Unit";
 		public const string BuffId = "BuffId";
 		public const string Skill = "Skill";
 		public const string SkillConfig = "SkillConfig";

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BTEnvKey.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BTEnvKey.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorNodeConfig.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorNodeConfig.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorNodeConfig.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorNodeConfig.cs.meta


+ 8 - 3
Unity/Assets/Scripts/BehaviorTree/BehaviorTree.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTree.cs

@@ -5,6 +5,9 @@ namespace Model
 {
 	public class BehaviorTree
 	{
+		public long Id;
+		public int GameObjectId;
+		public List<long> PathList = new List<long>();
 		private readonly Node node;
 		public Scene Scene { get; }
 
@@ -16,8 +19,9 @@ namespace Model
 			}
 		}
 
-		public BehaviorTree(Scene scene, Node node)
+		public BehaviorTree(Scene scene, long id, Node node)
 		{
+			this.Id = id;
 			this.Scene = scene;
 			this.node = node;
 		}
@@ -26,9 +30,10 @@ namespace Model
 		{
 			try
 			{
+				this.PathList.Clear();
+				env.Add(BTEnvKey.NodePath, this.PathList);
 				bool ret = this.node.DoRun(this, env);
-				List<long> pathList = env.Get<List<long>>(BTEnvKey.NodePath);
-				Game.Scene.GetComponent<EventComponent>().Run(EventIdType.BehaviorTreeRunTreeEvent, this, pathList);
+				Game.Scene.GetComponent<EventComponent>().Run(EventIdType.BehaviorTreeRunTreeEvent, this);
 				return ret;
 			}
 			catch (Exception e)

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTree.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTree.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeArgsDict.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeArgsDict.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeArgsDict.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeArgsDict.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeConfig.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeConfig.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeConfig.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeConfig.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BTTypeBaseComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeBaseComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BTTypeBaseComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeBaseComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BTTypeManager.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeManager.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BTTypeManager.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BTTypeManager.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayDoubleComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayDoubleComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayDoubleComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayDoubleComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayFloatComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayFloatComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayFloatComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayFloatComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayInt64Component.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayInt64Component.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayInt64Component.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayInt64Component.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayIntComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayIntComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayIntComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayIntComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayStringComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayStringComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTArrayStringComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTArrayStringComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTBoolComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTBoolComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTBoolComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTBoolComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTDoubleComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTDoubleComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTDoubleComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTDoubleComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTEnumComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTEnumComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTEnumComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTEnumComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTFloatComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTFloatComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTFloatComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTFloatComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTInt64Component.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTInt64Component.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTInt64Component.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTInt64Component.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTIntComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTIntComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTIntComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTIntComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTStringComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTStringComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/BaseType/BTStringComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/BaseType/BTStringComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayAudioClipComponent.cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArrayAudioClipComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArrayAudioClipComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayAudioClipComponent.cs.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayGameObjectComponent.cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArrayGameObjectComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArrayGameObjectComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayGameObjectComponent.cs.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayMaterialComponent.cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArrayMaterialComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArrayMaterialComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayMaterialComponent.cs.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayShaderComponent.cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArrayShaderComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArrayShaderComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayShaderComponent.cs.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArraySpriteComponent..cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArraySpriteComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArraySpriteComponent..cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArraySpriteComponent..cs.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture2DComponent..cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArrayTexture2DComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture2DComponent..cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture2DComponent..cs.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture3DComponent.cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArrayTexture3DComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture3DComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTexture3DComponent.cs.meta


+ 7 - 0
Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTextureComponent.cs

@@ -0,0 +1,7 @@
+namespace Model
+{
+	public class BTArrayTextureComponent: BTTypeBaseComponent
+	{
+		public UnityEngine.Object[] fieldValue;
+	}
+}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTextureComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTArrayTextureComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTAudioClipComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTAudioClipComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTAudioClipComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTAudioClipComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTGameObjectComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTGameObjectComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTGameObjectComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTGameObjectComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTMaterialComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTMaterialComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTMaterialComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTMaterialComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTShaderComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTShaderComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTShaderComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTShaderComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTSpriteComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTSpriteComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTSpriteComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTSpriteComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTTexture2DComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture2DComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTTexture2DComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture2DComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTTexture3DComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture3DComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTTexture3DComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTexture3DComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTTextureComponent.cs → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTextureComponent.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/BehaviorTreeType/UnityType/BTTextureComponent.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/BehaviorTreeType/UnityType/BTTextureComponent.cs.meta


+ 0 - 5
Unity/Assets/Scripts/BehaviorTree/Node.cs → Unity/Assets/Scripts/Base/BehaviorTree/Node.cs

@@ -76,11 +76,6 @@ namespace Model
 
 		public bool DoRun(BehaviorTree behaviorTree, BTEnv env)
 		{
-			if (!env.ContainKey(BTEnvKey.NodePath))
-			{
-				env.Add(BTEnvKey.NodePath, new List<long>());
-			}
-
 			env.Get<List<long>>(BTEnvKey.NodePath).Add(this.NodeProto.Id);
 			return this.Run(behaviorTree, env);
 		}

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/Node.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/Node.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeAttribute.cs → Unity/Assets/Scripts/Base/BehaviorTree/NodeAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeAttribute.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/NodeAttribute.cs.meta


+ 1 - 1
Unity/Assets/Scripts/BehaviorTree/NodeClassifyType.cs → Unity/Assets/Scripts/Base/BehaviorTree/NodeClassifyType.cs

@@ -7,6 +7,6 @@
 		Action,
 		Condition,
 		Root,
-		DataTransform
+		DataTransform,
 	}
 }

+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeClassifyType.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/NodeClassifyType.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeDeprecatedAttribute.cs → Unity/Assets/Scripts/Base/BehaviorTree/NodeDeprecatedAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeDeprecatedAttribute.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/NodeDeprecatedAttribute.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeDesignerProto.cs → Unity/Assets/Scripts/Base/BehaviorTree/NodeDesignerProto.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeDesignerProto.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/NodeDesignerProto.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeEngineObjectAttribute.cs → Unity/Assets/Scripts/Base/BehaviorTree/NodeEngineObjectAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeEngineObjectAttribute.cs.meta → Unity/Assets/Scripts/Base/BehaviorTree/NodeEngineObjectAttribute.cs.meta


+ 0 - 0
Unity/Assets/Scripts/BehaviorTree/NodeFieldBaseAttribute.cs → Unity/Assets/Scripts/Base/BehaviorTree/NodeFieldBaseAttribute.cs


Некоторые файлы не были показаны из-за большого количества измененных файлов