From 76c56fb57563e86e6612d8bb23ed058fc6210a15 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 02 三月 2019 15:04:41 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(套装)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py | 18 +++++++++++-------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 4 ++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py | 4 ++--
3 files changed, 15 insertions(+), 11 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 ae1eec5..320f964 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -752,23 +752,25 @@
continue
for ipyData in ipyDataList:
suiteCnt = ipyData.GetSuiteCnt()
- star = ipyData.GetStar()
+ needStar = ipyData.GetStar()
skillID = ipyData.GetSkillID()
- if starList.count(star) >= suiteCnt:
+ if [1 if star >= needStar else 0 for star in starList].count(1) >= suiteCnt:
for attrID, attrValue in ipyData.GetAttrInfo().items():
PlayerControl.CalcAttrDict_Type(attrID, attrValue, allAttrListSuit)
#技能
if skillID and not skillManager.FindSkillBySkillTypeID(skillID):
learnSkillList.append(skillID)
+ #广播
+ notifyMark = ipyData.GetIsNotify()
+ if notifyMark and not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_EquipPartSuiteNotify, notifyMark):
+ PlayerControl.WorldNotify(0, 'AllStarLevelUp', [playerName, suiteID, suiteCnt, needStar])
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_EquipPartSuiteNotify, notifyMark, 1)
+
else:
if skillID and skillManager.FindSkillBySkillTypeID(skillID):
delSkillID.append(skillID)
skillManager.DeleteSkillBySkillTypeID(skillID)
- notifyMark = ipyData.GetIsNotify()
- if notifyMark and not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_EquipPartSuiteNotify, notifyMark):
- PlayerControl.WorldNotify(0, 'AllStarLevelUp', [playerName, suiteID, suiteCnt, star])
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_EquipPartSuiteNotify, notifyMark, 1)
-
+
for skillID in learnSkillList:
GameWorld.DebugLog(' 激活套装技能 skillResID=%s' % (skillID))
@@ -832,6 +834,8 @@
def CalcEquipStarAttr(curPlayer, classlv, equipPlace, equipPartStar, allAttrListStar):
## 计算装备星数属性
+ if not equipPartStar:
+ return
ipyData = IpyGameDataPY.GetIpyGameData('EquipStarUp', classlv, equipPlace, equipPartStar)
if not ipyData:
return
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 9313db0..17ed9dc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -543,8 +543,8 @@
ChEquip.NotifyEquipPartStar(curPlayer)
Operate_EquipWash.OnEquipWashLogin(curPlayer)
#通知套装信息
- ChEquip.NotifyEquipPartSuiteLV(curPlayer)
- ChEquip.SyncAllEquipAttrActiveInfo(curPlayer)
+ #ChEquip.NotifyEquipPartSuiteLV(curPlayer)
+ #ChEquip.SyncAllEquipAttrActiveInfo(curPlayer)
#装备位宝石镶嵌通知
Operate_EquipStone.OnLogin(curPlayer)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
index 12d9664..ed846a0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.py
@@ -362,8 +362,8 @@
curSkillLV = curSkill.GetSkillLV()
UptateSuccessProgress(curPlayer, succType, curSkillLV, [curSkill.GetSkillTypeID()])
- elif succType == ShareDefine.SuccType_EquipSuit:
- Operate_EquipSuitCompose.DoSuiteSuccess(curPlayer)
+# elif succType == ShareDefine.SuccType_EquipSuit:
+# Operate_EquipSuitCompose.DoSuiteSuccess(curPlayer)
elif succType == ShareDefine.SuccType_FamilyTechLV:
ResetSuccessByType(curPlayer, succType)
techNeedLVDict = IpyGameDataPY.GetFuncEvalCfg('FamilyTechNeedLV', 1, {})
--
Gitblit v1.8.0