From b6e2e296d9fd4fc7e503a852da6906a31f8e9088 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 22 十月 2025 11:20:45 +0800
Subject: [PATCH] 16 卡牌服务端（删除开服活动）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py | 6
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetFreePoint.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 60 -------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 194 ------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.py | 2
/dev/null | 57 -------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 12 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 52 ------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 7
PySysDB/PySysDBPY.h | 21 --
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 5
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 4
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 13 -
16 files changed, 2 insertions(+), 442 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index e9030ed..f263862 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1619,27 +1619,6 @@
DWORD AddMaxAtk; //增加最大攻击
};
-
-//全民冲榜排行奖励表
-
-struct tagOSCBillRankAward
-{
- BYTE _OSCBillType; //冲榜类型
- BYTE RankA; //排名A
- BYTE RankB; //至排名B
- dict RankAward; //排名奖励 {"职业":[[物品ID,个数],...], ...}
-};
-
-
-//全民冲榜达成奖励表
-
-struct tagOSCBillTagAward
-{
- BYTE _OSCBillType; //冲榜类型
- WORD TagCondition; //目标条件值
- dict TagAward; //目标奖励 {"职业":[[物品ID,个数],...], ...}
-};
-
//七天登录奖励表
struct tagLoginDayAward
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 78d55be..1e80ea1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -803,18 +803,6 @@
PacketSubCMD_1=0x20
PacketCallFunc_1=OnTalk
-;开服活动
-[OpenServerCampaign]
-ScriptName = Player\OpenServerCampaign.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xAB
-PacketSubCMD_1=0x11
-PacketCallFunc_1=OnQueryOpenServerCampaignAward
-
;寻宝
[PlayerTreasure]
ScriptName = Player\PlayerTreasure.py
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index f88214d..154b33b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3185,7 +3185,7 @@
Def_PDictType_FlashSale, #限时抢购
Def_PDictType_TJGNotify, # 脱机挂结果通知
Def_PDictType_LVAward, # 等级奖励领取信息记录
-Def_PDictType_OpenServerCampaign, # 开服活动
+Def_PDictType_4, # 开服活动
Def_PDictType_WeekParty, #周狂欢
Def_PDictType_FeastWeekParty, # 节日巡礼
Def_PDictType_LoginAward, # 登录奖励运营活动
@@ -3738,14 +3738,6 @@
Def_PDict_FamilyGCZSQGridItemID = "FamilyGCZSQItemID_%s" # 圣泉当前层格子抽中物品ID，参数(格子编号)
Def_PDict_FamilyGCZSQGridItemCnt = "FamilyGCZSQItemCnt_%s" # 圣泉当前层格子抽中物品个数，参数(格子编号)
#-------------------------------------------------------------------------------
-
-#开服活动，Def_PDictType_OpenServerCampaign
-#奖励记录 - 从低位到高位，每位表示：0-不可领；1-可领取；2-已领
-Def_PDict_OSC_BillAwardRecord = "OSCBillAwardRecord" # 开服活动排行奖励记录, 按活动类型位存储是否领取/处理过
-Def_PDict_OSC_TagAwardRecord = "OSCTagAwardRecord_%s" # 开服活动目标奖励记录, 参数(活动类型), 按奖励位存储是否领取
-Def_PDict_OSC_RecordData = "OSCRecordData_%s" # 开服活动记录数值, 求余亿部分，参数(活动类型)
-Def_PDict_OSC_RecordDataEx = "OSCRecordDataEx_%s" # 开服活动记录数值, 整除亿部分，参数(活动类型)
-Def_PDict_OSC_EndMailState = "EndMailState" # 开服活动结束发放邮件处理状态, 记录该状态的目的是防止开服活动版本变更导致旧号重复补发奖励；
# 法器
Def_PDict_FaQiLV = "FaQiLV" # 法器等级
@@ -4509,7 +4501,7 @@
ItemGive_StonePickoff, # 摘除宝石 10
ItemGive_EquipSuit, # 套装
ItemGive_NPCDrop, # NPC掉落
-ItemGive_OpenServerCampaign, # 开服活动
+ItemGive_13, # 开服活动
ItemGive_CTG, # CTG
ItemGive_DiceEx, # 我要天机 15
ItemGive_16, # 仙盟宝库
@@ -4535,7 +4527,6 @@
ItemGive_StonePickoff:"StonePickoff",
ItemGive_EquipSuit:"EquipSuit",
ItemGive_NPCDrop:"NPCDrop",
- ItemGive_OpenServerCampaign:"OpenServerCampaign",
ItemGive_CTG:"CTG",
ItemGive_DiceEx:"DiceEx",
ItemGive_Refine:"Refine",
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 8e2d395..31f66a2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -11020,66 +11020,6 @@
#------------------------------------------------------
-# AB 11 开服活动奖励 #tagCMOpenServerCampaignAward
-
-class tagCMOpenServerCampaignAward(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("CampaignType", c_int), #活动类型
- ("AwardType", c_ubyte), #奖励类型，1-排行，2-目标
- ("AwardIndex", c_ubyte), #目标奖励索引，领取目标奖励时用，目标条件在目标奖励列表中索引
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xAB
- self.SubCmd = 0x11
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xAB
- self.SubCmd = 0x11
- self.CampaignType = 0
- self.AwardType = 0
- self.AwardIndex = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMOpenServerCampaignAward)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 11 开服活动奖励 //tagCMOpenServerCampaignAward:
- Cmd:%s,
- SubCmd:%s,
- CampaignType:%d,
- AwardType:%d,
- AwardIndex:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.CampaignType,
- self.AwardType,
- self.AwardIndex
- )
- return DumpString
-
-
-m_NAtagCMOpenServerCampaignAward=tagCMOpenServerCampaignAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMOpenServerCampaignAward.Cmd,m_NAtagCMOpenServerCampaignAward.SubCmd))] = m_NAtagCMOpenServerCampaignAward
-
-
-#------------------------------------------------------
# AC 05 召集仙盟成员打boss #tagCGCallupFamilyMemberToBoss
class tagCGCallupFamilyMemberToBoss(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 696333d..364c3dc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -17453,80 +17453,6 @@
#------------------------------------------------------
-#A9 03 开服活动奖励数量刷新#tagGCOpenServerCampaignAwardCount
-
-class tagGCOpenServerCampaignAwardCount(Structure):
- Head = tagHead()
- CampaignType = 0 #(BYTE CampaignType)//奖励类型
- AwardTypeCount = 0 #(BYTE AwardTypeCount)//奖品种类数量
- GotCountList = list() #(vector<DWORD> GotCountList)//奖品已领取数量列表，根据种类索引依次
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xA9
- self.Head.SubCmd = 0x03
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.CampaignType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.AwardTypeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.AwardTypeCount):
- value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
- self.GotCountList.append(value)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xA9
- self.Head.SubCmd = 0x03
- self.CampaignType = 0
- self.AwardTypeCount = 0
- self.GotCountList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 1
- length += 4 * self.AwardTypeCount
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.CampaignType)
- data = CommFunc.WriteBYTE(data, self.AwardTypeCount)
- for i in range(self.AwardTypeCount):
- data = CommFunc.WriteDWORD(data, self.GotCountList[i])
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- CampaignType:%d,
- AwardTypeCount:%d,
- GotCountList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.CampaignType,
- self.AwardTypeCount,
- "..."
- )
- return DumpString
-
-
-m_NAtagGCOpenServerCampaignAwardCount=tagGCOpenServerCampaignAwardCount()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCOpenServerCampaignAwardCount.Head.Cmd,m_NAtagGCOpenServerCampaignAwardCount.Head.SubCmd))] = m_NAtagGCOpenServerCampaignAwardCount
-
-
-#------------------------------------------------------
# A9 A2 排行榜信息#tagPYBillboardData
class tagPYBillboardInfo(Structure):
@@ -31364,126 +31290,6 @@
m_NAtagMCBossRebornInfo=tagMCBossRebornInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCBossRebornInfo.Head.Cmd,m_NAtagMCBossRebornInfo.Head.SubCmd))] = m_NAtagMCBossRebornInfo
-
-
-#------------------------------------------------------
-# AB 17 开服活动奖励状态 #tagMCOpenServerCampaignAwardList
-
-class tagMCOpenServerCampaignAward(Structure):
- _pack_ = 1
- _fields_ = [
- ("CampaignType", c_ubyte), #奖励类型
- ("BillAwardRecord", c_ubyte), #排行奖励是否已领取
- ("TagAwardRecord", c_int), #目标奖励索引位领取记录：0-未领；1-已领
- ("RecordData", c_int), #活动时的记录值，求余亿部分，为了统一逻辑，其他非战力榜的也使用此规则
- ("RecordDataEx", c_int), #活动时的记录值，整除亿部分，1代表1亿
- ]
-
- def __init__(self):
- self.Clear()
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.CampaignType = 0
- self.BillAwardRecord = 0
- self.TagAwardRecord = 0
- self.RecordData = 0
- self.RecordDataEx = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCOpenServerCampaignAward)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// AB 17 开服活动奖励状态 //tagMCOpenServerCampaignAwardList:
- CampaignType:%d,
- BillAwardRecord:%d,
- TagAwardRecord:%d,
- RecordData:%d,
- RecordDataEx:%d
- '''\
- %(
- self.CampaignType,
- self.BillAwardRecord,
- self.TagAwardRecord,
- self.RecordData,
- self.RecordDataEx
- )
- return DumpString
-
-
-class tagMCOpenServerCampaignAwardList(Structure):
- Head = tagHead()
- OSCAwardCnt = 0 #(BYTE OSCAwardCnt)//奖励类型数
- OSCAwardList = list() #(vector<tagMCOpenServerCampaignAward> OSCAwardList)// 奖励状态列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xAB
- self.Head.SubCmd = 0x17
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.OSCAwardCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.OSCAwardCnt):
- temOSCAwardList = tagMCOpenServerCampaignAward()
- _pos = temOSCAwardList.ReadData(_lpData, _pos)
- self.OSCAwardList.append(temOSCAwardList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xAB
- self.Head.SubCmd = 0x17
- self.OSCAwardCnt = 0
- self.OSCAwardList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- for i in range(self.OSCAwardCnt):
- length += self.OSCAwardList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.OSCAwardCnt)
- for i in range(self.OSCAwardCnt):
- data = CommFunc.WriteString(data, self.OSCAwardList[i].GetLength(), self.OSCAwardList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- OSCAwardCnt:%d,
- OSCAwardList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.OSCAwardCnt,
- "..."
- )
- return DumpString
-
-
-m_NAtagMCOpenServerCampaignAwardList=tagMCOpenServerCampaignAwardList()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCOpenServerCampaignAwardList.Head.Cmd,m_NAtagMCOpenServerCampaignAwardList.Head.SubCmd))] = m_NAtagMCOpenServerCampaignAwardList
#------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetFreePoint.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetFreePoint.py
index 57c637e..771f5fe 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetFreePoint.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetFreePoint.py
@@ -13,7 +13,6 @@
#
# 模块详细说明
-import OpenServerCampaign
import GameWorld
import PlayerControl
import IpyGameDataPY
@@ -32,8 +31,6 @@
value = paramList[0]
curPlayer.SetFreePoint(value)
GameWorld.DebugAnswer(curPlayer, "设置自由点: %s" % value)
- # 更新开服活动灵根数据
- OpenServerCampaign.UpdOpenServerCampaignLingGenData(curPlayer)
if len(paramList) > 1:
setPoint = paramList[1]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py
deleted file mode 100644
index 39f186d..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.SetOSCRecordData
-#
-# @todo:设置开服活动记录数据
-# @author hxp
-# @date 2016-06-30
-# @version 1.1
-#
-# @change: "2016-10-11 15:00" hxp 开服活动增加神器
-# 详细描述: 设置开服活动记录数据
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2016-10-11 15:00"""
-#-------------------------------------------------------------------------------
-
-
-import OpenServerCampaign
-import PlayerControl
-import ShareDefine
-import ChConfig
-import GameWorld
-#---------------------------------------------------------------------
-## 执行逻辑
-# @param curPlayer 当前玩家
-# @param cmdList 参数
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, cmdList):
-
- oscTypeDict = {
- ShareDefine.Def_Campaign_Type_Plus:"强化",
- ShareDefine.Def_Campaign_Type_Horse:"坐骑",
- ShareDefine.Def_Campaign_Type_StoneLV:"宝石",
- ShareDefine.Def_Campaign_Type_LV:"等级",
- ShareDefine.Def_Campaign_Type_RealmLV:"境界",
- ShareDefine.Def_Campaign_Type_FightPower:"战力",
- ShareDefine.Def_Campaign_Type_RuneLV:"符印",
- ShareDefine.Def_Campaign_Type_GodWeaponLV:"神兵",
- ShareDefine.Def_Campaign_Type_Recharge:"充值",
- ShareDefine.Def_Campaign_Type_PetLV:"灵宠",
- ShareDefine.Def_Campaign_Type_LingGen:"灵根",
- ShareDefine.Def_Campaign_Type_StarLV:"升星",
- ShareDefine.Def_Campaign_Type_Wash:"洗练",
- }
-
- if len(cmdList) != 2:
- __AnswerHelp(curPlayer, oscTypeDict)
- return
-
- campaignType, recordData = cmdList
- if campaignType not in oscTypeDict:
- GameWorld.DebugAnswer(curPlayer, "该活动类型不需要设置活动数据!")
- __AnswerHelp(curPlayer, oscTypeDict)
- return
-
- recordData = OpenServerCampaign.SetOSCRecordData(curPlayer, campaignType, recordData)
- OpenServerCampaign.Sync_OpenServerCampaignAward(curPlayer, campaignType)
- GameWorld.DebugAnswer(curPlayer, "设置[%s]活动数值: %s OK!" % (oscTypeDict.get(campaignType), recordData))
- return
-
-
-def __AnswerHelp(curPlayer, oscTypeDict):
- helpTypeStr = ""
- for oscType, name in oscTypeDict.items():
- helpTypeStr += "%s-%s," % (oscType, name)
-
- GameWorld.DebugAnswer(curPlayer, "SetOSCRecordData 活动类型 数值")
- GameWorld.DebugAnswer(curPlayer, "活动类型:%s" % helpTypeStr)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 920a31e..1d1ed71 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1318,19 +1318,6 @@
("DWORD", "AddMaxAtk", 0),
),
- "OSCBillRankAward":(
- ("BYTE", "OSCBillType", 1),
- ("BYTE", "RankA", 0),
- ("BYTE", "RankB", 0),
- ("dict", "RankAward", 0),
- ),
-
- "OSCBillTagAward":(
- ("BYTE", "OSCBillType", 1),
- ("WORD", "TagCondition", 0),
- ("dict", "TagAward", 0),
- ),
-
"LoginDayAward":(
("BYTE", "DayID", 1),
("dict", "Reward", 0),
@@ -4301,29 +4288,6 @@
def GetAddMinAtk(self): return self.attrTuple[3] # 增加最小攻击 DWORD
def GetAddMaxAtk(self): return self.attrTuple[4] # 增加最大攻击 DWORD
-# 全民冲榜排行奖励表
-class IPY_OSCBillRankAward():
-
- def __init__(self):
- self.attrTuple = None
- return
-
- def GetOSCBillType(self): return self.attrTuple[0] # 冲榜类型 BYTE
- def GetRankA(self): return self.attrTuple[1] # 排名A BYTE
- def GetRankB(self): return self.attrTuple[2] # 至排名B BYTE
- def GetRankAward(self): return self.attrTuple[3] # 排名奖励 {"职业":[[物品ID,个数],...], ...} dict
-
-# 全民冲榜达成奖励表
-class IPY_OSCBillTagAward():
-
- def __init__(self):
- self.attrTuple = None
- return
-
- def GetOSCBillType(self): return self.attrTuple[0] # 冲榜类型 BYTE
- def GetTagCondition(self): return self.attrTuple[1] # 目标条件值 WORD
- def GetTagAward(self): return self.attrTuple[2] # 目标奖励 {"职业":[[物品ID,个数],...], ...} dict
-
# 七天登录奖励表
class IPY_LoginDayAward():
@@ -6235,8 +6199,6 @@
self.__LoadFileData("Chests", onlyCheck)
self.__LoadFileData("ChestsAward", onlyCheck)
self.__LoadFileData("VIPKillNPC", onlyCheck)
- self.__LoadFileData("OSCBillRankAward", onlyCheck)
- self.__LoadFileData("OSCBillTagAward", onlyCheck)
self.__LoadFileData("LoginDayAward", onlyCheck)
self.__LoadFileData("SpringSale", onlyCheck)
self.__LoadFileData("OrderInfo", onlyCheck)
@@ -7393,20 +7355,6 @@
def GetVIPKillNPCByIndex(self, index):
self.CheckLoadData("VIPKillNPC")
return self.ipyVIPKillNPCCache[index]
-
- def GetOSCBillRankAwardCount(self):
- self.CheckLoadData("OSCBillRankAward")
- return self.ipyOSCBillRankAwardLen
- def GetOSCBillRankAwardByIndex(self, index):
- self.CheckLoadData("OSCBillRankAward")
- return self.ipyOSCBillRankAwardCache[index]
-
- def GetOSCBillTagAwardCount(self):
- self.CheckLoadData("OSCBillTagAward")
- return self.ipyOSCBillTagAwardLen
- def GetOSCBillTagAwardByIndex(self, index):
- self.CheckLoadData("OSCBillTagAward")
- return self.ipyOSCBillTagAwardCache[index]
def GetLoginDayAwardCount(self):
self.CheckLoadData("LoginDayAward")
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 144adf6..3675dae 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -64,7 +64,6 @@
import PlayerRune
import IpyGameDataPY
import EventReport
-import OpenServerCampaign
import PassiveBuffEffMng
import PlayerFlashSale
import PlayerFlashGiftbag
@@ -546,12 +545,6 @@
# 通知累计登陆礼
PlayerLoginDayAward.OnLoginNotifyLoginDayAward(curPlayer)
-
- # 开服活动奖励信息
- OpenServerCampaign.OnOpenServerCampaignLogin(curPlayer)
-
- # 采集NPC次数通知
- #NPCCommon.SyncCollNPCTime(curPlayer)
# 副本进入时间
FBCommon.FBOnLogin(curPlayer)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
deleted file mode 100644
index 24b514f..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.OpenServerCampaign
-#
-# @todo:开服活动
-# @author hxp
-# @date 2018-03-06
-# @version 1.0
-#
-# 详细描述: 开服活动
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2018-03-06 11:00"""
-#-------------------------------------------------------------------------------
-import ShareDefine
-import ChPyNetSendPack
-import NetPackCommon
-import ChConfig
-import GameWorld
-import ItemControler
-import IPY_GameWorld
-import PlayerControl
-import IpyGameDataPY
-import PlayerBillboard
-import ItemCommon
-
-(
-OSC_BillLimitValue, # 上榜限制值
-OSC_StartDay, # 开启开服天
-OSC_EndDay, # 结束开服天
-) = range(3)
-
-def DoBillboardOpen(curPlayer):
- for campaignType, billBoardType in ShareDefine.Def_Campaign_Billboard_Dict.items():
- value = GetOSCRecordData(curPlayer, campaignType)
- cmpValue = value / ChConfig.Def_PerPointValue
- cmpValue2 = value % ChConfig.Def_PerPointValue
- GameWorld.DebugLog("排行榜开启,同步开服活动记录!campaignType=%s,billBoardType=%s,value=%s" % (campaignType, billBoardType, value))
- if CanUpdOSCBillboard(curPlayer, campaignType, value):
- PlayerBillboard.UpdatePlayerBillboard(curPlayer, billBoardType, cmpValue, cmpValue2)
- return
-
-def __CanUpdOSCRecordData(campaignType, curValue=None):
- ## 可否更新开服活动数据
- OSCBillboardDataLimitDict = IpyGameDataPY.GetFuncEvalCfg("OSCBillboardOpen", 1)
- campTypeS = str(campaignType)
- if campTypeS not in OSCBillboardDataLimitDict:
- #GameWorld.DebugLog("不存在该开服活动类型: %s" % campaignType)
- return False
- limitValue = OSCBillboardDataLimitDict[campTypeS][OSC_BillLimitValue]
- endOpenServerDay = OSCBillboardDataLimitDict[campTypeS][OSC_EndDay]
-
- openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
- if openServerDay > endOpenServerDay:
- #GameWorld.DebugLog("该开服活动已结束，无法上榜！campaignType=%s,openServerDay=%s > endOpenServerDay=%s" % (campaignType, openServerDay, endOpenServerDay))
- return False
-
- if curValue != None and curValue < limitValue:
- #GameWorld.DebugLog("该开服活动数值不足，无法上榜！campaignType=%s,curValue=%s < limitValue=%s" % (campaignType, curValue, limitValue))
- return False
- return True
-
-def CanUpdOSCBillboard(curPlayer, campaignType, curValue): return __CanUpdOSCRecordData(campaignType, curValue)
-def IsNeedSaveOpenServerCampaignRecordData(campaignType): return __CanUpdOSCRecordData(campaignType)
-
-def GetOSCRecordData(curPlayer, campaignType):
- return curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordData % campaignType) + \
- curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordDataEx % campaignType) * ChConfig.Def_PerPointValue
-
-def SetOSCRecordData(curPlayer, campaignType, updRecordData):
- recordData = updRecordData % ChConfig.Def_PerPointValue
- recordDataEx = updRecordData / ChConfig.Def_PerPointValue
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSC_RecordData % campaignType, recordData)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSC_RecordDataEx % campaignType, recordDataEx)
- return GetOSCRecordData(curPlayer, campaignType)
-
-def AddOpenServerCampaignRecordData(curPlayer, campaignType, addValue):
- ## 增加开服活动数据记录(外调函数)
- recordData = GetOSCRecordData(curPlayer, campaignType)
-
- recordData += addValue
- UpdOpenServerCampaignRecordData(curPlayer, campaignType, recordData)
- return
-
-def UpdOpenServerCampaignRecordData(curPlayer, campaignType, value):
- ## 更新开服活动数据记录(外调函数)
- if not IsNeedSaveOpenServerCampaignRecordData(campaignType):
- #GameWorld.DebugLog(" 非开服活动记录数据时机, campaignType=%s" % campaignType)
- return
-
- recordData = GetOSCRecordData(curPlayer, campaignType)
-
- if value == recordData:
- GameWorld.DebugLog(" 开服活动数据等于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s"
- % (campaignType, recordData, value), curPlayer.GetPlayerID())
- return
-
- if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower,
- ShareDefine.Def_Campaign_Type_RuneLV, ShareDefine.Def_Campaign_Type_LingGen, ShareDefine.Def_Campaign_Type_StarLV] and value < recordData:
- GameWorld.DebugLog(" 开服活动数据小于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s"
- % (campaignType, recordData, value), curPlayer.GetPlayerID())
- return
-
- # 更新开服活动时的记录数值
- value = SetOSCRecordData(curPlayer, campaignType, value)
- Sync_OpenServerCampaignAward(curPlayer, campaignType)
- GameWorld.DebugLog(" 更新开服活动数据记录 campaignType=%s,recordData=%s,updValue=%s"
- % (campaignType, recordData, value), curPlayer.GetPlayerID())
-
- canUpdOSCBill = CanUpdOSCBillboard(curPlayer, campaignType, value)
- if campaignType in ShareDefine.Def_Campaign_Billboard_Dict and (value <= recordData or canUpdOSCBill):
- cmpValue = value / ChConfig.Def_PerPointValue
- cmpValue2 = value % ChConfig.Def_PerPointValue
- if not canUpdOSCBill:
- cmpValue = -1
- cmpValue2 = 0
- GameWorld.DebugLog(" 不能上榜降数据的，设置该榜单数据为-1，删除该数据！", curPlayer.GetPlayerID())
- billBoardType = ShareDefine.Def_Campaign_Billboard_Dict[campaignType]
- PlayerBillboard.UpdatePlayerBillboard(curPlayer, billBoardType, cmpValue, cmpValue2)
- return
-
-##==================================================================================================
-
-def GetOSCTagAwardIpyList(campType):
- tagAwardList = IpyGameDataPY.GetIpyGameDataListNotLog("OSCBillTagAward", campType)
- if not tagAwardList:
- return []
-
- tagAwardIpyList = []
- for ipyData in tagAwardList:
- tagAwardIpyList.append([ipyData.GetTagCondition(), ipyData])
- tagAwardIpyList.sort()
- return [info[1] for info in tagAwardIpyList]
-
-def OnOpenServerCampaignLogin(curPlayer):
- ## 开服活动登录处理
- if not __DoSendOSCAwardMail(curPlayer):
- Sync_OpenServerCampaignAward(curPlayer)
- return
-
-def OnOpenServerCampaignDay(curPlayer):
- ## 开服活动过天处理
- __DoSendOSCAwardMail(curPlayer)
- return
-
-def __DoSendOSCAwardMail(curPlayer):
- ## 执行开服活动补发奖励邮件逻辑
- # @return: 是否处理补发
-
- openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
- awardEndOpenServerDay = IpyGameDataPY.GetFuncCfg("OSCBillboardOpen", 2)
- if openServerDay <= awardEndOpenServerDay:
- GameWorld.DebugLog("开服活动中，过天不处理!openServerDay=%s,awardEndOpenServerDay=%s" % (openServerDay, awardEndOpenServerDay))
- return False
-
- endMailState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_EndMailState)
- if endMailState:
- GameWorld.DebugLog("已经处理过开服活动奖励补发！")
- return True
-
- for campType in ShareDefine.Def_Campaign_Type_List:
- tagAwardIpyList = GetOSCTagAwardIpyList(campType)
- for index, tagAwardIpyData in enumerate(tagAwardIpyList):
- DoGiveOSCTagAward(curPlayer, campType, index, tagAwardIpyData, True)
-
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSC_EndMailState, 1)
- return True
-
-#def __SendOSCGameServerQuery(curPlayer, campTypeList, isEndMail=False):
-# # 以下为需要向GameServer请求领取奖励所需信息
-# # @param isEndMail: 是否使用邮件发放
-# if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_QueryOpenServerAwardState) == 1:
-# #已经在查询中
-# GameWorld.DebugLog(" 已经在查询中...")
-# return
-# curPlayer.SetDict(ChConfig.Def_PlayerKey_QueryOpenServerAwardState, 1)
-#
-# msgListStr = str([campTypeList, isEndMail])
-# GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, 'OpenServerCampaignAward', msgListStr, len(msgListStr))
-# GameWorld.DebugLog(" __SendOSCGameServerQuery campTypeList=%s, isEndMail=%s" % (campTypeList, isEndMail), curPlayer.GetPlayerID())
-# return
-
-
-#// AB 11 开服活动奖励 #tagCMOpenServerCampaignAward
-#
-#struct tagCMOpenServerCampaignAward
-#
-#{
-# tagHead Head;
-# DWORD CampaignType; //活动类型
-# BYTE AwardType; //奖励类型，1-排行，2-目标
-# BYTE AwardIndex; //目标奖励索引，领取目标奖励时用，目标条件在目标奖励列表中索引
-#};
-def OnQueryOpenServerCampaignAward(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- campaignType = clientData.CampaignType
- awardType = clientData.AwardType
- awardIndex = clientData.AwardIndex # 奖励位
-
- GameWorld.DebugLog("开服活动领奖 campaignType=%s,awardType=%s,index=%s" % (campaignType, awardType, awardIndex), curPlayer.GetPlayerID())
-
- OSCBillboardDataLimitDict = IpyGameDataPY.GetFuncEvalCfg("OSCBillboardOpen", 1)
- campTypeS = str(campaignType)
- if campTypeS not in OSCBillboardDataLimitDict:
- GameWorld.ErrLog("不存在该开服活动类型,不可领奖！campaignType=%s" % campaignType)
- return
- endOpenServerDay = OSCBillboardDataLimitDict[campTypeS][OSC_EndDay]
- openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
- # 只限制排行榜；目标奖励随时可领取
- if awardType == 1 and openServerDay <= endOpenServerDay:
- GameWorld.DebugLog("该开服活动未结束，无法领奖！campaignType=%s,openServerDay=%s <= endOpenServerDay=%s" % (campaignType, openServerDay, endOpenServerDay))
- return
-
- awardEndOpenServerDay = IpyGameDataPY.GetFuncCfg("OSCBillboardOpen", 2)
- if openServerDay > awardEndOpenServerDay:
- GameWorld.DebugLog("该开服活动领奖已结束！campaignType=%s,openServerDay=%s > awardEndOpenServerDay=%s" % (campaignType, openServerDay, awardEndOpenServerDay))
- return
-
- # 排行奖励
- if awardType == 1:
- # 自动发放，不可手动领取
- return
-
- # 目标奖励
- elif awardType == 2:
- tagAwardIpyList = GetOSCTagAwardIpyList(campaignType)
- if not tagAwardIpyList or awardIndex < 0 or awardIndex >= len(tagAwardIpyList):
- GameWorld.DebugLog("不存在该目标奖励！awardIndex=%s" % (awardIndex))
- return
- DoGiveOSCTagAward(curPlayer, campaignType, awardIndex, tagAwardIpyList[awardIndex], False)
- else:
- GameWorld.ErrLog("开服活动领奖奖励类型错误!不存在:awardType=%s" % awardType)
- return
-
- return
-
-def DoGiveOSCTagAward(curPlayer, campaignType, index, tagAwardIpyData, isEndMail=False):
- ## 给目标奖励
-
- tagAwardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_TagAwardRecord % campaignType)
- if tagAwardRecord & pow(2, index):
- GameWorld.DebugLog(" 已经领取过该目标奖励, campaignType=%s,awardIndex=%s" % (campaignType, index), curPlayer.GetPlayerID())
- return
-
- condition = tagAwardIpyData.GetTagCondition()
- recordData = GetOSCRecordData(curPlayer, campaignType)
- if recordData < condition:
- GameWorld.DebugLog(" 未达到该开服活动目标条件奖励！campaignType=%s,index=%s,recordData=%s < condition=%s"
- % (campaignType, index, recordData, condition), curPlayer.GetPlayerID())
- return
-
- tagAwardDict = tagAwardIpyData.GetTagAward()
- job = str(curPlayer.GetJob())
- if job not in tagAwardDict:
- GameWorld.ErrLog("没有配置该职业对应的开服活动目标奖励!campaignType=%s,job=%s" % (campaignType, job))
- return
- giveItemList = tagAwardDict[job]
-
- updAwardRecord = tagAwardRecord|pow(2, index)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_OSC_TagAwardRecord % campaignType, updAwardRecord)
-
- GameWorld.DebugLog(" 发放活动目标奖励, campaignType=%s,index=%s,condition=%s,recordData=%s,updAwardRecord=%s,giveItemList=%s"
- % (campaignType, index, condition, recordData, updAwardRecord, giveItemList), curPlayer.GetPlayerID())
-
- drDict = {"CampaignType":campaignType, "Index":index}
- mailTypeKey = "OSCTagAward%s" % campaignType
- mailParamList = [condition]
- __DoGiveOSCAwardItem(curPlayer, giveItemList, drDict, isEndMail, mailTypeKey, mailParamList)
-
- if not isEndMail:
- Sync_OpenServerCampaignAward(curPlayer, campaignType)
-
- return
-
-def DoGiveOSCBillAward(curPlayer, awardResultList):
- ## 给排行奖励
- return
-
-def __DoGiveOSCAwardItem(curPlayer, giveItemList, drDict, isEndMail, mailTypeKey, mailParamList):
- ## 给开服活动奖励 [[itemID, itemCount], ...], 默认绑定
- if not giveItemList:
- return
-
- isMail = False
- needSpace = len(giveItemList)
- if isEndMail or ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace) < needSpace:
- isMail = True
-
- if isMail:
- mailItemList = []
- for itemInfo in giveItemList:
- itemID, itemCount = itemInfo[:2]
- isBind = itemInfo[2] if len(itemInfo) > 2 else 1
- mailItemList.append([itemID, itemCount, isBind])
- PlayerControl.SendMailByKey(mailTypeKey, [curPlayer.GetPlayerID()], mailItemList, mailParamList)
-
- else:
- for itemInfo in giveItemList:
- itemID, itemCount = itemInfo[:2]
- isBind = itemInfo[2] if len(itemInfo) > 2 else 1
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem],
- event=[ChConfig.ItemGive_OpenServerCampaign, True, drDict])
- ItemControler.NotifyGiveAwardInfo(curPlayer, giveItemList, ChConfig.ItemGive_OpenServerCampaign)
- return
-
-
-def Sync_OpenServerCampaignAward(curPlayer, campaignType=None):
- ## 通知开服活动奖励信息
-
- syncOSCTypeList = [campaignType] if campaignType != None else ShareDefine.Def_Campaign_Type_List
-
- oscAwardListPack = ChPyNetSendPack.tagMCOpenServerCampaignAwardList()
- oscAwardListPack.Clear()
- oscAwardListPack.OSCAwardList = []
-
- for syncOSCType in syncOSCTypeList:
- oscAward = ChPyNetSendPack.tagMCOpenServerCampaignAward()
- oscAward.Clear()
- oscAward.CampaignType = syncOSCType
- oscAward.BillAwardRecord = 1 if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_BillAwardRecord) & pow(2, syncOSCType) else 0
- oscAward.TagAwardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_TagAwardRecord % syncOSCType)
- oscAward.RecordData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordData % syncOSCType)
- oscAward.RecordDataEx = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordDataEx % syncOSCType)
- oscAwardListPack.OSCAwardList.append(oscAward)
-
- oscAwardListPack.OSCAwardCnt = len(oscAwardListPack.OSCAwardList)
- NetPackCommon.SendFakePack(curPlayer, oscAwardListPack)
- return
-
-def UpdOpenServerCampaignLingGenData(curPlayer):
- # 记录开服活动数据
- totalLingGen = curPlayer.GetFreePoint() + PlayerControl.GetMetal(curPlayer) + PlayerControl.GetWood(curPlayer) + \
- PlayerControl.GetWater(curPlayer) + PlayerControl.GetFire(curPlayer) + PlayerControl.GetEarth(curPlayer)
- #GameWorld.DebugLog("总灵根: %s" % totalLingGen)
- UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LingGen, totalLingGen)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 42b42ee..3c02df8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -3524,9 +3524,6 @@
#if curPlayer.GetMaxMP() > 0:
# curPlayer.SetMP(curPlayer.GetMaxMP())
- # 记录开服活动冲级数据
- #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())
-
#不需要做升级任务, 设置玩家经验
SetPlayerTotalExp(curPlayer, curTotalExp)
return
@@ -4547,8 +4544,6 @@
GameWorld.DebugLog("总战力: %s, 历史最高战力: %s, beforeFightPower=%s" % (value, highestFightPower, beforeFightPower), curPlayer.GetPlayerID())
#PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)
- # 记录开服活动数据
- #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_FightPower, totalFightPower)
#if beforeFightPower != totalFightPower:
# CrossPlayerData.OnPlayerFightPowerChange(curPlayer)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
index 216923e..ae4a996 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -39,7 +39,6 @@
import PlayerGoldInvest
import PlayerCrossRealmPK
import PlayerCrossChampionship
-import OpenServerCampaign
import PlayerCostRebate
import CrossActCTGBillboard
import CrossActAllRecharge
@@ -246,9 +245,6 @@
# 常规过天
if onEventType == ShareDefine.Def_OnEventType:
-
- #开服活动
- OpenServerCampaign.OnOpenServerCampaignDay(curPlayer)
#清空每日事件奖励
curPlayer.SetDayProcessGameEventCount(0)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
index 14b6e90..c67cddb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
@@ -34,7 +34,6 @@
#import EventReport
import IpyGameDataPY
import PassiveBuffEffMng
-import OpenServerCampaign
import random
@@ -58,8 +57,6 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_GodWeaponLV % weaponType, lv)
totalLV = GetGodWeaponTotalLV(curPlayer)
- # 开服活动数据
- OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_GodWeaponLV, totalLV)
PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_GodWeapon, totalLV, False, True)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
index 213b448..7575923 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
@@ -632,8 +632,6 @@
if updClassLV > horseLV:
# 玩家马匹进阶
DataRecordPack.DR_NewHorseByClassUp(curPlayer, updClassLV, 0)
- # 记录开服活动马匹阶级
- #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Horse, updClassLV)
Sync_HorseClassData(curPlayer)
# 刷属性，更新排行榜
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
index 229e746..e46a841 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -32,7 +32,6 @@
import GameWorld
import IpyGameDataPY
import GameMap
-import OpenServerCampaign
import PlayerWeekParty
import CalcNoLineEffect
import PassiveBuffEffMng
@@ -516,8 +515,6 @@
PetControl.DoLogic_PlayerPetLearnSkillList(rolePet, learnSkillList)
RefreshPetItemAddAttr(curPlayer, True)
- # 开服活动数据
- OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_PetLV, GetTotalPetLV(curPlayer))
PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Pet, petNPCID, False)
return True
@@ -751,9 +748,6 @@
PetControl.DoLogic_PlayerPetLearnSkillList(fightPet, learnSkillList)
RefreshPetItemAddAttr(curPlayer, True)
-
- # 开服活动数据
- OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_PetLV, GetTotalPetLV(curPlayer))
extraInfoDict = {"petItemIndex":PetItemIndex, "petNPCID":petNPCID}
extraInfoDict.update(eval(petDataItem.GetUserData()))
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.py
index 569cd20..b5d3d0a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.py
@@ -266,6 +266,4 @@
PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_RealmLV)
#更新排行榜
PlayerBillboard.UpdateRealmBillboard(curPlayer)
- # 记录开服活动
- #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RealmLV, nextRealmLv)
return True
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
index 5b836c1..481ebf9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -26,7 +26,6 @@
import NetPackCommon
import IpyGameDataPY
import IPY_GameWorld
-import OpenServerCampaign
import DataRecordPack
import PlayerWeekParty
@@ -369,8 +368,6 @@
runeItemPlusLV = ItemControler.GetRuneItemPlusLV(runeData) + 1 #客户端1开始
totalLV += runeItemPlusLV
PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Rune, itemColor, False)
- # 开服活动数据
- #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RuneLV, totalLV)
return
#// A5 66 符印分解 #tagCMRuneDecompose
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_OpenServerCampaignAward.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_OpenServerCampaignAward.py
deleted file mode 100644
index 2ef7ff7..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_OpenServerCampaignAward.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_OpenServerCampaignAward
-#
-# @todo:开服活动奖励
-# @author hxp
-# @date 2018-03-06
-# @version 1.0
-#
-# 详细描述: 开服活动奖励
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2018-03-06 11:00"""
-#-------------------------------------------------------------------------------
-
-import OpenServerCampaign
-import GameWorld
-import ChConfig
-
-
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 请求的玩家ID
-# @param packCMDList 发包命令 [ ]
-# @param tick 当前时间
-# @return resultDisc
-def DoLogic(query_Type, query_ID, packCMDList, tick):
- return
-
-#---------------------------------------------------------------------
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
-
- curPlayer.SetDict(ChConfig.Def_PlayerKey_QueryOpenServerAwardState, 0)
-
- try:
- funResultList = eval(funResult)
- except:
- GameWorld.ErrLog("GY_Query_OpenServerCampaignAward %s eval Error" % funResult, curPlayer.GetPlayerID())
- return
-
- GameWorld.DebugLog("GY_Query_OpenServerCampaignAward ResultList=%s" % str(funResultList), curPlayer.GetPlayerID())
- if funResultList:
- OpenServerCampaign.DoGiveOSCBillAward(curPlayer, funResultList)
-
- return
-
-
-
--
Gitblit v1.8.0