Просмотр исходного кода

支持ICE接口AddUnits添加单位时的属性alias

大爷 1 год назад
Родитель
Сommit
e79a615b67

+ 6 - 6
Common/CommonAI/Zone/Instance/InstanceZone.cs

@@ -807,12 +807,12 @@ namespace CommonAI.Zone.Instance
 
 
         //-------------------------------------------------------------------------------------------
         //-------------------------------------------------------------------------------------------
 
 
-        public InstanceUnit AddUnit(int unitTemplateID, string name, int force, int level, float x, float y, float direction, bool pointLv = false, uint CustomId = 0)
+        public InstanceUnit AddUnit(int unitTemplateID, string name, int force, int level, float x, float y, float direction, bool pointLv = false, uint CustomId = 0, string alias = null)
         {
         {
             UnitInfo info = Templates.getUnit(unitTemplateID);
             UnitInfo info = Templates.getUnit(unitTemplateID);
             if (info != null)
             if (info != null)
             {
             {
-                return AddUnit(info, name, force, level, x, y, direction, null, "", 0, pointLv, CustomId);
+                return AddUnit(info, name, force, level, x, y, direction, null, "", 0, pointLv, CustomId, alias);
             }
             }
             return null;
             return null;
         }
         }
@@ -830,10 +830,10 @@ namespace CommonAI.Zone.Instance
         /// <param name="summoner">召唤者</param>
         /// <param name="summoner">召唤者</param>
         /// <returns></returns>
         /// <returns></returns>
         public InstanceUnit AddUnit(UnitInfo info, string name, int force, int level, float x, float y, float direction,
         public InstanceUnit AddUnit(UnitInfo info, string name, int force, int level, float x, float y, float direction,
-            InstanceUnit summoner = null, String clientShowName = "", int gsFlag = 0, bool pointLv = false, uint CustomId = 0)
+            InstanceUnit summoner = null, String clientShowName = "", int gsFlag = 0, bool pointLv = false, uint CustomId = 0, string alias = null)
         {
         {
             AddUnitEvent add;
             AddUnitEvent add;
-            return AddUnit(info, name, force, level, x, y, direction, out add, summoner, clientShowName, gsFlag, 0, pointLv, CustomId);
+            return AddUnit(info, name, force, level, x, y, direction, out add, summoner, clientShowName, gsFlag, 0, pointLv, CustomId, alias);
         }
         }
         /// <summary>
         /// <summary>
         /// 添加一个单位
         /// 添加一个单位
@@ -853,7 +853,7 @@ namespace CommonAI.Zone.Instance
         private long mAddUnitPrintTime = 0;
         private long mAddUnitPrintTime = 0;
 
 
         public InstanceUnit AddUnit(UnitInfo info, string name, int force, int level, float x, float y, float direction,
         public InstanceUnit AddUnit(UnitInfo info, string name, int force, int level, float x, float y, float direction,
-            out AddUnitEvent add, InstanceUnit summoner = null, String clientShowName = "", int gsFlag = 0, int alliesForce = 0, bool pointLv = false, uint CustomId = 0)
+            out AddUnitEvent add, InstanceUnit summoner = null, String clientShowName = "", int gsFlag = 0, int alliesForce = 0, bool pointLv = false, uint CustomId = 0, string alias = null)
         {
         {
             add = null;
             add = null;
             if (mObjects.UnitsCount >= mMaxUnitCount)
             if (mObjects.UnitsCount >= mMaxUnitCount)
@@ -879,7 +879,7 @@ namespace CommonAI.Zone.Instance
             if (ret is InstanceUnit)
             if (ret is InstanceUnit)
             {
             {
                 InstanceUnit unit = ret as InstanceUnit;
                 InstanceUnit unit = ret as InstanceUnit;
-                //unit.Name = name;
+                unit.Alias = alias;
                 unit.gameServerFlag = gsFlag;
                 unit.gameServerFlag = gsFlag;
                 if(CustomId > 0 && mObjects.ContainsObjectByKey(CustomId))
                 if(CustomId > 0 && mObjects.ContainsObjectByKey(CustomId))
                 {
                 {

+ 4 - 3
XmdsServerCS/XmdsServerEdgeJS/Zone/ZoneServiceICE.cs

@@ -643,9 +643,10 @@ namespace XmdsServerEdgeJS.Zone
                         else
                         else
                         {
                         {
                             //根据坐标
                             //根据坐标
-                            x = u.x;
-                            y = u.y;
+                            x = (float)u.x;
+                            y = (float)u.y;
                         }
                         }
+                        string alias = u["alias"];
 
 
                         int force = u.force;
                         int force = u.force;
                         var unitInfo = zone.Templates.getUnit(templateId);
                         var unitInfo = zone.Templates.getUnit(templateId);
@@ -673,7 +674,7 @@ namespace XmdsServerEdgeJS.Zone
                                 }
                                 }
                             }
                             }
 							
 							
-							var ret = zone.AddUnit(unitInfo, uuid, force, level, x, y, birthDirection, null, name, gsFlag, level > 0);
+							var ret = zone.AddUnit(unitInfo, uuid, force, level, x, y, birthDirection, null, name, gsFlag, level > 0, 0, alias);
 							if(ret == null)
 							if(ret == null)
 							{
 							{
 								log.Warn("单位添加失败:" + unitInfo.TemplateID + ", " + zone.Data.ID);
 								log.Warn("单位添加失败:" + unitInfo.TemplateID + ", " + zone.Data.ID);