修改了ICE接口的namespace

Common/Pomelo/PomeloShare/IceManager.cs

@@ -5,6 +5,7 @@ using System.Web.Helpers;
 using CommonLang;
 using System.Collections.Concurrent;
 using Pomelo.JSGModule;
+using BattleIce;
 
 namespace Pomelo
 {
@@ -179,9 +180,6 @@ namespace Pomelo
             }
         }
 
-
-
-
         public int setCallback(string gameServerId, string srvUUID, ZoneManagerCallbackPrx client, ZoneManagerCallbackPrx callback)
         {
             lock (callbacks)
@@ -282,6 +280,7 @@ namespace Pomelo
             Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CSharp");
             foreach (var e in proxys)
             {
+                log.Warn($"add ice adapter: {e.Key}");
                 adapter.add(e.Value, communicator().stringToIdentity(e.Key));
             }
             adapter.activate();

Common/Pomelo/PomeloShare/ZoneManagerI.cs

@@ -5,6 +5,8 @@ using System.Web.Helpers;
 using CommonLang.Log;
 using System.Collections;
 using Pomelo.JSGModule;
+using System.Threading;
+using BattleIce;
 
 namespace Pomelo
 {
@@ -205,7 +207,7 @@ namespace Pomelo
             });
         }
 
-        public override void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid, Ice.Current current__)
+        public override void registerGameServer_async(AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid, Ice.Current current__)
         {
 			zone.RegisterGameServer(serverid, crossid, (err, ret) =>
             {
@@ -235,5 +237,5 @@ namespace Pomelo
 				}
 			});
 		}
-	}
+    }
 }

Common/Pomelo/PomeloShare/generated/ZoneManager.cs

@@ -28,7 +28,7 @@ namespace IceCompactId
 {
 }
 
-namespace Pomelo
+namespace BattleIce
 {
     [_System.Runtime.InteropServices.ComVisible(false)]
     [_System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704")]
@@ -61,7 +61,7 @@ namespace Pomelo
     }
 }
 
-namespace Pomelo
+namespace BattleIce
 {
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
     public delegate void Callback_ZoneManagerCallback_eventNotify();
@@ -100,7 +100,7 @@ namespace Pomelo
     public delegate void Callback_ZoneManager_getUnitHP(int ret__);
 }
 
-namespace Pomelo
+namespace BattleIce
 {
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
     public interface ZoneManagerCallbackPrx : Ice.ObjectPrx
@@ -109,9 +109,9 @@ namespace Pomelo
 
         void eventNotify(string eventType, string msg, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_eventNotify(string eventType, string msg, Ice.AsyncCallback cb__, object cookie__);
 
@@ -140,14 +140,14 @@ namespace Pomelo
         /// 场景管理器相关协议
         /// </summary>
         /// <returns>An asynchronous result object.</returns>
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID);
 
         /// <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_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         /// <summary>
         /// 场景管理器相关协议
@@ -189,14 +189,14 @@ namespace Pomelo
         /// 场景副本相关协议
         /// </summary>
         /// <returns>An asynchronous result object.</returns>
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data);
+        Ice.AsyncResult<BattleIce.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 force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.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>
         /// 场景副本相关协议
@@ -225,9 +225,9 @@ namespace Pomelo
 
         void destroyZoneRequest(string instanceId, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_destroyZoneRequest(string instanceId, Ice.AsyncCallback cb__, object cookie__);
 
@@ -252,14 +252,14 @@ namespace Pomelo
         /// 玩家相关协议
         /// </summary>
         /// <returns>An asynchronous result object.</returns>
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest();
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest();
 
         /// <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_clearAllPlayersRequest> begin_clearAllPlayersRequest(_System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest(_System.Collections.Generic.Dictionary<string, string> ctx__);
 
         /// <summary>
         /// 玩家相关协议
@@ -288,9 +288,9 @@ namespace Pomelo
 
         int getAllPlayerCountRequest(_System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest();
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest();
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest(_System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest(_System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_getAllPlayerCountRequest(Ice.AsyncCallback cb__, object cookie__);
 
@@ -302,9 +302,9 @@ namespace Pomelo
 
         void playerEnterRequest(string playerId, string instanceId, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_playerEnterRequest(string playerId, string instanceId, string data, Ice.AsyncCallback cb__, object cookie__);
 
@@ -316,9 +316,9 @@ namespace Pomelo
 
         void playerLeaveRequest(string playerId, string instanceId, bool keepObject, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject, Ice.AsyncCallback cb__, object cookie__);
 
@@ -330,9 +330,9 @@ namespace Pomelo
 
         void playerNetStateChanged(string playerId, string state, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_playerNetStateChanged(string playerId, string state, Ice.AsyncCallback cb__, object cookie__);
 
@@ -344,9 +344,9 @@ namespace Pomelo
 
         string getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverId);
+        Ice.AsyncResult<BattleIce.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<BattleIce.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__);
 
@@ -358,9 +358,9 @@ namespace Pomelo
 
         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);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_registerGameServer(int serverid, int crossid, Ice.AsyncCallback cb__, object cookie__);
 
@@ -372,9 +372,9 @@ namespace Pomelo
 
         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);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId);
 
-        Ice.AsyncResult<Pomelo.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__);
+        Ice.AsyncResult<BattleIce.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         Ice.AsyncResult begin_getUnitHP(string instanceId, int objectId, Ice.AsyncCallback cb__, object cookie__);
 
