From d1058e0767342cd44e97543ab3a483f0879e0886 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 10 十月 2018 11:30:13 +0800
Subject: [PATCH] 4105 子 【主干】新增射日神弓成就 / 【后端】新增成就 4108 【后端】八卦炉丹药祈福新增VIP限制
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py | 22 ++++++++++++++--------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 9 ++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 3 ++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.py | 5 +++--
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 9 ++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 3 ++-
6 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 39b2be2..a8efaf8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1606,7 +1606,10 @@
SuccType_RefineStoveColor, #炼制X品质丹药X枚126
SuccType_UseStoveBylv, #使用X品丹药X枚127
SuccType_QueenRelicsEx, #通关娲皇遗迹128
-) = range(1, 129)
+SuccType_DogzBattle, #x神兽出战129
+SuccType_DogzEquipPlus, #出战神兽装备总强化X级130
+SuccType_Collect, #采集X物品X次131
+) = range(1, 132)
@@ -1621,7 +1624,7 @@
SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
SuccType_Pray,SuccType_PetClassLV,
SuccType_HorseAllLV, SuccType_QueenRelics,SuccType_XMZZConWin,
- SuccType_EquipSuit,
+ SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
SuccType_UseItem,SuccType_FamilyTechLV,
SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
]
@@ -1634,7 +1637,7 @@
#增加进度前需要重置的成就类型
NeedResetSuccessTypeList = [
SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
- SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,
+ SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
]
# 聊天类型, 从100开始, 前100个给c++用
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index b48749c..f9a704b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4849,7 +4849,8 @@
VIPPrivilege_FMTDouble, #28 封魔坛双倍击杀
VIPPrivilege_29, #29 娲皇遗迹购买次数 - 副本总表统一处理
VIPPrivilege_BindJadeWheel, #30 绑玉转盘次数
-) = range(1, 31)
+VIPPrivilege_PrayElixir, #31 丹药祈福次数
+) = range(1, 32)
(
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 b9af9b6..cd703bd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -5392,7 +5392,8 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcIDCollTime % npcID, updCollTime)
SyncCollNPCTime(curPlayer, npcIDList=[npcID])
GameWorld.DebugLog(" 增加当日采集次数: todayCollTime=%s,updCollTime=%s" % (todayCollTime, updCollTime))
-
+ #采集成就
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_Collect, successCnt, [npcID])
SyncCollectionItemInfo(curPlayer, addExp, addMoney, addZhenQi, giveItemInfoList, npcID)
#DataRecordPack.DR_CollectNPCOK(curPlayer, npcID, addMoney, addExp, addZhenQi, giveItemInfoList)
return True
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
index 7231a85..0a68d1a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
@@ -28,6 +28,7 @@
import PassiveBuffEffMng
import SkillCommon
import SkillShell
+import PlayerSuccess
import time
@@ -146,9 +147,8 @@
# 助战状态换装需要刷属性
if GetDogzIsHelpFight(curPlayer, dogzID):
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
-
return
@@ -223,7 +223,7 @@
# 助战状态换装需要刷属性
if GetDogzIsHelpFight(curPlayer, dogzID):
SetDogzIsHelpFight(curPlayer, dogzID, False) # 因为脱下了状态，所以必须设置为非助战状态
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
return
@@ -283,11 +283,12 @@
if curItem.IsEmpty():
GameWorld.DebugLog("神兽有装备未穿戴，无法助战！dogzID=%s,packIndex=%s" % (dogzID, i), playerID)
return
-
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzBattle, 1, [dogzID])
+
isFight = True if batteState else False
GameWorld.DebugLog("神兽助战状态变更！dogzID=%s,isFight=%s" % (dogzID, isFight), playerID)
SetDogzIsHelpFight(curPlayer, dogzID, isFight)
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
if isFight and ipyData.GetHelpBattleNotify():
@@ -474,7 +475,7 @@
% (curPlusLV, curPlusExpTotal, addExpTotal, updPlusLV, updPlusExpTotal), playerID)
if isRefreshAtrr:
- RefreshDogzAttr(curPlayer)
+ RefreshDogzAttr(curPlayer, True)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitDogzEquipPlus, 1)
@@ -502,9 +503,9 @@
return retLV, retExp
-def RefreshDogzAttr(curPlayer):
+def RefreshDogzAttr(curPlayer, isUpdateSucc=False):
## 刷新神兽属性
-
+ totalPlusLv = 0 #出战神兽装备总强化等级
fightPowerEx = 0
allAttrList = [{} for _ in range(4)]
@@ -552,6 +553,7 @@
# 强化属性
curPlusLV = curEquip.GetUserAttrByIndex(ShareDefine.Def_IudetDogzEquipPlus, 0)
+ totalPlusLv += curPlusLV
plusIpyData = IpyGameDataPY.GetIpyGameData("DogzEquipPlus", curEquip.GetEquipPlace(), curPlusLV)
if plusIpyData:
plusAttrTypeList = plusIpyData.GetPlusAttrTypes()
@@ -576,6 +578,10 @@
# 技能属性，从Def_CalcAttrFunc_Dogz获取
skillAttrList = CalcDogzBattleSkillAttr(curPlayer)
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_DogzBattleSkill, skillAttrList)
+ #成就
+ if isUpdateSucc:
+ PlayerSuccess.ResetSuccessByType(curPlayer, ShareDefine.SuccType_DogzEquipPlus)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzEquipPlus, totalPlusLv)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.py
index 9a4d58e..5c38b75 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.py
@@ -30,6 +30,7 @@
import EventShell
import PlayerActivity
import PlayerFairyCeremony
+import PlayerVip
import copy
@@ -350,8 +351,8 @@
def PlayerPrayElixir(index, clientPack, tick):
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
prayCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AlchemyPrayCnt)
- limitCnt = IpyGameDataPY.GetFuncCfg('GodAlchemy', 3)
- if limitCnt and prayCnt >= limitCnt:
+ limitCnt = PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_PrayElixir)
+ if prayCnt >= limitCnt:
GameWorld.DebugLog('今日祈福丹药次数已满！prayCnt=%s'%prayCnt)
return
packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, 1)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 39b2be2..a8efaf8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1606,7 +1606,10 @@
SuccType_RefineStoveColor, #炼制X品质丹药X枚126
SuccType_UseStoveBylv, #使用X品丹药X枚127
SuccType_QueenRelicsEx, #通关娲皇遗迹128
-) = range(1, 129)
+SuccType_DogzBattle, #x神兽出战129
+SuccType_DogzEquipPlus, #出战神兽装备总强化X级130
+SuccType_Collect, #采集X物品X次131
+) = range(1, 132)
@@ -1621,7 +1624,7 @@
SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
SuccType_Pray,SuccType_PetClassLV,
SuccType_HorseAllLV, SuccType_QueenRelics,SuccType_XMZZConWin,
- SuccType_EquipSuit,
+ SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
SuccType_UseItem,SuccType_FamilyTechLV,
SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
]
@@ -1634,7 +1637,7 @@
#增加进度前需要重置的成就类型
NeedResetSuccessTypeList = [
SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
- SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,
+ SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
]
# 聊天类型, 从100开始, 前100个给c++用
--
Gitblit v1.8.0