tanghai 10 anni fa
parent
commit
50a24a85e3

+ 1 - 1
CSharp/App/Editor/app.config

@@ -36,7 +36,7 @@
     <add key="Port" value="8888" />
     <add key="Account" value="egametang@163.com" />
     <add key="Password" value="163bio1" />
-    <add key="NodePath" value="D:\Source\Egametang\CSharp\NodeProto.txt" />
+    <add key="NodePath" value="D:\Source\SLOL\Program\Unity\Assets\Resources\Config\NodeProto.txt" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.serviceModel>

+ 1 - 1
CSharp/App/Modules/BehaviorTreeModule/AllTreeView.xaml

@@ -41,7 +41,7 @@
 					</ListBox.ItemTemplate>
 				</ListBox>
 			</GroupBox>
-			<GroupBox Grid.Row="1" Grid.Column="0" Header="节点编辑:" Height="250" VerticalAlignment="Bottom">
+			<GroupBox Grid.Row="1" Grid.Column="0" Header="节点编辑:" Height="220" VerticalAlignment="Bottom">
 				<Tree:NodeDataEditor x:Name="nodeDataEditor" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" />
 			</GroupBox>
 			<GridSplitter Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Width="3" ShowsPreview="False" VerticalAlignment="Stretch"

+ 2 - 1
CSharp/App/Modules/BehaviorTreeModule/AllTreeViewModel.cs

@@ -78,7 +78,8 @@ namespace Modules.BehaviorTreeModule
 		public TreeViewModel Clone(TreeViewModel treeViewModel)
 		{
 			TreeViewModel newTreeViewModel = (TreeViewModel)treeViewModel.Clone();
-			this.treeViewModels.Add(treeViewModel);
+			newTreeViewModel.TreeId = ++this.MaxTreeId;
+			this.treeViewModels.Add(newTreeViewModel);
 			return newTreeViewModel;
 		}
 	}

+ 2 - 2
CSharp/App/Modules/BehaviorTreeModule/NodeDataEditor.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:tree="clr-namespace:Modules.BehaviorTreeModule"
-             mc:Ignorable="d" Height="220" DataContextChanged="OnDataContextChanged"
+             mc:Ignorable="d" Height="200" DataContextChanged="OnDataContextChanged"
 			 d:DataContext="{d:DesignInstance tree:TreeNodeViewModel}" VerticalContentAlignment="Stretch" HorizontalAlignment="Stretch" d:DesignWidth="242">
 	<UserControl.Resources>
 		<tree:ListToStringConverter x:Key="ListToStringConverter"/>
@@ -15,7 +15,7 @@
 			<RowDefinition Height="*"/>
 			<RowDefinition Height="*"/>
 			<RowDefinition Height="*"/>
-			<RowDefinition Height="4*"/>
+			<RowDefinition Height="5*"/>
 		</Grid.RowDefinitions>
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="40"/>

+ 2 - 2
CSharp/App/Modules/BehaviorTreeModule/TreeViewModel.cs

@@ -350,8 +350,8 @@ namespace Modules.BehaviorTreeModule
 		public void EndInit()
 		{
 			SetChildParent(Root);
-			this.Root.XX = 250;
-			this.Root.YY = 10;
+			this.Root.XX = 450;
+			this.Root.YY = 20;
 		}
 	}
 }