From a075f7841fb2d0a3b32bf10c8bc2df5bf02d6acb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 14 十二月 2025 14:24:28 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（贾诩所有技能；5022效果支持配置buff额外属性计算方式；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 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..5ca8203 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
@@ -26,12 +26,24 @@
import PlayerActLunhuidian
import PlayerActYunshi
import PlayerActivity
+import PlayerSuccess
+import OpenServerActivity
+import PlayerBillboard
+import ShareDefine
import ItemCommon
import PlayerHero
import PyGameData
import ChConfig
import random
+
+(
+CostType_Money, # 消耗货币 0
+CostType_DayFree, # 每日免费 1
+CostType_Item, # 消耗道具 2
+CostType_ADFree, # 广告免费 3
+) = range(4)
+CostFreeTypes = [CostType_DayFree, CostType_ADFree]
# 寻宝类型： >=100的为策划自行配置的自定义寻宝类型，<100的用于指定系统寻宝功能
TreasureTypeList = (
@@ -45,6 +57,8 @@
TreasureType_HeroComm = 11 # 英雄招募 - 普通
TreasureType_HeroHigh = 12 # 英雄招募 - 高级
TreasureType_HeroScore = 13 # 英雄招募 - 积分
+#武将招募的所有类型
+TreasureType_HeroCallList = [TreasureType_HeroComm, TreasureType_HeroHigh, TreasureType_HeroScore]
def OnTreasureLogin(curPlayer):
Sync_TreasureInfo(curPlayer)
@@ -107,12 +121,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 +144,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 +169,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 +179,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 +412,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:
@@ -420,22 +444,12 @@
if addScoreType and addScore:
PlayerControl.GiveMoney(curPlayer, addScoreType, addScore * treasureCount)
- if treasureType in [TreasureType_HeroComm, TreasureType_HeroHigh, TreasureType_HeroScore]:
+ if treasureType in TreasureType_HeroCallList:
PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_HeroCall, treasureCount)
- #if treasureType == TreasureType_Rune:
- # PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_RuneTreasure, treasureCount)
- # PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_RuneTreasure, treasureCount)
- # PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureRune, treasureCount)
- #elif treasureType == TreasureType_Jipin:
- # PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_Treasure, treasureCount)
- # PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_Treasure, treasureCount)
- # PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJipin, treasureCount)
- #elif treasureType == TreasureType_Jueshi:
- # PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_JSTreasure, treasureCount)
- # PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_JSTreasure, treasureCount)
- # PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJueshi, treasureCount)
- #elif treasureType == TreasureType_Gubao:
- # PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureGubao, treasureCount)
+ heroCallCnt = GetHeroCallCnt(curPlayer)
+ if OpenServerActivity.GetOSAState(curPlayer, ShareDefine.Def_BT_OSA_HeroCall) == 1:
+ PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_OSA_HeroCall, heroCallCnt)
+ PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_OSAHeroCall, heroCallCnt)
PlayerActLunhuidian.AddLunhuidianValue(curPlayer, PlayerActLunhuidian.AwardType_Treasure, treasureType, treasureCount)
@@ -479,6 +493,13 @@
Sync_TreasureInfo(curPlayer, [treasureType])
return
+
+def GetHeroCallCnt(curPlayer):
+ ## 获取武将招募总次数
+ callCount = 0
+ for treasureType in TreasureType_HeroCallList:
+ callCount += curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreasureCount % (treasureType))
+ return callCount
def __getLuckyRateInfo(curLuck, luckyItemRateDict, luckyValueList):
if not luckyItemRateDict or not luckyValueList:
@@ -534,7 +555,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