From c63ffd10aecb12b2e09dae603cf9a0f824f6482c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 十二月 2025 15:46:15 +0800
Subject: [PATCH] 16 卡牌服务端（合成目标物品与材料物品不在同一背包时支持合成；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py
index cb52de0..91fe638 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py
@@ -29,11 +29,11 @@
import PlayerControl
import FunctionNPCCommon
import PlayerActBuyCountGift
+import OpenServerActivity
import PlayerActLoginNew
import PlayerActTask
-import IPY_GameWorld
-import ItemCommon
import ItemControler
+import PlayerTravel
import PlayerHorse
import PlayerArena
import PlayerTask
@@ -45,11 +45,14 @@
ShareDefine.GameFuncID_Arena:lambda curObj:PlayerArena.DoArenaOpen(curObj),
ShareDefine.GameFuncID_Shop:lambda curObj:FunctionNPCCommon.DoShopOpen(curObj),
ShareDefine.GameFuncID_Horse:lambda curObj:PlayerHorse.DoHorseOpen(curObj),
+ ShareDefine.GameFuncID_Travel:lambda curObj:PlayerTravel.DoTravelOpen(curObj),
+ ShareDefine.GameFuncID_OSA_MainLevel:lambda curObj:OpenServerActivity.DoOSA_MainLevel(curObj),
+ ShareDefine.GameFuncID_OSA_HeroCall:lambda curObj:OpenServerActivity.DoOSA_HeroCall(curObj),
}
def GetFuncOpenLVIpyData(funcID): return IpyGameDataPY.GetIpyGameData("FuncOpenLV", funcID)
-def DoFuncOpenLogic(curPlayer):
+def DoFuncOpenLogic(curPlayer, checkServerDay=True):
'''执行触发功能开启逻辑
@param finishMissionIDList: 完成的任务ID列表
'''
@@ -87,7 +90,11 @@
continue
limitOpenDay = ipyData.GetLimitOpenDay()
- if limitOpenDay and serverDay < limitOpenDay:
+ if limitOpenDay and serverDay < limitOpenDay and checkServerDay:
+ continue
+
+ limitManLevel = ipyData.GetLimitManLevel()
+ if limitManLevel and PlayerControl.GetMainLevelPassValue(curPlayer) < limitManLevel:
continue
# 先更新值再处理开启逻辑，不能可能导致在功能开启逻辑中再开启功能引发的递归死循环
--
Gitblit v1.8.0