From c82bf80c543ddc6bada1e3085acb8ab9ee7b13db Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十一月 2025 14:26:33 +0800
Subject: [PATCH] 237 【福利内容】每日任务/每周任务/章节奖励-服务端(A340下发已完成的成就)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index 00883bb..fb773af 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -1257,15 +1257,13 @@
 def __doSetFightPoint(curPlayer, fightPoint):
     ## 设置消耗倍值
     GameWorld.DebugLog("设置战锤消耗倍值: %s" % fightPoint)
-    if fightPoint == 1:
-        pass
-    elif fightPoint == 2:
-        # 条件验证
-        pass
-    elif fightPoint == 3:
-        # 条件验证
-        pass
-    else:
+    needTreeLVList = IpyGameDataPY.GetFuncEvalCfg("AutoGuaji", 1)
+    if fightPoint < 1 or fightPoint > len(needTreeLVList):
+        return
+    needTreeLV = needTreeLVList[fightPoint - 1]
+    treeLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreeLV)
+    if treeLV < needTreeLV:
+        GameWorld.DebugLog("祝福树等级不足: treeLV=%s < %s" % (treeLV, needTreeLV))
         return
     curPlayer.SetFightPoint(fightPoint)
     return
@@ -1553,6 +1551,7 @@
             batObj = batObjMgr.getBatObj(objID)
             turnFight.ResetOneActionUseSkillCnt()
             TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_FightStart)
+            TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_InBattlefield)
             
     turnFight.enterLogic = True
     return True
@@ -1917,8 +1916,12 @@
     turnFight.costTime = time.time() - turnFight.startTime
     winFaction = turnFight.winFaction
     turnFight.isWin = (winFaction == ChConfig.Def_FactionA)
+    mapID = turnFight.mapID
+    funcLineID = turnFight.funcLineID
     GameWorld.DebugLog("--- 战斗结束处理 ---, winFaction=%s, costTime=%ss, %s" % (winFaction, turnFight.costTime, guid))
-    
+    if mapID != ChConfig.Def_FBMapID_Main:
+        GameWorld.Log("战斗耗时: %ss, mapID=%s,funcLineID=%s" % (turnFight.costTime, mapID, funcLineID))
+        
     # 统计明细
     batObjMgr = BattleObj.GetBatObjMgr()
     statInfo = {}
@@ -1953,8 +1956,6 @@
                 
     overMsg = {"winFaction":winFaction, "statInfo":statInfo}
     curPlayer = turnFight.curPlayer
-    mapID = turnFight.mapID
-    funcLineID = turnFight.funcLineID
     
     FBLogic.OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg)
     

--
Gitblit v1.8.0