Pārlūkot izejas kodu

【优化】编译问题 & 警告

meijun 3 gadi atpakaļ
vecāks
revīzija
eaee62244b
33 mainītis faili ar 357 papildinājumiem un 354 dzēšanām
  1. 1 1
      Common/CommonAI/Zone/Instance/InstanceUnit.cs
  2. 1 1
      Common/CommonAI/ZoneClient/ZoneObject.Unit.Status.cs
  3. 4 3
      Common/CommonAIServer.Connector/CommonAIServer.Connector.csproj
  4. 1 1
      Common/CommonAIServer.Connector/Form/TestClientLoader.cs
  5. 1 1
      Common/CommonFroms/G2D.DataGrid/G2DCollectionEditor.cs
  6. 2 2
      Common/CommonFroms/G2D.DataGrid/G2DPropertyGrid.cs
  7. 1 1
      Common/CommonFroms/G2D.TreeDataGrid/G2DTreeDataGrid.cs
  8. 1 1
      Common/CommonFroms/Net/FormNetSession.cs
  9. 1 1
      Common/CommonFroms/Net/FormSessionTracer.cs
  10. 1 1
      Common/CommonFroms/TreeGridView/TreeGridCell.cs
  11. 4 4
      Common/CommonServer.SSocket/CommonServer.SSocket.csproj
  12. 1 1
      Common/CommonServer.SSocket/SuperSocket/Server.cs
  13. 6 5
      Common/CommonServer/CommonServer.csproj
  14. 6 5
      Common/CommonUI/CommonUI.csproj
  15. 4 4
      Common/CommonUI_Unity3D/CommonUI_Unity3D.csproj
  16. 8 8
      Common/CommonUnity3D/CommonUnity3D.csproj
  17. 9 2
      Common/GameEditorPlugin/GameEditorPlugin.csproj
  18. 2 2
      Common/GameEditorPlugin/Win32/Runtime/FormRuntimeGameLocal.cs
  19. 4 4
      Common/GameEditorPluginServer/GameEditorPluginServer.csproj
  20. 4 4
      Common/GameEditorUnity3D/GameEditorUnity3D.csproj
  21. 4 0
      GameEditor/GameEditor.csproj
  22. 1 1
      GameEditor/Scene/SceneEditor.cs
  23. 1 1
      GameEditor/bin/.setting/buffs/.tree
  24. 1 1
      GameEditor/bin/.setting/items/.tree
  25. 1 1
      GameEditor/bin/.setting/unit_events/.tree
  26. 1 1
      GameEditor/bin/.setting/unit_triggers/.tree
  27. 11 2
      GameEditor/bin/codec.txt
  28. BIN
      Library/Debug/Newtonsoft.Json.dll
  29. BIN
      Library/Debug/SuperSocket.SocketEngine.dll
  30. 254 285
      Library/Debug/SuperSocket.SocketEngine.xml
  31. 13 2
      XmdsCommon.sln
  32. 4 4
      XmdsServerCS/XmdsServerEdgeJS/XmdsServerEdgeJS.csproj
  33. 4 4
      XmdsServerCS/XmdsServerNode/XmdsServerNode.csproj

+ 1 - 1
Common/CommonAI/Zone/Instance/InstanceUnit.cs

@@ -859,7 +859,7 @@ namespace CommonAI.Zone.Instance
 
             if (source == null)
             {
-                queueEvent(new UnitDeadEvent(ID, attacker.ID, false, mInfo.RebirthTimeMS));
+                queueEvent(new UnitDeadEvent(ID, attacker == null ? 0 : attacker.ID, false, mInfo.RebirthTimeMS));
                 changeState(new StateDead(this, attacker, true));
             }
             else

+ 1 - 1
Common/CommonAI/ZoneClient/ZoneObject.Unit.Status.cs

@@ -814,7 +814,7 @@ namespace CommonAI.ZoneClient
             public SkillDescType SkillType { get { return this.skill_desc_type; } }
         }
 
-        [Obsolete]
+        //[Obsolete]
         public List<SkillState> GetSkillStatus()
         {
             return new List<SkillState>(mSkillStatus.Skills);

+ 4 - 3
Common/CommonAIServer.Connector/CommonAIServer.Connector.csproj

@@ -49,9 +49,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonLang">
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -121,6 +118,10 @@
       <Project>{f3594e30-da84-4538-baa3-0959b86aa879}</Project>
       <Name>CommonFroms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CommonNetwork\CommonNetwork.csproj">
       <Project>{6c114f8f-ee02-4f15-8f3a-93691896d15f}</Project>
       <Name>CommonNetwork</Name>

+ 1 - 1
Common/CommonAIServer.Connector/Form/TestClientLoader.cs

@@ -75,7 +75,7 @@ namespace CommonAIServer.Connector
                             domain.Load(asm.FullName);
                         }
                     }
