From 8a5a4dc89554504aa6f106744498319b8ce4f2b8 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 20 三月 2019 10:53:39 +0800
Subject: [PATCH] 6381 【后端】【2.0】任务接口开发
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
index bcb1cf6..375d629 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -150,8 +150,7 @@
if 1 > packSpace:
PlayerControl.SendMailByKey('TreasureWakeUp', [curPlayer.GetID()], [itemAward])
else:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind,
- [IPY_GameWorld.rptItem], True, showSysInfo=True, event=["MWAward", False, {"mwID":mwID}])
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["MWAward", False, {"mwID":mwID}])
activeMWID = upIpyData.GetActiveMWID()
if activeMWID == mwID:
GameWorld.ErrLog(' TreasureUp.txt 配置异常 不可激活自身法宝 mwID=%s'%mwID)
@@ -472,19 +471,19 @@
# #全身装备X星
# cnt = ChEquip.GetTotalEquipStars(curPlayer)
- elif curType == 4:
- #X阶普通、强化套装
- suiteCntDict = {}
- playerEquip = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
- for equipIndex in xrange(playerEquip.GetCount()):
- curEquip = playerEquip.GetAt(equipIndex)
- if curEquip.IsEmpty():
- continue
- suiteInfo = ChEquip.GetSuiteInfoByPlace(curPlayer, equipIndex, curEquip)
- for suitelv, suiteType in conditionList:
- if suiteInfo.get(suiteType, 0) >= suitelv:
- suiteCntDict[suiteType] = suiteCntDict.get(suiteType, 0)+1
- cnt = max(suiteCntDict.values()) if suiteCntDict else 0
+# elif curType == 4:
+# #X阶普通、强化套装
+# suiteCntDict = {}
+# playerEquip = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
+# for equipIndex in xrange(playerEquip.GetCount()):
+# curEquip = playerEquip.GetAt(equipIndex)
+# if curEquip.IsEmpty():
+# continue
+# suiteInfo = ChEquip.GetSuiteInfoByPlace(curPlayer, equipIndex, curEquip)
+# for suitelv, suiteType in conditionList:
+# if suiteInfo.get(suiteType, 0) >= suitelv:
+# suiteCntDict[suiteType] = suiteCntDict.get(suiteType, 0)+1
+# cnt = max(suiteCntDict.values()) if suiteCntDict else 0
else:
return
@@ -507,7 +506,7 @@
# 给物品
if awardItemList:
for itemID, itemCnt in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 1, [IPY_GameWorld.rptItem], True)
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem])
#给钱
for moneyType, value in ipyData.GetMoney():
@@ -650,7 +649,8 @@
if privilege == ChConfig.MWPrivilege_EquipPlus:
#强化加成
- addAttr = ChEquip.CalcAllEquipAllPlusLVAttr(curPlayer)
+ #境界改版，废弃
+ pass
else:
multiple = 1 #倍数
if singleValue:
@@ -727,8 +727,7 @@
return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotItemState % privilege, 1)
for itemid, cnt, isBind in itemList:
- ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), isBind,
- [IPY_GameWorld.rptItem], True, showSysInfo=True, event=["MWSoulAward", False, {"privilege":privilege}])
+ ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0, [IPY_GameWorld.rptItem], event=["MWSoulAward", False, {"privilege":privilege}])
#通知
Sycn_MWPrivilegeData(curPlayer, privilege)
--
Gitblit v1.8.0