diff --git a/FileServer/FileServer.exe b/FileServer/FileServer.exe
index 48677edc..5af3b366 100755
Binary files a/FileServer/FileServer.exe and b/FileServer/FileServer.exe differ
diff --git a/Proto/Proto2CS.exe b/Proto/Proto2CS.exe
index d431ae56..66fa165f 100755
Binary files a/Proto/Proto2CS.exe and b/Proto/Proto2CS.exe differ
diff --git a/Server/Hotfix/Game/SkillSystem/NewSkill/System/SkillLogicSystem.cs b/Server/Hotfix/Game/SkillSystem/NewSkill/System/SkillLogicSystem.cs
index 4568ea6b..9dcccfc1 100755
--- a/Server/Hotfix/Game/SkillSystem/NewSkill/System/SkillLogicSystem.cs
+++ b/Server/Hotfix/Game/SkillSystem/NewSkill/System/SkillLogicSystem.cs
@@ -53,7 +53,7 @@ namespace ET
             AttackComponent attacker = self.owner.GetComponent<AttackComponent>();
             if (attacker == null)
             {
-                Log.Error($"attacker == null");
+                // Log.Error($"attacker == null");
                 return 1;
             }
 
@@ -65,7 +65,7 @@ namespace ET
             AttackComponent attacker = self.owner.GetComponent<AttackComponent>();
             if (attacker == null)
             {
-                Log.Error($"attacker == null");
+                // Log.Error($"attacker == null");
                 return;
             }
 
@@ -78,7 +78,7 @@ namespace ET
             AttackComponent attacker = self.owner.GetComponent<AttackComponent>();
             if (attacker == null)
             {
-                Log.Error($"attacker == null");
+                // Log.Error($"attacker == null");
                 return 1;
             }
 
@@ -90,7 +90,7 @@ namespace ET
             AttackComponent attacker = self.owner.GetComponent<AttackComponent>();
             if (attacker == null)
             {
-                Log.Error($"attacker == null");
+                // Log.Error($"attacker == null");
                 return;
             }
 
diff --git a/Server/Hotfix/Game/System/Map/PvpMapSystem.cs b/Server/Hotfix/Game/System/Map/PvpMapSystem.cs
index 9ff9d9d9..e5fd8dc8 100755
--- a/Server/Hotfix/Game/System/Map/PvpMapSystem.cs
+++ b/Server/Hotfix/Game/System/Map/PvpMapSystem.cs
@@ -47,12 +47,12 @@ namespace ET
         public static void UpdatePer30(this PvpMap self)
         {
             if (PvpMap.inatance.CanPvp() != null) return;
-            PvpMap.inatance.MatchBattle(PvpMap.inatance.matchGoldList);
-            PvpMap.inatance.MatchBattle(PvpMap.inatance.matchSliverList);
-            PvpMap.inatance.MatchBattle(PvpMap.inatance.matchCupperList);
             ClearNotInSceneUnit(PersonalPvpType.Cupper, PvpMap.inatance.matchCupperList);
             ClearNotInSceneUnit(PersonalPvpType.Sliver, PvpMap.inatance.matchSliverList);
             ClearNotInSceneUnit(PersonalPvpType.Gold, PvpMap.inatance.matchGoldList);
+            PvpMap.inatance.MatchBattle(PvpMap.inatance.matchGoldList);
+            PvpMap.inatance.MatchBattle(PvpMap.inatance.matchSliverList);
+            PvpMap.inatance.MatchBattle(PvpMap.inatance.matchCupperList);
         }
 
         private static void ClearNotInSceneUnit(PersonalPvpType type, List<Unit> list)
@@ -372,13 +372,13 @@ namespace ET
             }
             
             PersonalPvpType type = GetLevelType(self, data.personalScord);
-            // int sceneId = unitSceneMapId / 100;
-            // PersonalPvpType pvpType = GetTypeBySceneId(sceneId);
-            // if (type != pvpType)
-            // { 
-            //     Game.EventSystem.Publish(new ET.EventType.BackMainCity { unit = unit, }).Coroutine();
-            //     return "上次已结算";
-            // }
+            int sceneId = unitSceneMapId / 100;
+            PersonalPvpType pvpType = GetTypeBySceneId(sceneId);
+            if (type != pvpType)
+            { 
+                Game.EventSystem.Publish(new ET.EventType.BackMainCity { unit = unit, }).Coroutine();
+                return "上次已结算";
+            }
 
             UnitScene unitScene = unit.GetComponent<UnitScene>();
             UnitSceneType unitSceneType = MapHelper.GetMapType(unitScene.MapId / 100);
@@ -433,7 +433,10 @@ namespace ET
             if (list.Count < 2) return;
             using ListComponent<Unit> listComponent = ListComponent<Unit>.Create();
             listComponent.List.AddRange(list.FindAll(t =>
-                    t && t.teamState != TeamState.Fight && t.GetComponent<PlayerData>().personalPvpCount < ConstDefine.PersonalMaxBattleCount));
+                    t &&
+                    t.teamState != TeamState.Fight &&
+                    t.GetComponent<PlayerData>().personalPvpCount < ConstDefine.PersonalMaxBattleCount
+                    ));
             listComponent.List.Sort((a, b) =>
             {
                 try