From 6ce06da11598b0012297e502759ade43e63d7eaa Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 25 六月 2019 17:00:59 +0800
Subject: [PATCH] 7534 【2.0.100】【后端】日常活动新增蓬莱仙境

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 25e008f..c8002e4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -361,20 +361,7 @@
 Def_ItemType_DogzEquipScute = 123   # 神兽鳞甲
 Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数
 
-Def_ItemType_ZXCloak = 128 # 诛仙披风
-Def_ItemType_ZXMask = 129 # 诛仙面具
-Def_ItemType_ZXGlove = 130 # 诛仙手套
-Def_ItemType_ZXRuyi = 131 # 诛仙如意
-Def_ItemType_ZXPendant = 132 # 诛仙吊坠
-Def_ItemType_ZXRing = 133 # 诛仙戒指
-Def_ItemType_ZXWeapon1 = 134 # 诛仙剑1
-Def_ItemType_ZXWeapon2 = 135 # 诛仙剑2
-Def_ItemType_ZXWeapon3 = 136 # 诛仙剑3
-Def_ItemType_ZXWeapon4 = 137 # 诛仙剑4
-Def_ItemType_ZhuXianStuff = 138 # 诛仙材料
-
 Def_ItemType_DogzStuff = 139 # 神兽材料
-Def_ItemType_ZhuXianStone = 140 # 诛仙宝石
 
 #以下定义物品类型下次删除
 Def_Item_Type_Horse = 1000036          #坐骑
@@ -782,13 +769,10 @@
 
 Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
 #装备类型
-Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
+Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
 
 #神兽装备类型
 Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)
-
-#诛仙装备类型
-Def_ZhuXianEquiipType = xrange(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
 
 # 技能造成实质性伤害的类型
 Def_RealAttack_Type = [
@@ -849,10 +833,6 @@
 Def_PackCnt_DogzItem = 100
 #初始化神兽装备格子数
 Def_PackCnt_DogzEquip = 100
-#初始化诛仙背包格子数
-Def_PackCnt_ZhuXianItem = 100
-#初始化诛仙装备格子数
-Def_PackCnt_ZhuXianEquip = 12
 #初始化装备栏2
 Def_PackCnt_Equip2 = 0
 #初始化回收站
@@ -1096,8 +1076,6 @@
                                     ShareDefine.rptPet,
                                     ShareDefine.rptDogzItem,
                                     ShareDefine.rptDogzEquip,
-                                    ShareDefine.rptZhuXianItem,
-                                    ShareDefine.rptZhuXianEquip,
                                     ]
 
 #装备可强化背包列表
@@ -1246,7 +1224,7 @@
 ) = range( 0, Def_AutoAtkSkillType )
 
 #技能类型
-Def_SkillType_Count = 24
+Def_SkillType_Count = 25
 (
    Def_SkillType_Special      ,  #特殊技能   0        
    Def_SkillType_Atk          ,  #攻击类   1
@@ -1272,6 +1250,7 @@
    Def_SkillType_PassiveLstPlsBuff,  #被动触发持续增益类buff 21
    Def_SkillType_PassiveLstDepBuff,  #被动触发持续减益类buff 22
    Def_SkillType_AttrSkillNoLearn,   # 可叠加的同类型ID属性类技能 不可学习 算属性直接取表 目前用于神兽技能 23
+   Def_SkillType_PassiveLstPlsBuffAtk,  #被动持续攻击类BUFF 24
    
 ) = range( 0, Def_SkillType_Count )
 
@@ -1295,20 +1274,21 @@
                        Def_SkillType_PassiveActionBuff : IPY_GameWorld.bfActionBuff ,  #影响行为BUFF 14
                        Def_SkillType_PassiveLstPlsBuff: IPY_GameWorld.bfProcessBuff,  #被动触发持续增益类buff 3
                        Def_SkillType_PassiveLstDepBuff: IPY_GameWorld.bfProcessDeBuff,  #被动触发持续减益类buff 4
+                       Def_SkillType_PassiveLstPlsBuffAtk : IPY_GameWorld.bfProcessBuff   ,  #持续增益BUFF  3
                        
                      }
 
 # 伤害型技能
-Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk]
+Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk]
 
 
 #持续型技能列表
-Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk,
+Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
                     Def_SkillType_PassiveLstPlsBuff, Def_SkillType_PassiveLstDepBuff ]
 
 #对敌使用技能列表
 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_PassiveLstPlsBuffAtk,
                            Def_SkillType_PassiveDepBuff, Def_SkillType_PassiveActionBuff, Def_SkillType_PassiveLstDepBuff ]
 
 #不利BUFF给NPC添加仇恨
@@ -1453,7 +1433,7 @@
 #自动恢复计算间隔
 Def_HPRestoreInterval = 5000
 #允许重置的背包索引
-Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptZhuXianItem]
+Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]
 #仓库分页个数
 Def_ItemReset_WarehousePageCnt = 56
 #玩家捡起物品的距离 8
@@ -3610,10 +3590,6 @@
 #试炼之塔
 Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV"  # 试炼之塔通关层数
 Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV"  # 试炼之塔昨日通关层数
-#诛仙塔
-Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV"  # 诛仙塔已通关层数
-Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor"  # 诛仙塔上次挑战层数
-Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime"  # 诛仙塔通关时间
 #天星塔
 Def_Player_Dict_SkyTowerFloor = "SkyTowerFloor"  # 天星塔已通关层数
 
@@ -4506,7 +4482,10 @@
 TriggerType_ThumpHitSuckBloodPer,   # 重击百分比吸血, 85
 TriggerType_SuperHitPer,  # 暴击伤害百分比 86
 TriggerType_SkillSuccessExpend, # 使用技能成功后不触发技能 处理消耗等问题用 87
-) = range(1, 88)
+TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
+TriggerType_HitValue, # 记录命中个数 89
+TriggerType_ChangeSkillEff, # 改变技能特效广播 90
+) = range(1, 91)
 
 
 #不可以佩戴翅膀的地图
@@ -4867,7 +4846,7 @@
 ItemDel_ChatBubbleBox, # 激活聊天气泡框
 ItemDel_GatherSoul, # 聚魂分解
 ItemDel_CoatDecompose, # 时装分解
-ItemDel_ZhuXianDecompose, # 诛仙装备分解
+ItemDel_2037,
 ItemDel_EquipStarUp, # 装备升星
 ItemDel_EquipPlusEvolve, # 装备强化进化
 ) = range(2000, 2000 + 40)
@@ -4911,7 +4890,6 @@
                    ItemDel_ChatBubbleBox:"ChatBubbleBox",
                    ItemDel_GatherSoul:"GatherSoul",
                    ItemDel_CoatDecompose:"CoatDecompose",
-                   ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
                    ItemDel_EquipStarUp:"EquipStarUp",
                    ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
                    }

--
Gitblit v1.8.0