From 6feb5f6c84521cab58c523d43ba8a8fc02a5029a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 13 四月 2019 17:22:00 +0800
Subject: [PATCH] 6485 【2.0】【后端】炼丹功能开发单
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py | 137 +++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 74 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 0dccd66..afc30f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -52,19 +52,7 @@
import ChEquip
import QuestCommon
import random
-
-# 可吞噬的装备位
-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 项链
-
-]
+import GameObj
Def_EatSpace = 5 # 低于X格自动吞噬
@@ -103,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
@@ -326,7 +315,7 @@
aSkillAtkRate = curPlayer.GetSkillAtkRate() # 技能攻击力加成
petMinAtk = PlayerControl.GetPetMinAtk(curPlayer) #灵宠最小攻击
petMaxAtk = PlayerControl.GetPetMaxAtk(curPlayer) #灵宠最大攻击
- petDamPer = PlayerControl.GetPetDamPer(curPlayer) #灵宠增加伤害
+ petDamPer = GameObj.GetPetDamPer(curPlayer) #灵宠增加伤害
atkSpeed = PlayerControl.GetAtkSpeed(curPlayer) # 攻击速度
aIgnoreDefRate = curPlayer.GetIgnoreDefRate() # 无视防御比率
aLuckyHit = curPlayer.GetLuckyHitVal() # 会心一击
@@ -475,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):
@@ -488,8 +477,7 @@
if not curItemData:
continue
- # 掉落绑定, 默认绑定
- isDropBind = dropIDBindDict.get(itemID, 1)
+ isAuctionItem = itemID in auctionIDList
itemControl = ItemControler.PlayerItemControler(curPlayer)
## 装备物品 白蓝直接换算铜钱
@@ -501,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, {}]):
@@ -510,7 +498,7 @@
#记录紫橙装数量用于通知
NoteEquip(curPlayer, curItemData.GetItemColor())
else:
- curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isDropBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isAuctionItem)
if not curItem:
continue
@@ -535,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
@@ -544,6 +532,7 @@
#GameWorld.DebugLog("equipScores----%s"%equipScores)
eatIndexList = []
+ eatItemIDList = []
itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
for i in range(0, itemPack.GetCount()):
curItem = itemPack.GetAt(i)
@@ -566,9 +555,9 @@
continue
eatIndexList.append(i)
-
+ eatItemIDList.append(curItem.GetItemTypeID())
#GameWorld.DebugLog("eatIndexList-----------%s"%len(eatIndexList))
- eatCount, giveCnt = PlayerEquipDecompose.EatItems(curPlayer, eatIndexList)
+ eatCount, giveCnt = PlayerEquipDecompose.EatItems(curPlayer, eatIndexList, eatItemIDList)
NoteEatEquip(curPlayer, eatCount, giveCnt)
CheckPackFull(curPlayer)
--
Gitblit v1.8.0