From 2f64dfa5d5b4f1106c5985bec7c23615636ccbe2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 17 九月 2019 15:11:44 +0800
Subject: [PATCH] 8266 【后端】货币祈愿改为获得灵石
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 1ff0968..8c9a392 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -771,7 +771,7 @@
Def_HurtType_FuhaoHit, # 富豪一击
) = range(21, 25)
-Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
+Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retGlove + 1)
#装备类型
Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
@@ -3455,7 +3455,9 @@
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_TodayCTGCoinTotal = "TodayCTGCoinTotal" # 当日充值Coin数
Def_PDict_TodayCTGCount = "TodayCTGCount_%s" # 当日充值次数，参数(CTG对应的商品记录ID)
Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s" # 对应充值商品已购买次数，参数(CTG对应的商品记录ID)
Def_PDict_GoldGiftFirstRecord = "GoldGiftFirstRecord" # 首充领取记录，0-未领取；1-已领取
@@ -3605,7 +3607,14 @@
Def_Player_Dict_ElderBattlefieldStage = "ElderBattlefieldStage" # 本次达到阶段
#仙盟宴会
+Def_Player_Dict_FamilyPartyJoinSign = "FamilyPartyJoinSign" # 今日参与宴会标记
Def_Player_Dict_FamilyPartyAnswerCnt = "FamilyPartyAnswerCnt" # 答题数量
+Def_Player_Dict_FamilyPartySitState = "FamilyPartySitState" # 是否已打坐传功
+Def_Player_Dict_FamilyPartyHelpSitCount = "FamilyPartyHelpSitCount" # 已经帮助传功次数
+Def_Player_Dict_FamilyPartyCollectState = "FamilyPartyCollectState" # 是否已采集
+Def_Player_Dict_FamilyPartyTotalExp = "FamilyPartyTotalExp" # 获得的总经验
+Def_Player_Dict_FamilyPartyTotalExpPoint = "FamilyPartyTotalExpPoint" # 获得的总经验点
+Def_Player_Dict_FamilyPartyTotalPoint = "FamilyPartyTotalPoint" # 获得的总仙盟贡献值
#虚拟背包物品数据
Def_PDict_VPackItem = "VPackItem_%s_%s" # 虚拟背包物品数据, 参数(背包类型, 位置索引)
@@ -3664,7 +3673,9 @@
Def_PDict_FCPartyCurCnt = "FCPartyCurCnt_%s" #全民来嗨活动当前完成次数 参数活动ID
Def_PDict_FCPartyCurPoint = "FCPartyCurPoint" #全民来嗨活动当前总点数
Def_PDict_FCPartyAwardRecord = "FCPartyAwardRecord" #全民来嗨活动领奖记录
-Def_PDict_FCCostGold = "FCCostGold" # 绝版降临总累计消费仙玉
+Def_PDict_FCCTGRMBTotal = "FCCTGRMBTotal" # 绝版降临总累计充值元
+Def_PDict_FCFireworksBuyCount = "FCFireworksBuyCount" # 高级烟花已购买次数
+Def_PDict_FCFireworksScore = "FCFireworksScore" # 总烟花积分，含普通烟花
#新仙界盛典
Def_PDict_NewFairyCeremonyID = "NewFairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
@@ -3750,8 +3761,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" # 符印镶嵌数据, 参数(第几孔)
@@ -4061,6 +4072,9 @@
#战斗线性
ShareDefine.Def_Effect_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
+ ShareDefine.Def_Effect_MaxHP_ShenPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
+ ShareDefine.Def_Effect_MaxHP_XianPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
+ ShareDefine.Def_Effect_MaxHP_JiPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
ShareDefine.Def_Effect_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],
ShareDefine.Def_Effect_Def:[[TYPE_Calc_AttrDEF], False, TYPE_Linear],
ShareDefine.Def_Effect_Miss:[[TYPE_Calc_AttrMiss], False, TYPE_Linear],
@@ -4071,6 +4085,9 @@
ShareDefine.Def_Effect_MinAtk:[[TYPE_Calc_AttrATKMin], False, TYPE_Linear],
ShareDefine.Def_Effect_MaxAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
+ ShareDefine.Def_Effect_Atk_ShenPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
+ ShareDefine.Def_Effect_Atk_XianPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
+ ShareDefine.Def_Effect_Atk_JiPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
#ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
# TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
@@ -4098,12 +4115,18 @@
AttrName_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],
AttrName_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
ShareDefine.Def_Effect_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
+ ShareDefine.Def_Effect_IceAtk_ShenPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
+ ShareDefine.Def_Effect_IceAtk_XianPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
+ ShareDefine.Def_Effect_IceAtk_JiPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
AttrName_FireAtk:[[TYPE_Calc_AttrFireAtk], False, TYPE_Linear],
AttrName_PoisonAtk:[[TYPE_Calc_AttrPoisonAtk], False, TYPE_Linear],
AttrName_ThunderAtk:[[TYPE_Calc_AttrThunderAtk], False, TYPE_Linear],
AttrName_WindAtk:[[TYPE_Calc_AttrWindAtk], False, TYPE_Linear],
AttrName_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
ShareDefine.Def_Effect_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
+ ShareDefine.Def_Effect_IceDef_ShenPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
+ ShareDefine.Def_Effect_IceDef_XianPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
+ ShareDefine.Def_Effect_IceDef_JiPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
AttrName_FireDef:[[TYPE_Calc_AttrFireDef], False, TYPE_Linear],
AttrName_PoisonDef:[[TYPE_Calc_AttrPoisonDef], False, TYPE_Linear],
AttrName_ThunderDef:[[TYPE_Calc_AttrThunderDef], False, TYPE_Linear],
@@ -4290,8 +4313,14 @@
EquipBassAttrAddInfoSet = {
ShareDefine.Def_Effect_EquipBaseAddPer: [-1, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
ShareDefine.Def_Effect_BaseEquipAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
- ShareDefine.Def_Effect_BaseEquipAtkAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
- ShareDefine.Def_Effect_BaseEquipMaxHPAddPer: [-2, [ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_BaseEquipAtkAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_BaseEquipAtkAddPer_ShenPin: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_BaseEquipAtkAddPer_XianPin: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_BaseEquipAtkAddPer_JiPin: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_BaseEquipMaxHPAddPer: [-2, [ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_ShenPin: [-2, [ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_XianPin: [-2, [ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_JiPin: [-2, [ShareDefine.Def_Effect_MaxHP]],
ShareDefine.Def_Effect_WeaponAddPer: [ShareDefine.retWeapon, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
ShareDefine.Def_Effect_Weapon2AddPer: [ShareDefine.retWeapon2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
ShareDefine.Def_Effect_BeltAddPer: [ShareDefine.retBelt, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
@@ -4363,7 +4392,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]
@@ -4380,9 +4411,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],
@@ -5200,7 +5231,8 @@
Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
Def_RewardType_FairyAdventuresAward, #缥缈奇遇领取27
-)= range(28)
+Def_RewardType_HistoryChargeAward, #历史累计充值领取28
+)= range(29)
#boss复活相关活动定义
@@ -5222,7 +5254,7 @@
Def_BRAct_FamilyBoss, #仙盟BOSS 15
) = range(1, 15+1)
-#全民来嗨活动定义
+#全民来嗨活动定义(仙界盛典)
PeoplePartyActIDList = (
Def_PPAct_Fireworks, #购买烟花 1
Def_PPAct_Treasure, #极品寻宝 2
@@ -5237,9 +5269,12 @@
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_XJMJ, #仙境秘境 2
--
Gitblit v1.8.0