-                    catch (Exception err) { }
+                    catch (Exception ) { }
                 }
             }
         }

+ 1 - 1
Common/CommonFroms/G2D.DataGrid/G2DCollectionEditor.cs

@@ -198,7 +198,7 @@ namespace CommonFroms.G2D.DataGrid
                     listView1.SelectedItems[0].Tag = e.ChangedItem.Value;
                 }
             }
-            catch (Exception err) { }
+            catch (Exception ) { }
           
             foreach (ListViewItem item in listView1.SelectedItems)
             {

+ 2 - 2
Common/CommonFroms/G2D.DataGrid/G2DPropertyGrid.cs

@@ -361,7 +361,7 @@ namespace CommonFroms.G2D.DataGrid
                         return true;
                     }
                 }
-                catch (Exception err) { }
+                catch (Exception ) { }
             }
             target = null;
             return false;
@@ -480,7 +480,7 @@ namespace CommonFroms.G2D.DataGrid
                             expect_type = g2dpp.DecleardFieldType;
                         }
                     }
-                    catch (Exception err)
+                    catch (Exception )
                     {
                         this.lst_text = item.Value.ToString();
                     }

+ 1 - 1
Common/CommonFroms/G2D.TreeDataGrid/G2DTreeDataGrid.cs

@@ -81,7 +81,7 @@ namespace CommonFroms.Utils.TreeGrid
                     treeGridView1.Invalidate();
                 }
             }
-            catch (Exception err) { }
+            catch (Exception ) { }
         }
 
         //-------------------------------------------------------------------------------------------

+ 1 - 1
Common/CommonFroms/Net/FormNetSession.cs

@@ -64,7 +64,7 @@ namespace CommonFroms.Net
                 py += ph;
                 mTrackerSend.DrawGrap(e.Graphics, px + 1, py + 1, pw - 2, ph - 2);
             }
-            catch (Exception err) { }
+            catch (Exception ) { }
         }
 
         private void pictureBox1_Click(object sender, EventArgs e)

+ 1 - 1
Common/CommonFroms/Net/FormSessionTracer.cs

@@ -70,7 +70,7 @@ namespace CommonFroms.Net
                 py += ph;
                 mTrackerSend.DrawGrap(e.Graphics, px + 1, py + 1, pw - 2, ph - 2);
             }
-            catch (Exception err) { }
+            catch (Exception ) { }
         }
 
         private void pictureBox1_Click(object sender, EventArgs e)

+ 1 - 1
Common/CommonFroms/TreeGridView/TreeGridCell.cs

@@ -27,7 +27,7 @@ namespace AdvancedDataGridView
 		internal bool IsSited;
 		private Padding _previousPadding;
 		private int _imageWidth = 0, _imageHeight = 0, _imageHeightOffset = 0;
-		private Rectangle _lastKnownGlyphRect;
+		//private Rectangle _lastKnownGlyphRect;
 
 		public TreeGridCell()
 		{			

+ 4 - 4
Common/CommonServer.SSocket/CommonServer.SSocket.csproj

@@ -44,10 +44,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Library\SuperSocket.Binaries\net40\Release\Newtonsoft.Json.dll</HintPath>
@@ -89,6 +85,10 @@
     <Folder Include="SuperUDP\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CommonServer\CommonServer.csproj">
       <Project>{71cc36a4-6899-4bb8-8968-682dba861d98}</Project>
       <Name>CommonServer</Name>

+ 1 - 1
Common/CommonServer.SSocket/SuperSocket/Server.cs

@@ -114,7 +114,7 @@ namespace CommonServer.SSocket.SuperSocket
                         }
                     }
                 }
-                catch (Exception err) { }
+                catch (Exception ) { }
             }
             this.Open(cfg, listener);
         }

+ 6 - 5
Common/CommonServer/CommonServer.csproj

@@ -45,10 +45,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="CommonNetwork, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Library\Debug\CommonNetwork.dll</HintPath>
@@ -65,7 +61,12 @@
     <Compile Include="Server\Server.cs" />
     <Compile Include="Server\Session.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

+ 6 - 5
Common/CommonUI/CommonUI.csproj

@@ -48,10 +48,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -91,7 +87,12 @@
     <Compile Include="Tool\XMLTool.cs" />
     <Compile Include="UIFactory.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <None Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
   </ItemGroup>

+ 4 - 4
Common/CommonUI_Unity3D/CommonUI_Unity3D.csproj

