From f6a4dfb5b00b4a2ff652ac2a1669904a267a5830 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 06 五月 2021 16:55:27 +0800
Subject: [PATCH] 8721 【主干】【BT2】【后端】H.活动-合服庆典（转盘 同步主干冲突）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTurntable.py | 5 +++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 16 ++++++++++++++++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 3 +++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py | 2 ++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 6 ++++++
5 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index a14375b..d33e547 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1478,6 +1478,22 @@
PacketSubCMD_2=0x11
PacketCallFunc_2=OnRequestAssistTeamFB
+;转盘活动
+[PlayerActTurntable]
+ScriptName = Player\PlayerActTurntable.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 2
+
+PacketCMD_1=0xAA
+PacketSubCMD_1=0x12
+PacketCallFunc_1=OnTurntableChooseItem
+
+PacketCMD_2=0xAA
+PacketSubCMD_2=0x13
+PacketCallFunc_2=OnTurntableStart
+
;竞技场
[PlayerArena]
ScriptName = Player\PlayerArena.py
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 573baf4..7469bdc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -118,6 +118,7 @@
import Item_ResetAttrPoint
import CrossActCTGBillboard
import PlayerFuncSysPrivilege
+import PlayerActTurntable
import CrossRealmPlayer
import ChNetSendPack
import FamilyRobBoss
@@ -720,6 +721,8 @@
PlayerActManyDayRecharge.OnPlayerLogin(curPlayer)
# 单笔累充活动
PlayerActSingleRecharge.OnPlayerLogin(curPlayer)
+ # 转盘活动
+ PlayerActTurntable.OnPlayerLogin(curPlayer)
# 仙界盛典活动
PlayerFairyCeremony.OnLogin(curPlayer)
# 新仙界盛典活动
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTurntable.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTurntable.py
index 49a3cc3..6403123 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTurntable.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTurntable.py
@@ -26,6 +26,7 @@
import NetPackCommon
import GameWorld
import ChConfig
+import CommFunc
import random
@@ -169,7 +170,7 @@
% (actNum, coinType, ctgTypeEffValue), curPlayer.GetPlayerID())
continue
- ctgPrizeList = ipyData.GetCTGPrizeList()
+ ctgPrizeList = [CommFunc.RMBToCoin(floatRMB) for floatRMB in ipyData.GetCTGPrizeList()]
nowCTGValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TurntableCTGValue % actNum)
if nowCTGValue >= max(ctgPrizeList):
GameWorld.DebugLog("转盘活动充值已达最大记录，actNum=%s,nowCTGValue=%s,maxCTGValue=%s"
@@ -489,7 +490,7 @@
clientPack.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
clientPack.IsDayReset = ipyData.GetIsDayReset()
clientPack.LimitLV = ipyData.GetLVLimit()
- clientPack.CTGPrizeList = ipyData.GetCTGPrizeList()
+ clientPack.CTGPrizeList = [CommFunc.RMBToCoin(floatRMB) for floatRMB in ipyData.GetCTGPrizeList()]
clientPack.CTGPrizeCount = len(clientPack.CTGPrizeList)
clientPack.UseGoldPrizeList = ipyData.GetUseGoldPrizeList()
clientPack.UseGoldPrizeCount = len(clientPack.UseGoldPrizeList)
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 236dc75..a9b7cd9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -59,6 +59,7 @@
import PlayerFeastTravel
import PlayerWeekParty
import PlayerGoldInvest
+import PlayerActTurntable
import ItemCommon
import PyGameData
import CommFunc
@@ -452,6 +453,7 @@
#累积充值X元
PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin)
PlayerActSingleRecharge.UpdSingleRechargeValue(curPlayer, orderCoin, coinType) # 单笔累充
+ PlayerActTurntable.OnPlayerRecharge(curPlayer, orderCoin, coinType) # 转盘
PlayerFairyCeremony.AddFCCTGRMB(curPlayer, orderCoin)
PlayerNewFairyCeremony.AddFCCostGold(curPlayer, orderCoin)
#开服活动
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
index 0e2c392..94a6609 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -82,6 +82,7 @@
import PlayerActSingleRecharge
import PlayerActRechargePrize
import PlayerActGrowupBuy
+import PlayerActTurntable
import PlayerSpringSale
import PlayerBossReborn
import PlayerWeekParty
@@ -531,6 +532,8 @@
PlayerRefineStove.OnDay(curPlayer)
#绑玉转盘
PlayerBindJadeWheel.OnDay(curPlayer)
+ #转盘
+ PlayerActTurntable.PlayerOnDay(curPlayer)
#每日分享奖励重置
shareGameAwardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShareGameAwardState)
if shareGameAwardState:
@@ -1369,6 +1372,9 @@
elif actionName == ShareDefine.OperationActionName_SingleRecharge:
PlayerActSingleRecharge.RefreshSingleRechargeActionInfo(actNum)
+ elif actionName == ShareDefine.OperationActionName_Turntable:
+ PlayerActTurntable.RefreshTurntableActionInfo(actNum)
+
elif actionName == ShareDefine.OperationActionName_SpringSale:
PlayerSpringSale.RefreshSpringSaleActionInfo(actNum)
--
Gitblit v1.8.0