From c44ec183b6e00bec7bfc1322a884e786744c27fd Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 05 八月 2021 19:07:06 +0800
Subject: [PATCH] 9134 【BT3】【主干】新增物品获得活动积分（增加给货币通用效果ID264，A值数量，B值货币类型）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.py | 9 +++++----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index e0a2e18..d735f9d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -475,6 +475,7 @@
Def_Effect_ItemGiveTreasureScore = 254 #使用道具给予寻宝积分
Def_Effect_VIPLVCard = 256 #VIP等级直升卡 直接升到VIPx级，只加经验，享受VIP特权 效果值A： vip等级 效果值B： 领取是否默认直接使用
Def_Effect_AddArenaBattleCount = 257 #增加竞技场挑战次数，A值为增加次数
+Def_Effect_ItemGiveMoney = 264 #通用给货币道具，A值数量，B值货币类型
#----以下未使用或代码依然存在的---
Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.py
index 63e25d4..428157f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.py
@@ -15,7 +15,6 @@
# @change: "2012-04-09 14:30" jiang 流向记录
# @change: "2012-06-18 18:00" jiang 修改ItemCommon.DelItem函数的参数用于Oss事件记录
# @change: "2013-12-26 20:20" Alee 减少流向记录
-# @change: "2014-02-19 20:10" Alee 给用户银票（恶魔精华）
# @change: "2015-01-14 00:30" hxp 增加事件汇报
# @change: "2015-05-20 16:00" hxp 增加批量使用逻辑
# @change: "2016-07-20 14:30" hxp 统一函数
@@ -55,8 +54,7 @@
giveMoneyDict = {}
for i in range(effectCount):
curEff = curRoleItem.GetEffectByIndex(i)
- curEffID = curEff.GetEffectID()
- moneyType = GetAddMoneyType(curEffID)
+ moneyType = GetAddMoneyType(curEff)
if moneyType == -1:
continue
@@ -124,7 +122,8 @@
# @param curEffID: 道具的效果ID
# @return: 金钱的类型 如果根据效果ID找不到的话返回-1
# @remarks: 根据道具的效果ID获得需要给的金钱的类型 D找不到的话返回-1
-def GetAddMoneyType(curEffID):
+def GetAddMoneyType(curEff):
+ curEffID = curEff.GetEffectID()
if curEffID == ChConfig.Def_Effect_GivePlayerMoneySilver:
return IPY_GameWorld.TYPE_Price_Silver_Money
elif curEffID == ChConfig.Def_Effect_GivePlayerMoneyGift:
@@ -153,5 +152,7 @@
return ShareDefine.TYPE_Price_SoulCore
elif curEffID == ChConfig.Def_Effect_ItemGiveTreasureScore:
return ShareDefine.TYPE_Price_TreasureScore
+ elif curEffID == ChConfig.Def_Effect_ItemGiveMoney:
+ return curEff.GetEffectValue(1)
return -1
--
Gitblit v1.8.0