From 8618b0f5bae37f9cd32eaa8b71c5910aa7ecb355 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 08 五月 2019 11:14:54 +0800
Subject: [PATCH] 3506 【2.0】GM工具批量支持问题（全服邮件查询结果增加单服邮件服务器ID显示支持）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
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 4b0522a..fb1f598 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
@@ -30,6 +30,8 @@
import SkillShell
import PlayerSuccess
import DataRecordPack
+import PlayerWeekParty
+import ItemControler
import time
@@ -66,7 +68,7 @@
# 设置成功后才能刷技能
PassiveBuffEffMng.PlayerDogzSkill(curPlayer)
if not isFight:
- DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_Title, {'dogzID':dogzID})
+ DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_Dogz, {'dogzID':dogzID})
return
@@ -111,7 +113,7 @@
for equipIndex in equipIndexList:
dogzItemPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzItem)
curEquip = dogzItemPack.GetAt(equipIndex)
- if not ItemCommon.CheckItemCanUse(curEquip):
+ if not ItemCommon.CheckItemCanUse(curEquip) or ItemControler.GetIsAuctionItem(curEquip):
GameWorld.DebugLog("物品为空或不可用: equipIndex=%s" % equipIndex, playerID)
continue
if not ItemCommon.GetIsDogzEquip(curEquip):
@@ -141,8 +143,12 @@
continue
destEquip = dogzEquipPack.GetAt(equipPackIndex)
+ desItemID, desUserData = [0, ''] if destEquip.IsEmpty() else [destEquip.GetItemTypeID(), destEquip.GetUserData()]
+ srcItemID, srcUserData = curEquip.GetItemTypeID(), curEquip.GetUserData()
if ItemCommon.DoLogicSwitchItem(curPlayer, curEquip, destEquip, ShareDefine.rptDogzEquip):
succIndexList.append(equipIndex)
+ dataDict = {'dotype':'EquipDogzItem', 'desItemID':desItemID, 'desUserData':desUserData,'srcItemID':srcItemID,'srcUserData':srcUserData}
+ DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_EquipChange, dataDict)
GameWorld.DebugLog(" 穿戴成功索引列表: %s" % succIndexList, playerID)
if not succIndexList:
@@ -287,6 +293,7 @@
GameWorld.DebugLog("神兽有装备未穿戴，无法助战！dogzID=%s,packIndex=%s" % (dogzID, i), playerID)
return
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzBattle, 1, [dogzID])
+ PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Dogz, dogzID, False)
isFight = True if batteState else False
GameWorld.DebugLog("神兽助战状态变更！dogzID=%s,isFight=%s" % (dogzID, isFight), playerID)
--
Gitblit v1.8.0