From 118dfec06bcec570a8760734375b2132954464cc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 01 八月 2019 13:44:44 +0800
Subject: [PATCH] 8180 【后端】【主干】优化组队打BOSS(修复仙盟狗熊王掉落问题)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 2db25a8..f7c3a8e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1180,8 +1180,6 @@
                 "CrossRealmPKDan":(
                         ("BYTE", "DanLV", 1),
                         ("WORD", "LVUpScore", 0),
-                        ("BYTE", "MatchRobotRate", 0),
-                        ("BYTE", "MatchRobotRateEx", 0),
                         ),
 
                 "CrossRealmPKDanAward":(
@@ -1382,7 +1380,8 @@
                         ("BYTE", "IsJobLimit", 0),
                         ("list", "CostEquipColor", 0),
                         ("BYTE", "CostEquipCnt", 0),
-                        ("BYTE", "SuitTotalRate", 0),
+                        ("BYTE", "UnSuitRate", 0),
+                        ("BYTE", "SuitRate", 0),
                         ("dict", "CostItemDict", 0),
                         ("dict", "StarAttrInfo", 0),
                         ("dict", "BaseAttrInfo", 0),
@@ -1484,6 +1483,12 @@
                         ("DWORD", "NeedExp", 0),
                         ("dict", "AttrInfo", 0),
                         ("BYTE", "SkinIndex", 0),
+                        ),
+
+                "HistoryRechargeAward":(
+                        ("BYTE", "ID", 1),
+                        ("DWORD", "Recharge", 0),
+                        ("dict", "Reward", 0),
                         ),
                 }
 
@@ -3894,15 +3899,11 @@
     
     def __init__(self):
         self.DanLV = 0
-        self.LVUpScore = 0
-        self.MatchRobotRate = 0
-        self.MatchRobotRateEx = 0
+        self.LVUpScore = 0
         return
         
     def GetDanLV(self): return self.DanLV # 段位等级
-    def GetLVUpScore(self): return self.LVUpScore # 升段位所需积分
-    def GetMatchRobotRate(self): return self.MatchRobotRate # 匹配机器人基础概率,百分率
-    def GetMatchRobotRateEx(self): return self.MatchRobotRateEx # 匹配机器人失败次数附加概率,百分率
+    def GetLVUpScore(self): return self.LVUpScore # 升段位所需积分
 
 # 跨服竞技场段位奖励表
 class IPY_CrossRealmPKDanAward():
@@ -4319,7 +4320,8 @@
         self.IsJobLimit = 0
         self.CostEquipColor = []
         self.CostEquipCnt = 0
-        self.SuitTotalRate = 0
+        self.UnSuitRate = 0
+        self.SuitRate = 0
         self.CostItemDict = {}
         self.StarAttrInfo = {}
         self.BaseAttrInfo = {}
@@ -4332,7 +4334,8 @@
     def GetIsJobLimit(self): return self.IsJobLimit # 是否只用本职业装备材料
     def GetCostEquipColor(self): return self.CostEquipColor # 可用装备品质
     def GetCostEquipCnt(self): return self.CostEquipCnt # 装备数量
-    def GetSuitTotalRate(self): return self.SuitTotalRate # 全套装加成概率(非套50%)
+    def GetUnSuitRate(self): return self.UnSuitRate # 单件非套装加成概率
+    def GetSuitRate(self): return self.SuitRate # 单件套装加成概率
     def GetCostItemDict(self): return self.CostItemDict # 特殊材料
     def GetStarAttrInfo(self): return self.StarAttrInfo # 星级属性
     def GetBaseAttrInfo(self): return self.BaseAttrInfo # 基础属性增加
@@ -4544,6 +4547,19 @@
     def GetNeedExp(self): return self.NeedExp # 升级需要经验
     def GetAttrInfo(self): return self.AttrInfo # 属性
     def GetSkinIndex(self): return self.SkinIndex # 外观
+
+# 累计充值奖励表
+class IPY_HistoryRechargeAward():
+    
+    def __init__(self):
+        self.ID = 0
+        self.Recharge = 0
+        self.Reward = {}
+        return
+        
+    def GetID(self): return self.ID # id
+    def GetRecharge(self): return self.Recharge # 所需充值元
+    def GetReward(self): return self.Reward # 职业对应的奖励内容,每个职业4组数据,物品ID和物品数量(1.枪豪2.道师3.剑修)
 
 
 def Log(msg, playerID=0, par=0):
@@ -4867,6 +4883,8 @@
         self.ipyLingGenEffectLen = len(self.ipyLingGenEffectCache)
         self.ipyHorsePetSkinCache = self.__LoadFileData("HorsePetSkin", IPY_HorsePetSkin)
         self.ipyHorsePetSkinLen = len(self.ipyHorsePetSkinCache)
+        self.ipyHistoryRechargeAwardCache = self.__LoadFileData("HistoryRechargeAward", IPY_HistoryRechargeAward)
+        self.ipyHistoryRechargeAwardLen = len(self.ipyHistoryRechargeAwardCache)
         Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
         Log("IPY_DataMgr InitOK!")
         return
@@ -5331,6 +5349,8 @@
     def GetLingGenEffectByIndex(self, index): return self.ipyLingGenEffectCache[index]
     def GetHorsePetSkinCount(self): return self.ipyHorsePetSkinLen
     def GetHorsePetSkinByIndex(self, index): return self.ipyHorsePetSkinCache[index]
+    def GetHistoryRechargeAwardCount(self): return self.ipyHistoryRechargeAwardLen
+    def GetHistoryRechargeAwardByIndex(self, index): return self.ipyHistoryRechargeAwardCache[index]
 
 IPYData = IPY_DataMgr()
 def IPY_Data(): return IPYData

--
Gitblit v1.8.0