namespace与目录路径一致

CSharp/App/Editor/Bootstrapper.cs

@@ -3,7 +3,7 @@ using System.Windows;
 using Infrastructure;
 using Microsoft.Practices.Prism.MefExtensions;
 using Microsoft.Practices.Prism.Regions;
-using Tree;
+using Modules.Tree;
 
 namespace Editor
 {

CSharp/App/Editor/Editor.csproj

@@ -8,7 +8,7 @@
     <ProjectGuid>{C46F3337-0F48-4A72-84AD-8FDD1F159BB0}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Editor</RootNamespace>
+    <RootNamespace>App.Editor</RootNamespace>
     <AssemblyName>Editor</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>

CSharp/App/Infrastructure/Infrastructure.csproj

@@ -8,7 +8,7 @@
     <ProjectGuid>{48A2E149-0DAC-41B4-BB54-DFBCCD6D42B3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Infrastructure</RootNamespace>
+    <RootNamespace>App.Infrastructure</RootNamespace>
     <AssemblyName>Infrastructure</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

CSharp/App/Modules/Tree/AllTreeData.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace Tree
+namespace Modules.Tree
 {
     [DataContract]
     public class AllTreeData

CSharp/App/Modules/Tree/AllTreeView.xaml

@@ -2,8 +2,8 @@
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 		xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-		xmlns:Tree="clr-namespace:Tree"
-		x:Class="Tree.AllTreeView"
+		xmlns:Tree="clr-namespace:Modules.Tree"
+		x:Class="Modules.Tree.AllTreeView"
 		mc:Ignorable="d" 
 		d:DesignHeight="800" 
 		d:DesignWidth="1280" 

CSharp/App/Modules/Tree/AllTreeView.xaml.cs

@@ -6,7 +6,7 @@ using System.Windows.Input;
 using Infrastructure;
 using Microsoft.Practices.Prism.PubSubEvents;
 
-namespace Tree
+namespace Modules.Tree
 {
     /// <summary>
     /// BehaviorTreeView.xaml 的交互逻辑

CSharp/App/Modules/Tree/AllTreeViewModel.cs

@@ -2,9 +2,9 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
 using System.IO;
-using Helper;
+using Common.Helper;
 
-namespace Tree
+namespace Modules.Tree
 {
     [Export(contractType: typeof (AllTreeViewModel)),
      PartCreationPolicy(creationPolicy: CreationPolicy.NonShared)]

CSharp/App/Modules/Tree/FolderVisiableConverter.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace Tree
+namespace Modules.Tree
 {
     [ValueConversion(typeof (bool), typeof (Visibility))]
     public class FolderVisiableConverter: IValueConverter

CSharp/App/Modules/Tree/ListToStringConverter.cs

@@ -4,7 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 
-namespace Tree
+namespace Modules.Tree
 {
     [ValueConversion(typeof (List<string>), typeof (string))]
     public class ListToStringConverter: IValueConverter

CSharp/App/Modules/Tree/NodeDataEditor.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="Tree.NodeDataEditor"
+<UserControl x:Class="Modules.Tree.NodeDataEditor"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:tree="clr-namespace:Tree"
+             xmlns:tree="clr-namespace:Modules.Tree"
              mc:Ignorable="d" Height="220" Width="211" DataContextChanged="OnDataContextChanged"
 			 d:DataContext="{d:DesignInstance tree:TreeNodeViewModel}">
 	<UserControl.Resources>

CSharp/App/Modules/Tree/NodeDataEditor.xaml.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using Helper;
+using Common.Helper;
 
-namespace Tree
+namespace Modules.Tree
 {
     /// <summary>
     /// NodeDataEditor.xaml 的交互逻辑

CSharp/App/Modules/Tree/NodeType.cs

@@ -1,4 +1,4 @@
-namespace Tree
+namespace Modules.Tree
 {
     public enum NodeType
     {

CSharp/App/Modules/Tree/NodeTypeColorConverter.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace Tree
+namespace Modules.Tree
 {
     [ValueConversion(typeof (int), typeof (int))]
     public class NodeTypeColorConverter: IValueConverter

CSharp/App/Modules/Tree/NodeTypeToStringConverter.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace Tree
+namespace Modules.Tree
 {
     [ValueConversion(typeof (int), typeof (string))]
     public class NodeTypeToStringConverter: IValueConverter

CSharp/App/Modules/Tree/OneTreeData.cs

@@ -1,5 +1,5 @@
 
-namespace Tree
+namespace Modules.Tree
 {
     public class OneTreeData
     {

CSharp/App/Modules/Tree/Tree.csproj

@@ -8,7 +8,7 @@
     <ProjectGuid>{6CD185D1-08E0-4729-A999-2D5B57BA8193}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Modules.Tree</RootNamespace>
+    <RootNamespace>App.Modules.Tree</RootNamespace>
     <AssemblyName>Tree</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

CSharp/App/Modules/Tree/TreeInfoViewModel.cs

@@ -1,5 +1,5 @@
 
-namespace Tree
+namespace Modules.Tree
 {
     public class TreeInfoViewModel
     {

CSharp/App/Modules/Tree/TreeLayout.cs

@@ -1,4 +1,4 @@
-namespace Tree
+namespace Modules.Tree
 {
     public class TreeLayout
     {

CSharp/App/Modules/Tree/TreeModule.cs

@@ -1,7 +1,7 @@
 using Microsoft.Practices.Prism.MefExtensions.Modularity;
 using Microsoft.Practices.Prism.Modularity;
 
-namespace Tree
+namespace Modules.Tree
 {
     [ModuleExport(moduleType: typeof (TreeModule))]
     public class TreeModule: IModule

CSharp/App/Modules/Tree/TreeNodeData.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace Tree
+namespace Modules.Tree
 {
     [DataContract]
     public class TreeNodeData

CSharp/App/Modules/Tree/TreeNodeViewModel.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.Practices.Prism.Mvvm;
 
-namespace Tree
+namespace Modules.Tree
 {
     public class TreeNodeViewModel: BindableBase
     {

CSharp/App/Modules/Tree/TreeView.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="Tree.TreeView"
+<UserControl x:Class="Modules.Tree.TreeView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:tree="clr-namespace:Tree"
+             xmlns:tree="clr-namespace:Modules.Tree"
              mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300"
 			 d:DataContext="{d:DesignInstance tree:TreeViewModel}">

CSharp/App/Modules/Tree/TreeView.xaml.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Windows;
 using System.Windows.Input;
-using Logger;
+using Common.Logger;
 
-namespace Tree
+namespace Modules.Tree
 {
     /// <summary>
     /// TreeView.xaml 的交互逻辑

CSharp/App/Modules/Tree/TreeViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
 using Microsoft.Practices.Prism.Mvvm;
 
-namespace Tree
+namespace Modules.Tree
 {
     [Export(typeof (TreeViewModel)), PartCreationPolicy(CreationPolicy.NonShared)]
     public class TreeViewModel: BindableBase

CSharp/Game/Component/ConfigCategory.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using Helper;
+using Common.Helper;
 
 namespace Component
 {

CSharp/Game/Component/LogicManager.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Helper;
-using Logger;
+using Common.Helper;
+using Common.Logger;
 
 namespace Component
 {

CSharp/Game/Logic/Event/BeforeLoginWorldEvent.cs

@@ -1,7 +1,7 @@
 using Component;
-using Logger;
+using Common.Logger;
 
-namespace Logic
+namespace Logic.Event
 {
     [Event(Type = EventType.BeforeLoginWorldEvent, Order = 1)]
     public class CheckPlayerEvent: IEvent

CSharp/Game/Logic/Event/BeforeUseItemEvent.cs

@@ -1,7 +1,7 @@
 using Component;
-using Logger;
+using Common.Logger;
 
-namespace Logic
+namespace Logic.Event
 {
     [Event(Type = EventType.BeforeUseItemEvent, Order = 1)]
     public class UseCountStatisticsEvent: IEvent

CSharp/Game/Logic/Handler/ChatHandler.cs

@@ -1,9 +1,9 @@
 using Component;
 using Component.Config;
-using Helper;
-using Logger;
+using Common.Helper;
+using Common.Logger;
 
-namespace Logic
+namespace Logic.Handler
 {
     [Handler(Type = typeof (CChat), Opcode = 1)]
     internal class ChatHandler: IHandler

CSharp/Game/Logic/Handler/LoginWorldHandler.cs

@@ -1,6 +1,6 @@
 using Component;
 
-namespace Logic.Handler
+namespace Logic.Event.Handler
 {
     [Handler(Type = typeof (CLoginWorld), Opcode = 2)]
     public class LoginWorldHandler: IHandler

CSharp/Game/Logic/Handler/ReloadHandler.cs

@@ -1,6 +1,6 @@
 using Component;
 
-namespace Logic
+namespace Logic.Handler
 {
     [Handler(Type = typeof (CReloadHandler), Opcode = 3)]
     internal class ReloadHandlerHandler: IHandler

CSharp/Platform/Common/Helper/BigIntegerHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Numerics;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class BigIntegerHelper
     {

CSharp/Platform/Common/Helper/ByteHelper.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class ByteHelper
     {

CSharp/Platform/Common/Helper/EnumHelper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class EnumHelper
     {

CSharp/Platform/Common/Helper/LoaderHelper.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class LoaderHelper
     {

CSharp/Platform/Common/Helper/MongoHelper.cs

@@ -3,7 +3,7 @@ using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class MongoHelper
     {

CSharp/Platform/Common/Helper/ProtobufHelper.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using ProtoBuf;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class ProtobufHelper
     {

CSharp/Platform/Common/Helper/RandomHelper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class RandomHelper
     {

CSharp/Platform/Common/Helper/StringHelper.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class StringHelper
     {

CSharp/Platform/Common/Helper/TimeHelper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class TimeHelper
     {

CSharp/Platform/Common/Helper/XmlHelper.cs

@@ -4,7 +4,7 @@ using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace Helper
+namespace Common.Helper
 {
     public static class XmlHelper
     {

CSharp/Platform/Common/Hooks/Native.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Hooks
+namespace Common.Hooks
 {
     [UnmanagedFunctionPointer(CallingConvention.StdCall, CharSet = CharSet.Unicode,
             SetLastError = true)]

CSharp/Platform/Common/Logger/ALogDecorater.cs

@@ -1,4 +1,4 @@
-namespace Logger
+namespace Common.Logger
 {
     public abstract class ALogDecorater
     {

CSharp/Platform/Common/Logger/ILog.cs

@@ -1,4 +1,4 @@
-namespace Logger
+namespace Common.Logger
 {
     public interface ILog
     {

CSharp/Platform/Common/Logger/Log.cs

@@ -1,4 +1,4 @@
-namespace Logger
+namespace Common.Logger
 {
     public static class Log
     {

CSharp/Platform/Common/Logger/NLogAdapter.cs

@@ -1,6 +1,6 @@
 using NLog;
 
-namespace Logger
+namespace Common.Logger
 {
     public class NLogAdapter: ALogDecorater, ILog
     {

CSharp/Platform/Common/Logger/StackInfoDecorater.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace Logger
+namespace Common.Logger
 {
     internal class StackInfoDecorater: ALogDecorater
     {

CSharp/Platform/ENetTest/ENetClientServerTest.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics;
 using System.Threading;
 using ENet;
-using Helper;
-using Logger;
+using Common.Helper;
+using Common.Logger;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace ENetTest

CSharp/Platform/TNetTest/TcpAcceptorTest.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Net.Sockets;
 using System.Threading;
-using Helper;
-using Logger;
+using Common.Helper;
+using Common.Logger;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TNet;
 

CSharp/Platform/TNetTest/TcpListenerTest.cs

@@ -2,8 +2,8 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
-using Helper;
-using Logger;
+using Common.Helper;
+using Common.Logger;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace TNetTest