@@ -384,7 +384,7 @@ namespace Pomelo
     }
 }
 
-namespace Pomelo
+namespace BattleIce
 {
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
     public interface ZoneManagerCallbackOperations_
@@ -413,30 +413,30 @@ 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 force, string data, Ice.Current current__);
+        void createZoneRequest_async(BattleIce.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__);
+        void destroyZoneRequest_async(BattleIce.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId, Ice.Current current__);
 
         /// <summary>
         /// 玩家相关协议
         /// </summary>
         /// <param name="cb__">The callback object for the operation.</param>
         /// <param name="current__">The Current object for the invocation.</param>
-        void clearAllPlayersRequest_async(Pomelo.AMD_ZoneManager_clearAllPlayersRequest cb__, Ice.Current current__);
+        void clearAllPlayersRequest_async(BattleIce.AMD_ZoneManager_clearAllPlayersRequest cb__, Ice.Current current__);
 
-        void getAllPlayerCountRequest_async(Pomelo.AMD_ZoneManager_getAllPlayerCountRequest cb__, Ice.Current current__);
+        void getAllPlayerCountRequest_async(BattleIce.AMD_ZoneManager_getAllPlayerCountRequest cb__, Ice.Current current__);
 
-        void playerEnterRequest_async(Pomelo.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data, Ice.Current current__);
+        void playerEnterRequest_async(BattleIce.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data, Ice.Current current__);
 
-        void playerLeaveRequest_async(Pomelo.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject, Ice.Current current__);
+        void playerLeaveRequest_async(BattleIce.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject, Ice.Current current__);
 
-        void playerNetStateChanged_async(Pomelo.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state, Ice.Current current__);
+        void playerNetStateChanged_async(BattleIce.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(BattleIce.AMD_ZoneManager_getServerState cb__, string serverId, Ice.Current current__);
 
-        void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid, Ice.Current current__);
+        void registerGameServer_async(BattleIce.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid, Ice.Current current__);
 
-        void getUnitHP_async(Pomelo.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId, Ice.Current current__);
+        void getUnitHP_async(BattleIce.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId, Ice.Current current__);
     }
 
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
@@ -452,33 +452,33 @@ 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 force, string data);
+        void createZoneRequest_async(BattleIce.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);
+        void destroyZoneRequest_async(BattleIce.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId);
 
         /// <summary>
         /// 玩家相关协议
         /// </summary>
         /// <param name="cb__">The callback object for the operation.</param>
-        void clearAllPlayersRequest_async(Pomelo.AMD_ZoneManager_clearAllPlayersRequest cb__);
+        void clearAllPlayersRequest_async(BattleIce.AMD_ZoneManager_clearAllPlayersRequest cb__);
 
-        void getAllPlayerCountRequest_async(Pomelo.AMD_ZoneManager_getAllPlayerCountRequest cb__);
+        void getAllPlayerCountRequest_async(BattleIce.AMD_ZoneManager_getAllPlayerCountRequest cb__);
 
-        void playerEnterRequest_async(Pomelo.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data);
+        void playerEnterRequest_async(BattleIce.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data);
 
-        void playerLeaveRequest_async(Pomelo.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject);
+        void playerLeaveRequest_async(BattleIce.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject);
 
-        void playerNetStateChanged_async(Pomelo.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state);
+        void playerNetStateChanged_async(BattleIce.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state);
 