@@ -59,10 +59,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Library\Debug\CommonMPQ.dll</HintPath>
     </Reference>
-    <Reference Include="CommonNetwork, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonNetwork.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System.Xml" />
@@ -137,6 +133,10 @@
       <Project>{29a43d20-f079-42bb-b6ff-d910c04eacd9}</Project>
       <Name>CommonMPQ.SharpZipLib</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CommonNetwork\CommonNetwork.csproj">
+      <Project>{6c114f8f-ee02-4f15-8f3a-93691896d15f}</Project>
+      <Name>CommonNetwork</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CommonUI\CommonUI.csproj">
       <Project>{fe159004-4f5c-4a17-b633-e66d5a64acfb}</Project>
       <Name>CommonUI</Name>

+ 8 - 8
Common/CommonUnity3D/CommonUnity3D.csproj

@@ -49,18 +49,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="CommonMPQ, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Library\Debug\CommonMPQ.dll</HintPath>
     </Reference>
-    <Reference Include="CommonMPQ.SharpZipLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonMPQ.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -144,6 +136,14 @@
     <Compile Include="XMUnity\LoadUtil\XMUnityLoadImlFactory.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\CommonFileSystem.SharpZipLib\CommonMPQ.SharpZipLib.csproj">
+      <Project>{29a43d20-f079-42bb-b6ff-d910c04eacd9}</Project>
+      <Name>CommonMPQ.SharpZipLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CommonUI\CommonUI.csproj">
       <Project>{fe159004-4f5c-4a17-b633-e66d5a64acfb}</Project>
       <Name>CommonUI</Name>

+ 9 - 2
Common/GameEditorPlugin/GameEditorPlugin.csproj

@@ -53,9 +53,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Library\Debug\CommonAIClient.dll</HintPath>
     </Reference>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="CommonLang.Fakes">
+      <HintPath>FakesAssemblies\CommonLang.Fakes.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -169,6 +171,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Fakes Include="Fakes\CommonLang.fakes" />
     <None Include="Resources\close12.png" />
   </ItemGroup>
   <ItemGroup>
@@ -332,6 +335,10 @@
       <Project>{f3594e30-da84-4538-baa3-0959b86aa879}</Project>
       <Name>CommonFroms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

+ 2 - 2
Common/GameEditorPlugin/Win32/Runtime/FormRuntimeGameLocal.cs

@@ -112,12 +112,12 @@ namespace GameEditorPlugin.Win32.Runtime
                             fos.Flush();
                             fos.Close();
                         }
-                        catch (Exception err) { }
+                        catch (Exception ) { }
                         try
                         {
                             fos.Dispose();
                         }
-                        catch (Exception err) { }
+                        catch (Exception ) { }
                     };
                 }
 

+ 4 - 4
Common/GameEditorPluginServer/GameEditorPluginServer.csproj

@@ -44,10 +44,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="CommonNetwork, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Library\Debug\CommonNetwork.dll</HintPath>
@@ -118,6 +114,10 @@
       <Project>{f3594e30-da84-4538-baa3-0959b86aa879}</Project>
       <Name>CommonFroms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CommonServer.SSocket\CommonServer.SSocket.csproj">
       <Project>{9fb63fa2-2dcc-45ab-bd74-3c158e313ee9}</Project>
       <Name>CommonServer.SSocket</Name>

+ 4 - 4
Common/GameEditorUnity3D/GameEditorUnity3D.csproj

@@ -73,10 +73,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Library\Debug\CommonAI.dll</HintPath>
     </Reference>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
@@ -156,6 +152,10 @@
       <Project>{f3594e30-da84-4538-baa3-0959b86aa879}</Project>
       <Name>CommonFroms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CommonUnity3DEditorIpc\CommonUnity3DEditorIpc.csproj">
       <Project>{9DABD5A2-DD99-4F5C-8E12-9E268C4F53EB}</Project>
       <Name>CommonUnity3DEditorIpc</Name>

+ 4 - 0
GameEditor/GameEditor.csproj

@@ -433,6 +433,10 @@
       <Project>{847ebc4b-297b-4ec7-ba21-3e3b9212cca3}</Project>
       <Name>XmdsCommonServer</Name>
     </ProjectReference>
+    <ProjectReference Include="..\XmdsVSPlugins\XmdsCommonSkill\XmdsCommonSkill.csproj">
+      <Project>{9af3ee1e-3b5d-47f4-8385-7566c23866bc}</Project>
+      <Name>XmdsCommonSkill</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

+ 1 - 1
GameEditor/Scene/SceneEditor.cs

