From ac36bdcfa7db1557790a5b912c3248b22625841f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十一月 2025 18:49:17 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
index ae360c7..394c127 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -53,7 +53,6 @@
 import CrossActCTGBillboard
 import CrossActAllRecharge
 import PlayerActGrowupBuy
-import PlayerFeastTravel
 import PlayerWeekParty
 import PlayerGoldInvest
 import PlayerActTurntable
@@ -239,6 +238,19 @@
         Sync_CoinToGoldCountInfo(curPlayer, syncRecordIDList)
     return
 
+#// A8 06 查询充值结果 #tagCMQueryRecharge
+#
+#struct    tagCMQueryRecharge
+#{
+#    tagHead        Head;
+#};
+def OnQueryRecharge(index, packData, tick):
+    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+    if tick - curPlayer.GetDictByKey("QRtick") < 10000:
+        return
+    curPlayer.SetDict("QRtick", tick)
+    curPlayer.SendDBQueryRecharge()
+    return
 
 #// A1 23 查询充值次数 #tagCMQueryCoinToGoldCount
 #
@@ -584,15 +596,15 @@
     giveItemList += GetCTGGiveItemList(ipyData)
     giveItemList += selectItemList
     
-    payType = ipyData.GetPayType()
+    #payType = ipyData.GetPayType()
     moneyType = ipyData.GetMoneyType() # 获得货币类型
     addGold = ipyData.GetGainGold() # 获得货币数
     gainGoldPrize = ipyData.GetGainGoldPrize() # 赠送货币数,首次充值赠送仙玉时,此仙玉不给
     firstGoldPrize = ipyData.GetFirstGoldPrize() # 首次充值赠送的仙玉
     prizeGold = firstGoldPrize if (not totalBuyCount and firstGoldPrize) else gainGoldPrize
     if moneyType == IPY_GameWorld.TYPE_Price_Gold_Money:
-        if payType in [PayType_Gold, PayType_GoldPlus] and PlayerGoldInvest.GetInvestState(curPlayer, ChConfig.InvestType_Life):
-            prizeGold = addGold # bt tqxbqy 版本,永久卡仙玉直充固定双倍
+        #if payType in [PayType_Gold, PayType_GoldPlus] and PlayerGoldInvest.GetInvestState(curPlayer, ChConfig.InvestType_Life):
+        #    prizeGold = addGold # bt tqxbqy 版本,永久卡仙玉直充固定双倍
         actPrizeGold = PlayerActRechargePrize.DoAddPlayerActRechargePrizeCount(curPlayer, recordID)
         if actPrizeGold:
             prizeGold += actPrizeGold
@@ -778,12 +790,11 @@
     PlayerActSingleRecharge.UpdSingleRechargeValue(curPlayer, orderCoin, coinType) # 单笔累充
     PlayerActTurntable.OnPlayerRecharge(curPlayer, orderCoin, coinType) # 转盘
     PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Recharge, addVIPExp)
-    PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_CTGExp, addVIPExp)
     #投资
     if ctgIpyData:
         ctgID = ctgIpyData.GetRecordID()
         #PlayerActFamilyCTGAssist.OnPlayerCTG(curPlayer, ctgID)
-        #PlayerGoldInvest.InvestByCTG(curPlayer, ctgID)
+        PlayerGoldInvest.InvestByCTG(curPlayer, ctgID)
         PlayerGoldGift.OnGiftByCTGID(curPlayer, ctgID)
         PlayerZhanling.OnActiviteByCTGID(curPlayer, ctgID)
         PlayerGoldRush.OnGoldRushByCTGID(curPlayer, ctgID)

--
Gitblit v1.8.0