优化服务器文件名

DotNet/Hotfix/Helper/MapHelper.cs

@@ -163,14 +163,14 @@ namespace ET.Server
 
             Log.Info($"createArea instanceId:{instanceId}, templateId:{prop.TemplateID}, bs:{player.GetZoneManager()}");
 
-            int resCode = player.GetZoneManager().createZoneRequest(player.GetId().ToString(), "bs-" + GameConst.GameServerId,
+            int resCode = player.GetZoneManager().createZoneRequest(player.GetId().ToString(), "bs-" + ConstGame.GameServerId,
                 prop.TemplateID, instanceId.ToString(), forceCreate, enterData);
 
             if (resCode == 0)
             {
                 jsonObject.Add("instanceId", instanceId);
                 jsonObject.Add("areaId", mapId);
-                return CreatLocalMap(player, prop, jsonObject, instanceId, mapId, "bs-" + GameConst.GameServerId);
+                return CreatLocalMap(player, prop, jsonObject, instanceId, mapId, "bs-" + ConstGame.GameServerId);
             }
 
             Log.Warning($"createZoneRequest resCode={resCode}, mapID={prop.Id}, playerId={player.GetId()}");

DotNet/Hotfix/Helper/SceneFactory.cs

@@ -33,8 +33,8 @@ namespace ET.Server
                     scene.AddComponent<UserSessionComponent>();
                     break;
                 case SceneType.Game:
-                    GameConst.GameServerId = startSceneConfig.Id;
-                    GameConst.GameServerUUID = System.Guid.NewGuid().ToString();
+                    ConstGame.GameServerId = startSceneConfig.Id;
+                    ConstGame.GameServerUUID = System.Guid.NewGuid().ToString();
 
                     scene.AddComponent<NetServerComponent, IPEndPoint, NetworkProtocol>(startSceneConfig.InnerIPOutPort, NetworkProtocol.KCP);
                     scene.AddComponent<GameTokenInfoComponent>();

DotNet/Hotfix/Module/FastStream/FastStreamComponentSystem.cs

@@ -54,7 +54,7 @@ namespace ET.Server
         private static void OnSessionConnected(object sender, EventArgs e)
         {
             Log.Debug("fast stream session connected");
-            FastStreamComponent.Instance.SendData("connetorId", ("bs-" + GameConst.GameServerId.ToString()).ToUtf8());
+            FastStreamComponent.Instance.SendData("connetorId", ("bs-" + ConstGame.GameServerId.ToString()).ToUtf8());
         }
 
         private static void OnSessionDataReceived(FastStreamBuffer pack)

DotNet/Hotfix/Module/IceBattle/BattleIceAgentComponentSystem.cs

@@ -53,14 +53,14 @@ namespace ET.Server
                     ZoneIce.ice_invocationTimeout(15000);
 
                     ObjectAdapter adapter = communicator().createObjectAdapter("");
-                    ObjectPrx prx = adapter.add(new ZoneManagerCallback(), communicator().stringToIdentity("bs-" + GameConst.GameServerId));
+                    ObjectPrx prx = adapter.add(new ZoneManagerCallback(), communicator().stringToIdentity("bs-" + ConstGame.GameServerId));
                     ZoneIce.ice_getCachedConnection().setAdapter(adapter);
                     //-3: 未知异常
                     //-2: 异常参数;
                     //-1: 已有在线的，拒绝;
                     //0	: 加入成功
                     //1 : 加入成功，重连
-                    int code = ZoneIce.setCallback(prx.ice_getIdentity(), GameConst.GameServerUUID);
+                    int code = ZoneIce.setCallback(prx.ice_getIdentity(), ConstGame.GameServerUUID);
                     if (code < 0)
                     {
                         Log.Error($"战斗服连接异常: {code}");
@@ -68,7 +68,7 @@ namespace ET.Server
                     }
 
                     //向战斗服注册本GameServer
-                    string res = ZoneIce.registerGameServer(GameConst.GameServerId, GameConst.GameServerId);
+                    string res = ZoneIce.registerGameServer(ConstGame.GameServerId, ConstGame.GameServerId);
                     BattleIceAgentComponent.Instance.StrBattleServerVersion = res;
                     Log.Info($"Battle Server version:  {res}");
                 }

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

@@ -240,14 +240,14 @@ namespace ET.Server
             data.Add("alliesForce", 0);
             data.Add("force", 1);
             data.Add("pro", self.GetPro());
-            data.Add("serverId", GameConst.GameServerId);
+            data.Add("serverId", ConstGame.GameServerId);
             data.Add("titleId", 0);
             data.Add("level", self.GetLevel());
             data.Add("vip", 0);
             data.Add("upLevel", 1);
             // 无悬赏
             data.Add("beReward", 0);
-            data.Add("logicServerId", GameConst.GameServerId);
+            data.Add("logicServerId", ConstGame.GameServerId);
             data.Add("sex", self.GetSex());
             data.Add("uuid", self.GetId().ToString());
             data.Add("potionAddition", 0);
@@ -272,7 +272,7 @@ namespace ET.Server
                 playerEntered = map.HasPlayerEntered,
                 avatars = new { },
                 basic = self.GetBattlerServerBasic(),
-                connectServerId = "bs-" + GameConst.GameServerId,
+                connectServerId = "bs-" + ConstGame.GameServerId,
                 uid = self.GetId().ToString(),
                 unitTemplateID = self.BasicProp.TemplateId,
                 robot = false,

DotNet/Model/Share/GameConst.cs → DotNet/Model/Share/ConstGame.cs

@@ -7,7 +7,7 @@ namespace ET.Server
     /// <summary>
     /// 游戏服静态常量
     /// </summary>
-    public static class GameConst
+    public static class ConstGame
     {
         [StaticField]
         public static int GameServerId;