@@ -1106,7 +1106,7 @@ namespace CommonAIEditor.Scene
                 {
                     mZoneData.TerrainMatrix[dd.SceneX, dd.SceneY] = dd.Flag;
                 }
-                catch (Exception err) { }
+                catch (Exception ) { }
             }
             pictureBox1.Refresh();
         }

+ 1 - 1
GameEditor/bin/.setting/buffs/.tree

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-16"?>
-<node Name="BUFF" IsExpanded="False" />
+<node Name="BUFF" IsExpanded="True" />

+ 1 - 1
GameEditor/bin/.setting/items/.tree

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-16"?>
-<node Name="物品" IsExpanded="False" />
+<node Name="物品" IsExpanded="True" />

+ 1 - 1
GameEditor/bin/.setting/unit_events/.tree

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-16"?>
-<node Name="单位事件" IsExpanded="False" />
+<node Name="单位事件" IsExpanded="True" />

+ 1 - 1
GameEditor/bin/.setting/unit_triggers/.tree

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-16"?>
-<node Name="单位触发器" IsExpanded="False" />
+<node Name="单位触发器" IsExpanded="True" />

+ 11 - 2
GameEditor/bin/codec.txt

@@ -23,6 +23,7 @@
 0x00004017 - CommonAI.Zone.CricleSpeedMode
 0x00004018 - CommonAI.Zone.FlyEffect
 0x00004027 - CommonAI.Zone.KillHitMove
+0x00004028 - CommonAI.Zone.BuffAddItem
 0x00004104 - CommonAI.Zone.UnitActionData+KeyFrame
 0x00004105 - CommonAI.Zone.SpellTemplate+KeyFrame
 0x00004106 - CommonAI.Zone.BuffTemplate+KeyFrame
@@ -51,6 +52,7 @@
 0x00004405 - CommonAI.Zone.ZoneEditor.SceneTransportAbilityData
 0x00004406 - CommonAI.Zone.ZoneEditor.SpawnItemAbilityData
 0x00004407 - CommonAI.Zone.ZoneEditor.SpawnItemAbilityData+SpawnItem
+0x00004408 - CommonAI.Zone.ZoneEditor.RegionDamageAbilityData
 0x00004500 - CommonAI.ZoneEditor.ZoneVar
 0x00004501 - CommonAI.Zone.ZoneEditor.ZoneEvent
 0x00004502 - CommonAI.Zone.UnitEvent
@@ -147,7 +149,14 @@
 0x00008606 - CommonAI.Zone.UnitFollowAction
 0x00008700 - CommonAI.Zone.SkillMove
 0x00008701 - CommonAI.Zone.PlayDestoryEffect
-0x00008801 - XmdsCommon.EditorData.XmdsRebirthAbility
+0x00008702 - CommonAI.Zone.PlayPetTeleportAction
+0x00008703 - CommonAI.Zone.RefreshTalnetInfo
+0x00008704 - CommonAI.Zone.RefreshCardInfo
+0x00008705 - CommonAI.Zone.PlayerLaunchCardSkill
+0x00008706 - CommonAI.Zone.RefreshBossCardInfo
+0x00008707 - CommonAI.Zone.BossTriggerCardSkill
+0x00008708 - CommonAI.Zone.PlayerPKModeChangeEventB2C
+0x00008801 - CommonAI.Zone.ZoneEditor.XmdsRebirthAbility
 0x00008901 - XmdsCommon.EditorData.XmdsSceneTransportAbilityData
 0x00009001 - CommonAI.ZoneClient.SyncObjectsEvent
 0x00009002 - CommonAI.ZoneClient.LockActorEvent
@@ -238,7 +247,6 @@
 0x0F000012 - XmdsCommon.Message.ScriptRemoveUnitEventsB2C
 0x0F000014 - XmdsCommon.Message.ShowTipsEventB2C
 0x0F000015 - XmdsCommon.Message.MonsterVisibleDataB2C
-0x0F000016 - XmdsCommon.Message.PlayerPKModeChangeEventB2C
 0x0F000017 - XmdsCommonServer.Message.TransUnitEventB2R
 0x0F000018 - XmdsCommonServer.Message.SummonMountEventB2R
 0x0F000019 - XmdsCommon.Message.PlayerPKLvChangeEventB2C
@@ -282,3 +290,4 @@
 0x0FFF0003 - XmdsCommonServer.Message.UnitBattleReportDetail
 0x0FFF0004 - XmdsCommonServer.Message.KillBossEventB2R
 0x0FFF0005 - XmdsCommonServer.Message.PlayerExceptionEventB2R
+0x0FFF0006 - XmdsCommonServer.Message.MountainKingHelpEventB2R

BIN
Library/Debug/Newtonsoft.Json.dll


