【增加】战斗结束处理

Config/Proto/OuterMessage_C_10001.proto

@@ -326,3 +326,10 @@ message R2C_Disconnect // IActorMessage
 	int32 Error = 2;
 	string Message = 3;
 }
+
+message G2C_GameOver // IActorMessage
+{
+	int32 RpcId = 1;
+	int32 Error = 2;
+	string Message = 3;
+}

DotNet/Hotfix/Helper/BattleServerEventHelper.cs

@@ -0,0 +1,176 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace ET.Server
+{
+    /// <summary>
+    /// 战斗服事件工具类
+    /// </summary>
+    public static class BattleServerEventHelper
+    {
+        /// <summary>
+        /// area related battleServerEvent
+        /// </summary>
+        /// <param name="msg"></param>
+        public static void AreaBattleServerEvent(JObject msg)
+        {
+            Log.Debug($"AreaBattleServerEvent msg: {JsonConvert.SerializeObject(msg, Formatting.Indented)}");
+            long instanceId = Convert.ToInt64(msg.SelectToken("instanceId"));
+            Map map = GameMapComponent.Instance.Get(instanceId);
+            if (map == null)
+            {
+                Log.Warning($"areaBattleServerEvent no area: {msg}");
+                return;
+            }
+
+            switch (Convert.ToString(msg.SelectToken("eventName")))
+            {
+                case "unitDead":
+                {
+                    OnUnitDead(map, msg);
+                    return;
+                }
+                case "message":
+                {
+                    // 副本消息
+                    map.GetComponent<MapEventComponent>().OnMessageEvent(msg);
+                    return;
+                }
+                case "gameOver":
+                {
+                    map.GetComponent<MapEventComponent>().OnGameOver(map);
+                    return;
+                }
+                case "pickItem":
+                {
+                    map.GetComponent<MapEventComponent>().OnPickItem(msg);
+                    return;
+                }
+                case "KillBossEventB2R":
+                {
+                    map.GetComponent<MapEventComponent>().OnKillBoss(msg);
+                    return;
+                }
+                case "BattleReportEventB2R":
+                {
+                    // 战斗统计事件
+                    map.GetComponent<MapEventComponent>().OnBattleReport(msg);
+                    return;
+                }
+                default:
+                {
+                    Log.Error($"unknown area event: {msg}");
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// player related battleServerEvent
+        /// </summary>
+        /// <param name="msg"></param>
+        public static void PlayerBattleServerEvent(JObject msg)
+        {
+            Log.Debug($"PlayerBattleServerEvent msg: {JsonConvert.SerializeObject(msg, Formatting.Indented)}");
+            switch (Convert.ToString(msg.SelectToken("eventName")))
+            {
+                case "ConsumeItemEventB2R":
+                {
+                    return;
+                }
+                case "interActiveItem":
+                {
+                    return;
+                }
+                case "changeSceneProgress":
+                {
+                    return;
+                }
+                case "TransUnitEventB2R":
+                {
+                    return;
+                }
+                case "SummonMountEventB2R":
+                {
+                    return;
+                }
+                case "ShowRebirthDialogueB2R":
+                {
+                    return;
+                }
+                case "TriggerSceneEventB2R":
+                {
+                    return;
+                }
+                case "PlayerExceptionEventB2R":
+                {
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// task related battleServerEvent
+        /// </summary>
+        /// <param name="msg"></param>
+        public static void TaskBattleServerEvent(JObject msg)
+        {
+            Log.Debug($"TaskBattleServerEvent msg: {JsonConvert.SerializeObject(msg, Formatting.Indented)}");
+        }
+
+        public static void MapNotifyEvent(JObject msg)
+        {
+            Log.Debug($"MapNotifyEvent msg: {JsonConvert.SerializeObject(msg, Formatting.Indented)}");
+        }
+
+        /// <summary>
+        /// 单位死亡
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="msg"></param>
+        private static void OnUnitDead(Map map, JObject msg)
+        {
+            int unitType = Convert.ToInt32(msg.SelectToken("unitType"));
+            // 攻击者
+            long hitFinalPlayerId = Convert.ToInt64(msg.SelectToken("hitFinal"));
+            long belongPlayerId = Convert.ToInt64(msg.SelectToken("belongPlayerId"));
+            long[] atkAssistantList = JsonConvert.DeserializeObject<long[]>(Convert.ToString(msg.SelectToken("atkAssistantList")) ?? string.Empty);
+            WNPlayer hitFinalPlayer = null;
+
+            // 默认使用第一个摸怪玩家
+            if (belongPlayerId > 0)
+            {
+                hitFinalPlayer = map.GetPlayer(belongPlayerId);
+            }
+
+            if (hitFinalPlayer == null && hitFinalPlayerId > 0)
+            {
+                hitFinalPlayer = map.GetPlayer(hitFinalPlayerId);
+            }
+
+            switch (unitType)
+            {
+                // 怪物死亡
+                case 0:
+                    int unitTemplateId = Convert.ToInt32(msg.SelectToken("unitTemplateId"));
+                    Monster monsterProp = MonsterCategory.Instance.Get(unitTemplateId);
+                    if (monsterProp == null)
+                    {
+                        Log.Error($"unitDead not fount montster : {unitTemplateId}, {map.MapId}, {msg}");
+                    }
+                    else
+                    {
+                        map.GetComponent<MapEventComponent>().OnUnitDead(monsterProp, map);
+                    }
+                    break;
+                // 玩家死亡
+                case 1:
+                    break;
+                // 宠物死亡
+                case 2:
+                    break;
+            }
+        }
+    }
+}

DotNet/Hotfix/Helper/MapHelper.cs

@@ -173,7 +173,7 @@ namespace ET.Server
         /// <returns></returns>
         public static Map CreateMap(WNPlayer player, JObject jObject, bool forceCreate)
         {
-            Log.Debug($"createArea areaData:{jObject}");
+            Log.Debug($"createArea areaData:{JsonConvert.SerializeObject(jObject, Formatting.Indented)}");
             int mapId = Convert.ToInt32(jObject.SelectToken("areaId"));
             MapConfig prop = MapConfigCategory.Instance.Get(mapId);
             if (prop == null)
@@ -235,8 +235,8 @@ namespace ET.Server
             if (map != null)
             {
                 Log.Info($"创建Area场景:{map.MapId}, instanceId:{instanceId}, srvId:" + map.LogicServerId);
-                scene.GetComponent<GameMapComponent>().Add(map);
                 map.BindBattleServer(player, bsServerId);
+                scene.GetComponent<GameMapComponent>().Add(map);
             }
             else
             {

DotNet/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs

@@ -21,7 +21,7 @@ namespace ET.Server
                 }
             }
         }
-    
+
         [ObjectSystem]
         public class ActorMessageSenderComponentAwakeSystem: AwakeSystem<ActorMessageSenderComponent>
         {
@@ -100,16 +100,16 @@ namespace ET.Server
             {
                 throw new Exception($"actor id is 0: {message}");
             }
-            
+
             ProcessActorId processActorId = new(actorId);
-            
+
             // 这里做了优化，如果发向同一个进程，则直接处理，不需要通过网络层
             if (processActorId.Process == Options.Instance.Process)
             {
                 NetInnerComponent.Instance.HandleMessage(actorId, message);
                 return;
             }
-            
+
             Session session = NetInnerComponent.Instance.Get(processActorId.Process);
             session.Send(processActorId.ActorId, message);
         }
@@ -127,7 +127,7 @@ namespace ET.Server
         )
         {
             request.RpcId = self.GetRpcId();
-            
+
             if (actorId == 0)
             {
                 throw new Exception($"actor id is 0: {request}");
@@ -135,7 +135,7 @@ namespace ET.Server
 
             return await self.Call(actorId, request.RpcId, request, needException);
         }
-        
+
         public static async ETTask<IActorResponse> Call(
                 this ActorMessageSenderComponent self,
                 long actorId,
@@ -150,9 +150,9 @@ namespace ET.Server
             }
 
             var tcs = ETTask<IActorResponse>.Create(true);
-            
+
             self.requestCallback.Add(rpcId, new ActorMessageSender(actorId, iActorRequest, tcs, needException));
-            
+
             self.Send(actorId, iActorRequest);
 
             long beginTime = TimeHelper.ServerFrameTime();
@@ -162,9 +162,9 @@ namespace ET.Server
             long costTime = endTime - beginTime;
             if (costTime > 200)
             {
-                Log.Warning("actor rpc time > 200: {0} {1}", costTime, iActorRequest);
+                Log.Warning($"actor rpc time > 200: {costTime} {iActorRequest}");
             }
-            
+
             return response;
         }
 
@@ -177,7 +177,7 @@ namespace ET.Server
             }
 
             self.requestCallback.Remove(response.RpcId);
-            
+
             Run(actorMessageSender, response);
         }
     }

DotNet/Hotfix/Module/DB/DBManagerComponentSystem.cs

@@ -22,7 +22,7 @@ namespace ET.Server
                 DBManagerComponent.Instance = null;
             }
         }
