From b081d6f889a35197f94e72cf37800015d9943512 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 31 七月 2023 16:35:04 +0800
Subject: [PATCH] 9788 【BT9】【后端】成就系统（新增成就类型164~175） hygame2 冲突
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py | 2 ++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 20 ++++++++++++++++++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 2 ++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArena.py | 2 ++
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 20 ++++++++++++++++++--
5 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 8064653..0ef5df6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1911,7 +1911,19 @@
SuccType_Battlefield_Wall, # 古神战场 - 累计采集积分墙 x次 161
SuccType_Battlefield_BillFirst, # 古神战场 - 任意周榜榜首 x次 162
SuccType_Battlefield_BillIn, # 古神战场 - 结算时累计上榜 x次 163
-) = range(1, 164)
+SuccType_ActivityPlace, # 活跃放置x次 164
+SuccType_UseStoveByType, # 使用丹药X枚 165
+SuccType_Arena, # 参与竞技场x次 166
+SuccType_KillCrossPenglaiBoss, # 击杀蓬莱仙境bossx只 167
+SuccType_KillCrossDemonLandBoss, # 击杀魔化之地bossx只 168
+SuccType_EquipPlusClass, # X阶装备强化总等级X级 169
+SuccType_EquipStarClass, # X阶装备升星总等级X星 170
+SuccType_EquipStoneClass, # X阶装备宝石总等级X级 171
+SuccType_EquipWashClass, # X阶装备洗炼总等级X级 172
+SuccType_EquipPlusTotal, # 全身强化总等级X级 173
+SuccType_EquipStarTotal, # 全身升星总星数X星 174
+SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
+) = range(1, 176)
# 节日红包成就类型
FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1923,7 +1935,7 @@
UnDownCheckSuccessTypeList = [
SuccType_GodWeapon,
SuccType_MainTaskNode,SuccType_PassWagicWeapon,
- SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
+ SuccType_KillSpecificNPC, SuccType_UseStoveBylv, SuccType_UseStoveByType,
SuccType_Pray,SuccType_PetClassLV,
SuccType_QueenRelics,SuccType_XMZZConWin,
SuccType_Collect,SuccType_DogzBattle,
@@ -1941,6 +1953,10 @@
SuccType_EquipPlus:[0], # 阶不向下适配
SuccType_EquipWash:[0], # 阶不向下适配
SuccType_EquipStar:[0], # 阶不向下适配
+ SuccType_EquipPlusClass:[0], # 阶不向下适配
+ SuccType_EquipStarClass:[0], # 阶不向下适配
+ SuccType_EquipStoneClass:[0], # 阶不向下适配
+ SuccType_EquipWashClass:[0], # 阶不向下适配
}
#传进来的条件满足配置的条件列表中的一个就行的成就类型
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 0b99de4..7f87b74 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -2510,10 +2510,12 @@
if mapID == ChConfig.Def_FBMapID_CrossPenglai:
#跨服蓬莱仙境
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossPenglai)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillCrossPenglaiBoss, 1)
PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillCrossPenglaiBoss, 1)
elif mapID == ChConfig.Def_FBMapID_CrossDemonLand:
#跨服魔化之地
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossDemonLand)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillCrossDemonLandBoss, 1)
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)
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 d85fc15..0a3213e 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 PlayerSuccess
import PlayerGubao
#关联类型
@@ -961,6 +962,7 @@
EventShell.EventRespons_ActivityPlace(curPlayer, "getreward")
PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_ActivityPlace, rewardCount)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_ActivityPlace, rewardCount)
PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_ActivityPlace, rewardCount)
Sync_ActivityPlaceInfo(curPlayer)
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 bfd67c0..4b5cd00 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 PlayerSuccess
import PlayerGubao
def DoArenaOpen(curPlayer):
@@ -305,6 +306,7 @@
PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Arena, 1)
PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_Arena, 1)
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_Arena, 1)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_Arena, 1)
PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_Arena, 1)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 8064653..0ef5df6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1911,7 +1911,19 @@
SuccType_Battlefield_Wall, # 古神战场 - 累计采集积分墙 x次 161
SuccType_Battlefield_BillFirst, # 古神战场 - 任意周榜榜首 x次 162
SuccType_Battlefield_BillIn, # 古神战场 - 结算时累计上榜 x次 163
-) = range(1, 164)
+SuccType_ActivityPlace, # 活跃放置x次 164
+SuccType_UseStoveByType, # 使用丹药X枚 165
+SuccType_Arena, # 参与竞技场x次 166
+SuccType_KillCrossPenglaiBoss, # 击杀蓬莱仙境bossx只 167
+SuccType_KillCrossDemonLandBoss, # 击杀魔化之地bossx只 168
+SuccType_EquipPlusClass, # X阶装备强化总等级X级 169
+SuccType_EquipStarClass, # X阶装备升星总等级X星 170
+SuccType_EquipStoneClass, # X阶装备宝石总等级X级 171
+SuccType_EquipWashClass, # X阶装备洗炼总等级X级 172
+SuccType_EquipPlusTotal, # 全身强化总等级X级 173
+SuccType_EquipStarTotal, # 全身升星总星数X星 174
+SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
+) = range(1, 176)
# 节日红包成就类型
FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1923,7 +1935,7 @@
UnDownCheckSuccessTypeList = [
SuccType_GodWeapon,
SuccType_MainTaskNode,SuccType_PassWagicWeapon,
- SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
+ SuccType_KillSpecificNPC, SuccType_UseStoveBylv, SuccType_UseStoveByType,
SuccType_Pray,SuccType_PetClassLV,
SuccType_QueenRelics,SuccType_XMZZConWin,
SuccType_Collect,SuccType_DogzBattle,
@@ -1941,6 +1953,10 @@
SuccType_EquipPlus:[0], # 阶不向下适配
SuccType_EquipWash:[0], # 阶不向下适配
SuccType_EquipStar:[0], # 阶不向下适配
+ SuccType_EquipPlusClass:[0], # 阶不向下适配
+ SuccType_EquipStarClass:[0], # 阶不向下适配
+ SuccType_EquipStoneClass:[0], # 阶不向下适配
+ SuccType_EquipWashClass:[0], # 阶不向下适配
}
#传进来的条件满足配置的条件列表中的一个就行的成就类型
--
Gitblit v1.8.0