修复运行错误 & 找回了原版的ice源文件

Common/Pomelo/PomeloShare/ZoneManagerI.cs

@@ -55,7 +55,7 @@ namespace Pomelo
             {
                 //log.Info("createZone begin:" + System.Threading.Thread.CurrentThread.ManagedThreadId);
                 zone.CreateZone(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data,
-					 (ret) => { cb__.ice_response(); },
+					 (ret) => { cb__.ice_response(ret); },
 					 (err) => { cb__.ice_exception(err); }
 					 );
 
@@ -199,7 +199,7 @@ namespace Pomelo
                 }
                 else
                 {
-                    cb__.ice_response(/*Json.Encode(ret)*/);
+                    cb__.ice_response(Json.Encode(ret));
                 }
                 log.Debug("getServerState_async end:" + System.Threading.Thread.CurrentThread.ManagedThreadId);
             });
@@ -215,7 +215,7 @@ namespace Pomelo
                 }
                 else
                 {
-                    cb__.ice_response(/*ret*/);
+                    cb__.ice_response(ret);
                 }
                // log.Debug("getServerState_async end:" + System.Threading.Thread.CurrentThread.ManagedThreadId);
             });
@@ -231,7 +231,7 @@ namespace Pomelo
 				}
 				else
 				{
-					cb__.ice_response(/*ret*/);
+					cb__.ice_response(ret);
 				}
 			});
 		}

Common/Pomelo/PomeloShare/generated/ZoneManager.cs

@@ -70,7 +70,7 @@ namespace Pomelo
     public delegate void Callback_ZoneManager_setCallback(int ret__);
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
-    public delegate void Callback_ZoneManager_createZoneRequest();
+    public delegate void Callback_ZoneManager_createZoneRequest(int ret__);
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
     public delegate void Callback_ZoneManager_destroyZoneRequest();
@@ -91,13 +91,13 @@ namespace Pomelo
     public delegate void Callback_ZoneManager_playerNetStateChanged();
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
-    public delegate void Callback_ZoneManager_getServerState();
+    public delegate void Callback_ZoneManager_getServerState(string ret__);
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
-    public delegate void Callback_ZoneManager_registerGameServer();
+    public delegate void Callback_ZoneManager_registerGameServer(string ret__);
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
-    public delegate void Callback_ZoneManager_getUnitHP();
+    public delegate void Callback_ZoneManager_getUnitHP(int ret__);
 }
 
 namespace Pomelo
@@ -176,27 +176,27 @@ namespace Pomelo
         /// 场景副本相关协议
         /// </summary>
         
-        void createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data);
+        int createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data);
 
         /// <summary>
         /// 场景副本相关协议
         /// </summary>
         /// <param name="ctx__">The Context map to send with the invocation.</param>
         
-        void createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        int createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         /// <summary>
         /// 场景副本相关协议
         /// </summary>
         /// <returns>An asynchronous result object.</returns>
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data);
+        Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data);
 
         /// <summary>
         /// 场景副本相关协议
         /// </summary>
         /// <param name="ctx__">The Context map to send with the invocation.</param>
         /// <returns>An asynchronous result object.</returns>
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         /// <summary>
         /// 场景副本相关协议
@@ -204,7 +204,7 @@ namespace Pomelo
         /// <param name="cb__">Asynchronous callback invoked when the operation completes.</param>
         /// <param name="cookie__">Application data to store in the asynchronous result object.</param>
         /// <returns>An asynchronous result object.</returns>
-        Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, Ice.AsyncCallback cb__, object cookie__);
+        Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, Ice.AsyncCallback cb__, object cookie__);
 
         /// <summary>
         /// 场景副本相关协议
@@ -213,13 +213,13 @@ namespace Pomelo
         /// <param name="cb__">Asynchronous callback invoked when the operation completes.</param>
         /// <param name="cookie__">Application data to store in the asynchronous result object.</param>
         /// <returns>An asynchronous result object.</returns>
-        Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__);
+        Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__);
 
         /// <summary>
         /// 场景副本相关协议
         /// </summary>
         /// <param name="r__">The asynchronous result object for the invocation.</param>
-        void end_createZoneRequest(Ice.AsyncResult r__);
+        int end_createZoneRequest(Ice.AsyncResult r__);
 
         void destroyZoneRequest(string instanceId);
 
@@ -340,23 +340,23 @@ namespace Pomelo
 
         void end_playerNetStateChanged(Ice.AsyncResult r__);
 