-        
+
         public static DBComponent GetZoneDB(this DBManagerComponent self, int zone)
         {
             DBComponent dbComponent = self.DBComponents[zone];

DotNet/Hotfix/Module/IceBattle/BattleEventHandler.cs

@@ -30,7 +30,7 @@
             }
             if (player.Map != null)
             {
-                player.Map.OnReady(player);
+                player.Map.GetComponent<MapEventComponent>().OnReady(player);
             }
             await ETTask.CompletedTask;
         }

DotNet/Hotfix/Module/IceBattle/BattleIceAgentComponentSystem.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Threading;
 using BattleIce;
+using Newtonsoft.Json.Linq;
 
 namespace ET.Server
 {
@@ -56,7 +57,7 @@ namespace ET.Server
                     ZoneIce.ice_getCachedConnection().setAdapter(adapter);
                     //-3: 未知异常
                     //-2: 异常参数;
-                    //-1: 已有在线的，拒绝；
+                    //-1: 已有在线的，拒绝;
                     //0	: 加入成功
                     //1 : 加入成功，重连
                     int code = ZoneIce.setCallback(prx.ice_getIdentity(), ConstGame.GameServerUUID);
@@ -110,27 +111,27 @@ namespace ET.Server
         {
             public override void eventNotify(string eventType, string msg, Current current__)
             {
-                Log.Debug("======================================");
-                Log.Debug($"battleServer zone notify: type({eventType}), msg({msg})");
-                Log.Debug("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^");
-
                 switch (eventType)
                 {
                     case "areaEvent":
                     case "zoneEvent":
                     {
+                        BattleServerEventHelper.AreaBattleServerEvent(JObject.Parse(msg));
                         return;
                     }
                     case "playerEvent":
                     {
+                        BattleServerEventHelper.PlayerBattleServerEvent(JObject.Parse(msg));
                         return;
                     }
                     case "taskEvent":
                     {
+                        BattleServerEventHelper.TaskBattleServerEvent(JObject.Parse(msg));
                         return;
                     }
                     case "mapNotify":
                     {
+                        BattleServerEventHelper.MapNotifyEvent(JObject.Parse(msg));
                         return;
                     }
                 }

DotNet/Hotfix/Module/Message/NetServerComponentSystem.cs

@@ -52,7 +52,7 @@ namespace ET.Server
                 session.AddComponent<SessionIdleCheckerComponent>();
             }
         }
-        
+
         private static void OnRead(this NetServerComponent self, long channelId, long actorId, object message)
         {
             Session session = self.GetChild<Session>(channelId);
@@ -61,9 +61,9 @@ namespace ET.Server
                 return;
             }
             session.LastRecvTime = TimeHelper.ClientNow();
-            
+
             OpcodeHelper.LogMsg(self.DomainZone(), message);
-			
+
             EventSystem.Instance.Publish(Root.Instance.Scene, new NetServerComponentOnRead() {Session = session, Message = message});
         }
     }

