From 4dcb18d0e7848effd25e0d5970e9c84808da957c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 10 六月 2019 14:12:34 +0800
Subject: [PATCH] 7155 【后端】【2.0】新增仙盟创建规则

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   24 ++++++++++++------------
 1 files changed, 12 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 6abd9df..0101a93 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -263,7 +263,7 @@
 Def_ItemID_FamilyContribution = 26               # 直接给战盟贡献点
 Def_ItemID_FamilyActive = 28               # 直接给战盟活跃点
 Def_ItemID_SP = 29               # 直接给sp
-Def_ItemID_GoldPaper = 30               # 直接给绑玉
+#Def_ItemID_GoldPaper = 30               # 直接给绑玉
 Def_ItemID_RealmPoint = 24               # 直接给修行点
 Def_ItemID_BossReborn = 21               # 直接给boss复活点
 Def_ItemID_Ysog = 4306               # 直接给符印融合石
@@ -271,9 +271,9 @@
 Def_ItemID_SoulSplinters = 701               # 直接给聚魂碎片
 Def_ItemID_SoulCore = 702               # 直接给核心环
 Def_ItemID_Honor = 2141               # 直接给荣誉
-Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper, 
+Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, #Def_ItemID_GoldPaper, 
                            Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
-                           Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor]
+                           Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney]
 #---------------------------------------------------------------------
 #写死的物品类型都放这边
 Def_ItemType_All = -1             #所有类型
@@ -807,11 +807,6 @@
 #内网GM等级
 Def_GM_LV_God = 90
 #---------------------------------------------------------------------
-#游戏中所有的金钱类型
-Def_MoneyType_All = [IPY_GameWorld.TYPE_Price_Gold_Money,     # 元宝
-                     IPY_GameWorld.TYPE_Price_Gold_Paper,     # 礼券
-                     IPY_GameWorld.TYPE_Price_Silver_Money,   # 银子
-                     ]
 
 #客户端心跳响应封包间隔(毫秒)
 Def_PlayerOnLineReply_ClientReply = 30000    #30000  
@@ -3891,6 +3886,7 @@
 Def_PDict_AlchemyLearnState = "AlchemyLearnState%s" #丹方是否已学习 
 Def_PDict_AlchemyItemID = "AlchemyItemID_%s" #炼丹中的丹药ID  参数丹药类型
 Def_PDict_AlchemyStartTime = "AlchemyStartTime_%s" #炼丹开始时间    参数丹药ID
+Def_PDict_AlchemyTimes = "AlchemyTimes_%s" #本次炼丹几次    参数丹药ID
 Def_PDict_AlchemyCnt = "AlchemyCnt%s" #丹药炼丹次数
 
 Def_PDict_AlchemyPrayCnt = "AlchemyPrayCnt" #炼丹祈福次数
@@ -4503,7 +4499,8 @@
 TriggerType_AddHP,        # 技能回血 84
 TriggerType_ThumpHitSuckBloodPer,   # 重击百分比吸血, 85
 TriggerType_SuperHitPer,  # 暴击伤害百分比 86
-) = range(1, 87)
+TriggerType_SkillSuccessExpend, # 使用技能成功后不触发技能 处理消耗等问题用 87
+) = range(1, 88)
 
 
 #不可以佩戴翅膀的地图
@@ -4610,6 +4607,7 @@
 Def_Cost_AuctionBid, # 拍卖行竞价
 Def_Cost_BuyDailyActionCnt, # 购买活动次数
 Def_Cost_FBBuyBuff, # 副本买buff
+Def_Cost_CreatFamily, # 创建仙盟
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4622,7 +4620,7 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 58)
+) = range(2000, 2000 + 59)
 
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
@@ -4702,6 +4700,7 @@
 Def_Cost_AuctionBid:"AuctionBid",
 Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
 Def_Cost_FBBuyBuff:"FBBuyBuff",
+Def_Cost_CreatFamily:"CreatFamily",
 }
 ## -----------------------------------------------------
 
@@ -5250,7 +5249,7 @@
 Def_WPAct_CrossPK, #跨服pk 11
 Def_WPAct_Recharge, #充值X仙玉 12
 Def_WPAct_GiftBag,  #购买限时礼包 13
-Def_WPAct_FamilyRobBoss, #boss争夺战 14
+Def_WPAct_HorsePetBoss, #骑宠争夺 14
 Def_WPAct_SWRH, #守卫人皇 15
 Def_WPAct_ElderBattlefield, #上古战场 16
 Def_WPAct_ChaosDemon, #混乱妖域 17
@@ -5264,7 +5263,8 @@
 Def_WPAct_GodWeapon,  #神兵总等级 25
 Def_WPAct_Rune,  #穿戴某品质符印 26
 Def_WPAct_Pray,  #祈愿 27
-) = range(1, 27+1)
+Def_WPAct_FamilyBoss,  #仙盟Boss 28
+) = range(1, 28+1)
 
 #可提前完成的周狂欢活动
 AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]

--
Gitblit v1.8.0