From c215892f0f794eb86a641e56a99d535faeab3a7f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 20 十一月 2025 18:49:05 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(赵云所有技能;增加效果5023 6019 6020;5011效果增加可验证战斗类型;5022效果支持多属性;战斗增减伤改名;增加触发方式28~39)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
index d2f2a7a..8d271d6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
@@ -33,6 +33,14 @@
 
 import random
 
+(
+CostType_Money, # 消耗货币 0
+CostType_DayFree, # 每日免费 1
+CostType_Item, # 消耗道具 2
+CostType_ADFree, # 广告免费 3
+) = range(4)
+CostFreeTypes = [CostType_DayFree, CostType_ADFree]
+
 # 寻宝类型: >=100的为策划自行配置的自定义寻宝类型,<100的用于指定系统寻宝功能
 TreasureTypeList = (
 TreasureType_Jipin, # 极品寻宝 1
@@ -107,12 +115,15 @@
 #};
 def OnRequestTreasure(index, clientData, tick):
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    playerLV = curPlayer.GetLV()
-    playerID = curPlayer.GetPlayerID()
     treasureType = clientData.TreasureType
     treasureIndex = clientData.TreasureIndex
     costType = clientData.CostType
-    
+    DoTreasure(curPlayer, treasureType, costType, treasureIndex)
+    return
+
+def DoTreasure(curPlayer, treasureType, costType, treasureIndex=0):
+    playerLV = curPlayer.GetLV()
+    playerID = curPlayer.GetPlayerID()
     GameWorld.DebugLog("玩家寻宝: treasureType=%s,treasureIndex=%s,costType=%s,playerLV=%s" 
                        % (treasureType, treasureIndex, costType, playerLV), playerID)
     
@@ -127,6 +138,9 @@
     if not treasureCountList:
         GameWorld.DebugLog("没有寻宝次数列表配置!", playerID)
         return
+    if costType == CostType_ADFree:
+        treasureIndex = 0
+        GameWorld.DebugLog("广告寻宝强制设置: treasureIndex=%s" % treasureIndex, playerID)
     if treasureIndex < 0 or treasureIndex >= len(treasureCountList):
         GameWorld.ErrLog("寻宝次数索引不存在!treasureType=%s,treasureIndex=%s" % (treasureType, treasureIndex), playerID)
         return
@@ -149,7 +163,7 @@
             return
         
     # 免费次数
-    if costType == 1:
+    if costType == CostType_DayFree:
         dailyFreeCount = setIpyData.GetDailyFreeCount()
         if not dailyFreeCount:
             GameWorld.ErrLog("该寻宝类型索引不支持免费次数寻宝!treasureType=%s,treasureIndex=%s" % (treasureType, treasureIndex), playerID)
@@ -159,9 +173,11 @@
         if updFreeCountToday > dailyFreeCount:
             GameWorld.DebugLog("今日免费次数不足,无法使用免费寻宝! freeCountToday=%s + %s > %s" % (freeCountToday, treasureCount, dailyFreeCount), playerID)
             return
-        
+    # 广告免费
+    elif costType == CostType_ADFree:
+        pass
     # 寻宝道具, 目前默认消耗1个
-    elif costType == 2:
+    elif costType == CostType_Item:
         costItemID = setIpyData.GetCostItemID()
         costItemList = setIpyData.GetCostItemCountList() # 消耗道具物品ID列表
         if not costItemID or not costItemList or treasureIndex >= len(costItemList):
@@ -390,10 +406,12 @@
         treasureResult.append([gridNum, itemID, itemCount, isTrans])
         
     # 扣消耗
-    if costType == 1:
+    if costType == CostType_DayFree:
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureFreeCount % (treasureType), updFreeCountToday)
         GameWorld.DebugLog("消耗免费次数,更新今日已使用免费次数: %s" % updFreeCountToday, playerID)
-    elif costType == 2:
+    elif costType == CostType_ADFree:
+        GameWorld.DebugLog("广告寻宝免费", playerID)
+    elif costType == CostType_Item:
         ItemCommon.DelCostItemByBind(curPlayer, costItemIndexList, bindCnt, unBindCnt, delCostItemCount, ChConfig.ItemDel_Treasure)
         GameWorld.DebugLog("扣除寻宝道具,costItemID=%s,delCostItemCount=%s" % (costItemID, delCostItemCount), playerID)
         if lackCountCostMoney:
@@ -534,7 +552,7 @@
 def GetUpdLuckyItemRateList(ipyData, luckyGridNumList, curLuck, luckFormula, costType):
     # 获取幸运物品提升概率后的饼图
     treasureType = ipyData.GetTreasureType()
-    srcPieList = ipyData.GetGridItemRateListFree() if costType == 1 else ipyData.GetGridItemRateList1()
+    srcPieList = ipyData.GetGridItemRateListFree() if costType in CostFreeTypes else ipyData.GetGridItemRateList1()
     if not srcPieList:
         srcPieList = ipyData.GetGridItemRateList1()
         

--
Gitblit v1.8.0