DotNet/Hotfix/Module/Router/RouterComponentSystem.cs

@@ -196,7 +196,7 @@ namespace ET.Server
                         Log.Warning($"kcp router router reconnect connectId diff1: {routerNode.SyncIpEndPoint} {(IPEndPoint) self.IPEndPoint}");
                         break;
                     }
-                    
+
                     // 不是自己的，outerConn冲突, 直接break,也就是说这个软路由上有个跟自己outerConn冲突的连接，就不能连接了
                     // 这个路由连接不上，客户端会换个软路由，所以没关系
                     if (routerNode.InnerConn != innerConn)
@@ -204,7 +204,7 @@ namespace ET.Server
                         Log.Warning($"kcp router router reconnect inner conn diff1: {routerNode.SyncIpEndPoint} {(IPEndPoint) self.IPEndPoint}");
                         break;
                     }
-                    
+
                     if (routerNode.OuterConn != outerConn)
                     {
                         Log.Warning($"kcp router router reconnect outer conn diff1: {routerNode.SyncIpEndPoint} {(IPEndPoint) self.IPEndPoint}");
@@ -224,7 +224,7 @@ namespace ET.Server
                         Log.Warning($"router sync error2: {routerNode.OuterConn} {routerNode.InnerAddress} {outerConn} {realAddress}");
                         break;
                     }
-                    
+
                     if (++routerNode.RouterSyncCount > 40)
                     {
                         self.OnError(routerNode.Id, ErrorCore.ERR_KcpRouterRouterSyncCountTooMuchTimes);
@@ -330,7 +330,7 @@ namespace ET.Server
                         Log.Warning($"kcp router syn ip is diff3: {kcpRouter.SyncIpEndPoint.Address} {ipEndPoint.Address}");
                         break;
                     }
-                    
+
                     // 发了syn过来，那么RouterSyn就成功了，可以删除ConnectId
                     self.ConnectIdNodes.Remove(kcpRouter.ConnectId);
 
@@ -508,7 +508,7 @@ namespace ET.Server
                         Log.Warning($"kcp router ack not found outer nodes: {outerConn} {innerConn}");
                         break;
                     }
-                    
+
                     kcpRouterNode.Status = RouterStatus.Msg;
 
                     kcpRouterNode.InnerConn = innerConn;

DotNet/Hotfix/Scenes/Game/GameMapComponentSystem.cs

@@ -13,6 +13,7 @@ namespace ET.Server
             /// <param name="self"></param>
             protected override void Awake(GameMapComponent self)
             {
+                GameMapComponent.Instance = self;
                 // todo 添加场景销毁检测定时器
             }
         }

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

@@ -115,7 +115,7 @@ namespace ET.Server
 
             // 登录数据
             player.OnLogin();
-            map.OnPlayerLogin(player);
+            map.GetComponent<MapEventComponent>().OnPlayerLogin(player);
 
             response.Player = PlayerHelper.PlayerInfoToProto(player);
             response.Player.areaId = mapConfig.TemplateID;

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

@@ -52,7 +52,7 @@ namespace ET.Server
             }
 
             map.PlayerEnterRequest(player);
-            map.OnPlayerEntered(player);
+            map.GetComponent<MapEventComponent>().OnPlayerEntered(player);
 
             response.MapInstanceId = player.Map.Id;
             reply();

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