BIN
Library/Debug/SuperSocket.SocketEngine.dll


+ 254 - 285
Library/Debug/SuperSocket.SocketEngine.xml

@@ -381,272 +381,7 @@
             Command assembly configuation collection
             </summary>
         </member>
-        <member name="T:SuperSocket.SocketEngine.Configuration.Server">
-            <summary>
-            Server, the port which is compatible with .Net 4.5 or higher
-            </summary>
-            <summary>
-            Server configuration
-            </summary>
-        </member>
-        <member name="M:SuperSocket.SocketEngine.Configuration.Server.GetChildConfig``1(System.String)">
-            <summary>
-            Gets the child config.
-            </summary>
-            <typeparam name="TConfig">The type of the config.</typeparam>
-            <param name="childConfigName">Name of the child config.</param>
-            <returns></returns>
-        </member>
-        <member name="M:SuperSocket.SocketEngine.Configuration.Server.OnDeserializeUnrecognizedAttribute(System.String,System.String)">
-            <summary>
-            Gets a value indicating whether an unknown attribute is encountered during deserialization.
-            To keep compatible with old configuration
-            </summary>
-            <param name="name">The name of the unrecognized attribute.</param>
-            <param name="value">The value of the unrecognized attribute.</param>
-            <returns>
-            true when an unknown attribute is encountered while deserializing; otherwise, false.
-            </returns>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.DefaultCulture">
-            <summary>
-            Gets/sets the default culture for this server.
-            </summary>
-            <value>
-            The default culture.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ServerTypeName">
-            <summary>
-            Gets the name of the server type this appServer want to use.
-            </summary>
-            <value>
-            The name of the server type.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ServerType">
-            <summary>
-            Gets the type definition of the appserver.
-            </summary>
-            <value>
-            The type of the server.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ReceiveFilterFactory">
-            <summary>
-            Gets the Receive filter factory.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Ip">
-            <summary>
-            Gets the ip.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Port">
-            <summary>
-            Gets the port.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Mode">
-            <summary>
-            Gets the mode.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Disabled">
-            <summary>
-            Gets a value indicating whether this <see cref="T:SuperSocket.SocketBase.Config.IServerConfig"/> is disabled.
-            </summary>
-            <value>
-              <c>true</c> if disabled; otherwise, <c>false</c>.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SendTimeOut">
-            <summary>
-            Gets the send time out.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.MaxConnectionNumber">
-            <summary>
-            Gets the max connection number.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ReceiveBufferSize">
-            <summary>
-            Gets the size of the receive buffer.
-            </summary>
-            <value>
-            The size of the receive buffer.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SendBufferSize">
-            <summary>
-            Gets the size of the send buffer.
-            </summary>
-            <value>
-            The size of the send buffer.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SyncSend">
-            <summary>
-            Gets a value indicating whether sending is in synchronous mode.
-            </summary>
-            <value>
-              <c>true</c> if [sync send]; otherwise, <c>false</c>.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogCommand">
-            <summary>
-            Gets a value indicating whether log command in log file.
-            </summary>
-            <value><c>true</c> if log command; otherwise, <c>false</c>.</value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogBasicSessionActivity">
-            <summary>
-            Gets a value indicating whether [log basic session activity like connected and disconnected].
-            </summary>
-            <value>
-            	<c>true</c> if [log basic session activity]; otherwise, <c>false</c>.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogAllSocketException">
-            <summary>
-            Gets a value indicating whether [log all socket exception].
-            </summary>
-            <value>
-            <c>true</c> if [log all socket exception]; otherwise, <c>false</c>.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ClearIdleSession">
-            <summary>
-            Gets a value indicating whether clear idle session.
-            </summary>
-            <value><c>true</c> if clear idle session; otherwise, <c>false</c>.</value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ClearIdleSessionInterval">
-            <summary>
-            Gets the clear idle session interval, in seconds.
-            </summary>
-            <value>The clear idle session interval.</value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.IdleSessionTimeOut">
-            <summary>
-            Gets the idle session timeout time length, in seconds.
-            </summary>
-            <value>The idle session time out.</value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.CertificateConfig">
-            <summary>
-            Gets the certificate config.
-            </summary>
-            <value>The certificate config.</value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Certificate">
-            <summary>
-            Gets X509Certificate configuration.
-            </summary>
-            <value>
-            X509Certificate configuration.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Security">
-            <summary>
-            Gets the security protocol, X509 certificate.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.MaxRequestLength">
-            <summary>
-            Gets the max allowed length of request.
-            </summary>
-            <value>
-            The max allowed length of request.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.DisableSessionSnapshot">
-            <summary>
-            Gets a value indicating whether [disable session snapshot]
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SessionSnapshotInterval">
-            <summary>
-            Gets the interval to taking snapshot for all live sessions.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ConnectionFilter">
-            <summary>
-            Gets the connection filters used by this server instance.
-            </summary>
-            <value>
-            The connection filters's name list, seperated by comma
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.CommandLoader">
-            <summary>
-            Gets the command loader, multiple values should be separated by comma.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.KeepAliveTime">
-            <summary>
-            Gets the start keep alive time, in seconds
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.KeepAliveInterval">
-            <summary>
-            Gets the keep alive interval, in seconds.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ListenBacklog">
-            <summary>
-            Gets the backlog size of socket listening.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.StartupOrder">
-            <summary>
-            Gets the startup order of the server instance.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SendingQueueSize">
-            <summary>
-            Gets/sets the size of the sending queue.
-            </summary>
-            <value>
-            The size of the sending queue.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogFactory">
-            <summary>
-            Gets the logfactory name of the server instance.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.TextEncoding">
-            <summary>
-            Gets the default text encoding.
-            </summary>
-            <value>
-            The text encoding.
-            </value>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Listeners">
-            <summary>
-            Gets the listeners' configuration.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SuperSocket#SocketBase#Config#IServerConfig#Listeners">
-            <summary>
-            Gets the listeners' configuration.
-            </summary>
-        </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.Server.CommandAssemblies">
-            <summary>
-            Gets the command assemblies configuration.
-            </summary>
-            <value>
-            The command assemblies.
-            </value>
-        </member>
         <member name="T:SuperSocket.SocketEngine.Configuration.SocketServiceConfig">