-        void getServerState(string serverID);
+        string getServerState(string serverId);
 
-        void getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        string getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverID);
+        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverId);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult begin_getServerState(string serverID, Ice.AsyncCallback cb__, object cookie__);
+        Ice.AsyncResult begin_getServerState(string serverId, Ice.AsyncCallback cb__, object cookie__);
 
-        Ice.AsyncResult begin_getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__);
+        Ice.AsyncResult begin_getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__);
 
-        void end_getServerState(Ice.AsyncResult r__);
+        string end_getServerState(Ice.AsyncResult r__);
 
-        void registerGameServer(int serverid, int crossid);
+        string registerGameServer(int serverid, int crossid);
 
-        void registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        string registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult<Pomelo.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid);
 
@@ -366,11 +366,11 @@ namespace Pomelo
 
         Ice.AsyncResult begin_registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__);
 
-        void end_registerGameServer(Ice.AsyncResult r__);
+        string end_registerGameServer(Ice.AsyncResult r__);
 
-        void getUnitHP(string instanceId, int objectId);
+        int getUnitHP(string instanceId, int objectId);
 
-        void getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        int getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult<Pomelo.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId);
 
@@ -380,7 +380,7 @@ namespace Pomelo
 
         Ice.AsyncResult begin_getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__);
 
-        void end_getUnitHP(Ice.AsyncResult r__);
+        int end_getUnitHP(Ice.AsyncResult r__);
     }
 }
 
@@ -413,7 +413,7 @@ namespace Pomelo
         /// </summary>
         /// <param name="cb__">The callback object for the operation.</param>
         /// <param name="current__">The Current object for the invocation.</param>
-        void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, Ice.Current current__);
+        void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, Ice.Current current__);
 
         void destroyZoneRequest_async(Pomelo.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId, Ice.Current current__);
 
@@ -432,7 +432,7 @@ namespace Pomelo
 
         void playerNetStateChanged_async(Pomelo.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state, Ice.Current current__);
 
-        void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverID, Ice.Current current__);
+        void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverId, Ice.Current current__);
 
         void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid, Ice.Current current__);
 
@@ -452,7 +452,7 @@ namespace Pomelo
         /// 场景副本相关协议
         /// </summary>
         /// <param name="cb__">The callback object for the operation.</param>
-        void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data);
+        void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data);
 
         void destroyZoneRequest_async(Pomelo.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId);
 
@@ -470,7 +470,7 @@ namespace Pomelo
 
         void playerNetStateChanged_async(Pomelo.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state);
 
-        void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverID);
+        void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverId);
 
         void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid);
 
@@ -727,19 +727,20 @@ namespace Pomelo
             end_clearAllPlayersRequest(begin_clearAllPlayersRequest(context__, explicitCtx__, true, null, null));
         }
 
-        public void createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data)
+        public int createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data)
         {
-            this.createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, null, false);
+            return this.createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, force, data, null, false);
         }
 
-        public void createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public int createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
-            this.createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, ctx__, true);
+            return this.createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, force, data, ctx__, true);
         }
 
-        private void createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
+        private int createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
         {
-            end_createZoneRequest(begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, context__, explicitCtx__, true, null, null));
+            checkTwowayOnly__(__createZoneRequest_name);
+            return end_createZoneRequest(begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, force, data, context__, explicitCtx__, true, null, null));
         }
 
         public void destroyZoneRequest(string instanceId)
@@ -773,34 +774,36 @@ namespace Pomelo
             return end_getAllPlayerCountRequest(begin_getAllPlayerCountRequest(context__, explicitCtx__, true, null, null));
         }
 
-        public void getServerState(string serverID)
+        public string getServerState(string serverId)
         {
-            this.getServerState(serverID, null, false);
+            return this.getServerState(serverId, null, false);
         }
 
-        public void getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public string getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
-            this.getServerState(serverID, ctx__, true);
+            return this.getServerState(serverId, ctx__, true);
         }
 
-        private void getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
+        private string getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
         {
-            end_getServerState(begin_getServerState(serverID, context__, explicitCtx__, true, null, null));
+            checkTwowayOnly__(__getServerState_name);
+            return end_getServerState(begin_getServerState(serverId, context__, explicitCtx__, true, null, null));
         }
 