@@ -18,7 +18,7 @@ namespace ET.Server
             }
             if (player.Map != null)
             {
-                player.Map.OnReady(player);
+                player.Map.GetComponent<MapEventComponent>().OnReady(player);
             }
 
             reply();

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

@@ -0,0 +1,113 @@
+using System.Linq;
+using Newtonsoft.Json.Linq;
+
+namespace ET.Server
+{
+    [FriendOf(typeof(MapEventComponent))]
+    [FriendOfAttribute(typeof(ET.Server.Map))]
+    public static class MapEventComponentSystem
+    {
+        public class MapEventComponentAwakeSystem : AwakeSystem<MapEventComponent, Map>
+        {
+            /// <summary>
+            /// 场景事件组件创建
+            /// </summary>
+            /// <param name="self"></param>
+            /// <param name="map"></param>
+            protected override void Awake(MapEventComponent self, Map map)
+            {
+                Log.Info($"创建事件组件...");
+            }
+        }
+
+        public class MapEventComponentDestroySystem : DestroySystem<MapEventComponent>
+        {
+            /// <summary>
+            /// 场景事件组件销毁
+            /// </summary>
+            /// <param name="self"></param>
+            protected override void Destroy(MapEventComponent self)
+            {
+                Log.Info($"销毁事件组件...");
+            }
+        }
+
+        /** 玩家进场景后推的消息 **/
+        public static void OnReady(this MapEventComponent self, WNPlayer player)
+        {
+
+        }
+
+        /** 玩家登录事件 **/
+        public static void OnPlayerLogin(this MapEventComponent self, WNPlayer player)
+        {
+        }
+
+        /** 角色成功进入场景 **/
+        public static void OnPlayerEntered(this MapEventComponent self, WNPlayer player)
+        {
+        }
+
+        /** 单位死亡事件 **/
+        public static void OnUnitDead(this MapEventComponent self, Monster monsterProp, Map map)
+        {
+            int bossId = monsterProp.Id;
+            if (self.MonsterDeadList.Exists(monsterId => monsterId == bossId))
+            {
+                return;
+            }
+
+            if (bossId > 0)
+            {
+                self.MonsterDeadList.Add(bossId);
+            }
+
+            // 条件满足就结束
+            if (self.MonsterDeadList.Contains(1001) && self.MonsterDeadList.Contains(1002) && self.MonsterDeadList.Contains(1003))
+            {
+                self.OnGameOver(map);
+            }
+        }
+
+        /** 副本消息 **/
+        public static void OnMessageEvent(this MapEventComponent self, JObject msg)
+        {
+
+        }
+
+        /** 场景结算事件 **/
+        public static void OnGameOver(this MapEventComponent self, Map map)
+        {
+            if (map?.Players is not { Count: > 0 })
+            {
+                return;
+            }
+
+            foreach (WNPlayer player in map.Players.Values.Where(player => player != null))
+            {
+                MessageHelper.SendToClient(player, new G2C_GameOver());
+            }
+
+            // 战斗服结束场景
+            map.GetZoneManager().destroyZoneRequest(self.Id.ToString());
+        }
+
+        /** 拾取道具 **/
+        public static void OnPickItem(this MapEventComponent self, JObject msg)
+        {
+
+        }
+
+        /** 击杀boss **/
+        public static void OnKillBoss(this MapEventComponent self, JObject msg)
+        {
+
+        }
+
+        /** 战斗统计 **/
+        public static void OnBattleReport(this MapEventComponent self, JObject msg)
+        {
+
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using BattleIce;
 using Newtonsoft.Json;
@@ -22,11 +23,13 @@ namespace ET.Server
             {
                 self.createTime = TimeHelper.ServerNow();
 
-                Log.Debug($"create area opts:{opts}");
+                Log.Debug($"create area opts:{JsonConvert.SerializeObject(opts, Formatting.Indented)}");
                 self.LogicServerId = opts.SelectToken("logicServerId") != null? Convert.ToInt32(opts.SelectToken("logicServerId")) : 0;
                 self.MapId = Convert.ToInt32(opts.SelectToken("areaId"));
                 self.Prop = MapConfigCategory.Instance.Get(self.MapId);
                 self.Type = self.Prop.Type;
+                // 添加组件
+                self.AddComponent<MapEventComponent, Map>(self);
             }
         }
 
@@ -75,9 +78,16 @@ namespace ET.Server
         {
             Log.Info($"addPlayer: playerId={player.GetId()}, mapId={self.MapId}, ip={player.Session.RemoteAddress}");
             self.SetForce(player);
+            self.Players.TryAdd(player.GetId(), player);
             player.Map = self;
         }
 
+        /** 获取场景角色 **/
+        public static WNPlayer GetPlayer(this Map self, long playerId)
+        {
+            return self.Players.TryGetValue(playerId, out WNPlayer player) ? player : null;
+        }
+
         /** 分配阵营 **/
         public static void SetForce(this Map self, WNPlayer player)
         {
@@ -88,7 +98,7 @@ namespace ET.Server
         public static void RemovePlayer(this Map self, WNPlayer player, bool keepObject)
         {
             Log.Info($"removePlayer: playerId={player.GetId()}, mapId={self.MapId}, ip={player.Session.RemoteAddress}");
-            self.Players.TryGetValue(player.GetId(), out WNPlayer actorPlayer);
+            WNPlayer actorPlayer = self.GetPlayer(player.GetId());
             if (actorPlayer != null)
             {
                 self.Players.Remove(player.GetId());
@@ -131,22 +141,6 @@ namespace ET.Server
             Log.Debug($"playerLeaveRequest--------------------{player.GetName()} - {self.InstanceId} - {self.Prop.Name}");
         }
 
-        /** 玩家进场景后推的消息 **/
-        public static void OnReady(this Map self, WNPlayer player)
-        {
-
-        }
-
-        /** 玩家登录事件 **/
-        public static void OnPlayerLogin(this Map self, WNPlayer player)
-        {
-        }
-
-        /** 角色成功进入场景 **/
-        public static void OnPlayerEntered(this Map self, WNPlayer player)
-        {
-        }
-
         /** 绑定战斗服 **/
         public static void BindBattleServer(this Map self, WNPlayer player, string serverId)
         {

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

@@ -46,11 +46,10 @@ namespace ET.Server
                     map.RemovePlayer(player, false);
                     // 移除本地组件数据
                     map.DomainScene().GetComponent<GamePlayerComponent>().Remove(player.GetId());
+                    // 战斗服结束场景
+                    map.GetZoneManager().destroyZoneRequest(map.Id.ToString());
                 }
 
-                // 战斗服结束场景
-                player.GetZoneManager().destroyZoneRequest(map.Id.ToString());
-
                 player.Dispose();
             }
         }

DotNet/Hotfix/Session/NetInnerComponentOnReadEvent.cs

@@ -88,7 +88,7 @@ namespace ET.Server
                         Entity entity = Root.Instance.Get(realActorId);
                         if (entity == null)
                         {
-                            Log.Error($"not found actor: {scene.Name} {realActorId} {message}");
+                            // Log.Error($"not found actor: {scene.Name} {realActorId} {message}");
                             break;
                         }
 

DotNet/Model/Generate/Message/OuterMessage_C_10001.cs

@@ -673,6 +673,21 @@ namespace ET
 
 	}
 
+	[Message(OuterMessage.G2C_GameOver)]
+	[ProtoContract]
+	public partial class G2C_GameOver: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
 	public static class OuterMessage
 	{
 		 public const ushort HttpGetRouterResponse = 10002;
@@ -720,5 +735,6 @@ namespace ET
 		 public const ushort C2G_Benchmark = 10044;
 		 public const ushort G2C_Benchmark = 10045;
 		 public const ushort R2C_Disconnect = 10046;
+		 public const ushort G2C_GameOver = 10047;
 	}
 }

