From 2cf5365a5e409b38bba122f9bd1b0a6bd217c1c0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 03 七月 2025 17:57:30 +0800
Subject: [PATCH] 16 卡牌服务端（删除无用的GY_Query_Offline_xxx命令）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 4b2cec1..2ea5c7d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1661,11 +1661,11 @@
if endIndex == 0:
endIndex = curPack.GetCount() - 1
#检查是否能整理
- for i in range(0, curPack.GetCount()):
- curItem = curPack.GetAt(i)
- if curItem.GetIsLocked():
- #GameWorld.Log("物品有锁, 不允许重整")
- return
+ #for i in range(0, curPack.GetCount()):
+ # curItem = curPack.GetAt(i)
+ # if curItem.GetIsLocked():
+ # #GameWorld.Log("物品有锁, 不允许重整")
+ # return
# 整理方式不同区分
if packIndex == ShareDefine.rptHero:
@@ -2003,8 +2003,23 @@
武将等级＞突破等级＞武将星级＞武将品质＞武将ID
'''
- posNum1 = item1.GetUserAttr(ShareDefine.Def_IudetHeroPosNum)
- posNum2 = item2.GetUserAttr(ShareDefine.Def_IudetHeroPosNum)
+ posNum1, posNum2 = 0, 0
+ for lpIndex in range(item1.GetUserAttrCount(ShareDefine.Def_IudetHeroLineup)):
+ lineupValue = item1.GetUserAttrByIndex(ShareDefine.Def_IudetHeroLineup, lpIndex)
+ lineupID = lineupValue / 10000
+ if lineupID != ShareDefine.Lineup_Main:
+ continue
+ posNum1 = lineupValue % 100
+ break
+
+ for lpIndex in range(item2.GetUserAttrCount(ShareDefine.Def_IudetHeroLineup)):
+ lineupValue = item2.GetUserAttrByIndex(ShareDefine.Def_IudetHeroLineup, lpIndex)
+ lineupID = lineupValue / 10000
+ if lineupID != ShareDefine.Lineup_Main:
+ continue
+ posNum2 = lineupValue % 100
+ break
+
if (posNum1 and posNum2) or (not posNum1 and not posNum2):
lv1 = item1.GetUserAttr(ShareDefine.Def_IudetHeroLV)
lv2 = item2.GetUserAttr(ShareDefine.Def_IudetHeroLV)
--
Gitblit v1.8.0