From 6ad924ae5602f3ebc89267ed6c824a2523c0f36e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 13 四月 2019 16:15:21 +0800
Subject: [PATCH] 6515 【测试】【主干】新增游戏警报邮件
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py | 129 +++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 71 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
index 32d3417..afc30f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -54,19 +54,6 @@
import random
import GameObj
-# 可吞噬的装备位
-Def_EatItem_EquipPlace = [
- ShareDefine.retWeapon, #1 主手
- ShareDefine.retWeapon2, #2 副手
- ShareDefine.retHat, #3 帽子
- ShareDefine.retClothes, #4 衣服
- ShareDefine.retBelt, #5 腰带
- ShareDefine.retTrousers, #6 裤子
- ShareDefine.retShoes, #7 鞋子
- ShareDefine.retNeck, #8 项链
-
-]
-
Def_EatSpace = 5 # 低于X格自动吞噬
@@ -104,57 +91,58 @@
# 切换守护
def ChangeGuard(curPlayer, tick):
- # 检查过背包中无守护则不再执行
- if curPlayer.GetDictByKey("AutoCGuardID") == 1:
- return
-
- curGuardID = 0 # 装备的守护ID
- itemIDList = IpyGameDataPY.GetFuncEvalCfg('AutoUseGuardian', 1)
- guardItem = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip).GetAt(ShareDefine.retGuard)
- # 1。 守护存在，判断是否最优先守护
- if ItemCommon.CheckItemCanUse(guardItem) and ItemCommon.CheckItemCanUseByExpireTime(guardItem):
- curGuardID = guardItem.GetItemTypeID()
- if curGuardID == itemIDList[0]:
- # 最高优先级
- return
- if curPlayer.GetDictByKey("AutoCGuardID") == 2:
- # 当前背包最高
- return
-
-
- findItemList = []
- curPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
-
- # 找到背包中优先级最高的守护物品
- for i in range(0, curPack.GetCount()):
- item = curPack.GetAt(i)
-
- if not ItemCommon.CheckItemCanUse(item):
- continue
-
- if item.GetItemTypeID() not in itemIDList:
- continue
-
- if not ItemCommon.CheckItemCanUseByExpireTime(item):
- # 背包有不过期的物品
- continue
-
- findItemList.append(item)
-
- if not findItemList:
- curPlayer.SetDict("AutoCGuardID", 1) # 设置无可替换的标志
- return
-
- findItemList.sort(cmp=SortGuard)
- if curGuardID in itemIDList and itemIDList.index(curGuardID) <= itemIDList.index(findItemList[0].GetItemTypeID()):
- # 当前装备最高，减少遍历
- curPlayer.SetDict("AutoCGuardID", 2)
- return
-
-
- #---执行玩家换装逻辑---
- ChEquip.DoPlayerEquipItem(curPlayer, findItemList[0], ShareDefine.retGuard, tick)
- curPlayer.SetDict("AutoCGuardID", 0)
+ return #新版本不需要切换
+# # 检查过背包中无守护则不再执行
+# if curPlayer.GetDictByKey("AutoCGuardID") == 1:
+# return
+#
+# curGuardID = 0 # 装备的守护ID
+# itemIDList = IpyGameDataPY.GetFuncEvalCfg('AutoUseGuardian', 1)
+# guardItem = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip).GetAt(ShareDefine.retGuard1)
+# # 1。 守护存在，判断是否最优先守护
+# if ItemCommon.CheckItemCanUse(guardItem) and ItemCommon.CheckItemCanUseByExpireTime(guardItem):
+# curGuardID = guardItem.GetItemTypeID()
+# if curGuardID == itemIDList[0]:
+# # 最高优先级
+# return
+# if curPlayer.GetDictByKey("AutoCGuardID") == 2:
+# # 当前背包最高
+# return
+#
+#
+# findItemList = []
+# curPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
+#
+# # 找到背包中优先级最高的守护物品
+# for i in range(0, curPack.GetCount()):
+# item = curPack.GetAt(i)
+#
+# if not ItemCommon.CheckItemCanUse(item):
+# continue
+#
+# if item.GetItemTypeID() not in itemIDList:
+# continue
+#
+# if not ItemCommon.CheckItemCanUseByExpireTime(item):
+# # 背包有不过期的物品
+# continue
+#
+# findItemList.append(item)
+#
+# if not findItemList:
+# curPlayer.SetDict("AutoCGuardID", 1) # 设置无可替换的标志
+# return
+#
+# findItemList.sort(cmp=SortGuard)
+# if curGuardID in itemIDList and itemIDList.index(curGuardID) <= itemIDList.index(findItemList[0].GetItemTypeID()):
+# # 当前装备最高，减少遍历
+# curPlayer.SetDict("AutoCGuardID", 2)
+# return
+#
+#
+# #---执行玩家换装逻辑---
+# ChEquip.DoPlayerEquipItem(curPlayer, findItemList[0], ItemCommon.GetEquipPackIndex(findItemList[0]), tick)
+# curPlayer.SetDict("AutoCGuardID", 0)
return
@@ -476,10 +464,10 @@
# 满了不再给物品
return
- dropIDCountDict, dropIDBindDict, money = {}, {}, 0
+ dropIDCountDict, auctionIDList, money = {}, [], 0
dropRet = NPCCommon.GetNPCDropInfoTJG(curPlayer, curPlayer.GetMapID(), npcID, killCnt)
if dropRet:
- dropIDCountDict, dropIDBindDict, money = dropRet
+ dropIDCountDict, auctionIDList, money = dropRet
# 1. 出售为铜钱 2.放入背包 3.满则不继续给物品
for itemID, dropCount in dropIDCountDict.items():
if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
@@ -489,8 +477,7 @@
if not curItemData:
continue
- # 掉落绑定, 默认绑定
- isDropBind = dropIDBindDict.get(itemID, 1)
+ isAuctionItem = itemID in auctionIDList
itemControl = ItemControler.PlayerItemControler(curPlayer)
## 装备物品 白蓝直接换算铜钱
@@ -502,7 +489,7 @@
## 装备一件件给
if ItemCommon.GetIsEquip(curItemData):
for _ in xrange(dropCount):
- curItem = ItemControler.GetOutPutItemObj(itemID, 1, isDropBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, 1, isAuctionItem)
if not curItem:
continue
if not itemControl.PutInItem(IPY_GameWorld.rptItem, curItem, event=[ChConfig.ItemGive_TJGDropItem, False, {}]):
@@ -511,7 +498,7 @@
#记录紫橙装数量用于通知
NoteEquip(curPlayer, curItemData.GetItemColor())
else:
- curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isDropBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isAuctionItem)
if not curItem:
continue
@@ -536,7 +523,7 @@
equipScores = {}
equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
- for i in Def_EatItem_EquipPlace:
+ for i in ChConfig.EquipPlace_Base:
equipItem = equipPack.GetAt(i)
if not equipItem or equipItem.IsEmpty():
continue
--
Gitblit v1.8.0