-            <summary>
-            SocketServiceConfig, the part which is compatible with .Net 4.5 or higher
-            </summary>
             <summary>
             SuperSocket's root configuration node
             </summary>
@@ -681,14 +416,6 @@
             <param name="childConfigName">Name of the child config.</param>
             <returns></returns>
         </member>
-        <member name="P:SuperSocket.SocketEngine.Configuration.SocketServiceConfig.DefaultCulture">
-            <summary>
-            Gets/sets the default culture for all server instances.
-            </summary>
-            <value>
-            The default culture.
-            </value>
-        </member>
         <member name="P:SuperSocket.SocketEngine.Configuration.SocketServiceConfig.Servers">
             <summary>
             Gets all the server configurations
@@ -848,33 +575,24 @@
             Socket Session, all application session should base on this class
             </summary>
         </member>
-        <member name="M:SuperSocket.SocketEngine.SocketSession.LogError(System.Exception,System.String,System.String,System.Int32)">
+        <member name="M:SuperSocket.SocketEngine.SocketSession.LogError(System.Exception)">
             <summary>
             Logs the error, skip the ignored exception
             </summary>
             <param name="exception">The exception.</param>
-            <param name="caller">The caller.</param>
-            <param name="callerFilePath">The caller file path.</param>
-            <param name="callerLineNumber">The caller line number.</param>
         </member>
-        <member name="M:SuperSocket.SocketEngine.SocketSession.LogError(System.String,System.Exception,System.String,System.String,System.Int32)">
+        <member name="M:SuperSocket.SocketEngine.SocketSession.LogError(System.String,System.Exception)">
             <summary>
             Logs the error, skip the ignored exception
             </summary>
             <param name="message">The message.</param>
             <param name="exception">The exception.</param>
-            <param name="caller">The caller.</param>
-            <param name="callerFilePath">The caller file path.</param>
-            <param name="callerLineNumber">The caller line number.</param>
         </member>
-        <member name="M:SuperSocket.SocketEngine.SocketSession.LogError(System.Int32,System.String,System.String,System.Int32)">
+        <member name="M:SuperSocket.SocketEngine.SocketSession.LogError(System.Int32)">
             <summary>
             Logs the socket error, skip the ignored error
             </summary>
             <param name="socketErrorCode">The socket error code.</param>
-            <param name="caller">The caller.</param>
-            <param name="callerFilePath">The caller file path.</param>
-            <param name="callerLineNumber">The caller line number.</param>
         </member>
         <member name="M:SuperSocket.SocketEngine.SocketSession.Start">
             <summary>
@@ -1227,6 +945,257 @@
             Listener configuration collection
             </summary>
         </member>
