From f460b6035d693dd40c361f7c289c5dac2a2a32a1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十月 2018 16:30:12 +0800
Subject: [PATCH] 4201 【主干】【后端】新增战斗力参数：移动速度百分比
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 4bafff2..72ae1e5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -364,8 +364,8 @@
def GetItemPackType(itemType, defaultPack=IPY_GameWorld.rptItem):
## 获取物品类型对应存放的默认背包类型
- if defaultPack == ShareDefine.rptTreasure:
- #寻宝背包不做处理
+ if defaultPack in [ShareDefine.rptTreasure, ShareDefine.rptTempItem]:
+ #寻宝背包、临时背包不做处理
return defaultPack
for pack, itemTypeList in Def_PackItemTypeList_Dict.items():
if itemType in itemTypeList:
@@ -840,7 +840,7 @@
#初始化临时存放背包格子数
Def_PackCnt_TempItem = 10
#初始化宠物背包格子数
-Def_PackCnt_Pet = 20
+Def_PackCnt_Pet = 50
#初始化通用宠物装备背包格子数
Def_PackCnt_PetEquip = 4
#主角刚登陆游戏开启精魄槽格子数/符文
@@ -1227,7 +1227,7 @@
) = range( 0, Def_AutoAtkSkillType )
#技能类型
-Def_SkillType_Count = 23
+Def_SkillType_Count = 24
(
Def_SkillType_Special , #特殊技能 0
Def_SkillType_Atk , #攻击类 1
@@ -1252,6 +1252,7 @@
Def_SkillType_AttrSkill, # 属性类技能 20
Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
+ Def_SkillType_AttrSkillNoLearn, # 可叠加的同类型ID属性类技能 不可学习 算属性直接取表 目前用于神兽技能 23
) = range( 0, Def_SkillType_Count )
@@ -1288,7 +1289,8 @@
#对敌使用技能列表
Def_CanAttackSkill_List = [ Def_SkillType_LstDepBuff, Def_SkillType_DepBuff, Def_SkillType_Atk,
- Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk ]
+ Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk,
+ Def_SkillType_PassiveDepBuff, Def_SkillType_PassiveActionBuff, Def_SkillType_PassiveLstDepBuff ]
#不利BUFF给NPC添加仇恨
Def_Debuff_List = [Def_SkillType_LstDepBuff, Def_SkillType_DepBuff, Def_SkillType_Action,
@@ -2141,6 +2143,7 @@
1000 * 3, # 仓库整理间隔
1000 * 15, # 渡劫鼓舞间隔
1000 * 1, # vip体验时效
+ 1000 * 1, # 限时抢购
]
TYPE_Player_Tick_Count = len(TYPE_Player_Tick_Time)
@@ -2216,6 +2219,7 @@
TYPE_Player_Tick_WareHouseSort, # 仓库整理间隔
TYPE_Player_Tick_DuJieInspire, # 渡劫鼓舞间隔
TYPE_Player_Tick_VIPExperience, #vip体验时效
+TYPE_Player_Tick_FlashSale, #限时抢购
) = range(0, TYPE_Player_Tick_Count)
#---------------------------------------------------------------------
@@ -3038,6 +3042,7 @@
Def_PlayerKey_ComboAddHurtPer = "ComboAddHurtPer" #当前连击的伤害加成万分率
Def_PlayerKey_ComboBuffProcessState = "ComboBuffProcessState" #持续性buff连击处理状态
Def_PlayerKey_LvAwardQueryState = 'LvAwardQueryState' # 等级奖励领奖查询状态
+Def_PlayerKey_StoreQueryState = 'StoreQueryState' # 商店全服购买次数查询状态
#===============================================================================
# # 持续性buff伤害处理连击技能ID列表
# # 因为释放一次技能后一段时间内是持续性的, 故连接判断效果仅处理一次, 持续时间内均受此效果影响, 不重复处理连击
@@ -3192,7 +3197,7 @@
Def_PDictType_Default, # 默认
Def_PDictType_OnlinePrize, # 在线奖励(暂停使用)，领取后重新计时型
Def_PDictType_FBWipeOut, # fb扫荡
-Def_PDictType_3,
+Def_PDictType_FlashSale, #限时抢购
Def_PDictType_TJGNotify, # 脱机挂结果通知
Def_PDictType_LVAward, # 等级奖励领取信息记录5
Def_PDictType_GoldGift, # 充值豪礼
@@ -3498,6 +3503,8 @@
Def_PDict_DownloadAwardState = "DownloadAwardState" # 分支下载奖励状态 0-未领 1-已领
+Def_PDict_ChestsOpenCount = "ChestsOpenCount_%s" # 宝箱已开启次数, 参数(宝箱ID), 只有有开启次数额外奖励的才会记录
+
# 跑环
Def_PDict_RunTaskAwardState = "RunTaskAwardState_%s" # 是否已领取跑环本轮结束奖励 参数任务类型
Def_PDict_RunTaskAwardRecord = "RunTaskAwardRecord_%s" # 跑环本轮结束奖励记录 参数任务类型
@@ -3601,6 +3608,16 @@
Def_PDict_FCPartyCurPoint = "FCPartyCurPoint" #全民来嗨活动当前总点数
Def_PDict_FCPartyAwardRecord = "FCPartyAwardRecord" #全民来嗨活动领奖记录
Def_PDict_FCCostGold = "FCCostGold" # 绝版降临总累计消费仙玉
+
+#绑玉转盘
+Def_PDict_BindJadeWheelCurCnt = "BindJadeWheelCurCnt" # 今日已转次数
+Def_PDict_BindJadeWheelHistoryCnt = "BindJadeWheelHistoryCnt" # 历史已转次数
+
+#限时抢购活动
+Def_PDict_FlashSaleID = "FlashSaleID" # 玩家身上的限时抢购活动ID，唯一标识，取活动开始日期time
+Def_PDict_FlashSaleState = "FlashSaleState" # 玩家身上的限时抢购活动state
+Def_PDict_FlashSaleMailState = "FlashSaleMailState" # 玩家身上的活动更新提醒邮件状态
+Def_PDict_FlashSaleYY = "FlashSaleYY_%s" # 玩家预约限时抢购商品
#-------------------------------------------------------------------------------
#类型 Def_PDictType_OnlinePrize
Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
@@ -4440,13 +4457,14 @@
Def_Cost_DogzEquipPlus, # 神兽装备强化
Def_Cost_RuneHole, # 符印孔解锁
Def_Cost_AlchemyPray, # 丹药祈福
+Def_Cost_ResetGreatMasterSkill, # 重置天赋技能
+Def_Cost_BindJadeWheel, # 绑玉转盘
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
Def_Cost_RefreshTruck, # 刷新镖车
Def_Cost_FinishTruck, # 完成镖车
Def_Cost_RefreshTimeShop, # 刷新神秘商店
-Def_Cost_ResetGreatMasterSkill, # 重置大师技能
Def_Cost_OpenNoble, # 开通贵族
Def_Cost_BuyMergePKCnt, # 购买跨服PK次数
Def_Cost_RecoverMergePKWin, # 恢复跨服PK连胜
@@ -4461,7 +4479,7 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 55)
+) = range(2000, 2000 + 56)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
@@ -4506,7 +4524,7 @@
Def_Cost_FinishTruck:"FinishTruck",
Def_Cost_RefreshArrestTask:"RefreshArrestTask",
Def_Cost_RefreshTimeShop:"RefreshTimeShop",
-Def_Cost_ResetGreatMasterSkill:"ResetGreatMasterSkill",
+Def_Cost_ResetGreatMasterSkill:"ResetTalentSkill",
Def_Cost_BuyMergePKCnt:"BuyMergePKCnt",
Def_Cost_RecoverMergePKWin:"RecoverMergePKWin",
Def_Cost_MergeKingSupport:"MergeKingSupport",
@@ -4544,6 +4562,7 @@
Def_Cost_DogzEquipPlus:"DogzEquipPlus",
Def_Cost_RuneHole:"RuneHole",
Def_Cost_AlchemyPray:"AlchemyPray",
+Def_Cost_BindJadeWheel:"BindJadeWheel",
}
## -----------------------------------------------------
@@ -4574,7 +4593,8 @@
Def_GiveMoney_Trade, # 交易
Def_GiveMoney_Truck, # 运镖
Def_GiveMoney_FreeGoods, # 极品白拿 25
-) = range(1000, 1000 + 25)
+Def_GiveMoney_BindJadeWheel, # 绑玉转盘
+) = range(1000, 1000 + 26)
Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
@@ -4605,6 +4625,7 @@
Def_GiveMoney_Trade:"Trade",
Def_GiveMoney_Truck:"Truck",
Def_GiveMoney_FreeGoods:"FreeGoods",
+Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
}
##==================================================================================================
@@ -4837,7 +4858,9 @@
VIPPrivilege_BOSSHomeKillLimit, #27 BOSS之家疲劳值上限
VIPPrivilege_FMTDouble, #28 封魔坛双倍击杀
VIPPrivilege_29, #29 娲皇遗迹购买次数 - 副本总表统一处理
-) = range(1, 30)
+VIPPrivilege_BindJadeWheel, #30 绑玉转盘次数
+VIPPrivilege_PrayElixir, #31 丹药祈福次数
+) = range(1, 32)
(
--
Gitblit v1.8.0