From affca29e7500fc8e2e65cf15d19496a370f6329e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 27 十二月 2018 16:22:58 +0800
Subject: [PATCH] 860312 机器人

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
index 75f7fc5..992ecc5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
@@ -483,7 +483,7 @@
         #阵营奖励
         winAward = IpyGameDataPY.GetFuncEvalCfg('XMZZAward', 3)
         LoseAward = IpyGameDataPY.GetFuncEvalCfg('XMZZAward', 4)
-        dogfallAward = IpyGameDataPY.GetFuncEvalCfg('XMZZAward', 5)
+        dogfallAward = IpyGameDataPY.GetFuncCfg('XMZZAward', 5)
         result = self.GetXMZZCurResult()
         if result == Faction_1:
             SavePKRecord('XMZZ_Victory', [result], True)          
@@ -501,7 +501,6 @@
                 SavePKRecord('XMZZ_Draw', [], True)
                 
                 PlayerCompensation.SendMailByKey('XMZZDogfall', Faction_2_IDList + Faction_1_IDList, [], goldPaper=dogfallAward)
-                #PlayerControl.MergeWorldNotify(0, '', [])
         
         PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_XMZZIsOver, 1)
         self.NotifyXMZZInfo()
@@ -694,7 +693,7 @@
                 aboveList2.append(playerID)
         GameWorld.DebugLog('    筛选对手 myPower=%s,underList1=%s, aboveList1=%s,underList2=%s, aboveList2=%s' % (myPower, underList1, aboveList1, underList2, aboveList2), myPlayerID)
 
-        if conWinCnt % 5 == 0: #每5个匹配战力低的对手
+        if conWinCnt % 5 == 0 or conWinCnt <= IpyGameDataPY.GetFuncCfg('XMZZPKPowerRange', 3): #每5个匹配战力低的对手
             if underList1:
                 pkPlayerID = underList1[0]
             elif underList2:

--
Gitblit v1.8.0