DotNet/Model/IceGenerate/ZoneManager.cs

@@ -126,14 +126,14 @@ namespace BattleIce
         /// <summary>
         /// 场景管理器相关协议
         /// </summary>
-        
+
         int setCallback(Ice.Identity ident, string srvUUID);
 
         /// <summary>
         /// 场景管理器相关协议
         /// </summary>
         /// <param name="ctx__">The Context map to send with the invocation.</param>
-        
+
         int setCallback(Ice.Identity ident, string srvUUID, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         /// <summary>
@@ -175,14 +175,14 @@ namespace BattleIce
         /// <summary>
         /// 场景副本相关协议
         /// </summary>
-        
+
         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>
-        
+
         int createZoneRequest(string playerId, string gameServerId, int mapTemplateId, string instanceId, bool force, string data, _System.Collections.Generic.Dictionary<string, string> ctx__);
 
         /// <summary>
@@ -238,14 +238,14 @@ namespace BattleIce
         /// <summary>
         /// 玩家相关协议
         /// </summary>
-        
+
         void clearAllPlayersRequest();
 
         /// <summary>
         /// 玩家相关协议
         /// </summary>
         /// <param name="ctx__">The Context map to send with the invocation.</param>
-        
+
         void clearAllPlayersRequest(_System.Collections.Generic.Dictionary<string, string> ctx__);
 
         /// <summary>
@@ -405,7 +405,7 @@ namespace BattleIce
         /// 场景管理器相关协议
         /// </summary>
         /// <param name="current__">The Current object for the invocation.</param>
-        
+
         int setCallback(Ice.Identity ident, string srvUUID, Ice.Current current__);
 
         /// <summary>
@@ -445,7 +445,7 @@ namespace BattleIce
         /// <summary>
         /// 场景管理器相关协议
         /// </summary>
-        
+
         int setCallback(Ice.Identity ident, string srvUUID);
 
         /// <summary>
@@ -1908,7 +1908,7 @@ namespace BattleIce
 
         #region Slice type-related members
 
-        public static new readonly string[] ids__ = 
+        public static new readonly string[] ids__ =
         {
             "::BattleIce::ZoneManagerCallback",
             "::Ice::Object"
@@ -2119,7 +2119,7 @@ namespace BattleIce
 
         #region Slice type-related members
 
-        public static new readonly string[] ids__ = 
+        public static new readonly string[] ids__ =
         {
             "::BattleIce::ZoneManager",
             "::Ice::Object"

DotNet/Model/Module/RobotCase/RobotLog.cs

@@ -1,20 +1,27 @@
 namespace ET.Server
 {
-	public static class RobotLog
-	{
-		public static void Debug(string msg)
-		{
-			Log.Info(msg);
-		}
-		
-		public static void Debug(string msg, params object[] args)
-		{
-			Log.Info(msg, args);
-		}
+    public static class RobotLog
+    {
+#if DOTNET
+        public static void Debug(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        {
+            Logger.Instance.Debug(message.ToStringAndClear());
+        }
 
-		public static void Console(string msg)
-		{
-			Log.Console(msg);
-		}
-	}
-}
+        public static void Console(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        {
+            Logger.Instance.Console(message.ToStringAndClear());
+        }
+#endif
+
+        public static void Debug(string msg)
+        {
+            Logger.Instance.Debug(msg);
+        }
+
+        public static void Console(string msg)
+        {
+            Logger.Instance.Console(msg);
+        }
+    }
+}

DotNet/Model/Scenes/Game/GameMapComponent.cs

@@ -8,7 +8,10 @@ namespace ET.Server
     [ComponentOf(typeof(Scene))]
     public class GameMapComponent: Entity, IAwake, IDestroy
     {
+        [StaticField]
+        public static GameMapComponent Instance;
         /** 场景集合 key:instanceId, value:map **/
-        public readonly Dictionary<long, Map> allMaps = new Dictionary<long, Map>();
+        [StaticField]
+        public Dictionary<long, Map> allMaps = new Dictionary<long, Map>();
     }
 }

DotNet/Model/Scenes/Game/Map/Map.cs

@@ -22,7 +22,7 @@ namespace ET.Server
         /** 副本创建时间 **/
         public long createTime { get; set; }
         /** 场景里的角色 **/
+        [StaticField]
         public Dictionary<long, WNPlayer> Players = new Dictionary<long, WNPlayer>();
-
     }
 }

DotNet/Model/Scenes/Game/Map/MapEventComponent.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace ET.Server
+{
+    [ComponentOf(typeof (Map))]
+    public class MapEventComponent: Entity, IAwake<Map>, IDestroy
+    {
+        /** 已杀的boss列表 **/
+        [StaticField]
+        public List<int> MonsterDeadList = new List<int>();
+    }
+}

Share/Analyzer/Analyzer/StaticClassCircularDependencyAnalyzer.cs

@@ -27,6 +27,8 @@ namespace ET.Analyzer
 
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 
+        private object lockObj = new object();
+
         public override void Initialize(AnalysisContext context)
         {
             if (!AnalyzerGlobalSetting.EnableAnalyzer)
@@ -61,7 +63,7 @@ namespace ET.Analyzer
             context.RegisterCompilationEndAction(analysisContext => { this.CircularDependencyAnalyze(analysisContext, dependencyMap, staticClassSet); });
         }
 
-        
+
 
         /// <summary>
         /// 静态类依赖分析 构建depedencyMap
@@ -97,9 +99,12 @@ namespace ET.Analyzer
 
             string methodClassTypeName = methodSymbol.ContainingType.ToString();
 
-            if (!staticClassSet.Contains(selfClassTypeName))
+            lock (this.lockObj)
             {
-                staticClassSet.Add(selfClassTypeName);
+                if (!staticClassSet.Contains(selfClassTypeName))
+                {
+                    staticClassSet.Add(selfClassTypeName);
+                }
             }
 
             // 筛选出对其他静态类的函数调用
@@ -118,10 +123,15 @@ namespace ET.Analyzer
                 dependencyMap[methodClassTypeName] = new HashSet<string>();
             }
 