-        void getServerState_async(Pomelo.AMD_ZoneManager_getServerState cb__, string serverId);
+        void getServerState_async(BattleIce.AMD_ZoneManager_getServerState cb__, string serverId);
 
-        void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid);
+        void registerGameServer_async(BattleIce.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid);
 
-        void getUnitHP_async(Pomelo.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId);
+        void getUnitHP_async(BattleIce.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId);
     }
 }
 
-namespace Pomelo
+namespace BattleIce
 {
     [_System.Runtime.InteropServices.ComVisible(false)]
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
@@ -505,12 +505,12 @@ namespace Pomelo
 
         #region Asynchronous operations
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg)
         {
             return begin_eventNotify(eventType, msg, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_eventNotify(eventType, msg, ctx__, true, false, null, null);
         }
@@ -532,9 +532,9 @@ namespace Pomelo
             end__(r__, __eventNotify_name);
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManagerCallback_eventNotify> begin_eventNotify(string eventType, string msg, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManagerCallback_eventNotify> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManagerCallback_eventNotify>(__eventNotify_name, eventNotify_completed__, cookie__);
+            IceInternal.OnewayOutgoingAsync<BattleIce.Callback_ZoneManagerCallback_eventNotify> result__ = getOnewayOutgoingAsync<BattleIce.Callback_ZoneManagerCallback_eventNotify>(__eventNotify_name, eventNotify_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -555,7 +555,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void eventNotify_completed__(Pomelo.Callback_ZoneManagerCallback_eventNotify cb__)
+        private void eventNotify_completed__(BattleIce.Callback_ZoneManagerCallback_eventNotify cb__)
         {
             if(cb__ != null)
             {
@@ -673,13 +673,13 @@ namespace Pomelo
 
         public static readonly string[] ids__ =
         {
-            "::Ice::Object",
-            "::Pomelo::ZoneManagerCallback"
+            "::BattleIce::ZoneManagerCallback",
+            "::Ice::Object"
         };
 
         public static string ice_staticId()
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         #endregion
@@ -887,12 +887,12 @@ namespace Pomelo
 
         #region Asynchronous operations
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest()
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest()
         {
             return begin_clearAllPlayersRequest(null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest(_System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest(_System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_clearAllPlayersRequest(ctx__, true, false, null, null);
         }
@@ -914,9 +914,9 @@ namespace Pomelo
             end__(r__, __clearAllPlayersRequest_name);
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest(_System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManager_clearAllPlayersRequest> begin_clearAllPlayersRequest(_System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_clearAllPlayersRequest> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_clearAllPlayersRequest>(__clearAllPlayersRequest_name, clearAllPlayersRequest_completed__, cookie__);
+            IceInternal.OnewayOutgoingAsync<BattleIce.Callback_ZoneManager_clearAllPlayersRequest> result__ = getOnewayOutgoingAsync<BattleIce.Callback_ZoneManager_clearAllPlayersRequest>(__clearAllPlayersRequest_name, clearAllPlayersRequest_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -934,7 +934,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void clearAllPlayersRequest_completed__(Pomelo.Callback_ZoneManager_clearAllPlayersRequest cb__)
+        private void clearAllPlayersRequest_completed__(BattleIce.Callback_ZoneManager_clearAllPlayersRequest cb__)
         {
             if(cb__ != null)
             {
@@ -942,12 +942,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_createZoneRequest> begin_createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data)
         {
             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 force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.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, force, data, ctx__, true, false, null, null);
         }
@@ -992,10 +992,10 @@ namespace Pomelo
             }
         }
 
-        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__)
+        private Ice.AsyncResult<BattleIce.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__)
         {
             checkAsyncTwowayOnly__(__createZoneRequest_name);
-            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_createZoneRequest> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_createZoneRequest>(__createZoneRequest_name, createZoneRequest_completed__, cookie__);
+            IceInternal.TwowayOutgoingAsync<BattleIce.Callback_ZoneManager_createZoneRequest> result__ =  getTwowayOutgoingAsync<BattleIce.Callback_ZoneManager_createZoneRequest>(__createZoneRequest_name, createZoneRequest_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1020,7 +1020,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void createZoneRequest_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_createZoneRequest cb__, Ice.ExceptionCallback excb__)
+        private void createZoneRequest_completed__(Ice.AsyncResult r__, BattleIce.Callback_ZoneManager_createZoneRequest cb__, Ice.ExceptionCallback excb__)
         {
             int ret__;
             try
@@ -1041,12 +1041,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId)
         {
             return begin_destroyZoneRequest(instanceId, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_destroyZoneRequest(instanceId, ctx__, true, false, null, null);
         }
@@ -1068,9 +1068,9 @@ namespace Pomelo
             end__(r__, __destroyZoneRequest_name);
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManager_destroyZoneRequest> begin_destroyZoneRequest(string instanceId, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_destroyZoneRequest> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_destroyZoneRequest>(__destroyZoneRequest_name, destroyZoneRequest_completed__, cookie__);
+            IceInternal.OnewayOutgoingAsync<BattleIce.Callback_ZoneManager_destroyZoneRequest> result__ = getOnewayOutgoingAsync<BattleIce.Callback_ZoneManager_destroyZoneRequest>(__destroyZoneRequest_name, destroyZoneRequest_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1090,7 +1090,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void destroyZoneRequest_completed__(Pomelo.Callback_ZoneManager_destroyZoneRequest cb__)
+        private void destroyZoneRequest_completed__(BattleIce.Callback_ZoneManager_destroyZoneRequest cb__)
         {
             if(cb__ != null)
             {
@@ -1098,12 +1098,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest()
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest()
         {
             return begin_getAllPlayerCountRequest(null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest(_System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest(_System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_getAllPlayerCountRequest(ctx__, true, false, null, null);
         }
@@ -1148,10 +1148,10 @@ namespace Pomelo
             }
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest(_System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManager_getAllPlayerCountRequest> begin_getAllPlayerCountRequest(_System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
             checkAsyncTwowayOnly__(__getAllPlayerCountRequest_name);
-            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getAllPlayerCountRequest> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getAllPlayerCountRequest>(__getAllPlayerCountRequest_name, getAllPlayerCountRequest_completed__, cookie__);
+            IceInternal.TwowayOutgoingAsync<BattleIce.Callback_ZoneManager_getAllPlayerCountRequest> result__ =  getTwowayOutgoingAsync<BattleIce.Callback_ZoneManager_getAllPlayerCountRequest>(__getAllPlayerCountRequest_name, getAllPlayerCountRequest_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1169,7 +1169,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void getAllPlayerCountRequest_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_getAllPlayerCountRequest cb__, Ice.ExceptionCallback excb__)
+        private void getAllPlayerCountRequest_completed__(Ice.AsyncResult r__, BattleIce.Callback_ZoneManager_getAllPlayerCountRequest cb__, Ice.ExceptionCallback excb__)
         {
             int ret__;
             try
@@ -1190,12 +1190,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getServerState> begin_getServerState(string serverId)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_getServerState> begin_getServerState(string serverId)
         {
             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<BattleIce.Callback_ZoneManager_getServerState> begin_getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_getServerState(serverId, ctx__, true, false, null, null);
         }
@@ -1240,10 +1240,10 @@ namespace Pomelo
             }
         }
 
-        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<BattleIce.Callback_ZoneManager_getServerState> begin_getServerState(string serverId, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
             checkAsyncTwowayOnly__(__getServerState_name);
-            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getServerState> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getServerState>(__getServerState_name, getServerState_completed__, cookie__);
+            IceInternal.TwowayOutgoingAsync<BattleIce.Callback_ZoneManager_getServerState> result__ =  getTwowayOutgoingAsync<BattleIce.Callback_ZoneManager_getServerState>(__getServerState_name, getServerState_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1263,7 +1263,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void getServerState_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_getServerState cb__, Ice.ExceptionCallback excb__)
+        private void getServerState_completed__(Ice.AsyncResult r__, BattleIce.Callback_ZoneManager_getServerState cb__, Ice.ExceptionCallback excb__)
         {
             string ret__;
             try
@@ -1284,12 +1284,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId)
         {
             return begin_getUnitHP(instanceId, objectId, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_getUnitHP> begin_getUnitHP(string instanceId, int objectId, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_getUnitHP(instanceId, objectId, ctx__, true, false, null, null);
         }
@@ -1334,10 +1334,10 @@ namespace Pomelo
             }
         }
 
-        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__)
+        private Ice.AsyncResult<BattleIce.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__)
         {
             checkAsyncTwowayOnly__(__getUnitHP_name);
-            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getUnitHP> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_getUnitHP>(__getUnitHP_name, getUnitHP_completed__, cookie__);
+            IceInternal.TwowayOutgoingAsync<BattleIce.Callback_ZoneManager_getUnitHP> result__ =  getTwowayOutgoingAsync<BattleIce.Callback_ZoneManager_getUnitHP>(__getUnitHP_name, getUnitHP_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1358,7 +1358,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void getUnitHP_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_getUnitHP cb__, Ice.ExceptionCallback excb__)
+        private void getUnitHP_completed__(Ice.AsyncResult r__, BattleIce.Callback_ZoneManager_getUnitHP cb__, Ice.ExceptionCallback excb__)
         {
             int ret__;
             try
@@ -1379,12 +1379,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data)
         {
             return begin_playerEnterRequest(playerId, instanceId, data, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_playerEnterRequest(playerId, instanceId, data, ctx__, true, false, null, null);
         }
@@ -1406,9 +1406,9 @@ namespace Pomelo
             end__(r__, __playerEnterRequest_name);
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerEnterRequest> begin_playerEnterRequest(string playerId, string instanceId, string data, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_playerEnterRequest> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_playerEnterRequest>(__playerEnterRequest_name, playerEnterRequest_completed__, cookie__);
+            IceInternal.OnewayOutgoingAsync<BattleIce.Callback_ZoneManager_playerEnterRequest> result__ = getOnewayOutgoingAsync<BattleIce.Callback_ZoneManager_playerEnterRequest>(__playerEnterRequest_name, playerEnterRequest_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1430,7 +1430,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void playerEnterRequest_completed__(Pomelo.Callback_ZoneManager_playerEnterRequest cb__)
+        private void playerEnterRequest_completed__(BattleIce.Callback_ZoneManager_playerEnterRequest cb__)
         {
             if(cb__ != null)
             {
@@ -1438,12 +1438,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject)
         {
             return begin_playerLeaveRequest(playerId, instanceId, keepObject, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_playerLeaveRequest(playerId, instanceId, keepObject, ctx__, true, false, null, null);
         }
@@ -1465,9 +1465,9 @@ namespace Pomelo
             end__(r__, __playerLeaveRequest_name);
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerLeaveRequest> begin_playerLeaveRequest(string playerId, string instanceId, bool keepObject, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_playerLeaveRequest> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_playerLeaveRequest>(__playerLeaveRequest_name, playerLeaveRequest_completed__, cookie__);
+            IceInternal.OnewayOutgoingAsync<BattleIce.Callback_ZoneManager_playerLeaveRequest> result__ = getOnewayOutgoingAsync<BattleIce.Callback_ZoneManager_playerLeaveRequest>(__playerLeaveRequest_name, playerLeaveRequest_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1489,7 +1489,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void playerLeaveRequest_completed__(Pomelo.Callback_ZoneManager_playerLeaveRequest cb__)
+        private void playerLeaveRequest_completed__(BattleIce.Callback_ZoneManager_playerLeaveRequest cb__)
         {
             if(cb__ != null)
             {
@@ -1497,12 +1497,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state)
         {
             return begin_playerNetStateChanged(playerId, state, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_playerNetStateChanged(playerId, state, ctx__, true, false, null, null);
         }
@@ -1524,9 +1524,9 @@ namespace Pomelo
             end__(r__, __playerNetStateChanged_name);
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManager_playerNetStateChanged> begin_playerNetStateChanged(string playerId, string state, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
-            IceInternal.OnewayOutgoingAsync<Pomelo.Callback_ZoneManager_playerNetStateChanged> result__ = getOnewayOutgoingAsync<Pomelo.Callback_ZoneManager_playerNetStateChanged>(__playerNetStateChanged_name, playerNetStateChanged_completed__, cookie__);
+            IceInternal.OnewayOutgoingAsync<BattleIce.Callback_ZoneManager_playerNetStateChanged> result__ = getOnewayOutgoingAsync<BattleIce.Callback_ZoneManager_playerNetStateChanged>(__playerNetStateChanged_name, playerNetStateChanged_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1547,7 +1547,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void playerNetStateChanged_completed__(Pomelo.Callback_ZoneManager_playerNetStateChanged cb__)
+        private void playerNetStateChanged_completed__(BattleIce.Callback_ZoneManager_playerNetStateChanged cb__)
         {
             if(cb__ != null)
             {
@@ -1555,12 +1555,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid)
         {
             return begin_registerGameServer(serverid, crossid, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_registerGameServer> begin_registerGameServer(int serverid, int crossid, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_registerGameServer(serverid, crossid, ctx__, true, false, null, null);
         }
@@ -1605,10 +1605,10 @@ namespace Pomelo
             }
         }
 
-        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__)
+        private Ice.AsyncResult<BattleIce.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__)
         {
             checkAsyncTwowayOnly__(__registerGameServer_name);
-            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_registerGameServer> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_registerGameServer>(__registerGameServer_name, registerGameServer_completed__, cookie__);
+            IceInternal.TwowayOutgoingAsync<BattleIce.Callback_ZoneManager_registerGameServer> result__ =  getTwowayOutgoingAsync<BattleIce.Callback_ZoneManager_registerGameServer>(__registerGameServer_name, registerGameServer_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1629,7 +1629,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void registerGameServer_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_registerGameServer cb__, Ice.ExceptionCallback excb__)
+        private void registerGameServer_completed__(Ice.AsyncResult r__, BattleIce.Callback_ZoneManager_registerGameServer cb__, Ice.ExceptionCallback excb__)
         {
             string ret__;
             try
@@ -1650,12 +1650,12 @@ namespace Pomelo
             }
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID)
         {
             return begin_setCallback(ident, srvUUID, null, false, false, null, null);
         }
 
-        public Ice.AsyncResult<Pomelo.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID, _System.Collections.Generic.Dictionary<string, string> ctx__)
+        public Ice.AsyncResult<BattleIce.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID, _System.Collections.Generic.Dictionary<string, string> ctx__)
         {
             return begin_setCallback(ident, srvUUID, ctx__, true, false, null, null);
         }
@@ -1700,10 +1700,10 @@ namespace Pomelo
             }
         }
 
-        private Ice.AsyncResult<Pomelo.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
+        private Ice.AsyncResult<BattleIce.Callback_ZoneManager_setCallback> begin_setCallback(Ice.Identity ident, string srvUUID, _System.Collections.Generic.Dictionary<string, string> ctx__, bool explicitContext__, bool synchronous__, Ice.AsyncCallback cb__, object cookie__)
         {
             checkAsyncTwowayOnly__(__setCallback_name);
-            IceInternal.TwowayOutgoingAsync<Pomelo.Callback_ZoneManager_setCallback> result__ =  getTwowayOutgoingAsync<Pomelo.Callback_ZoneManager_setCallback>(__setCallback_name, setCallback_completed__, cookie__);
+            IceInternal.TwowayOutgoingAsync<BattleIce.Callback_ZoneManager_setCallback> result__ =  getTwowayOutgoingAsync<BattleIce.Callback_ZoneManager_setCallback>(__setCallback_name, setCallback_completed__, cookie__);
             if(cb__ != null)
             {
                 result__.whenCompletedWithAsyncCallback(cb__);
@@ -1724,7 +1724,7 @@ namespace Pomelo
             return result__;
         }
 
-        private void setCallback_completed__(Ice.AsyncResult r__, Pomelo.Callback_ZoneManager_setCallback cb__, Ice.ExceptionCallback excb__)
+        private void setCallback_completed__(Ice.AsyncResult r__, BattleIce.Callback_ZoneManager_setCallback cb__, Ice.ExceptionCallback excb__)
         {
             int ret__;
             try
@@ -1855,13 +1855,13 @@ namespace Pomelo
 
         public static readonly string[] ids__ =
         {
-            "::Ice::Object",
-            "::Pomelo::ZoneManager"
+            "::BattleIce::ZoneManager",
+            "::Ice::Object"
         };
 
         public static string ice_staticId()
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         #endregion
@@ -1889,7 +1889,7 @@ namespace Pomelo
     }
 }
 
-namespace Pomelo
+namespace BattleIce
 {
     [_System.Runtime.InteropServices.ComVisible(false)]
     [_System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.6.4")]
@@ -1910,8 +1910,8 @@ namespace Pomelo
 
         public static new readonly string[] ids__ = 
         {
-            "::Ice::Object",
-            "::Pomelo::ZoneManagerCallback"
+            "::BattleIce::ZoneManagerCallback",
+            "::Ice::Object"
         };
 
         public override bool ice_isA(string s)
@@ -1936,17 +1936,17 @@ namespace Pomelo
 
         public override string ice_id()
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         public override string ice_id(Ice.Current current__)
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         public static new string ice_staticId()
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         #endregion
@@ -2045,75 +2045,75 @@ 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 force, string data)
+        public void createZoneRequest_async(BattleIce.AMD_ZoneManager_createZoneRequest cb__, string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data)
         {
             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 force, string data, Ice.Current current__);
+        public abstract void createZoneRequest_async(BattleIce.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)
+        public void destroyZoneRequest_async(BattleIce.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId)
         {
             destroyZoneRequest_async(cb__, instanceId, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void destroyZoneRequest_async(Pomelo.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId, Ice.Current current__);
+        public abstract void destroyZoneRequest_async(BattleIce.AMD_ZoneManager_destroyZoneRequest cb__, string instanceId, Ice.Current current__);
 
-        public void clearAllPlayersRequest_async(Pomelo.AMD_ZoneManager_clearAllPlayersRequest cb__)
+        public void clearAllPlayersRequest_async(BattleIce.AMD_ZoneManager_clearAllPlayersRequest cb__)
         {
             clearAllPlayersRequest_async(cb__, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void clearAllPlayersRequest_async(Pomelo.AMD_ZoneManager_clearAllPlayersRequest cb__, Ice.Current current__);
+        public abstract void clearAllPlayersRequest_async(BattleIce.AMD_ZoneManager_clearAllPlayersRequest cb__, Ice.Current current__);
 
-        public void getAllPlayerCountRequest_async(Pomelo.AMD_ZoneManager_getAllPlayerCountRequest cb__)
+        public void getAllPlayerCountRequest_async(BattleIce.AMD_ZoneManager_getAllPlayerCountRequest cb__)
         {
             getAllPlayerCountRequest_async(cb__, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void getAllPlayerCountRequest_async(Pomelo.AMD_ZoneManager_getAllPlayerCountRequest cb__, Ice.Current current__);
+        public abstract void getAllPlayerCountRequest_async(BattleIce.AMD_ZoneManager_getAllPlayerCountRequest cb__, Ice.Current current__);
 
-        public void playerEnterRequest_async(Pomelo.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data)
+        public void playerEnterRequest_async(BattleIce.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data)
         {
             playerEnterRequest_async(cb__, playerId, instanceId, data, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void playerEnterRequest_async(Pomelo.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data, Ice.Current current__);
+        public abstract void playerEnterRequest_async(BattleIce.AMD_ZoneManager_playerEnterRequest cb__, string playerId, string instanceId, string data, Ice.Current current__);
 
-        public void playerLeaveRequest_async(Pomelo.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject)
+        public void playerLeaveRequest_async(BattleIce.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject)
         {
             playerLeaveRequest_async(cb__, playerId, instanceId, keepObject, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void playerLeaveRequest_async(Pomelo.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject, Ice.Current current__);
+        public abstract void playerLeaveRequest_async(BattleIce.AMD_ZoneManager_playerLeaveRequest cb__, string playerId, string instanceId, bool keepObject, Ice.Current current__);
 
-        public void playerNetStateChanged_async(Pomelo.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state)
+        public void playerNetStateChanged_async(BattleIce.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state)
         {
             playerNetStateChanged_async(cb__, playerId, state, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void playerNetStateChanged_async(Pomelo.AMD_ZoneManager_playerNetStateChanged cb__, string playerId, string state, Ice.Current current__);
+        public abstract void playerNetStateChanged_async(BattleIce.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(BattleIce.AMD_ZoneManager_getServerState cb__, string serverId)
         {
             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(BattleIce.AMD_ZoneManager_getServerState cb__, string serverId, Ice.Current current__);
 
-        public void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid)
+        public void registerGameServer_async(BattleIce.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid)
         {
             registerGameServer_async(cb__, serverid, crossid, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void registerGameServer_async(Pomelo.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid, Ice.Current current__);
+        public abstract void registerGameServer_async(BattleIce.AMD_ZoneManager_registerGameServer cb__, int serverid, int crossid, Ice.Current current__);
 
-        public void getUnitHP_async(Pomelo.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId)
+        public void getUnitHP_async(BattleIce.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId)
         {
             getUnitHP_async(cb__, instanceId, objectId, Ice.ObjectImpl.defaultCurrent);
         }
 
-        public abstract void getUnitHP_async(Pomelo.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId, Ice.Current current__);
+        public abstract void getUnitHP_async(BattleIce.AMD_ZoneManager_getUnitHP cb__, string instanceId, int objectId, Ice.Current current__);
 
         #endregion
 
@@ -2121,8 +2121,8 @@ namespace Pomelo
 
         public static new readonly string[] ids__ = 
         {
-            "::Ice::Object",
-            "::Pomelo::ZoneManager"
+            "::BattleIce::ZoneManager",
+            "::Ice::Object"
         };
 
         public override bool ice_isA(string s)
@@ -2147,17 +2147,17 @@ namespace Pomelo
 
         public override string ice_id()
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         public override string ice_id(Ice.Current current__)
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         public static new string ice_staticId()
         {
-            return ids__[1];
+            return ids__[0];
         }
 
         #endregion
@@ -2515,7 +2515,7 @@ namespace Pomelo
     }
 }
 
-namespace Pomelo
+namespace BattleIce
 {
     /// <summary>
     /// 场景副本相关协议

Common/Pomelo/PomeloShare/slice/ZoneManager.ice

@@ -8,7 +8,7 @@
 
 #include <Ice/Identity.ice>
 
-module Pomelo
+module BattleIce
 { 
 
 	//场景管理事件回调
@@ -21,6 +21,7 @@ module Pomelo
 	//场景管理
 	interface ZoneManager
 	{
+
 		/************************************场景管理器相关协议********************************************/
 		//设置事件回调
 		int setCallback(Ice::Identity ident, string srvUUID);

XmdsServerCS/XmdsServerEdgeJS/XmdsServerEdgeJS.csproj

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals" />
+  <Import Project="..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props')" />
+  <PropertyGroup Label="Globals">
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_JSGProfile|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug_JSGProfile\</OutputPath>
@@ -155,6 +159,14 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

XmdsServerCS/XmdsServerEdgeJS/Zone/XmdsManagerICE.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Ice;
-using Xmds;
+using BattleIce;
 using XmdsCommon.Plugin;
 using System.Web.Helpers;
 using SuperSocket.SocketBase.Logging;
@@ -190,7 +190,7 @@ namespace XmdsServerEdgeJS.Zone
             }
         }
 
-        public override void canUseItem_async(Xmds.AMD_XmdsManager_canUseItem cb__, string playerId, Ice.Current current__)
+        public override void canUseItem_async(AMD_XmdsManager_canUseItem cb__, string playerId, Ice.Current current__)
         {
             try
             {
@@ -418,7 +418,7 @@ namespace XmdsServerEdgeJS.Zone
             }
         }
 
-        public override void refreshPlayerPetPropertyChange_async(Xmds.AMD_XmdsManager_refreshPlayerPetPropertyChange cb__, string playerId, string data, Ice.Current current__)
+        public override void refreshPlayerPetPropertyChange_async(AMD_XmdsManager_refreshPlayerPetPropertyChange cb__, string playerId, string data, Ice.Current current__)
         {
             try
             {
@@ -798,5 +798,5 @@ namespace XmdsServerEdgeJS.Zone
 				cb__.ice_exception(e);
 			}
 		}
-	}
+    }
 }

XmdsServerCS/XmdsServerEdgeJS/generated/SliceCompile.XmdsManager.d

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<dependencies>
+  <source name="slice\XmdsManager.ice">
+    <options>
+      <IceHome>C:\Apps\Ice-3.6.4</IceHome>
+      <IceToolsPath>C:\Apps\Ice-3.6.4\bin</IceToolsPath>
+      <OutputDir>E:\WSHCommon\XmdsServerCS\XmdsServerEdgeJS\generated</OutputDir>
+    </options>
+  </source>
+</dependencies>

XmdsServerCS/XmdsServerEdgeJS/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Ice" version="3.5.1.0" targetFramework="net48" />
+  <package id="zeroc.icebuilder.msbuild" version="5.0.9" targetFramework="net48" />
 </packages>

XmdsServerCS/XmdsServerEdgeJS/slice/XmdsManager.ice

@@ -6,7 +6,7 @@
 
 #pragma once
 
-module Xmds
+module BattleIce
 {
 	/**onFinishPickItem*/
 	class FinishPickItem {
@@ -221,7 +221,8 @@ module Xmds
 		void playerChuanGong(string instanceId, string playerIdA, string playerIdB);
 		
 		//山大王死亡，通知事件
-		void mountainKingRefreshNotify(string instanceId, string data);		
+		void mountainKingRefreshNotify(string instanceId, string data);
+
 	};
 };