From 9bf495592b652343954ba444a85dcbbb70d72d99 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 29 六月 2023 16:42:54 +0800
Subject: [PATCH] 9790 9762 【BT9】【后端】藏宝阁修改（增加领取物品奖励特殊效果） master 冲突
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py | 2 ++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 3 +++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 6 +++++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py | 2 ++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 8 +++++++-
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 8154581..9a6502f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4268,6 +4268,7 @@
#古宝
Def_PDict_GubaoLVInfo = "GubaoLVInfo_%s" # 古宝等级信息，参数(古宝ID)，等级*100+星级
+Def_PDict_GubaoItemEffValue = "GubaoItemEffValue_%s_%s" # 古宝效果物品进度，参数(古宝ID, 效果类型)
#神通
Def_PDict_ShentongLVInfo = "ShentongLVInfo_%s" # 神通等级信息，参数(神通ID)，阶级*100+等级
@@ -5707,7 +5708,12 @@
Def_RewardType_ShediaoEquip, #射雕装备奖励 51
Def_RewardType_CAAllRecharge, #跨服全民充值奖励 52
Def_RewardType_CrossYaomoBossHurt, #跨服妖魔boss伤害奖励 53
-)= range(54)
+Def_RewardType_BTGMPowerSuperDaily, #BT超级GM特权每日礼包奖励 54
+Def_RewardType_WeekTreasureCount, #寻宝周次数奖励 55
+Def_RewardType_SponsorDaily, #赞助星级每日奖励 56
+Def_RewardType_SponsorStar, #赞助星级礼包奖励 57
+Def_RewardType_GubaoItemEff, #古宝特殊效果物品奖励 58
+)= range(59)
#boss复活相关活动定义
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index c284326..9b7223d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -66,6 +66,7 @@
import PlayerActLogin
import FamilyRobBoss
import IpyGameDataPY
+import PlayerGubao
import PlayerState
import PyGameData
import PlayerTeam
@@ -2482,6 +2483,7 @@
if limitIndex == ShareDefine.Def_Boss_Func_World:
# 世界BOSS击杀成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillWorldBoss, 1)
+ PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillWorldBoss, 1)
# 每日活动
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_WorldBOSS)
PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_WorldBOSS, 1)
@@ -2496,6 +2498,7 @@
#BOSS之家
# BOSS之家BOSS击杀成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillBossHomeBoss, 1)
+ PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillBossHome, 1)
# 每日活动
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_BOSSHome)
PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_BOSSHome, 1)
@@ -2507,10 +2510,11 @@
if mapID == ChConfig.Def_FBMapID_CrossPenglai:
#跨服蓬莱仙境
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossPenglai)
+ PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillCrossPenglaiBoss, 1)
elif mapID == ChConfig.Def_FBMapID_CrossDemonLand:
#跨服魔化之地
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossDemonLand)
-
+ PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillCrossDemonLandBoss, 1)
if mapID in [ChConfig.Def_FBMapID_CrossPenglai, ChConfig.Def_FBMapID_CrossDemonLand]:
PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_CrossBoss)
PlayerTongTianLing.AddTongTianTaskValue(curPlayer, ChConfig.TTLTaskType_CrossBoss, 1)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 338add5..4e315ad 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -5613,6 +5613,9 @@
# 跨服妖魔boss伤害奖励
elif rewardType == ChConfig.Def_RewardType_CrossYaomoBossHurt:
PlayerCrossYaomoBoss.GetCrossYaomoBossHurtAward(curPlayer, dataEx, tick)
+ # 古宝特殊效果物品奖励
+ elif rewardType == ChConfig.Def_RewardType_GubaoItemEff:
+ PlayerGubao.GetGubaoItemEffAward(curPlayer, dataEx, dataExStr)
#缥缈奇遇领取
elif rewardType == ChConfig.Def_RewardType_FairyAdventuresAward:
PlayerFairyDomain.GetFairyAdventuresAward(curPlayer, dataEx, dataExStr)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
index 635d239..d85fc15 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -38,6 +38,7 @@
import PlayerBossReborn
import PlayerActGarbageSorting
import PlayerTongTianLing
+import PlayerGubao
#关联类型
(
@@ -960,6 +961,7 @@
EventShell.EventRespons_ActivityPlace(curPlayer, "getreward")
PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_ActivityPlace, rewardCount)
+ PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_ActivityPlace, rewardCount)
Sync_ActivityPlaceInfo(curPlayer)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py
index d1d6542..bfd67c0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py
@@ -30,6 +30,7 @@
import PlayerWeekParty
import PlayerFeastTravel
import PlayerActivity
+import PlayerGubao
def DoArenaOpen(curPlayer):
## 竞技场功能开启
@@ -304,6 +305,7 @@
PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Arena, 1)
PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_Arena, 1)
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_Arena, 1)
+ PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_Arena, 1)
return
def __DoUpdateArenaScore(curPlayer, cmdDict={}):
--
Gitblit v1.8.0