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/Player/PlayerSpringSale.py | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.py
index 8cb6885..8abbaef 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.py
@@ -162,21 +162,19 @@
for itemIpyData in shopItemIpyDataList:
giftBag = ChPyNetSendPack.tagMCSpringSaleGiftbag()
giftBag.GiftID = itemIpyData.GetID()
- giftBag.BuyCountLimit = 0 if not itemIpyData.GetLimitCnt() else itemIpyData.GetLimitCnt()[0]
+ giftBag.BuyCountLimit = itemIpyData.GetLimitCnt()
giftBag.MoneyType = itemIpyData.GetMoneyType()
giftBag.MoneyNumber = itemIpyData.GetMoneyNum()
giftBag.MoneyOriginal = itemIpyData.GetMoneyOriginal()
giftBag.ItemInfo = []
- itemList = [[itemIpyData.GetItemID(), itemIpyData.GetItemCnt(), itemIpyData.GetIsBind()]]
+ itemList = [[itemIpyData.GetItemID(), itemIpyData.GetItemCnt(), 0]]
itemList += itemIpyData.GetItemListEx()
- jobItemList = itemIpyData.GetJobItem()
for itemID, itemCount, isBind in itemList:
item = ChPyNetSendPack.tagMCSpringSaleItem()
- jobItemID = FunctionNPCCommon.GetShopJobItem(job, itemID, jobItemList)
- item.ItemID = jobItemID
+ item.ItemID = itemID
item.ItemCount = itemCount
item.IsBind = isBind
- item.IsMainItem = int(itemID == FunctionNPCCommon.GetShopJobItem(job, itemIpyData.GetMainItemID(), jobItemList))
+ #item.IsMainItem = int(itemID == FunctionNPCCommon.GetShopJobItem(job, itemIpyData.GetMainItemID(), jobItemList))
giftBag.ItemInfo.append(item)
giftBag.GiftItemCount = len(giftBag.ItemInfo)
shop.GiftbagInfo.append(giftBag)
--
Gitblit v1.8.0