-            if (!dependencyMap[methodClassTypeName].Contains(selfClassTypeName))
+            var set = dependencyMap[methodClassTypeName];
+            lock (set)
             {
-                dependencyMap[methodClassTypeName].Add(selfClassTypeName);
+                if (!set.Contains(selfClassTypeName))
+                {
+                    set.Add(selfClassTypeName);
+                }
             }
+
         }
 
         /// <summary>
@@ -130,7 +140,7 @@ namespace ET.Analyzer
         private void CircularDependencyAnalyze(CompilationAnalysisContext context, ConcurrentDictionary<string, HashSet<string>> dependencyMap,
         HashSet<string> staticClassSet)
         {
-            
+
             // 排除只引用其他静态类的静态类
             while (true)
             {
@@ -152,13 +162,13 @@ namespace ET.Analyzer
                     break;
                 }
             }
-            
+
             var staticClassDependencyMap = new ConcurrentDictionary<string, HashSet<string>>();
             foreach (string? staticClass in staticClassSet)
             {
                 staticClassDependencyMap[staticClass] = dependencyMap[staticClass];
             }
-            
+
             //排除只被其他静态类引用的静态类
             while (true)
             {
@@ -193,7 +203,7 @@ namespace ET.Analyzer
                 return stringBuilder.ToString();
             }
         }
-        
+
         /// <summary>
         /// 获取没有被任何其他静态类引用的静态类
         /// </summary>

Unity/Assets/Scripts/Codes/Hotfix/Share/Module/Message/SessionAcceptTimeoutComponentSystem.cs

