From 180eab3510f793ed008e9504976c3b3063f7ca6d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 18 十一月 2025 18:21:52 +0800
Subject: [PATCH] 110 【主界面】仙树升级-服务端(免费减时修改为充能减时;特权支持充能额外上限;广告奖励支持领取充能奖励;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 76605b3..f5bf705 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -3219,7 +3219,7 @@
         PlayerSuccess.GetSuccessAward(curPlayer, dataEx)
     # 仙树免费减时
     elif rewardType == ChConfig.Def_RewardType_TreeFreeTime:
-        PlayerTree.FreeReduceTreeLVTime(curPlayer)
+        PlayerTree.FreeReduceTreeLVTime(curPlayer, dataEx)
     # 广告奖励
     elif rewardType == ChConfig.Def_RewardType_ADAward:
         OnGetADAward(curPlayer, dataEx)
@@ -3377,14 +3377,15 @@
         return
     adCntMax = ipyData.GetADCntMax()
     adCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ADCnt % adID)
-    if adCnt >= adCntMax:
+    if adCntMax and adCnt >= adCntMax:
         GameWorld.DebugLog("今日该广告奖励已达上限! adID=%s,adCnt=%s > %s" % (adID, adCnt, adCntMax))
         return
     adCnt += 1
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ADCnt % adID, adCnt)
     awardItemList = ipyData.GetADAwardItemList()
     adMapID = ipyData.GetADMapID()
-    GameWorld.DebugLog("领取广告奖励! adID=%s,adCnt=%s,adMapID=%s,awardItemList=%s" % (adID, adCnt, adMapID, awardItemList))
+    adAwardType = ipyData.GetADAwardType()
+    GameWorld.DebugLog("领取广告奖励! adID=%s,adCnt=%s,adMapID=%s,adAwardType=%s,awardItemList=%s" % (adID, adCnt, adMapID, adAwardType, awardItemList))
     SyncADCntInfo(curPlayer, [adID])
     
     if adMapID:
@@ -3393,6 +3394,9 @@
     if awardItemList:
         ItemControler.GivePlayerItemOrMail(curPlayer, awardItemList, event=["ADAward", False, {}])
         
+    # 领取祝福树充能奖励
+    if adAwardType == 1:
+        PlayerTree.GetTreeEnergyAward(curPlayer, False)
     return
 
 def ADCntOnDay(curPlayer):

--
Gitblit v1.8.0