From 794d31c3d9615701ef8f04a199417737ddf60bd7 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 11 一月 2019 09:59:57 +0800
Subject: [PATCH] 5762 子 【开发】【1.5】新增300级后的成长基金 / 【后端】【1.5】新增300级后的成长基金

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
index 4dea3c3..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()
@@ -628,11 +627,15 @@
     isRobotNPC = True
     pkDataDict = {}
     conWinCnt = XMZZPlayerDict[myPlayerID].ConWinCnt #参数
-    XMZZSpecialNPCRate = eval(IpyGameDataPY.GetFuncCfg('XMZZSpecialNPCRate'))
+    XMZZSpecialNPCRate = eval(IpyGameDataPY.GetFuncCompileCfg('XMZZSpecialNPCRate'))
+    XMZZSuperNPCRate = eval(IpyGameDataPY.GetFuncCompileCfg('XMZZSpecialNPCRate', 2))
     XMZZNPCByLVPowerList = IpyGameDataPY.GetFuncEvalCfg('XMZZPKPowerRange', 2)
     isByLVPower = conWinCnt + 1 in XMZZNPCByLVPowerList #是否按等级表战力来随机范围
+    if GameWorld.CanHappen(XMZZSuperNPCRate):
+        GameWorld.DebugLog('    筛选对手  超级机器人 XMZZSuperNPCRate=%s' % (XMZZSuperNPCRate))
+        pkPlayerID = 2
     
-    if not isByLVPower and GameWorld.CanHappen(XMZZSpecialNPCRate):
+    elif not isByLVPower and GameWorld.CanHappen(XMZZSpecialNPCRate):
         GameWorld.DebugLog('    筛选对手  高级机器人 XMZZSpecialNPCRate=%s' % (XMZZSpecialNPCRate))
         #机器人ID规则: ID从0~n, n不大于机器人ID列表长度, ID越大机器人越高级,根据策划需求自增
         #高级机器人
@@ -690,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