-        public void getUnitHP(string instanceId, int objectId)
+        public int getUnitHP(string instanceId, int objectId)
         {
-            this.getUnitHP(instanceId, objectId, null, false);
+            return this.getUnitHP(instanceId, objectId, null, false);
         }
 
-        public void getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public int getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
-            this.getUnitHP(instanceId, objectId, ctx__, true);
+            return this.getUnitHP(instanceId, objectId, ctx__, true);
         }
 
-        private void getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
+        private int getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
         {
-            end_getUnitHP(begin_getUnitHP(instanceId, objectId, context__, explicitCtx__, true, null, null));
+            checkTwowayOnly__(__getUnitHP_name);
+            return end_getUnitHP(begin_getUnitHP(instanceId, objectId, context__, explicitCtx__, true, null, null));
         }
 
         public void playerEnterRequest(string playerId, string instanceId, string data)
@@ -848,19 +851,20 @@ namespace Pomelo
             end_playerNetStateChanged(begin_playerNetStateChanged(playerId, state, context__, explicitCtx__, true, null, null));
         }
 
-        public void registerGameServer(int serverid, int crossid)
+        public string registerGameServer(int serverid, int crossid)
         {
-            this.registerGameServer(serverid, crossid, null, false);
+            return this.registerGameServer(serverid, crossid, null, false);
         }
 
-        public void registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public string registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
-            this.registerGameServer(serverid, crossid, ctx__, true);
+            return this.registerGameServer(serverid, crossid, ctx__, true);
         }
 
-        private void registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
+        private string registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> context__, bool explicitCtx__)
         {
-            end_registerGameServer(begin_registerGameServer(serverid, crossid, context__, explicitCtx__, true, null, null));
+            checkTwowayOnly__(__registerGameServer_name);
+            return end_registerGameServer(begin_registerGameServer(serverid, crossid, context__, explicitCtx__, true, null, null));
         }
 
         public int setCallback(Ice.Identity ident, string srvUUID)
@@ -938,36 +942,60 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data)
+        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data)
         {
-            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, null, false, false, null, null);
+            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, force, data, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
-            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, ctx__, true, false, null, null);
+            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, force, data, ctx__, true, false, null, null);
         }
 
-        public Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, Ice.AsyncCallback cb__, object cookie__)
+        public Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, Ice.AsyncCallback cb__, object cookie__)
         {
-            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, null, false, false, cb__, cookie__);
+            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, force, data, null, false, false, cb__, cookie__);
         }
 
-        public Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__)
+        public Ice.AsyncResult begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__)
         {
-            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, ctx__, true, false, cb__, cookie__);
+            return begin_createZoneRequest(playerId, gameServerId, mapTemplateId, instanceId, force, data, ctx__, true, false, cb__, cookie__);
         }
 
         private const string __createZoneRequest_name = "createZoneRequest";
 
-        public void end_createZoneRequest(Ice.AsyncResult r__)
+        public int end_createZoneRequest(Ice.AsyncResult r__)
         {
-            end__(r__, __createZoneRequest_name);
+            IceInternal.OutgoingAsync outAsync__ = IceInternal.OutgoingAsync.check(r__, this, __createZoneRequest_name);
+            try
+            {
+                if(!outAsync__.wait())
+                {
+                    try
+                    {
+                        outAsync__.throwUserException();
+                    }
+                    catch(Ice.UserException ex__)
+                    {
+                        throw new Ice.UnknownUserException(ex__.ice_name(), ex__);
+                    }
+                }
+                int ret__;
+                IceInternal.BasicStream is__ = outAsync__.startReadParams();
+                ret__ = is__.readInt();
+                outAsync__.endReadParams();
+                return ret__;
+            }
+            finally
+            {
+                outAsync__.cacheMessageBuffers();
+            }
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_createZoneRequest> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_createZoneRequest>(__createZoneRequest_name, createZoneRequest_completed__, cookie__);
+            checkAsyncTwowayOnly__(__createZoneRequest_name);
+            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_createZoneRequest> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_createZoneRequest>(__createZoneRequest_name, createZoneRequest_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -980,7 +1008,7 @@ namespace Pomelo
                 os__.writeString(gameServerId);
                 os__.writeInt(mapTemplateId);
                 os__.writeString(instanceId);
-                os__.writeBool(forceCreate);
+                os__.writeBool(force);
                 os__.writeString(data);
                 result__.endWriteParams();
                 result__.invoke();
@@ -992,11 +1020,24 @@ namespace Pomelo
             return result__;
         }
 
-        private void createZoneRequest_completed__(Pomelo.Callback_ZoneManager_createZoneRequest cb__)
+        private void createZoneRequest_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_createZoneRequest cb__, Ice.ExceptionCallback excb__)
         {
+            int ret__;
+            try
+            {
+                ret__ = end_createZoneRequest(r__);
+            }
+            catch(Ice.Exception ex__)
+            {
+                if(excb__ != null)
+                {
+                    excb__(ex__);
+                }
+                return;
+            }
             if(cb__ != null)
             {
-                cb__();
+                cb__(ret__);
             }
         }
 
