From 5685e4d493ef5b7570bc20b6037fc2c8603cab85 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 二月 2019 14:41:57 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单(删除旧合服相关内容)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 07af3b5..b714457 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3114,7 +3114,6 @@
 Def_PlayerKey_AtkInterval = "NormalAtkInterval_%s"  # 公共技能CD类型
 Def_PlayerKey_AtkTick = "NormalAtkTick_%s"  # 公共技能CD类型
 Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState"  # 查询开服奖励状态
-Def_PlayerKey_QueryMixServerAwardState = "QueryMixServerAwardState"  # 查询合服奖励状态
 Def_PlayerKey_QueryFamilyStoreTick = "QueryFamilyStoreTick"  # 战盟仓库操作tick
 
 Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex'  # 指定账号生成卡类型
@@ -3500,8 +3499,6 @@
 Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen"  # 超值礼包是否开过
 Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord"  # 天天首充领奖记录,0-不可领;1-可领;2-已领
 Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt"  # 当日已充值数
-Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex"  # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
-Def_PDict_UnlimitedGoldGiftCnt = "UnlimitedGoldGiftCnt"  # 当日无限领取礼包已领取次数
 Def_PDict_IsReBorn = "Def_PDict_IsReBorn"  # 是否回城复活
 Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward"  # 王者仙盟每日俸禄领取状态
 Def_PDict_Family_Contribution = "FamilyContribution"  #战盟贡献度
@@ -3530,7 +3527,6 @@
 Def_PDict_HighLadder_IsRelCD = "HighLadderIsRelCD"           #天梯是否进入真正挑战冷却
 Def_PDict_HighLadder_WinningStreak = "HighLadderWinningStreak"   #天梯连胜场次
 Def_PDict_HighLadder_HistoryMaxOrder = "HighLadderMaxOrder"   #天梯历史最高排名
-Def_PDict_MixLoginDayState = "PMixLoginDayState"  # 合服天登陆状态<按登陆天从低位起0-未领1-可领2-已领>
 Def_PDict_FestivalLoginState = "FestivalLoginState_%s"  # 节日登陆奖励状态_%s表示节日类型<按登陆天从低位起0-未领1-可领2-已领>
 Def_PDict_Currency = "PlayerCurrency_%s"  # 自定义货币类型, 参数[自定义货币类型]
 Def_PDict_TJGSet = "TJGSet"  # 脱机挂系统设定
@@ -3541,7 +3537,6 @@
 
 Def_PDict_LoginClientType = "LoginClientType"  # 客户端登录类型
 
-Def_PDict_ReUpdBillboardSign = "ReUpdBillboardSign"  # 重新同步排行表标记
 Def_PDict_MSFirstLogin_UpdBillboard = "MSFirstLogin_UpdBillboard"  # 合服首登同步排行榜信息
 Def_PDict_MixLoginDay = "MixLoginDay"  # 合服首登处理标记
 
@@ -3801,10 +3796,6 @@
 Def_PDict_OSC_TagAwardRecord = "OSCTagAwardRecord_%s"  # 开服活动目标奖励记录, 参数(活动类型), 按奖励位存储是否领取
 Def_PDict_OSC_RecordData = "OSCRecordData_%s"  # 开服活动记录数值, 参数(活动类型)
 Def_PDict_OSC_EndMailState = "EndMailState"  # 开服活动结束发放邮件处理状态, 记录该状态的目的是防止开服活动版本变更导致旧号重复补发奖励;
-
-Def_PDict_MixServerCampaign_AwardRecord = "MSCAwardRecord_%s"  # 合服活动奖励记录
-Def_PDict_MixServerCampaign_RecordData = "MSCRecordData_%s"  # 合服活动记录数值
-Def_PDict_MixServerCampaign_MailState = "MSCMailState"  # 合服活动结束补发未领奖记录邮件状态, 按类型位二进制存储状态
 
 # 坐骑 Def_PDictType_Horse
 Def_PDict_Horser_LV = "Horser_LV_%d"  # 坐骑等级 0代表未激活 1代表1级

--
Gitblit v1.8.0