From 388823edfe6308cba6f76ca6dc4f20022c5cb2be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 30 六月 2025 19:03:50 +0800
Subject: [PATCH] 10431 【英文】看广告获得限时代金券

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
index 923067f..78a13f2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
@@ -23,6 +23,7 @@
 import ShareDefine
 import PyGameData
 import GameWorld
+import ChConfig
 
 import random
 import time
@@ -37,6 +38,8 @@
     def __init__(self, playerID):
         self.playerID = playerID
         self.job = 0
+        self.face = 0
+        self.facePic = 0
         self.playerName = ""
         self.playerLV = 0
         self.realmLV = 0
@@ -67,6 +70,10 @@
         helpBattlePlayer.realmLV = int(str(value5)[-3:-1])
         helpBattlePlayer.job = value5 % 10
         helpBattlePlayer.playerName = recData.GetStrValue1()
+        strValue2 = recData.GetStrValue2()
+        strValue2List = strValue2.split("|")
+        helpBattlePlayer.face = GameWorld.ToIntDef(strValue2List[0] if len(strValue2List) > 0 else "0", 0)
+        helpBattlePlayer.facePic = GameWorld.ToIntDef(strValue2List[1] if len(strValue2List) > 1 else "0", 0)
         strValue3 = recData.GetStrValue3()
         strValue3List = strValue3.split("|")
         helpCountDictStr = strValue3List[0] if len(strValue3List) > 0 else "{}"
@@ -96,11 +103,12 @@
         recData = checkInPlayerRecList.AddRec()
         recData.SetTime(checkInPlayer.checkInTime)
         recData.SetValue1(playerID)
-        recData.SetValue2(checkInPlayer.fightPower)
+        recData.SetValue2(min(max(checkInPlayer.fightPower, 0), ChConfig.Def_UpperLimit_DWord))
         recData.SetValue3(checkInPlayer.familyID)
         recData.SetValue4(checkInPlayer.checkInCount)
         recData.SetValue5(int("%d%02d%02d%d" % (checkInPlayer.playerLV, checkInPlayer.vipLV, checkInPlayer.realmLV, checkInPlayer.job)))
         recData.SetStrValue1(checkInPlayer.playerName)
+        recData.SetStrValue2("%s|%s" % (checkInPlayer.face, checkInPlayer.facePic))
         strValue3 = "%s|%s" % (str(checkInPlayer.todayHelpCountDict).replace(" ", ""),
                                str(checkInPlayer.getThanksGiftCountDict).replace(" ", ""))
         recData.SetStrValue3(strValue3)
@@ -165,6 +173,7 @@
 def __DoPlayerFBHelpBattleCheckIn(curPlayer, msgList):
     ## 玩家登记
     checkInCount, fightPower = msgList[1:]
+    fightPower = min(fightPower, ChConfig.Def_UpperLimit_DWord) # 登记助战战力最高暂支持20E
     curTime = int(time.time())
     playerID = curPlayer.GetPlayerID()
     curCache = PlayerViewCache.FindViewCache(playerID)
@@ -177,6 +186,8 @@
     helpBattlePlayer.playerName = curPlayer.GetName()
     helpBattlePlayer.playerLV = curPlayer.GetLV()
     helpBattlePlayer.job = curPlayer.GetJob()
+    helpBattlePlayer.face = curPlayer.GetFace()
+    helpBattlePlayer.facePic = curPlayer.GetFacePic()
     helpBattlePlayer.realmLV = curPlayer.GetOfficialRank()
     helpBattlePlayer.fightPower = fightPower
     helpBattlePlayer.familyID = curPlayer.GetFamilyID()
@@ -193,6 +204,7 @@
     ## 更新登记的助战玩家等级战力
     if playerID not in PyGameData.g_fbHelpBattleCheckInPlayerDict:
         return
+    fightPower = min(fightPower, ChConfig.Def_UpperLimit_DWord) # 登记助战战力最高暂支持20E
     helpBattlePlayer = PyGameData.g_fbHelpBattleCheckInPlayerDict[playerID]
     helpBattlePlayer.fightPower = fightPower
     helpBattlePlayer.familyID = familyID
@@ -210,6 +222,10 @@
         helpBattlePlayer.playerLV = value
     elif refreshType == IPY_GameServer.CDBPlayerRefresh_VIPLv:
         helpBattlePlayer.vipLV = value
+    elif refreshType == IPY_GameServer.CDBPlayerRefresh_Face:
+        helpBattlePlayer.face = value
+    elif refreshType == IPY_GameServer.CDBPlayerRefresh_HairColor:
+        helpBattlePlayer.facePic = value
     else:
         return
     GameWorld.DebugLog("更新助战玩家信息: refreshType=%s,value=%s" % (refreshType, value), playerID)
@@ -444,6 +460,8 @@
     helpPlayerDict["Name"] = helpBattlePlayer.playerName
     helpPlayerDict["LV"] = helpBattlePlayer.playerLV
     #helpPlayerDict["Job"] = helpBattlePlayer.job
+    helpPlayerDict["Face"] = helpBattlePlayer.face
+    helpPlayerDict["FacePic"] = helpBattlePlayer.facePic
     helpPlayerDict["RealmLV"] = helpBattlePlayer.realmLV
     helpPlayerDict["FightPower"] = helpBattlePlayer.fightPower
     helpPlayerDict["Relation"] = relation
@@ -558,6 +576,7 @@
             continue
         helpBattlePlayer = PyGameData.g_fbHelpBattleCheckInPlayerDict[assistPlayerID]
         assistPlayerDict[assistPlayerID] = {"PlayerName":helpBattlePlayer.playerName, "Job":helpBattlePlayer.job,
+                                            "Face":helpBattlePlayer.face, "FacePic":helpBattlePlayer.facePic,
                                             "LV":helpBattlePlayer.playerLV, "RealmLV":helpBattlePlayer.realmLV,
                                             "TodayGiftCount":helpBattlePlayer.getThanksGiftCountDict.get(liheItemID, 0)}
     

--
Gitblit v1.8.0