+        <member name="T:SuperSocket.SocketEngine.Configuration.Server">
+            <summary>
+            Server configuration
+            </summary>
+        </member>
+        <member name="M:SuperSocket.SocketEngine.Configuration.Server.GetChildConfig``1(System.String)">
+            <summary>
+            Gets the child config.
+            </summary>
+            <typeparam name="TConfig">The type of the config.</typeparam>
+            <param name="childConfigName">Name of the child config.</param>
+            <returns></returns>
+        </member>
+        <member name="M:SuperSocket.SocketEngine.Configuration.Server.OnDeserializeUnrecognizedAttribute(System.String,System.String)">
+            <summary>
+            Gets a value indicating whether an unknown attribute is encountered during deserialization.
+            To keep compatible with old configuration
+            </summary>
+            <param name="name">The name of the unrecognized attribute.</param>
+            <param name="value">The value of the unrecognized attribute.</param>
+            <returns>
+            true when an unknown attribute is encountered while deserializing; otherwise, false.
+            </returns>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ServerTypeName">
+            <summary>
+            Gets the name of the server type this appServer want to use.
+            </summary>
+            <value>
+            The name of the server type.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ServerType">
+            <summary>
+            Gets the type definition of the appserver.
+            </summary>
+            <value>
+            The type of the server.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ReceiveFilterFactory">
+            <summary>
+            Gets the Receive filter factory.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Ip">
+            <summary>
+            Gets the ip.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Port">
+            <summary>
+            Gets the port.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Mode">
+            <summary>
+            Gets the mode.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Disabled">
+            <summary>
+            Gets a value indicating whether this <see cref="T:SuperSocket.SocketBase.Config.IServerConfig"/> is disabled.
+            </summary>
+            <value>
+              <c>true</c> if disabled; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SendTimeOut">
+            <summary>
+            Gets the send time out.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.MaxConnectionNumber">
+            <summary>
+            Gets the max connection number.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ReceiveBufferSize">
+            <summary>
+            Gets the size of the receive buffer.
+            </summary>
+            <value>
+            The size of the receive buffer.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SendBufferSize">
+            <summary>
+            Gets the size of the send buffer.
+            </summary>
+            <value>
+            The size of the send buffer.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SyncSend">
+            <summary>
+            Gets a value indicating whether sending is in synchronous mode.
+            </summary>
+            <value>
+              <c>true</c> if [sync send]; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogCommand">
+            <summary>
+            Gets a value indicating whether log command in log file.
+            </summary>
+            <value><c>true</c> if log command; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogBasicSessionActivity">
+            <summary>
+            Gets a value indicating whether [log basic session activity like connected and disconnected].
+            </summary>
+            <value>
+            	<c>true</c> if [log basic session activity]; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogAllSocketException">
+            <summary>
+            Gets a value indicating whether [log all socket exception].
+            </summary>
+            <value>
+            <c>true</c> if [log all socket exception]; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ClearIdleSession">
+            <summary>
+            Gets a value indicating whether clear idle session.
+            </summary>
+            <value><c>true</c> if clear idle session; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ClearIdleSessionInterval">
+            <summary>
+            Gets the clear idle session interval, in seconds.
+            </summary>
+            <value>The clear idle session interval.</value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.IdleSessionTimeOut">
+            <summary>
+            Gets the idle session timeout time length, in seconds.
+            </summary>
+            <value>The idle session time out.</value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.CertificateConfig">
+            <summary>
+            Gets the certificate config.
+            </summary>
+            <value>The certificate config.</value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Certificate">
+            <summary>
+            Gets X509Certificate configuration.
+            </summary>
+            <value>
+            X509Certificate configuration.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Security">
+            <summary>
+            Gets the security protocol, X509 certificate.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.MaxRequestLength">
+            <summary>
+            Gets the max allowed length of request.
+            </summary>
+            <value>
+            The max allowed length of request.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.DisableSessionSnapshot">
+            <summary>
+            Gets a value indicating whether [disable session snapshot]
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SessionSnapshotInterval">
+            <summary>
+            Gets the interval to taking snapshot for all live sessions.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ConnectionFilter">
+            <summary>
+            Gets the connection filters used by this server instance.
+            </summary>
+            <value>
+            The connection filters's name list, seperated by comma
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.CommandLoader">
+            <summary>
+            Gets the command loader, multiple values should be separated by comma.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.KeepAliveTime">
+            <summary>
+            Gets the start keep alive time, in seconds
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.KeepAliveInterval">
+            <summary>
+            Gets the keep alive interval, in seconds.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.ListenBacklog">
+            <summary>
+            Gets the backlog size of socket listening.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.StartupOrder">
+            <summary>
+            Gets the startup order of the server instance.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SendingQueueSize">
+            <summary>
+            Gets/sets the size of the sending queue.
+            </summary>
+            <value>
+            The size of the sending queue.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.LogFactory">
+            <summary>
+            Gets the logfactory name of the server instance.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.TextEncoding">
+            <summary>
+            Gets the default text encoding.
+            </summary>
+            <value>
+            The text encoding.
+            </value>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.Listeners">
+            <summary>
+            Gets the listeners' configuration.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.SuperSocket#SocketBase#Config#IServerConfig#Listeners">
+            <summary>
+            Gets the listeners' configuration.
+            </summary>
+        </member>
+        <member name="P:SuperSocket.SocketEngine.Configuration.Server.CommandAssemblies">
+            <summary>
+            Gets the command assemblies configuration.
+            </summary>
+            <value>
+            The command assemblies.
+            </value>
+        </member>
         <member name="T:SuperSocket.SocketEngine.Configuration.ServerCollection">
             <summary>
             Server configuration collection