@@ -1149,36 +1190,60 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverID)
+        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverId)
         {
-            return begin_getServerState(serverID, null, false, false, null, null);
+            return begin_getServerState(serverId, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
-            return begin_getServerState(serverID, ctx__, true, false, null, null);
+            return begin_getServerState(serverId, ctx__, true, false, null, null);
         }
 
-        public Ice.AsyncResult begin_getServerState(string serverID, Ice.AsyncCallback cb__, object cookie__)
+        public Ice.AsyncResult begin_getServerState(string serverId, Ice.AsyncCallback cb__, object cookie__)
         {
-            return begin_getServerState(serverID, null, false, false, cb__, cookie__);
+            return begin_getServerState(serverId, null, false, false, cb__, cookie__);
         }
 
-        public Ice.AsyncResult begin_getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__)
+        public Ice.AsyncResult begin_getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__, Ice.AsyncCallback cb__, object cookie__)
         {
-            return begin_getServerState(serverID, ctx__, true, false, cb__, cookie__);
+            return begin_getServerState(serverId, ctx__, true, false, cb__, cookie__);
         }
 
         private const string __getServerState_name = "getServerState";
 
-        public void end_getServerState(Ice.AsyncResult r__)
+        public string end_getServerState(Ice.AsyncResult r__)
         {
-            end__(r__, __getServerState_name);
+            IceInternal.OutgoingAsync outAsync__ = IceInternal.OutgoingAsync.check(r__, this, __getServerState_name);
+            try
+            {
+                if(!outAsync__.wait())
+                {
+                    try
+                    {
+                        outAsync__.throwUserException();
+                    }
+                    catch(Ice.UserException ex__)
+                    {
+                        throw new Ice.UnknownUserException(ex__.ice_name(), ex__);
+                    }
+                }
+                string ret__;
+                IceInternal.BasicStream is__ = outAsync__.startReadParams();
+                ret__ = is__.readString();
+                outAsync__.endReadParams();
+                return ret__;
+            }
+            finally
+            {
+                outAsync__.cacheMessageBuffers();
+            }
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverID, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_getServerState> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_getServerState>(__getServerState_name, getServerState_completed__, cookie__);
+            checkAsyncTwowayOnly__(__getServerState_name);
+            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getServerState> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getServerState>(__getServerState_name, getServerState_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1187,7 +1252,7 @@ namespace Pomelo
             {
                 result__.prepare(__getServerState_name, Ice.OperationMode.Normal, ctx__, explicitContext__, synchronous__);
                 IceInternal.BasicStream os__ = result__.startWriteParams(Ice.FormatType.DefaultFormat);
-                os__.writeString(serverID);
+                os__.writeString(serverId);
                 result__.endWriteParams();
                 result__.invoke();
             }
@@ -1198,11 +1263,24 @@ namespace Pomelo
             return result__;
         }
 
-        private void getServerState_completed__(Pomelo.Callback_ZoneManager_getServerState cb__)
+        private void getServerState_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_getServerState cb__, Ice.ExceptionCallback excb__)
         {
+            string ret__;
+            try
+            {
+                ret__ = end_getServerState(r__);
+            }
+            catch(Ice.Exception ex__)
+            {
+                if(excb__ != null)
+                {
+                    excb__(ex__);
+                }
+                return;
+            }
             if(cb__ != null)
             {
-                cb__();
+                cb__(ret__);
             }
         }
 
@@ -1228,14 +1306,38 @@ namespace Pomelo
 
         private const string __getUnitHP_name = "getUnitHP";
 