@@ -17,7 +17,7 @@ namespace ET
             }
         }
     }
-    
+
     [ObjectSystem]
     public class SessionAcceptTimeoutComponentAwakeSystem: AwakeSystem<SessionAcceptTimeoutComponent>
     {

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/OuterMessage_C_10001.cs

@@ -673,6 +673,21 @@ namespace ET
 
 	}
 
+	[Message(OuterMessage.G2C_GameOver)]
+	[ProtoContract]
+	public partial class G2C_GameOver: ProtoObject, IActorMessage
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
 	public static class OuterMessage
 	{
 		 public const ushort HttpGetRouterResponse = 10002;
@@ -720,5 +735,6 @@ namespace ET
 		 public const ushort C2G_Benchmark = 10044;
 		 public const ushort G2C_Benchmark = 10045;
 		 public const ushort R2C_Disconnect = 10046;
+		 public const ushort G2C_GameOver = 10047;
 	}
 }

Unity/Assets/Scripts/Core/Module/Entity/Entity.cs

@@ -20,7 +20,7 @@ namespace ET
 #if ENABLE_VIEW && UNITY_EDITOR
         private UnityEngine.GameObject viewGO;
 #endif
-        
+
         [BsonIgnore]
         public long InstanceId
         {
@@ -72,7 +72,7 @@ namespace ET
                     this.status &= ~EntityStatus.IsRegister;
                 }
 
-                
+
                 if (!value)
                 {
                     Root.Instance.Remove(this.InstanceId);
@@ -88,7 +88,7 @@ namespace ET
                 {
                     this.viewGO = new UnityEngine.GameObject(this.ViewName);
                     this.viewGO.AddComponent<ComponentView>().Component = this;
-                    this.viewGO.transform.SetParent(this.Parent == null? 
+                    this.viewGO.transform.SetParent(this.Parent == null?
                             UnityEngine.GameObject.Find("Global").transform : this.Parent.viewGO.transform);
                 }
                 else
@@ -98,12 +98,12 @@ namespace ET
 #endif
             }
         }
-        
+
         protected virtual string ViewName
         {
             get
             {
-                return this.GetType().Name;    
+                return this.GetType().Name;
             }
         }
 
@@ -140,7 +140,7 @@ namespace ET
                 }
             }
         }
-        
+
         [BsonIgnore]
         protected bool IsNew
         {
@@ -175,7 +175,7 @@ namespace ET
                 {
                     throw new Exception($"cant set parent null: {this.GetType().Name}");
                 }
-                
+
                 if (value == this)
                 {
                     throw new Exception($"cant set parent self: {this.GetType().Name}");
@@ -197,7 +197,7 @@ namespace ET
                     }
                     this.parent.RemoveFromChildren(this);
                 }
-                
+
                 this.parent = value;
                 this.IsComponent = false;
                 this.parent.AddToChildren(this);
@@ -215,18 +215,18 @@ namespace ET
                 {
                     throw new Exception($"cant set parent null: {this.GetType().Name}");
                 }
-                
+
                 if (value == this)
                 {
                     throw new Exception($"cant set parent self: {this.GetType().Name}");
                 }
-                
+
                 // 严格限制parent必须要有domain,也就是说parent必须在数据树上面
                 if (value.Domain == null)
                 {
                     throw new Exception($"cant set parent because parent domain is null: {this.GetType().Name} {value.GetType().Name}");
                 }
