From 94bb5ab94e98fb616137f9c143e702aae10df8a6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 17 七月 2019 14:32:17 +0800
Subject: [PATCH] 8125 子 【主干】新功能：累计充值 / 【后端】【主干】累计充值
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 1506607..5f4fc93 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3455,6 +3455,7 @@
Def_PDict_OnlineStartTick = "OnlineStartTime" # 在线计算时间
Def_PDict_LVAwardGetRecord = "LVAwardGetRecord" # 等级奖励领取信息记录，按二进制位标示
Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord" # 等级奖励vip领取信息记录，按二进制位标示
+Def_PDict_HistoryChargeAwardGetRecord = "HTotalGoldAwardRecord" # 历史累计充值奖励领取信息记录，按二进制位标示
Def_PDict_CTGCountResetTime = "CTGCountResetTime" # CTG次数重置时间time值
Def_PDict_TodayCTGCount = "TodayCTGCount_%s" # 当日充值次数，参数(CTG对应的商品记录ID)
Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s" # 对应充值商品已购买次数，参数(CTG对应的商品记录ID)
@@ -3750,8 +3751,8 @@
Def_PDict_Horser_Exp = "Horser_Exp_%d" # 坐骑经验
Def_PDict_Horser_Multiple = "Horser_Multiple" # 坐骑下次升阶暴击倍数
#骑宠觉醒
-Def_PDict_HorsePetSkinData = "HorsePetSkinData%d_%s" #觉醒等级*100+外观索引 参数(类型,关联ID)
-Def_PDict_HorsePetSkinExp = "HorsePetSkinExp%d_%s" #经验 参数(类型,关联ID)
+Def_PDict_HorsePetSkinData = "HorsePetSkinData%d_%s" #觉醒等级*100+外观索引 参数(类型,关联ID) 1-坐骑 2-灵宠
+Def_PDict_HorsePetSkinExp = "HorsePetSkinExp%d_%s" #经验 参数(类型,关联ID) 1-坐骑 2-灵宠
# 符印
Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState" # 符印解锁状态
Def_PDict_Rune_Data = "Rune_Data_%s" # 符印镶嵌数据, 参数(第几孔)
@@ -3816,7 +3817,6 @@
Def_PDict_CrossPK_WinCount = "CrossPK_WinCount" # 当前胜利次数
Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 当前连胜次数
Def_PDict_CrossPK_CLoseCount = "CrossPK_CLoseCount" # 当前连败次数
-Def_PDict_CrossPK_IsMatchRobot = "CrossPK_IsMatchRobot" # 本次是否匹配机器人，1-是，0-否
Def_PDict_CrossPK_TodayPKCount = "CrossPK_TodayPKCount" # 今日已PK次数
Def_PDict_CrossPK_TodayWinCount = "CrossPK_TodayWinCount" # 今日已胜利次数
Def_PDict_CrossPK_TodayBuyCount = "CrossPK_TodayBuyCount" # 今日已购买PK次数
@@ -4364,7 +4364,9 @@
Def_CalcAttrFunc_Coat, # 时装 36
Def_CalcAttrFunc_LingQi, # 灵器 37
Def_CalcAttrFunc_LingQiAttr, # 灵器属性 38
-) = range(39)
+Def_CalcAttrFunc_HorseSkin, # 坐骑觉醒 39
+Def_CalcAttrFunc_PetSkin, # 灵宠觉醒 40
+) = range(41)
# 技能功能点列表 - 默认不算战力，不享受百分比加成，技能功能点暂时配置，之后优化技能属性逻辑后可去掉
CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
@@ -4381,9 +4383,9 @@
ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
ShareDefine.Def_MFPType_LingQi:[Def_CalcAttrFunc_LingQi, Def_CalcAttrFunc_LingQiAttr],
ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
- ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill],
+ ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_PetSkin],
ShareDefine.Def_MFPType_PetSoul:[Def_CalcAttrFunc_PetSoul],
- ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill],
+ ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_HorseSkin],
ShareDefine.Def_MFPType_HorseSoul:[Def_CalcAttrFunc_HorseSoul],
ShareDefine.Def_MFPType_Prestige:[Def_CalcAttrFunc_Prestige],
ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
@@ -5201,7 +5203,8 @@
Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
Def_RewardType_FairyAdventuresAward, #缥缈奇遇领取27
-)= range(28)
+Def_RewardType_HistoryChargeAward, #历史累计充值领取28
+)= range(29)
#boss复活相关活动定义
@@ -5223,7 +5226,7 @@
Def_BRAct_FamilyBoss, #仙盟BOSS 15
) = range(1, 15+1)
-#全民来嗨活动定义
+#全民来嗨活动定义(仙界盛典)
PeoplePartyActIDList = (
Def_PPAct_Fireworks, #购买烟花 1
Def_PPAct_Treasure, #极品寻宝 2
@@ -5238,11 +5241,14 @@
Def_PPAct_Pray, #祈愿 11
Def_PPAct_BossHome, #boss之家 12
Def_PPAct_VIPBoss, #vipBOSS 13
-) = range(1, 13+1)
+Def_PPAct_RunFamilyTask, #仙盟任务 14
+Def_PPAct_FamilyBoss, #仙盟Boss 15
+Def_PPAct_FairyDomain, #缥缈仙域 16
+) = range(1, 16+1)
-#周狂欢活动定义
+#周狂欢活动定义（七天巡礼）
WeekPartyActIDList = (
-Def_WPAct_RunTask, #师门悬赏 1
+Def_WPAct_RunTask, #仙盟任务 1
Def_WPAct_XJMJ, #仙境秘境 2
Def_WPAct_KirinHome, #麒麟之府 3
Def_WPAct_QueenRelices, #娲皇遗迹 4
@@ -5270,7 +5276,8 @@
Def_WPAct_Rune, #穿戴某品质符印 26
Def_WPAct_Pray, #祈愿 27
Def_WPAct_FamilyBoss, #仙盟Boss 28
-) = range(1, 28+1)
+Def_WPAct_FairyDomain, #缥缈仙域 29
+) = range(1, 29+1)
#可提前完成的周狂欢活动
AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]
--
Gitblit v1.8.0