-        public void end_getUnitHP(Ice.AsyncResult r__)
+        public int end_getUnitHP(Ice.AsyncResult r__)
         {
-            end__(r__, __getUnitHP_name);
+            IceInternal.OutgoingAsync outAsync__ = IceInternal.OutgoingAsync.check(r__, this, __getUnitHP_name);
+            try
+            {
+                if(!outAsync__.wait())
+                {
+                    try
+                    {
+                        outAsync__.throwUserException();
+                    }
+                    catch(Ice.UserException ex__)
+                    {
+                        throw new Ice.UnknownUserException(ex__.ice_name(), ex__);
+                    }
+                }
+                int ret__;
+                IceInternal.BasicStream is__ = outAsync__.startReadParams();
+                ret__ = is__.readInt();
+                outAsync__.endReadParams();
+                return ret__;
+            }
+            finally
+            {
+                outAsync__.cacheMessageBuffers();
+            }
         }
 
         private Ice.AsyncResult<Pomelo.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_getUnitHP> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_getUnitHP>(__getUnitHP_name, getUnitHP_completed__, cookie__);
+            checkAsyncTwowayOnly__(__getUnitHP_name);
+            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getUnitHP> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getUnitHP>(__getUnitHP_name, getUnitHP_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1256,11 +1358,24 @@ namespace Pomelo
             return result__;
         }
 
-        private void getUnitHP_completed__(Pomelo.Callback_ZoneManager_getUnitHP cb__)
+        private void getUnitHP_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_getUnitHP cb__, Ice.ExceptionCallback excb__)
         {
+            int ret__;
+            try
+            {
+                ret__ = end_getUnitHP(r__);
+            }
+            catch(Ice.Exception ex__)
+            {
+                if(excb__ != null)
+                {
+                    excb__(ex__);
+                }
+                return;
+            }
             if(cb__ != null)
             {
-                cb__();
+                cb__(ret__);
             }
         }
 
@@ -1462,14 +1577,38 @@ namespace Pomelo
 
         private const string __registerGameServer_name = "registerGameServer";
 
-        public void end_registerGameServer(Ice.AsyncResult r__)
+        public string end_registerGameServer(Ice.AsyncResult r__)
         {
-            end__(r__, __registerGameServer_name);
+            IceInternal.OutgoingAsync outAsync__ = IceInternal.OutgoingAsync.check(r__, this, __registerGameServer_name);
+            try
+            {
+                if(!outAsync__.wait())
+                {
+                    try
+                    {
+                        outAsync__.throwUserException();
+                    }
+                    catch(Ice.UserException ex__)
+                    {
+                        throw new Ice.UnknownUserException(ex__.ice_name(), ex__);
+                    }
+                }
+                string ret__;
+                IceInternal.BasicStream is__ = outAsync__.startReadParams();
+                ret__ = is__.readString();
+                outAsync__.endReadParams();
+                return ret__;
+            }
+            finally
+            {
+                outAsync__.cacheMessageBuffers();
+            }
         }
 
         private Ice.AsyncResult<Pomelo.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_registerGameServer> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_registerGameServer>(__registerGameServer_name, registerGameServer_completed__, cookie__);
+            checkAsyncTwowayOnly__(__registerGameServer_name);
+            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_registerGameServer> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_registerGameServer>(__registerGameServer_name, registerGameServer_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1490,11 +1629,24 @@ namespace Pomelo
             return result__;
         }
 
-        private void registerGameServer_completed__(Pomelo.Callback_ZoneManager_registerGameServer cb__)
+        private void registerGameServer_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_registerGameServer cb__, Ice.ExceptionCallback excb__)
         {
+            string ret__;
+            try
+            {
+                ret__ = end_registerGameServer(r__);
+            }
+            catch(Ice.Exception ex__)
+            {
+                if(excb__ != null)
+                {
+                    excb__(ex__);
+                }
+                return;
+            }
             if(cb__ != null)
             {
-                cb__();
+                cb__(ret__);
             }
         }
 
@@ -1893,12 +2045,12 @@ namespace Pomelo
 
         public abstract int setCallback(Ice.Identity ident, string srvUUID, Ice.Current current__);
 
