From 4fe82776f183c8b42a48cccf24e09ca324a55078 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 05 六月 2019 14:14:56 +0800
Subject: [PATCH] 3951 【BUG】【2.0】骑宠争夺没有排名奖励

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |    6 +++---
 PySysDB/PySysDBPY.h                                                                  |    2 +-
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py       |    3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 55693eb..b82a80a 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1827,7 +1827,7 @@
 	list		WorldLV;	//世界等级
 	list		Rank;	//排名
 	list		Award1;	//奖励 [[独立概率万分率,[物品ID,数量,是否拍品]],..]
-	dict		Award2;	//饼图奖励{随机次数:[(概率,[物品ID,数量,是否拍品]),..]}
+	list		Award2;	//饼图奖励  [[(概率,[物品ID,数量,是否拍品]),..]]
 };
 
 //缥缈仙域表
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py
index ebb8939..4693671 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py
@@ -635,7 +635,8 @@
             strValue1 = universalRecData.GetStrValue1()
             strValue1List = strValue1.split('|')
             playerID = strValue1List[0]
-            if playerID:
+            getWay = int(strValue1List[3])
+            if playerID and getWay is ShareDefine.RedPackType_GoldPacket:
                 playerID = int(playerID)
                 grabRecordDict = __GetGrabRecord(redPacketID)
                 outNum = sum([a[0] for a in grabRecordDict.values()]) #已被抢的钱
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 782cf3e..d765ac4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1410,7 +1410,7 @@
                         ("list", "WorldLV", 0),
                         ("list", "Rank", 0),
                         ("list", "Award1", 0),
-                        ("dict", "Award2", 0),
+                        ("list", "Award2", 0),
                         ),
 
                 "FairyDomain":(
@@ -4364,14 +4364,14 @@
         self.WorldLV = []
         self.Rank = []
         self.Award1 = []
-        self.Award2 = {}
+        self.Award2 = []
         return
         
     def GetLineID(self): return self.LineID #  线路ID
     def GetWorldLV(self): return self.WorldLV # 世界等级
     def GetRank(self): return self.Rank # 排名
     def GetAward1(self): return self.Award1 # 奖励 [[独立概率万分率,[物品ID,数量,是否拍品]],..]
-    def GetAward2(self): return self.Award2 # 饼图奖励{随机次数:[(概率,[物品ID,数量,是否拍品]),..]}
+    def GetAward2(self): return self.Award2 # 饼图奖励  [[(概率,[物品ID,数量,是否拍品]),..]]
 
 # 缥缈仙域表
 class IPY_FairyDomain():

--
Gitblit v1.8.0