From 9e96321acfae28fe3d086c58ad858db0c6df77a2 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 13 三月 2019 15:36:20 +0800
Subject: [PATCH] 6305 【后端】【2.0】日常活动修改
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py | 39 +++++++++++++++++++++------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py | 20 ++++++++++----------
2 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
index 58a5a3a..47d0b0a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -966,29 +966,32 @@
return
## 通知公共部位强化等级
-def NotifyEquipPartPlusLV(curPlayer, packType=None, index=None):
+def NotifyEquipPartPlusLV(curPlayer, packType=IPY_GameWorld.rptEquip, index=None):
ePartStarLVPack = ChPyNetSendPack.tagMCEquipPartPlusInfo()
ePartStarLVPack.Clear()
ePartStarLVPack.InfoList = []
- for pType, indexList in ChConfig.Pack_EquipPart_CanPlusStar.items():
+ syncIndexList = []
+ if index == None:
+ equipMaxClasslv = IpyGameDataPY.GetFuncCfg('EquipMaxClasslv')
+ for equipPlace in ChConfig.Pack_EquipPart_CanPlusStar.get(packType, []):
+ for classlv in xrange(1, equipMaxClasslv+1):
+ ipyData = IpyGameDataPY.GetIpyGameData('EquipPlaceIndexMap', classlv, equipPlace)
+ if not ipyData:
+ continue
+ syncIndexList.append(ipyData.GetGridIndex())
+ else:
+ syncIndexList = [index]
- if packType != None and packType != pType:
- continue
-
- for i in indexList:
- if packType != None:
- if index != None and index != i:
- continue
-
- ePartStarLV = ChPyNetSendPack.tagMCEquipPartPlusLV()
- ePartStarLV.Clear()
- ePartStarLV.PackType = pType
- ePartStarLV.EquipIndex = i
- ePartStarLV.EquipPartStarLV = GetEquipPartPlusLV(curPlayer, pType, i)
- ePartStarLV.Proficiency = GetEquipPartProficiency(curPlayer, pType, i)
- ePartStarLV.EvolveLV = GetEquipPartPlusEvolveLV(curPlayer, pType, i)
- ePartStarLVPack.InfoList.append(ePartStarLV)
+ for i in syncIndexList:
+ ePartStarLV = ChPyNetSendPack.tagMCEquipPartPlusLV()
+ ePartStarLV.Clear()
+ ePartStarLV.PackType = packType
+ ePartStarLV.EquipIndex = i
+ ePartStarLV.EquipPartStarLV = GetEquipPartPlusLV(curPlayer, packType, i)
+ ePartStarLV.Proficiency = GetEquipPartProficiency(curPlayer, packType, i)
+ ePartStarLV.EvolveLV = GetEquipPartPlusEvolveLV(curPlayer, packType, i)
+ ePartStarLVPack.InfoList.append(ePartStarLV)
ePartStarLVPack.Count = len(ePartStarLVPack.InfoList)
NetPackCommon.SendFakePack(curPlayer, ePartStarLVPack)
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 1cc849e..3c2f580 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -84,11 +84,11 @@
#重新计算奖励阶段
__CalcAwardStage(curPlayer)
#重置可领取修行点，未领取的发邮件
- realmPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint)
- if realmPoint and GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_Official):
- if GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_DailyQuest):
- PlayerControl.SendMailByKey('XXDForgetToPick', [curPlayer.GetID()], [(ChConfig.Def_ItemID_RealmPoint, realmPoint, 1)], [realmPoint])
- __SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint, 0)
+# realmPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint)
+# if realmPoint and GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_Official):
+# if GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_DailyQuest):
+# PlayerControl.SendMailByKey('XXDForgetToPick', [curPlayer.GetID()], [(ChConfig.Def_ItemID_RealmPoint, realmPoint, 1)], [realmPoint])
+# __SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint, 0)
SyncDailyActivityInfo(curPlayer)
else:
@@ -230,18 +230,18 @@
__SetPDictValue(curPlayer, key, addPbCnt)
- #curTotalPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint)
+ #
multiple = 1
if addValue:
- #__SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint, nuwTotalPoint)
multiple, extraPointLimit = __GetActionAddPer(curPlayer)
curExtraPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_ExtraRealmPoint)
addExtraPoint = max(0, min(addValue*(multiple-1),extraPointLimit-curExtraPoint)) if extraPointLimit else addValue*(multiple-1)
__SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_ExtraRealmPoint, curExtraPoint+addExtraPoint)
addValue = addValue + addExtraPoint
-
- realmPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint)
- __SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint, realmPoint+addValue)
+ curTotalPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint)
+ __SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint, curTotalPoint+addValue)
+ #realmPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint)
+ #__SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_RealmPoint, realmPoint+addValue)
SyncDailyActivityInfo(curPlayer)
GameWorld.DebugLog("增加活跃度任务次数，activityNum=%s,addPbCnt=%s,addValue=%s, multiple=%s, addExtraPoint=%s,curExtraPoint=%s"
--
Gitblit v1.8.0