-        public void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data)
+        public void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data)
         {
-            createZoneRequest_async(cb__, playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, Ice.ObjectImpl.defaultCurrent);
+            createZoneRequest_async(cb__, playerId, gameServerId, mapTemplateId, instanceId, force, data, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data, Ice.Current current__);
+        public abstract void createZoneRequest_async(Pomelo.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, Ice.Current current__);
 
         public void destroyZoneRequest_async(Pomelo.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId)
         {
@@ -1942,12 +2094,12 @@ namespace Pomelo
 
         public abstract void playerNetStateChanged_async(Pomelo.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state, Ice.Current current__);
 
-        public void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverID)
+        public void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverId)
         {
-            getServerState_async(cb__, serverID, Ice.ObjectImpl.defaultCurrent);
+            getServerState_async(cb__, serverId, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverID, Ice.Current current__);
+        public abstract void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverId, Ice.Current current__);
 
         public void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid)
         {
@@ -2039,19 +2191,19 @@ namespace Pomelo
             string gameServerId;
             int mapTemplateId;
             string instanceId;
-            bool forceCreate;
+            bool force;
             string data;
             playerId = is__.readString();
             gameServerId = is__.readString();
             mapTemplateId = is__.readInt();
             instanceId = is__.readString();
-            forceCreate = is__.readBool();
+            force = is__.readBool();
             data = is__.readString();
             inS__.endReadParams();
             AMD_ZoneManager_createZoneRequest cb__ = new _AMD_ZoneManager_createZoneRequest(inS__);
             try
             {
-                obj__.createZoneRequest_async(cb__, playerId, gameServerId, mapTemplateId, instanceId, forceCreate, data, current__);
+                obj__.createZoneRequest_async(cb__, playerId, gameServerId, mapTemplateId, instanceId, force, data, current__);
             }
             catch(_System.Exception ex__)
             {
@@ -2189,13 +2341,13 @@ namespace Pomelo
         {
             Ice.ObjectImpl.checkMode__(Ice.OperationMode.Normal, current__.mode);
             IceInternal.BasicStream is__ = inS__.startReadParams();
-            string serverID;
-            serverID = is__.readString();
+            string serverId;
+            serverId = is__.readString();
             inS__.endReadParams();
             AMD_ZoneManager_getServerState cb__ = new _AMD_ZoneManager_getServerState(inS__);
             try
             {
-                obj__.getServerState_async(cb__, serverID, current__);
+                obj__.getServerState_async(cb__, serverId, current__);
             }
             catch(_System.Exception ex__)
             {
@@ -2376,7 +2528,7 @@ namespace Pomelo
         /// ice_response indicates that
         /// the operation completed successfully.
         /// </summary>
-        void ice_response();
+        void ice_response(int ret__);
     }
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
@@ -2386,11 +2538,21 @@ namespace Pomelo
         {
         }
 
-        public void ice_response()
+        public void ice_response(int ret__)
         {
             if(validateResponse__(true))
             {
-                writeEmptyParams__();
+                try
+                {
+                    IceInternal.BasicStream os__ = startWriteParams__(Ice.FormatType.DefaultFormat);
+                    os__.writeInt(ret__);
+                    endWriteParams__(true);
+                }
+                catch(Ice.LocalException ex__)
+                {
+                    exception__(ex__);
+                    return;
+                }
                 response__();
             }
         }
@@ -2561,7 +2723,7 @@ namespace Pomelo
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
     public interface AMD_ZoneManager_getServerState : Ice.AMDCallback
     {
-        void ice_response();
+        void ice_response(string ret__);
     }
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
@@ -2571,11 +2733,21 @@ namespace Pomelo
         {
         }
 
-        public void ice_response()
+        public void ice_response(string ret__)
         {
             if(validateResponse__(true))
             {
-                writeEmptyParams__();
+                try
+                {
+                    IceInternal.BasicStream os__ = startWriteParams__(Ice.FormatType.DefaultFormat);
+                    os__.writeString(ret__);
+                    endWriteParams__(true);
+                }
+                catch(Ice.LocalException ex__)
+                {
+                    exception__(ex__);
+                    return;
+                }
                 response__();
             }
         }
@@ -2585,7 +2757,7 @@ namespace Pomelo
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
     public interface AMD_ZoneManager_registerGameServer : Ice.AMDCallback
     {
-        void ice_response();
+        void ice_response(string ret__);
     }
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
@@ -2595,11 +2767,21 @@ namespace Pomelo
         {
         }
 
-        public void ice_response()
+        public void ice_response(string ret__)
         {
             if(validateResponse__(true))
             {
-                writeEmptyParams__();
+                try
+                {
+                    IceInternal.BasicStream os__ = startWriteParams__(Ice.FormatType.DefaultFormat);
+                    os__.writeString(ret__);
+                    endWriteParams__(true);
+                }
+                catch(Ice.LocalException ex__)
+                {
+                    exception__(ex__);
+                    return;
+                }
                 response__();
             }
         }
@@ -2609,7 +2791,7 @@ namespace Pomelo
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
     public interface AMD_ZoneManager_getUnitHP : Ice.AMDCallback
     {
-        void ice_response();
+        void ice_response(int ret__);
     }
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
@@ -2619,11 +2801,21 @@ namespace Pomelo
         {
         }
 
-        public void ice_response()
+        public void ice_response(int ret__)
         {
             if(validateResponse__(true))
             {
-                writeEmptyParams__();
+                try
+                {
+                    IceInternal.BasicStream os__ = startWriteParams__(Ice.FormatType.DefaultFormat);
+                    os__.writeInt(ret__);
+                    endWriteParams__(true);
+                }
+                catch(Ice.LocalException ex__)
+                {
+                    exception__(ex__);
+                    return;
+                }
                 response__();
             }
         }

Common/Pomelo/PomeloShare/slice/ZoneManager.ice

@@ -5,13 +5,15 @@
 // **********************************************************************
 
 #pragma once
+
 #include <Ice/Identity.ice>
 
 module Pomelo
 { 
+
 	//场景管理事件回调
 	interface ZoneManagerCallback
-	{ 
+	{
 	   //事件通知
 	   void  eventNotify(string eventType,string msg);
 	};
@@ -25,8 +27,8 @@ module Pomelo
 
 		/************************************场景副本相关协议********************************************/
 
-		//创建场景副本实例
-		["amd"] void createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool forceCreate, string data);
+		//创建场景副本实例, 0成功，1-战斗中不允许传送
+		["amd"] int createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data);
 
 		//删除场景副本实例
 		["amd"] void destroyZoneRequest(string instanceId);
@@ -48,10 +50,13 @@ module Pomelo
 		//玩家网络状况改变 {connected, disconnected, }
 		["amd"] void playerNetStateChanged(string playerId, string state);
 
-		["amd"] void getServerState(string serverID);
-		["amd"] void registerGameServer(int serverid, int crossid);
-		["amd"] void getUnitHP(string instanceId, int objectId);
+		["amd"] string getServerState(string serverId);
+		
+		//游戏服注册
+		["amd"] string registerGameServer(int serverid, int crossid);
 		
+		//获得指定单位的血量信息
+		["amd"] int getUnitHP(string instanceId, int objectId);
 	};
 
 };

XmdsServerCS/XmdsServerEdgeJS/slice/XmdsManager.ice

@@ -13,6 +13,8 @@ module Xmds
 		string itemIcon;
 		int quality;
 		int num;
+		string instanceId;
+		int objectId;
 	};
 	
 	/**getPlayerPKInfoData*/
