From bef073f48eb7c60a5e30e22f5c6d89144ac2e688 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 26 十一月 2018 11:08:18 +0800
Subject: [PATCH] 4762 【后端】增加自己过关获得仙缘币同步；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 108 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 16 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index e5f5364..6c1d7ed 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -573,7 +573,7 @@
Def_Skill_Effect_AttackMove = 2100 # NPC位移战斗
Def_Skill_Effect_RandSkill = 2101 # 从效果值获取随机技能
Def_Skill_Effect_HPPerLimit = 2102 # 血量限制
-
+Def_Skill_Effect_AppointNPC = 2103 # 指定释放的NPCID 和 Def_UseSkillTag_AppointNPC 搭配使用
#-----------
#变身技能（召唤）效果ID
Def_Skill_Effect_SummonMapNPC = 1162
@@ -1164,7 +1164,7 @@
) = range(Def_UseSkillAim_Type)
#技能施法目标类型, 修改此处应在Def_Dict_UseSkillTag_ObjType 相应更改
-Def_UseSkillTag_Type = 15
+Def_UseSkillTag_Type = 16
(
Def_UseSkillTag_None , #无需选择对象 0
Def_UseSkillTag_Self , #自己 1
@@ -1181,6 +1181,7 @@
Def_UseSkillTag_SummonMaster, #召唤兽主人 12
Def_UseSkillTag_CanAttackBaseNPC, #可攻击的野外小怪（含精英）怪物 13
Def_UseSkillTag_FriendNPC, #友好NPC 14
+ Def_UseSkillTag_AppointNPC, #指定NPC 15 必须和效果值配合 Def_Skill_Effect_AppointNPC
) = range( 0, Def_UseSkillTag_Type )
@@ -1202,6 +1203,7 @@
Def_UseSkillTag_SummonMaster : [IPY_GameWorld.gotPlayer, IPY_GameWorld.gotNPC],
Def_UseSkillTag_CanAttackBaseNPC : [IPY_GameWorld.gotNPC],
Def_UseSkillTag_FriendNPC : [IPY_GameWorld.gotNPC],
+ Def_UseSkillTag_AppointNPC : [IPY_GameWorld.gotNPC],
}
@@ -1798,7 +1800,10 @@
Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome]
# 可重复进的副本
-Def_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade]
+Def_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield]
+
+# 无玩家时不自动关闭的自伸缩副本
+Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap]
# 不可切换PK模式的地图
Def_CanNotChangeAtkModelMap = []
@@ -1872,10 +1877,16 @@
Def_FB_DropDoCountRate = 'DropDoCountRate' # 怪物掉落执行次数万分率
Def_FB_DropDoCountAdd = 'DropDoCountAdd' # 怪物掉落执行次数加成固定值
Def_FB_SingleFBPlayerID = 'SingleFBPlayerID' # 个人副本玩家ID
+Def_FB_HelpBattleFBObjID = 'HelpBattleFBObjID_%s' # 助战副本助战NPC机器人/玩家ID对应实例ID, 参数为玩家ID
+Def_FB_HelpBattleGoldCall = 'HelpBattleGoldCall_%s' # 助战机器人是否花费召唤, 参数为玩家ID
FBPlayerDict_EncourageLV = 'FBPlayerDict_EncourageLV' # 鼓舞等级
FBPlayerDict_IsDelTicket = 'FBPlayerDict_IsDelTicket' # 是否已扣除入场券/进入次数
FBPlayerDict_IsHelpFight = 'FBPlayerDict_IsHelpFight' # 是否助战
+
+FBPD_HelpBattleRefreshCount = 'FBPD_HelpBattleRefreshCount' # 助战已刷新次数
+FBPD_HelpBattleFBFightPower = 'FBPD_HelpBattleFBFightPower' # 副本战力
+FBPD_HelpBattleFBBaseHurt = 'FBPD_HelpBattleFBBaseHurt' # 副本伤害
#领取奖励标识
(
@@ -3119,6 +3130,7 @@
Def_PlayerKey_SuperHitRateReduce = "SuperHitRateReduce" # 抗致命一击概率
Def_PlayerKey_IgnoreDefRateReduce = "IgnoreDefRateReduce" # 抗无视防御概率
Def_PlayerKey_LastHurtValue = "LastHurtValue" # 最后一次伤害值
+Def_PlayerKey_LastHurtNPCObjID = "LastHurtNPCObjID" # 最后攻击的NPCObjID
Def_PlayerKey_ReduceSkillCDPer = "ReduceSkillCDPer" # 减技能CD万分率
Def_PlayerKey_CommMapExpRate = "CommMapExpRate" # 常规地图经验倍率加成
Def_PlayerKey_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
@@ -3309,6 +3321,7 @@
Def_Player_Dict_FbCntRegainStartTime = "FbCntRegainStartTime_%s" # 副本次数恢复开始时间, 参数为副本ID
Def_Player_Dict_FbCntRegainTotalTime = "FbCntRegainTotalTime_%s" # 副本次数恢复还需时间, 参数为副本ID
Def_Player_Dict_FBHistoryMaxLine = "FBHistoryMaxLine_%s" # 副本历史最高通关, 参数为副本ID
+Def_Player_Dict_IceLoadLineID = "IceLoadLineID_%s" # 副本星级星级信息, 参数为[key编号], 按位存储每个lineID是否选中
Def_Player_Dict_RefurbishGoodBookPlayerLv = "RefurbishGoodBookPlayerLv_97" # 刷新天书任务时的玩家等级
Def_Player_Dict_GameFuncFirstTouch = "GameFuncFirstTouch_%s" # 服务端功能首次触发开启状态; 参数, key编号
Def_Player_Dict_GameFuncAwardState = "GameFuncAwardState_%s" # 服务端功能开启领奖状态; 参数, key编号
@@ -3406,6 +3419,7 @@
Def_PDict_DailyGoldChargeState = "DailyGoldChargeState" # 天天首充活动状态，0-未开启；1-已开启
Def_PDict_DailyChargeState = "DailyChargeState" # 当日是否已充值
Def_PDict_SuperGiftStartTime = "SuperGiftStartTime" # 超值礼包开始时间
+Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen" # 超值礼包是否开过
Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord" # 天天首充领奖记录，0-不可领；1-可领；2-已领
Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt" # 当日已充值数
Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex" # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
@@ -3427,6 +3441,7 @@
Def_PDict_CollNpcBuyTime = "CollNpcBuyTime_%s" # 采集NPC功能号对应每日购买采集次数，%sNPC功能号
Def_PDict_CollNpcIDCollTime = "CollNpcIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
Def_PDict_ShopItemDayBuyCnt = "ShopItemDayBuyCnt_%s" # 商店NPC商品已购买次数，itemIndex
+Def_PDict_ShopItemStartTime = "ShopItemStartTime_%s" # 神秘限购商品开卖时间，itemIndex
Def_PDict_ShopItemBuyCnt = "ShopItemBuyCnt_%s_%s" # 自定义商品已购买次数，(shopID, itemIndex)
Def_PDict_ShopItemOpenState = "ShopItemOpenState_%s_%s" # 自定义神秘商店物品开启状态，(shopID, keyNum)
Def_PDict_TimeShopRefreshCnt = "TimeShopRefreshCnt_%s" # 自定义神秘商店已手动刷新次数，(shopID)
@@ -3585,6 +3600,7 @@
#封魔坛
Def_Player_Dict_FMTDouble = "FMTDouble" # 封魔坛是否双倍
+Def_Player_Dict_FMTOldDouble = "FMTOldDouble" # 封魔坛是否曾经可以双倍
#极品白拿
Def_PDict_FreeGoodsOpenTime = "FreeGoodsOpenTime" #极品白拿开启时间
@@ -3595,6 +3611,12 @@
Def_PDict_CostRebateTemplateID = "CostRebateTemplateID" # 玩家身上的消费返利模板ID
Def_PDict_CostRebateGold = "CostRebateGold" # 消费返利总累计消费仙玉
Def_PDict_CostRebateAwardRecord = "CostRebateAwardRecord" # 消费返利领奖记录
+
+#累计充值活动
+Def_PDict_TotalRechargeID = "TotalRechargeID" # 玩家身上的累计充值活动ID，唯一标识，取活动开始日期time值
+Def_PDict_TotalRechargeTemplateID = "TotalRechargeTemplateID" # 玩家身上的累计充值模板ID
+Def_PDict_TotalRechargeGold = "TotalRechargeGold" # 消费返利总累计充值仙玉
+Def_PDict_TotalRechargeAwardRecord = "TotalRechargeAwardRecord" # 累计充值领奖记录
#限时特惠活动
Def_PDict_SpringSaleID = "SpringSaleID" # 玩家身上的限时特惠活动ID，唯一标识，取活动开始日期time
@@ -3641,6 +3663,16 @@
#聊天气泡
Def_PDict_ChatBubbleBoxState = "ChatBubbleBoxState_%s" # 聊天气泡状态， 参数(key编号)
+#冰晶矿脉
+Def_PDict_IceLodeStarAwardRecord = "IceLodeStarAwardRecord" #星级奖励领奖记录
+Def_PDict_IceLodeHasSweep = "IceLodeHasSweep" #今日是否已扫荡过
+Def_PDict_IceLodeLastCheckTime = "IceLodeLastCheckTime" #上次补发星级奖励时间
+Def_PDict_IceLodeDayLV = "IceLodeDayLV" #今日等级
+Def_PDict_IceLodeIsInFBOnDay = "IceLodeIsInFBOnDay" #在副本里过天
+
+#助战
+Def_PDict_HelpBattleCheckInCount = "HelpBattleCheckInCount" #助战登记次数, 登记次数*10+今日是否登记过
+Def_PDict_HelpBattleTotalCount = "HelpBattleTotalCount" #累计助战次数
#-------------------------------------------------------------------------------
#类型 Def_PDictType_OnlinePrize
Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
@@ -3709,6 +3741,7 @@
Def_PDict_ActivityAwardRecord = "ActivityAwardRecord" # 活跃度奖励领取记录，按二进制位标识
Def_PDict_Activity_AwardStage = "Activity_AwardStage" # 当前活跃奖励阶段
Def_PDict_Activity_RealmPoint = "Activity_RealmPoint" # 当前可领修行点
+Def_PDict_Activity_ExtraRealmPoint = "Activity_ExtraRealmPoint" # 多倍活动额外获得的修行点
# 每日活动
Def_PDict_DailyActionDayTimes = "DailyActionDayTimes_%s" # 每日活动今日完成次数 参数每日活动ID
Def_PDict_DailyActionWeekTimes = "DailyActionWeekTimes_%s" # 每日活动本周完成次数 参数每日活动ID
@@ -3807,7 +3840,7 @@
Def_PDict_MWSoulGotValue = "MWSoulGotValue_%s" #法宝特权已领取进度 参数特权ID
Def_PDict_MWSoulGotItemState = "MWSoulGotItemState_%s" #法宝特权领取物品奖励状态 参数特权ID
Def_PDict_MWSoulActiveState = "MWSoulActiveState_%s" #法宝之魂激活状态 参数(key编号)
-
+Def_PDict_MWFBPassLevel = "MWFBPassLevel_%s" #法宝副本通关关卡 参数(法宝ID)
#炼丹炉
Def_PDict_AlchemyLV = "AlchemyLV" #炼丹等级
Def_PDict_AlchemyExp = "AlchemyExp" #炼丹经验
@@ -4248,7 +4281,9 @@
Def_CalcAttrFunc_MagicWeaponSoul, # 法宝之魂属性34
Def_CalcAttrFunc_Dogz, # 神兽35
Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
-) = range(37)
+Def_CalcAttrFunc_DogzEquip, # 神兽装备37
+Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
+) = range(39)
# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
@@ -4263,9 +4298,11 @@
#战斗力分组类型对应功能点属性分类索引列表，并不是一一对应的，有些战斗力类型可由多个功能点组成
MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
- ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipBaseWeapon, Def_CalcAttrFunc_EquipBaseRelics,
- Def_CalcAttrFunc_EquipBaseArmor, Def_CalcAttrFunc_Equip,
- Def_CalcAttrFunc_EquipOutOfPrint, Def_CalcAttrFunc_EquipAllStars],
+# 因为装备评分和实际战力一直出现不匹配的情况，所以装备战力修改为直接由装备评分做为参数计算战力，所以装备评分计算的所有属性不列入战力计算，祥见评分计算函数 ItemCommom.CalcEquipGS
+# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipBaseWeapon, Def_CalcAttrFunc_EquipBaseRelics,
+# Def_CalcAttrFunc_EquipBaseArmor, Def_CalcAttrFunc_Equip,
+# Def_CalcAttrFunc_EquipOutOfPrint, Def_CalcAttrFunc_EquipAllStars],
+ ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipAllStars],
ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_PlusBase, Def_CalcAttrFunc_PlusEx],
ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
ShareDefine.Def_MFPType_Suit:[Def_CalcAttrFunc_Suit],
@@ -4285,7 +4322,8 @@
ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
- ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz],
+ # 神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
+ ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
}
@@ -4350,7 +4388,10 @@
TriggerType_AddBuffOver, # 添加buff之后触发技能 56
TriggerType_StormAttackOver, # 类剑刃风暴每攻击一次触发技能 57
TriggerType_StormAttackReduceCD, # 类剑刃风暴攻击每攻击一次减少CD 58
-) = range(1, 59)
+TriggerType_AttackAddFinalPer, #增加最终伤害百分比 59
+TriggerType_SummonDie, #自身召唤兽死亡触发技能 60
+TriggerType_GiftReduceCD, # 天赋用的减CD 61
+) = range(1, 62)
# NPC功能类型定义
@@ -4449,6 +4490,15 @@
Def_ClientServerInitOK, #跨服子服启动成功6
) = range(7)
+#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
+(
+Def_VerFix_ChatBubbleBox, # 1.2版本购买VIP礼包可获得激活气泡框道具，针对已购买过VIP礼包的老号处理;
+Def_VerFix_CTGDoublePrize, # 1.2版本开放首充双倍，重置老号充值ID对应累计充值次数;
+Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
+Def_VerFix_FMTDouble, # 1.3版本VIP特权变更，记录切换版本前的VIP特权(封魔坛双倍挑战);
+Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启，改成等级到开启;
+) = range(5)
+
##==================================================================================================
#游戏消费点类型定义
Def_CostType_List = (
@@ -4487,9 +4537,11 @@
Def_Cost_DogzEquipPlus, # 神兽装备强化
Def_Cost_RuneHole, # 符印孔解锁
Def_Cost_AlchemyPray, # 丹药祈福
-Def_Cost_ResetGreatMasterSkill, # 重置天赋技能
+Def_Cost_ResetGreatMasterSkill, # 重置天赋技能 35
Def_Cost_BindJadeWheel, # 绑玉转盘
Def_Cost_WishingWell, # 许愿池刷新
+Def_Cost_GodWeapon, # 神兵
+Def_Cost_FBHelpBattle, # 副本助战
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4510,7 +4562,7 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 57)
+) = range(2000, 2000 + 59)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
@@ -4595,6 +4647,8 @@
Def_Cost_AlchemyPray:"AlchemyPray",
Def_Cost_BindJadeWheel:"BindJadeWheel",
Def_Cost_WishingWell:"WishingWell",
+Def_Cost_GodWeapon:"GodWeapon",
+Def_Cost_FBHelpBattle:"FBHelpBattle",
}
## -----------------------------------------------------
@@ -4893,7 +4947,10 @@
VIPPrivilege_29, #29 娲皇遗迹购买次数 - 副本总表统一处理
VIPPrivilege_BindJadeWheel, #30 绑玉转盘次数
VIPPrivilege_PrayElixir, #31 丹药祈福次数
-) = range(1, 32)
+VIPPrivilege_32, #32 封魔坛自动挑战
+VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
+VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
+) = range(1, 35)
(
@@ -4916,8 +4973,10 @@
ntPet,
ntTouchKill, #触碰后自杀类 17
ntUndeath, #不死类型 18
+ntRobot, #上古战场机器人类型 19
+ntHelpBattleRobot, #助战机器人 20
ntMax
-) = range(20)
+) = range(22)
(Def_SkillFuncType_Common, #0为通用技能
@@ -5040,7 +5099,9 @@
Def_RewardType_DownLoad, # 分包下载奖励15
Def_RewardType_WishingWell, # 许愿池奖励16
Def_RewardType_OpenFunc, # 功能开启奖励17
-)= range(18)
+Def_RewardType_TotalRecharge, # 累计充值奖励18
+Def_RewardType_IceLodeStar, # 冰晶矿脉星级奖励19
+)= range(20)
#boss复活相关活动定义
@@ -5075,4 +5136,19 @@
Def_PPAct_Pray, #祈愿 11
Def_PPAct_BossHome, #boss之家 12
Def_PPAct_VIPBoss, #vipBOSS 13
-) = range(1, 13+1)
\ No newline at end of file
+) = range(1, 13+1)
+
+# 套装枚举，普通套装，强化套装
+(EquipSuitType_Normal,
+EquipSuitType_Plus,
+) = range(1,3)
+
+EquipGroupType_Armor = '1' # 防具套装
+EquipGroupType_Relics = '2' # 仙器套装
+
+# 符印来源类型
+(
+Rune_Source_Unkown, # 老号未知 0
+Rune_Source_Default, # 默认 1
+Item_Source_Compound, # 符印合成 2
+) = range(3)
\ No newline at end of file
--
Gitblit v1.8.0