-                
+
                 if (this.parent != null) // 之前有parent
                 {
                     // parent相同，不设置
@@ -276,20 +276,20 @@ namespace ET
                 {
                     throw new Exception($"domain cant set null: {this.GetType().Name}");
                 }
-                
+
                 if (this.domain == value)
                 {
                     return;
                 }
-                
+
                 Entity preDomain = this.domain;
                 this.domain = value;
-                
+
                 if (preDomain == null)
                 {
                     this.InstanceId = IdGenerater.Instance.GenerateInstanceId();
                     this.IsRegister = true;
-                    
+
                     // 反序列化出来的需要设置父子关系
                     if (this.componentsDB != null)
                     {
@@ -436,30 +436,6 @@ namespace ET
             this.IsRegister = false;
             this.InstanceId = 0;
 
-            // 清理Component
-            if (this.components != null)
-            {
-                foreach (KeyValuePair<Type, Entity> kv in this.components)
-                {
-                    kv.Value.Dispose();
-                }
-
-                this.components.Clear();
-                ObjectPool.Instance.Recycle(this.components);
-                this.components = null;
-
-                // 创建的才需要回到池中,从db中不需要回收
-                if (this.componentsDB != null)
-                {
-                    this.componentsDB.Clear();
-                    if (this.IsNew)
-                    {
-                        ObjectPool.Instance.Recycle(this.componentsDB);
-                        this.componentsDB = null;
-                    }
-                }
-            }
-
             // 清理Children
             if (this.children != null)
             {
@@ -484,6 +460,30 @@ namespace ET
                 }
             }
 
+            // 清理Component
+            if (this.components != null)
+            {
+                foreach (KeyValuePair<Type, Entity> kv in this.components)
+                {
+                    kv.Value.Dispose();
+                }
+
+                this.components.Clear();
+                ObjectPool.Instance.Recycle(this.components);
+                this.components = null;
+
+                // 创建的才需要回到池中,从db中不需要回收
+                if (this.componentsDB != null)
+                {
+                    this.componentsDB.Clear();
+                    if (this.IsNew)
+                    {
+                        ObjectPool.Instance.Recycle(this.componentsDB);
+                        this.componentsDB = null;
+                    }
+                }
+            }
+
             // 触发Destroy事件
             if (this is IDestroy)
             {
@@ -507,7 +507,7 @@ namespace ET
             this.parent = null;
 
             base.Dispose();
-            
+
             if (this.IsFromPool)
             {
                 ObjectPool.Instance.Recycle(this);
@@ -521,7 +521,7 @@ namespace ET
             {
                 return;
             }
-            
+
             this.componentsDB ??= ObjectPool.Instance.Fetch<HashSet<Entity>>();
             this.componentsDB.Add(component);
         }
@@ -532,7 +532,7 @@ namespace ET
             {
                 return;
             }
-            
+
             if (this.componentsDB == null)
             {
                 return;
@@ -579,7 +579,7 @@ namespace ET
             this.children.TryGetValue(id, out Entity child);
             return child as K;
         }
-        
+
         public void RemoveChild(long id)
         {
             if (this.children == null)
@@ -591,7 +591,7 @@ namespace ET
             {
                 return;
             }
-            
+
             this.children.Remove(id);
             child.Dispose();
         }
@@ -697,7 +697,7 @@ namespace ET
             {
                 return null;
             }
-            
+
             // 如果有IGetComponent接口，则触发GetComponentSystem
             if (this is IGetComponent)
             {
@@ -706,7 +706,7 @@ namespace ET
 
             return component;
         }
-        
+
         private static Entity Create(Type type, bool isFromPool)
         {
             Entity component;
@@ -753,7 +753,7 @@ namespace ET
             component.Id = this.Id;
             component.ComponentParent = this;
             EventSystem.Instance.Awake(component);
-            
+
             if (this is IAddComponent)
             {
                 EventSystem.Instance.AddComponent(this, component);
@@ -773,7 +773,7 @@ namespace ET
             component.Id = this.Id;
             component.ComponentParent = this;
             EventSystem.Instance.Awake(component);
-            
+
             if (this is IAddComponent)
             {
                 EventSystem.Instance.AddComponent(this, component);
@@ -793,7 +793,7 @@ namespace ET
             component.Id = this.Id;
             component.ComponentParent = this;
             EventSystem.Instance.Awake(component, p1);
-            
+
             if (this is IAddComponent)
             {
                 EventSystem.Instance.AddComponent(this, component);
@@ -813,7 +813,7 @@ namespace ET
             component.Id = this.Id;
             component.ComponentParent = this;
             EventSystem.Instance.Awake(component, p1, p2);
-            
+
             if (this is IAddComponent)
             {
                 EventSystem.Instance.AddComponent(this, component);
@@ -833,14 +833,14 @@ namespace ET
             component.Id = this.Id;
             component.ComponentParent = this;
             EventSystem.Instance.Awake(component, p1, p2, p3);
-            
+
             if (this is IAddComponent)
             {
                 EventSystem.Instance.AddComponent(this, component);
             }
             return component as K;
         }
-        
+
         public Entity AddChild(Entity entity)
         {
             entity.Parent = this;

Unity/Assets/Scripts/Core/Module/Log/Log.cs

@@ -34,45 +34,46 @@ namespace ET
             Logger.Instance.Error(msg);
         }
 
-        public static void Error(Exception e)
+        public static void Error(Exception msg)
         {
-            Logger.Instance.Error(e);
+            Logger.Instance.Error(msg);
         }
 
-        public static void Trace(string message, params object[] args)
+        public static void Console(string msg)
         {
-            Logger.Instance.Trace(message, args);
+            Logger.Instance.Console(msg);
         }
 
-        public static void Warning(string message, params object[] args)
+#if DOTNET
+        public static void Trace(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Logger.Instance.Warning(string.Format(message, args));
+            Logger.Instance.Trace(message.ToStringAndClear());
         }
 
-        public static void Info(string message, params object[] args)
+        public static void Warning(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Logger.Instance.Info(string.Format(message, args));
+            Logger.Instance.Warning(message.ToStringAndClear());
         }
 
-        public static void Debug(string message, params object[] args)
+        public static void Info(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Logger.Instance.Debug(string.Format(message, args));
-
+            Logger.Instance.Info(message.ToStringAndClear());
         }
 
-        public static void Error(string message, params object[] args)
+        public static void Debug(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Logger.Instance.Error(message, args);
+            Logger.Instance.Debug(message.ToStringAndClear());
         }
-        
-        public static void Console(string message)
+
+        public static void Error(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Logger.Instance.Console(message);
+            Logger.Instance.Error(message.ToStringAndClear());
         }
-        
-        public static void Console(string message, params object[] args)
+
+        public static void Console(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
         {
-            Logger.Instance.Console(message, args);
+            Logger.Instance.Console(message.ToStringAndClear());
         }
+#endif
     }
 }