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/GM/Commands/SetTree.py |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetTree.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetTree.py
index 3da5631..731ef65 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetTree.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetTree.py
@@ -31,9 +31,26 @@
 def OnExec(curPlayer, cmdList):
     if not cmdList:
         GameWorld.DebugAnswer(curPlayer, "设置仙树: SetTree 等级 剩余时间秒")
+        GameWorld.DebugAnswer(curPlayer, "充能次数: SetTree e 次数 [已累计分钟]")
         return
     
     treeLV = cmdList[0]
+    if treeLV == "e":
+        energy = cmdList[1] if len(cmdList) > 1 else 0
+        energyTime = cmdList[2] if len(cmdList) > 2 else 0
+        energyTime *= 60
+        energyMax = PlayerTree.GetTreeEnergyMax(curPlayer)
+        if energy >= energyMax:
+            energy = energyMax
+            timeLast = 0
+        else:
+            timeLast = int(time.time()) - energyTime
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreeEnergy, energy)
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreeEnergyTimeLast, timeLast)
+        GameWorld.DebugAnswer(curPlayer, "充能次数:%s/%s,累计秒:%s" % (energy, energyMax, energyTime))
+        PlayerTree.SyncTreeInfo(curPlayer)
+        return
+    
     remainTime = cmdList[1] if len(cmdList) > 1 else 0
     ipyData = IpyGameDataPY.GetIpyGameData("TreeLV", treeLV)
     if not ipyData:

--
Gitblit v1.8.0