From 2a6bacedea0c4d6d49efcca5d0c56b7aa6e33adc Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 19 十一月 2018 14:45:39 +0800
Subject: [PATCH] 2397 【BUG】【1.2】【1.3】符印背包满的情况下合成符印，扣除符印融合石没合成符印，双属性符印升级后分解没返还符印融合石
---
ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 8410daf..0f0d821 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -182,6 +182,7 @@
"ActSpringSale":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -198,6 +199,7 @@
"ActFlashGiftbag":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -214,6 +216,7 @@
"ActExpRate":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -229,6 +232,7 @@
"ActCostRebate":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -241,6 +245,7 @@
"ActBossReborn":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -254,6 +259,7 @@
"ActFairyCeremony":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -272,6 +278,7 @@
"ActRealmPoint":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -285,6 +292,7 @@
"ActFlashSale":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -309,6 +317,7 @@
"ActWishingWell":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -323,6 +332,7 @@
"ActTotalRecharge":(
("DWORD", "CfgID", 1),
("char", "ActMark", 0),
+ ("list", "PlatformList", 0),
("list", "ServerIDList", 0),
("char", "StartDate", 0),
("char", "EndDate", 0),
@@ -651,6 +661,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -666,6 +677,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -684,6 +696,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -699,6 +712,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -717,6 +731,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -731,6 +746,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -748,6 +764,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -759,6 +776,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -773,6 +791,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -785,6 +804,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -800,6 +820,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -811,6 +832,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -838,6 +860,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -850,6 +873,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -865,6 +889,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -881,6 +906,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -915,6 +941,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -928,6 +955,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
@@ -944,6 +972,7 @@
def __init__(self):
self.CfgID = 0
self.ActMark = ""
+ self.PlatformList = []
self.ServerIDList = []
self.StartDate = ""
self.EndDate = ""
@@ -955,6 +984,7 @@
def GetCfgID(self): return self.CfgID # 配置ID
def GetActMark(self): return self.ActMark # 活动组标记
+ def GetPlatformList(self): return self.PlatformList # 活动平台列表["平台A", "平台A", ...],配[]代表所有
def GetServerIDList(self): return self.ServerIDList # 服务器ID列表
def GetStartDate(self): return self.StartDate # 开启日期
def GetEndDate(self): return self.EndDate # 结束日期
--
Gitblit v1.8.0