From 2b59c17039cf4bcccc79a714f96ffea659a0e730 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 24 十一月 2021 16:55:39 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统（增加情缘副本；AB相互提亲优化聘礼ID取较高的; 主干冲突）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 12 +++++++++++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 9 +++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index e8915a1..a585b55 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -459,7 +459,7 @@
Def_Effect_ItemSpeak = 2700 #小喇叭效果ID
Def_Effect_CleanGuilt = 2812 # 洗红名
Def_Effect_ResetAttrPoint = 231 # 洗点
-Def_Effect_AddFBCnt = 233 # 增加副本可进入次数
+Def_Effect_AddFBCnt = 233 # 增加副本可进入次数，A值副本ID，B值是否自动使用
Def_Effect_AddKillBossCnt = 234 # 增加BOSS可击杀次数
Def_Effect_DogzEquipPlusExp = 235 # 神兽强化材料经验效果，A值基础经验，B值双倍强化消耗仙玉
Def_Effect_AddMagicWeaponUpExp = 236 # 增加法宝升星经验 A值法宝ID B值X经验
@@ -1828,6 +1828,8 @@
Def_FBMapID_CrossGrasslandXian = 32050
#竞技场战斗
Def_FBMapID_ArenaBattle = 31290
+#情缘副本
+Def_FBMapID_Love = 31300
#前端自定义场景地图
ClientCustomScene = [Def_FBMapID_PersonalBoss, Def_FBMapID_ArenaBattle]
@@ -1948,6 +1950,7 @@
'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
'FairyTreasure':[Def_FBMapID_FairyTreasure],#缥缈宝藏
+ 'Love':[Def_FBMapID_Love],#情缘副本
}
#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -5345,7 +5348,9 @@
VIPPrivilege_42, #42 签到奖励倍率（客户端使用）
VIPPrivilege_43, #43 冰晶矿脉扫荡（客户端使用）
VIPPrivilege_BossDogzBuy, #44 神兽boss/蓬莱boss购买次数
-) = range(1, 45)
+VIPPrivilege_45, #45 魔化之地boss购买次数
+VIPPrivilege_46, #46 情缘副本购买次数
+) = range(1, 47)
(
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index a335929..11fae87 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1123,7 +1123,17 @@
#GameWorld.DebugLog("直升VIP默认使用")
tagItem.Clear()
return True
-
+ #增加副本次数
+ if itemEff.GetEffectID() == ChConfig.Def_Effect_AddFBCnt:
+ isAutoUse = itemEff.GetEffectValue(1)
+ if isAutoUse:
+ import FBCommon
+ mapID = itemEff.GetEffectValue(0)
+ FBCommon.AddFBCntByItem(curPlayer, itemID, mapID, tagItem.GetCount())
+ #GameWorld.DebugLog("增加副本次数默认使用! mapID=%s" % mapID)
+ tagItem.Clear()
+ return True
+
if itemID in ChConfig.Def_TransformItemIDList or tagItem.GetType() == ChConfig.Def_ItemType_AutoUseMoney:
# 直接转化为对应货币的物品仅在放入背包时直接转化，否则还是以真实物品的形式存在，但堆叠上限需要做特殊处理
if packIndex == IPY_GameWorld.rptItem:
--
Gitblit v1.8.0