From 5ded48e49cc0056094e5165822122b15771f7744 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 19 十一月 2025 10:35:49 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(支持广告招募武将;修改广告领奖配置方式;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py         |    6 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py |   36 +++++++++++++----
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py       |   15 +++++--
 PySysDB/PySysDBPY.h                                                                          |    4 +-
 4 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index e8b46fe..e7e77d3 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1099,8 +1099,8 @@
 	DWORD		_ADID;
 	BYTE		ADCntMax;	//每日次数
 	list		ADAwardItemList;	//广告奖励物品列表
-	DWORD		ADMapID;	//对应副本ID,默认给该副本1次次数
-	BYTE		ADAwardType;	//其他奖励类型
+	BYTE		ADAwardType;	//奖励类型
+	DWORD		ADAwardValue;	//类型对应值
 };
 
 //成就表
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index da5b323..eb09923 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -905,8 +905,8 @@
                         ("DWORD", "ADID", 1),
                         ("BYTE", "ADCntMax", 0),
                         ("list", "ADAwardItemList", 0),
-                        ("DWORD", "ADMapID", 0),
                         ("BYTE", "ADAwardType", 0),
+                        ("DWORD", "ADAwardValue", 0),
                         ),
 
                 "Success":(
@@ -3501,8 +3501,8 @@
     def GetADID(self): return self.attrTuple[0] # DWORD
     def GetADCntMax(self): return self.attrTuple[1] # 每日次数 BYTE
     def GetADAwardItemList(self): return self.attrTuple[2] # 广告奖励物品列表 list
-    def GetADMapID(self): return self.attrTuple[3] # 对应副本ID,默认给该副本1次次数 DWORD
-    def GetADAwardType(self): return self.attrTuple[4] # 其他奖励类型 BYTE
+    def GetADAwardType(self): return self.attrTuple[3] # 奖励类型 BYTE
+    def GetADAwardValue(self): return self.attrTuple[4] # 类型对应值 DWORD
 
 # 成就表
 class IPY_Success():
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 b58facc..58764be 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -3383,20 +3383,25 @@
     adCnt += 1
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ADCnt % adID, adCnt)
     awardItemList = ipyData.GetADAwardItemList()
-    adMapID = ipyData.GetADMapID()
     adAwardType = ipyData.GetADAwardType()
-    GameWorld.DebugLog("领取广告奖励! adID=%s,adCnt=%s,adMapID=%s,adAwardType=%s,awardItemList=%s" % (adID, adCnt, adMapID, adAwardType, awardItemList))
+    adAwardValue = ipyData.GetADAwardValue()
+    GameWorld.DebugLog("领取广告奖励! adID=%s,adCnt=%s,adAwardType=%s,adAwardValue=%s,awardItemList=%s" % (adID, adCnt, adAwardType, adAwardValue, awardItemList))
     SyncADCntInfo(curPlayer, [adID])
     
-    if adMapID:
-        FBCommon.AddFBADCnt(curPlayer, adMapID)
-        
     if awardItemList:
         ItemControler.GivePlayerItemOrMail(curPlayer, awardItemList, event=["ADAward", False, {}])
         
     # 领取祝福树充能奖励
     if adAwardType == 1:
         PlayerTree.GetTreeEnergyAward(curPlayer, False)
+    # 副本次数
+    elif adAwardType == 2:
+        adMapID = adAwardValue
+        FBCommon.AddFBADCnt(curPlayer, adMapID)
+    # 寻宝
+    elif adAwardType == 3:
+        treasureType = adAwardValue
+        PlayerTreasure.DoTreasure(curPlayer, treasureType, PlayerTreasure.CostType_ADFree)
     return
 
 def ADCntOnDay(curPlayer):
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