【优化】提交一下

DotNet/Hotfix/Helper/MapHelper.cs

@@ -41,7 +41,7 @@ namespace ET.Server
             // 非强制切图，检测一下pk模式，是否允许切图
             if (!forceChange)
             {
-                int resCode = player.GetXmdsManager().refreshPlayerPKMode(player.GetId().ToString().Trim(), true, (int)PkModel.Peace);
+                int resCode = player.GetXmdsManager().refreshPlayerPKMode(player.GetId().ToString(), true, (int)PkModel.Peace);
                 if (resCode != 0)
                 {
                     // 战斗状态下无法传送

DotNet/Hotfix/Scenes/Game/Handler/C2G_BindPlayerHandler.cs

@@ -12,7 +12,7 @@ namespace ET.Server
         protected override async ETTask Run(Session session, C2G_BindPlayer request, G2C_BindPlayer response, Action reply)
         {
             // 判断参数
-            if (string.IsNullOrEmpty(request.PlayerId.ToString().Trim()))
+            if (string.IsNullOrEmpty(request.PlayerId.ToString()))
             {
                 Log.Debug($"参数错误,角色id为空");
                 response.Error = ErrorCode.ERR_ParameterError;

DotNet/Hotfix/Scenes/Game/Handler/C2G_TriggrBattleFunctionHandler.cs

@@ -19,7 +19,7 @@ namespace ET.Server
                 return;
             }
 
-            player.GetXmdsManager().triggrBattleFunction(player.GetId().ToString().Trim(), request.TriggerID, request.Value1, request.Value2, request.Value3, request.Value4, request.Value5, request.Value6);
+            player.GetXmdsManager().triggrBattleFunction(player.GetId().ToString(), request.TriggerID, request.Value1, request.Value2, request.Value3, request.Value4, request.Value5, request.Value6);
 
             reply();
 

DotNet/Hotfix/Scenes/Game/Map/MapSystem.cs

@@ -59,7 +59,7 @@ namespace ET.Server
         /// <returns></returns>
         private static GetPlayerData GetBattleServerPlayerData(this Map self, long playerId)
         {
-            string result = self.GetXmdsManager().getPlayerData(playerId.ToString().Trim(), true);
+            string result = self.GetXmdsManager().getPlayerData(playerId.ToString(), true);
             return string.IsNullOrEmpty(result)? null : JsonConvert.DeserializeObject<GetPlayerData>(result);
         }
 
@@ -200,12 +200,12 @@ namespace ET.Server
             int addUnitsResult = 0;
 
             if (needReturn) {
-                addUnitsResult = self.GetXmdsManager().addUnits(self.Id.ToString().Trim(), JsonConvert.SerializeObject(data, Formatting.Indented));
-                Log.Info($"addUnits needReturn : mapId={self.MapId}, instanceId={self.Id.ToString().Trim()}, data={data}, add units result={addUnitsResult}");
+                addUnitsResult = self.GetXmdsManager().addUnits(self.Id.ToString(), JsonConvert.SerializeObject(data, Formatting.Indented));
+                Log.Info($"addUnits needReturn : mapId={self.MapId}, instanceId={self.Id.ToString()}, data={data}, add units result={addUnitsResult}");
             } else
             {
-                int objId = self.GetXmdsManager().addUnits(self.Id.ToString().Trim(), JsonConvert.SerializeObject(data, Formatting.Indented));
-                Log.Info($"addUnits: mapId={self.MapId}, instanceId={self.Id.ToString().Trim()}, objId={objId}");
+                int objId = self.GetXmdsManager().addUnits(self.Id.ToString(), JsonConvert.SerializeObject(data, Formatting.Indented));
+                Log.Info($"addUnits: mapId={self.MapId}, instanceId={self.Id.ToString()}, objId={objId}");
             }
 
             await ETTask.CompletedTask;
@@ -226,7 +226,7 @@ namespace ET.Server
         /// <param name="objectId"></param>
         public static async ETTask RemovePointUnit(this Map self, int objectId)
         {
-            self.GetXmdsManager().removePointUnit(self.Id.ToString().Trim(), objectId);
+            self.GetXmdsManager().removePointUnit(self.Id.ToString(), objectId);
             await ETTask.CompletedTask;
         }
 
@@ -248,7 +248,7 @@ namespace ET.Server
             {
                 string enterData = player.ToJSON4EnterScene(self);
                 Log.Debug($"{player.GetName()}, EnterSceneData:{enterData}");
-                self.GetZoneManager().playerEnterRequest(player.GetId().ToString().Trim(), self.Id.ToString().Trim(), enterData);
+                self.GetZoneManager().playerEnterRequest(player.GetId().ToString(), self.Id.ToString(), enterData);
             }
             catch (Exception e)
             {
@@ -266,7 +266,7 @@ namespace ET.Server
         {
             try
             {
-                self.GetZoneManager().playerLeaveRequest(player.GetId().ToString().Trim(), self.InstanceId.ToString(), keepObject);
+                self.GetZoneManager().playerLeaveRequest(player.GetId().ToString(), self.InstanceId.ToString(), keepObject);
             }
             catch (Exception e)
             {

DotNet/Hotfix/Scenes/Game/Player/PlayerSkillComponentSystem.cs

@@ -25,7 +25,7 @@ namespace ET.Server
                     }
                 }
                 // 初始化战斗服缓存数据
-                self.ToJson4BattleServerSkills = self.ToJson4BattleServerSkills();
+                self.ToJson4BattleServerSkills = self.GetBattleServerSkills();
             }
         }
 
@@ -72,7 +72,7 @@ namespace ET.Server
         /// </summary>
         /// <param name="self"></param>
         /// <returns></returns>
-        private static List<Struct.SkillInfo> ToJson4BattleServerSkills(this PlayerSkillComponent self)
+        public static List<Struct.SkillInfo> GetBattleServerSkills(this PlayerSkillComponent self)
         {
             List<Struct.SkillInfo> skills = new List<Struct.SkillInfo>();
             foreach (Struct.PlayerSkillBaseData skill in self.Data.Skills.Where(skill => skill != null))

DotNet/Hotfix/Scenes/Game/Player/PlayerSystem.cs

@@ -223,7 +223,7 @@ namespace ET.Server
             //PKMode设置为All
             self.GetXmdsManager().refreshPlayerPKMode(self.GetId().ToString(), false, (int)PkModel.All);
             //设置为自动战斗
-            self.GetXmdsManager().autoBattle(self.Id.ToString().Trim(), self.GetId().ToString(), true);
+            self.GetXmdsManager().autoBattle(self.Id.ToString(), self.GetId().ToString(), true);
 
             Log.Info($"OnEndEnterScene : mapId={self.Map.MapId}, map={self.Map.Prop.Name}");
         }

DotNet/Model/Const/Struct.cs

@@ -75,6 +75,25 @@
             }
         }
 
+        /// <summary>
+        /// 角色Avatar数据
+        /// </summary>
+        public class AvatarObj {
+            public byte tag { get; set; }
+            public string fileName { get; set; }
+            public byte effectType { get; set; }
+
+            public AvatarObj()
+            {
+            }
+
+            public AvatarObj(int tag, string fileName, int effectType) {
+                this.tag = (byte)tag;
+                this.fileName = fileName;
+                this.effectType = (byte)effectType;
+            }
+        }
+
         /// <summary>
         /// 场景数据
         /// </summary>