From a7ee20f2467c3d04d23ad80ebd25e07b806b5c22 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 03 十一月 2025 10:47:21 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（词条技能1021、1022、1024；增加触发方式25-受到持续伤害，26-敌方单位死亡时，27-己方单位死亡时；优化效果6008可配置免控类型；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index ed41b74..3ea23fe 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -25,18 +25,14 @@
import traceback
import random
import ReadChConfig
-import ChItem
-import PlayerSuccess
-import PlayerFamily
import ChPyNetSendPack
import NetPackCommon
import PlayerXiangong
import IpyGameDataPY
-import DataRecordPack
import PlayerGubao
import PyGameData
-import ChEquip
import PlayerHero
+import ObjPool
import math
import time
@@ -909,8 +905,6 @@
PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_GongdePoint, itemCount)
elif itemID == ChConfig.Def_ItemID_FamilyFlagWarPoint:
PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_FamilyFlagWarPoint, itemCount)
- elif itemID == ChConfig.Def_ItemID_SuccessScore:
- PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SuccessSocre, itemCount, moneyEventName, addDict)
return True
def __CrossServerPutInItem(self, packIndex, tagItem, event=["", False, {}]):
@@ -968,13 +962,6 @@
SetItemCountByID(curPlayer, itemID, GetItemCountByID(curPlayer, itemID) + tagItemCount)
tagItem.Clear()
return True
- #古宝碎片
- if itemEff.GetEffectID() == ChConfig.Def_Effect_GubaoPiece:
- gubaoID = itemEff.GetEffectValue(0)
- if gubaoID:
- PlayerGubao.AddGubaoPiece(curPlayer, gubaoID, tagItemCount, itemID)
- tagItem.Clear()
- return True
#气运
if itemEff.GetEffectID() == ChConfig.Def_Effect_TiandaoQiyun:
isAutoUse = itemEff.GetEffectValue(1)
@@ -1282,7 +1269,7 @@
itemCount = GetItemCountByID(curPlayer, itemID)
if not itemCount and not force:
continue
- countInfo = ChPyNetSendPack.tagMCAutoItemCount()
+ countInfo = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCAutoItemCount)
countInfo.Clear()
countInfo.ItemID = itemID
countInfo.ItemCount = itemCount
@@ -1291,7 +1278,7 @@
if not itemCountList:
return
- clientPack = ChPyNetSendPack.tagMCAutoItemCountRefresh()
+ clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagMCAutoItemCountRefresh)
clientPack.Clear()
clientPack.ItemCountList = itemCountList
clientPack.Count = len(clientPack.ItemCountList)
@@ -2023,7 +2010,7 @@
return False
if isAuctionItem:
- ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
+ ipyData = None #IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
if not ipyData:
GameWorld.ErrLog("非拍卖物品，默认转为非拍品! itemID=%s,itemCount=%s,isAuctionItem=%s"
% (itemID, itemCount, isAuctionItem), curPlayer.GetPlayerID())
@@ -2142,11 +2129,32 @@
def GetItemCountByID(curPlayer, itemID):
return curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ItemCount % itemID)
def SetItemCountByID(curPlayer, itemID, itemCount, isSync=True):
+ befCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ItemCount % itemID)
itemCount = max(0, min(itemCount, ChConfig.Def_UpperLimit_DWord))
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ItemCount % itemID, itemCount)
+
+ # 检查碎片溢出自动转化，数量增加时才检查
+ if itemCount > befCount:
+ #GameWorld.DebugLog("碎片数量增加，检查溢出! itemID=%s,itemCount=%s,befCount=%s" % (itemID, itemCount, befCount))
+ if PlayerGubao.AutoTransGubaoPiece(curPlayer, itemID):
+ PyGameData.g_transItemSign = 1
+
if isSync:
Sync_AutoItemCount(curPlayer, [itemID])
return itemCount
+def CheckItemEnoughByID(curPlayer, itemID, needCount):
+ itemCount = GetItemCountByID(curPlayer, itemID)
+ if itemCount < needCount:
+ GameWorld.DebugLog("物品碎片不足! itemID=%s,itemCount=%s < %s" % (itemID, itemCount, needCount))
+ return False
+ return True
+def DelItemCountByID(curPlayer, itemID, delCount, isSync=True):
+ itemCount = GetItemCountByID(curPlayer, itemID)
+ if itemCount < delCount:
+ GameWorld.DebugLog("扣除物品碎片不足! itemID=%s,itemCount=%s < %s" % (itemID, itemCount, delCount))
+ return False
+ SetItemCountByID(curPlayer, itemID, itemCount - delCount, isSync)
+ return True
## 设置物品数量
# @param item 物品实例
@@ -2191,10 +2199,6 @@
itemEff = itemData.GetEffectByIndex(0)
if itemEff.GetEffectID() == ChConfig.Def_Effect_ItemCount:
return True
- if itemEff.GetEffectID() == ChConfig.Def_Effect_GubaoPiece:
- gubaoID = itemEff.GetEffectValue(0)
- if gubaoID:
- return True
return False
def GetOutPutItemObj(itemID, itemCount=1, isAuctionItem=False, expireTime=0, curPlayer=None, setAttrDict=None):
--
Gitblit v1.8.0