@@ -70,13 +72,13 @@ module Xmds
 		//获取场景副本实例静态数据
 		string getZoneStaticData(string instanceId);
 
-		//获取场景副本中有效的刷新区域
+		//(异步) 获取场景副本中有效的刷新区域
 		string getZoneRegions(string instanceId);
 
 		// 获取跨场景出生坐标
-		string getBornPlace(string instanceId, int areaId);
+		string getBornPlace(string instanceId, int areaId, string pointId);
 
-		//获取场景副本所有的单位信息
+		//(异步) 获取场景副本所有的单位信息
 		string getAllUnitInfo(string instanceId);
 
 		//获取场景副本所有的npc信息
@@ -119,7 +121,7 @@ module Xmds
 		void refreshPlayerPetBaseInfoChange(string playerId, string data);
 
 		// 玩家宠物全部信息变更
-		void refreshPlayerPetDataChange(string playerId, int type, string data);
+		int refreshPlayerPetDataChange(string playerId, int type, string data);
 
 		// 玩家战斗信息同步
 		void refreshPlayerBattleEffect(string playerId, string effects);
@@ -129,6 +131,9 @@ module Xmds
 
 		// 玩家技能信息同步
 		void refreshPlayerSkill(string playerId, int operateID , string skills);
+		
+		//技能
+		void playerChangeSkill(string playerId, int oldSkillID, int newSkillID, string data);
 	
 		// 玩家时装信息同步
 		void refreshPlayerAvatar(string playerId, string avatars);
@@ -145,8 +150,8 @@ module Xmds
 		// 角色关联属性变更
 		void refreshPlayerPropertyChange(string playerId, string data);
 
