From 05365b968edacad72707a1a931a700200ed5cd4f Mon Sep 17 00:00:00 2001
From: Cal <3027929699@qq.com>
Date: Sat, 22 Jan 2022 20:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=9E=E6=8A=80=E5=9C=BAbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FileServer/FileServer.exe                     | Bin 174592 -> 174592 bytes
 Proto/Proto2CS.exe                            | Bin 174592 -> 174592 bytes
 .../NewSkill/System/SkillLogicSystem.cs       |   8 +++---
 Server/Hotfix/Game/System/Map/PvpMapSystem.cs |  25 ++++++++++--------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/FileServer/FileServer.exe b/FileServer/FileServer.exe
index 48677edc81fe188ea65698ca308273c24caeb636..5af3b36665a01d9d0469ee2c1ed9a6e299a9402c 100755
GIT binary patch
delta 202
zcmZp;!qsqvYr+fWz=yLMUvGWQD887{Xgl)~#<>dq#tfzmX$*-#(wxB(NE<U4Fc^VZ
zsX%d41`{Am2C|ZX;z>YRW1zZJAj=#GlNc<3&<F@Ys#1V#gYEB+Ft&zR11(Bq00Jf;
z&I95lR!j^_bU-`?2ACWVkSzkj)=Uf{x^TJe>m`|f3JE;gcE0xh^u3M~IbTV&@dX5K
K-=V|gQ40Vq+Az`p

delta 202
zcmZp;!qsqvYr+fW63ODm*IQpRiZ5m~+|Im&ajt@Y3PT!$1w$f35<@bB0g!FZkP76P
z0WnB41qdyHGATfLBL-uzNHS0+iNO#^ngLaV#EgM*mOwQ?leWJ<!q^&O4YVkc0SK6Y
zI1h-ISTQjy(E;%o7+`WdK(+`7TQf0;=)&c;ua{){DI~Dzhh*(G7Hz*hS-CvxRrlT6
KzC(w}qZR<m^e%M(

diff --git a/Proto/Proto2CS.exe b/Proto/Proto2CS.exe
index d431ae56f2c4650d5b25bc4e72077d39cccc85fd..66fa165fc042bbdf41433aef16f60b852a2459de 100755
GIT binary patch
delta 202
zcmZp;!qsqvYr+fWz=yLMUvGWQD887{Xgl)~#<>dq#tfzmX$*-#(wxB(NE<U4Fc^VZ
zsX%d41`{Am2C|ZX;z>YRW1zZJAj=#GlNc<3&<F@Ys#1V#gYEB+Ft&zR11(Bq00Jf;
z&I95lR!j^_bU-`?2ACWVkSzkj)=Uf{x^TJe>m`|f3JE;gcE0xh^u3M~IbTV&@dX5K
K-=V|gQ40Vq+Az`p

delta 202
zcmZp;!qsqvYr+fW63ODm*IQpRiZ5m~+|Im&ajt@Y3PT!$1w$f35<@bB0g!FZkP76P
z0WnB41qdyHGATfLBL-uzNHS0+iNO#^ngLaV#EgM*mOwQ?leWJ<!q^&O4YVkc0SK6Y
zI1h-ISTQjy(E;%o7+`WdK(+`7TQf0;=)&c;ua{){DI~Dzhh*(G7Hz*hS-CvxRrlT6
KzC(w}qZR<m^e%M(

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