From efaf363493930c5148271e5a50bbddd07909e110 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 03 九月 2025 18:27:33 +0800
Subject: [PATCH] 1111 删除旧榜单相关;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index d3e6b88..b74e0cb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -33,7 +33,6 @@
 import PlayerBillboard
 import GameServerRefresh
 import IPY_GameWorld
-import PlayerGameWallow
 import ChPyNetSendPack
 import NetPackCommon
 import DataRecordPack
@@ -51,7 +50,6 @@
 import PlayerActTurntable
 import PlayerCostRebate
 import PlayerActLunhuidian
-import PlayerActGarbageSorting
 import GY_Query_CrossRealmReg
 import PlayerTongTianLing
 import FunctionNPCCommon
@@ -1593,10 +1591,6 @@
 # @return 无意义
 # @remarks 刷新玩家时钟,切地图玩家时钟记录清空,处理相应逻辑
 def RefreshPlayerTick(curPlayer):
-    tick = GameWorld.GetGameWorld().GetTick()
-    
-    #防沉迷切线时间
-    PlayerGameWallow.DoLogic_WallowOnlineTime(curPlayer, tick)
     return
 
 
@@ -2811,6 +2805,9 @@
                 NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntBooty % itemID, unXiantaoCntBooty + price)
                 
         PlayerPrestigeSys.AddRealmTaskValue(curPlayer, PlayerPrestigeSys.RealmTaskType_UseXiantao, price)
+        PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_CutTree, price)
+        
+        
     unitPrice = price if quantity == 1 else int(math.ceil(price * 1.0 / quantity)) # 单价
     #reason_name = "Unknown" if not costType else costType
     reason_name = costType
@@ -2890,7 +2887,6 @@
     if costType not in ChConfig.CostRebate_DisableType:
         PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
         PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_UseGold, price)
-        PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_UseGold, price)
     else:
         GameWorld.DebugLog("不计入消费活动的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
         
@@ -3581,7 +3577,6 @@
             #if curPlayer.GetMaxMP() > 0:
             #    curPlayer.SetMP(curPlayer.GetMaxMP())
             
-            FBLogic.OnPlayerLVUp(curPlayer)
             # 记录开服活动冲级数据
             #OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())
             #神秘限购
@@ -4413,11 +4408,17 @@
     # @param wave: 第x波
     value = ComMainLevelValue(chapterID, levelNum, wave)
     SetMainLevelPassValue(curPlayer, value)
+    if wave == 0:
+        PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_MainLevel)
     return value
 def GetMainLevelPassInfo(curPlayer):
     ## 获取主线关卡过关进度信息
     # @return: chapterID, levelNum, wave
-    return GetMainLevelValue(GetMainLevelPassValue(curPlayer))
+    chapterID, levelNum, wave = GetMainLevelValue(GetMainLevelPassValue(curPlayer))
+    if not chapterID and not levelNum:
+        chapterID, levelNum, wave = 1, 1, 0
+        SetMainLevelPassValue(curPlayer, ComMainLevelValue(chapterID, levelNum, wave))
+    return chapterID, levelNum, wave
 
 ## 主线关卡当前进度值 = 章节*10000+关卡编号*100+第x波
 def GetMainLevelNowValue(curPlayer): return curPlayer.GetExAttr2()
@@ -4433,7 +4434,14 @@
 def GetMainLevelNowInfo(curPlayer):
     ## 获取主线关卡当前进度信息
     # @return: chapterID, levelNum, wave
-    return GetMainLevelValue(GetMainLevelNowValue(curPlayer))
+    chapterID, levelNum, wave = GetMainLevelValue(GetMainLevelNowValue(curPlayer))
+    if not chapterID and not levelNum:
+        chapterID, levelNum, wave = 1, 1, 1
+        SetMainLevelNowInfo(curPlayer, chapterID, levelNum, wave)
+    if not wave:
+        wave = 1
+        SetMainLevelNowInfo(curPlayer, chapterID, levelNum, wave)
+    return chapterID, levelNum, wave
 
 def ComMainLevelValue(chapterID, levelNum, wave=0): return chapterID * 10000 + levelNum * 100 + wave
 def GetMainLevelValue(value):

--
Gitblit v1.8.0