+ 13 - 2
XmdsCommon.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31911.196
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmdsCommon", "XmdsCommon\XmdsCommon.csproj", "{E739A788-7A95-4427-BB97-A167960DB7DB}"
 EndProject
@@ -120,6 +120,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BSServer", "test\BSServer.c
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameEditor", "GameEditor\GameEditor.csproj", "{3AEDCC34-FBCE-4955-A329-F5A832F292E6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E6F4820C-30D4-4DDF-8890-517C9EFD92A8} = {E6F4820C-30D4-4DDF-8890-517C9EFD92A8}
+		{9AF3EE1E-3B5D-47F4-8385-7566C23866BC} = {9AF3EE1E-3B5D-47F4-8385-7566C23866BC}
+		{E739A788-7A95-4427-BB97-A167960DB7DB} = {E739A788-7A95-4427-BB97-A167960DB7DB}
+		{6C114F8F-EE02-4F15-8F3A-93691896D15F} = {6C114F8F-EE02-4F15-8F3A-93691896D15F}
+		{9FB63FA2-2DCC-45AB-BD74-3C158E313EE9} = {9FB63FA2-2DCC-45AB-BD74-3C158E313EE9}
+		{93D1C0BF-C266-4033-9A5F-87638B305DB8} = {93D1C0BF-C266-4033-9A5F-87638B305DB8}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xmds-handlers", "ProtoGen\output\handlers\xmds-handlers.csproj", "{C72F73A9-AE1C-4FF8-BB28-82C4DD5F3EAD}"
 EndProject
@@ -2726,4 +2734,7 @@ Global
 		{C72F73A9-AE1C-4FF8-BB28-82C4DD5F3EAD} = {A3FA2CE9-5973-4353-B23F-F1C63F09D3A3}
 		{B5A9AB4F-77F7-4D9E-87D9-C5FC6DD3C506} = {A3FA2CE9-5973-4353-B23F-F1C63F09D3A3}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D0EB938A-F150-46F3-B2DE-30CF33FD4D5F}
+	EndGlobalSection
 EndGlobal

+ 4 - 4
XmdsServerCS/XmdsServerEdgeJS/XmdsServerEdgeJS.csproj

@@ -79,10 +79,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="XmdsCommonSkill, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\XmdsCommonSkill.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Data.cs" />
@@ -133,6 +129,10 @@
       <Project>{70a38a7f-053c-4757-a38e-eb8aae9c6005}</Project>
       <Name>XmdsCommonQuest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\XmdsVSPlugins\XmdsCommonSkill\XmdsCommonSkill.csproj">
+      <Project>{9af3ee1e-3b5d-47f4-8385-7566c23866bc}</Project>
+      <Name>XmdsCommonSkill</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\XmdsVSPlugins\XmdsCommonZone\XmdsCommonZone.csproj">
       <Project>{93d1c0bf-c266-4033-9a5f-87638b305db8}</Project>
       <Name>XmdsCommonZone</Name>

+ 4 - 4
XmdsServerCS/XmdsServerNode/XmdsServerNode.csproj

@@ -48,10 +48,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonLang, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Library\Debug\CommonLang.dll</HintPath>
-    </Reference>
     <Reference Include="Ice, Version=3.6.1.0, Culture=neutral, PublicKeyToken=cdd571ade22f2f16, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
@@ -108,6 +104,10 @@
       <Project>{0d86d14e-c45e-400a-8f50-ff7bde63b35a}</Project>
       <Name>CommonAI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Common\CommonLang\CommonLang.csproj">
+      <Project>{1835e71d-0b6c-463d-b538-e68891e4dacb}</Project>
+      <Name>CommonLang</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Common\Pomelo\PomeloShare\PomeloShare.csproj">
       <Project>{733e5fb8-1bbe-4cbb-b8b1-9f6d023db4c0}</Project>
       <Name>PomeloShare</Name>