From 1dd273126494e6f8ffd7a994b637f45ad1128191 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 03 十二月 2025 19:55:27 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(战报改为存储B430包Buffer;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 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 42003a0..d914d0b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -44,7 +44,6 @@
 import GameFuncComm
 import IpyGameDataPY
 import PyGameData
-import PlayerFeastTravel
 import PlayerActTurntable
 import PlayerCostRebate
 import PlayerActLunhuidian
@@ -2449,17 +2448,12 @@
     return
 
 def GetUnXiantaoCntEquip(curPlayer):
-    '''因为战锤对应装备是1个战锤可能对应多个装备掉落,所以分解装备的时候1个战锤需要支持可拆分
-    所以需要支持小数存储,暂定以支持3位小数存储
-    '''
-    return curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_UnXiantaoCntEquip) / 1000.0
+    return curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_UnXiantaoCntEquip)
 def AddUnXiantaoCntEquip(curPlayer, addCnt):
-    unXiantaoCntEquip = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_UnXiantaoCntEquip) + addCnt * 1000
+    unXiantaoCntEquip = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_UnXiantaoCntEquip) + addCnt
     return NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntEquip, unXiantaoCntEquip)
 def SetUnXiantaoCntEquip(curPlayer, unXiantaoCntEquip):
-    ## 保存装备未结算战锤数,保留3位小数
-    # @param unXiantaoCntEquip: 实际的未结算数量,支持小数
-    unXiantaoCntEquip = int(round(unXiantaoCntEquip, 3) * 1000) # 保留3为小数
+    ## 保存装备未结算战锤数
     return NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntEquip, unXiantaoCntEquip)
 
 ##玩家是否有钱款
@@ -2844,7 +2838,6 @@
     # 消费返利
     if costType not in ChConfig.CostRebate_DisableType:
         PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
-        PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_UseGold, price)
     else:
         GameWorld.DebugLog("不计入消费活动的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
         
@@ -2952,8 +2945,9 @@
             return
         SetMoney(curPlayer, priceType, updPlayerGold)
         
-        if isGiveBourseMoney and updPlayerGold > 0:
-            GiveMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney, min(value, updPlayerGold))
+        #废弃交易所额度
+        #if isGiveBourseMoney and updPlayerGold > 0:
+        #    GiveMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney, min(value, updPlayerGold))
         addDataDict["BourseMoney"] = GetMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney)
         
     elif priceType == IPY_GameWorld.TYPE_Price_Gold_Paper:
@@ -4195,11 +4189,11 @@
                 
     return totalExpRate
 
-##外观额外数据:  其他 * 100 + 坐骑外观
-def GetHorseSkinID(curPlayer): return GameWorld.GetValue(curPlayer.GetEquipShowSwitch(), 2, 2)
+##外观额外数据:  其他 * 1000 + 坐骑外观
+def GetHorseSkinID(curPlayer): return GameWorld.GetValue(curPlayer.GetEquipShowSwitch(), 3, 3)
 def SetHorseSkinID(curPlayer, horseSkinID):
     showValue = curPlayer.GetEquipShowSwitch()
-    updShowValue = GameWorld.SetValue(showValue, 2, 2, min(horseSkinID, 99))
+    updShowValue = GameWorld.SetValue(showValue, 3, 3, min(horseSkinID, 999))
     curPlayer.SetEquipShowSwitch(updShowValue)
     GameWorld.DebugLog("使用坐骑外观: horseSkinID=%s,showValue=%s,updShowValue=%s" % (horseSkinID, showValue, updShowValue))
     return
@@ -4321,7 +4315,9 @@
 
 ## 主线关卡过关进度值 = 章节*10000+关卡编号*100+第x波
 def GetMainLevelPassValue(curPlayer): return curPlayer.GetExAttr1()
-def SetMainLevelPassValue(curPlayer, value): curPlayer.SetExAttr1(value, False, False) # 不通知GameServer
+def SetMainLevelPassValue(curPlayer, value):
+    curPlayer.SetExAttr1(value, False, False) # 不通知GameServer
+    GameFuncComm.DoFuncOpenLogic(curPlayer)    
 def SetMainLevelPassInfo(curPlayer, chapterID, levelNum, wave=0):
     ## 设置主线关卡过关进度
     # @param chapterID: 章节ID

--
Gitblit v1.8.0