-		// 玩家pk模式同步 
-		void refreshPlayerPKMode(string playerId, int mode);  
+		// 玩家pk模式同步,同createZoneRequest返回
+		int refreshPlayerPKMode(string playerId, bool isLook, int mode);  
 
 		// 玩家pk值同步
 		void refreshPlayerPKValue(string playerId, int value);   
@@ -163,6 +168,9 @@ module Xmds
 		// 宠物加血判断
 		bool canUseItem(string playerId);
 
+		//玩家指定路点传送 
+		bool transferToPointPos(string instanceId, string playerId, string point, bool setDirection, float direction);
+
 		// 宠物加血
 		void refreshPlayerPetPropertyChange(string playerId, string data);
 
@@ -170,10 +178,10 @@ module Xmds
 		string getPlayerPetData(string playerId);
 
 		// 触发特殊战斗事件
-		void triggrBattleFunction(string playerId, int eventId, string data);
+		void triggrBattleFunction(string playerId, int eventId, int value1, int valu2, int valu3, int valu4, int value5, int value6);
 
-		// 往场景内种怪
-		void addUnits(string instanceId, string data);
+		// 往场景内种怪(Unit), 只创建一个怪物时，返回怪物ObjectId； 多个返回0；失败-1
+		int addUnits(string instanceId, string data);
 
 		// 切换宠物pk模式
 		void refreshPlayerPetFollowModeChange(string playerId, int mode);
@@ -188,17 +196,32 @@ module Xmds
 		void autoBattle(string instanceId, string playerId, bool enable);
 
 		// 获取玩家统计
-		string getPlayerStatistic(string playerId);
+		string getPlayerStatistic(string instanceId, string playerId, int flag);
 		
 		// 获取场景统计
 		string getInstanceStatistic(string instanceId);
 		
-		//刷NPC
+		//刷NPC(Item)
 		int addUnit(string instanceId, int unitTemplateID, string data);
 
-		//移除NPC
+		//移除NPC(item), 固定unitId
 		void removeUnit(string instanceId, int unitId);
 		
-	}; 
+		//移除单位，战斗服创建的unit
+		void removePointUnit(string instanceId, int unitObjectId);
+		
+		//移除物品
+		void removeItem(string instanceId, int itemId);
+		
+		//切换玩家状态， 14-传功，15-打坐
+		//time锁定时间，秒
+		void changePlayerState(string instanceId, string playerId, byte status, int time);
+		
+		//独立打坐功能，服务器处理
+		void playerChuanGong(string instanceId, string playerIdA, string playerIdB);
+		
+		//山大王死亡，通知事件
+		void mountainKingRefreshNotify(string instanceId, string data);		
+	};
 };
 

XmdsVSPlugins/XmdsCommonSkill/XmdsCommonSkill.csproj

@@ -144,7 +144,6 @@
     <Compile Include="Plugin\Buffs\Xmds_Fridge.cs" />
     <Compile Include="Plugin\base\JSGPlayerCardSkillBase.cs" />
     <Compile Include="Plugin\FunctionEvent\base\XmdsBattleFunctionEvent_9003.cs" />
-    <Compile Include="Plugin\FunctionEvent\base_gs\XmdsBattleFunctionEvent_9501.cs" />
     <Compile Include="Plugin\PassiveSkills\other\Other_100105.cs" />
     <Compile Include="Plugin\Skills\CardSkill\00_base\CardSkill_XuanWuBase.cs" />
     <Compile Include="Plugin\Skills\CardSkill\00_base\CardSkill_LiangYiBase.cs" />

test/BSServer.csproj

@@ -80,9 +80,8 @@
     <Reference Include="log4net">
       <HintPath>..\Library\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Common\Library\SuperSocket(1.6.6).Binaries\Net45\Release\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\Library\Debug\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SuperSocket.Common">
       <HintPath>..\Common\Library\SuperSocket.2022.3.10\Release\SuperSocket.Common.dll</HintPath>

test/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<appSettings>
-		<add key="zoneConfig.assetPath" value="D:\XMDS_TEMP\GameEditors\GameEditor\data"/>
+		<add key="zoneConfig.assetPath" value="E:\GameEditors\GameEditor\data"/>
 		<add key="logConfig.configFile" value="log4net"/>
 		<add key="logConfig.serverId" value="csharp-server-11"/>
 		<add key="logConfig.outputPath" value="../log/"/>