From 609e16921fd14b577cb7e4f56777a839b408b311 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:04 +0800
Subject: [PATCH] Merge commit '444a48bf8875c1c4295871d48eee7433ac700734'

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 5319ed9..853ff88 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -915,7 +915,7 @@
 
                 "TrialExchange":(
                         ("DWORD", "ID", 1),
-                        ("DWORD", "ExchangeItemID", 0),
+                        ("list", "ExchangeItemIDList", 0),
                         ("DWORD", "ExchangeItemCount", 0),
                         ("DWORD", "ExchangeItemIsBind", 0),
                         ("DWORD", "CostItemID", 0),
@@ -2787,7 +2787,7 @@
     
     def __init__(self):
         self.ID = 0
-        self.ExchangeItemID = 0
+        self.ExchangeItemIDList = []
         self.ExchangeItemCount = 0
         self.ExchangeItemIsBind = 0
         self.CostItemID = 0
@@ -2795,7 +2795,7 @@
         return
         
     def GetID(self): return self.ID # 兑换ID
-    def GetExchangeItemID(self): return self.ExchangeItemID # 兑换物品ID
+    def GetExchangeItemIDList(self): return self.ExchangeItemIDList # 兑换物品ID
     def GetExchangeItemCount(self): return self.ExchangeItemCount # 兑换物品个数
     def GetExchangeItemIsBind(self): return self.ExchangeItemIsBind # 兑换物品是否绑定
     def GetCostItemID(self): return self.CostItemID # 消耗物品ID

--
Gitblit v1.8.0