From fe9b738b1cb89e3b4d320924fceef70a8e1f6fac Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 04 三月 2021 14:24:50 +0800
Subject: [PATCH] 8650 【主干】【BT2】活动规则优化（多活动支持的改为单表模式，增加活动分组编号字段区分不同的活动编号；常规活动改为不受合服影响，合服活动独立出来；累计充值活动、集字活动适配为新模式 master冲突补同步）；
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py
index 4693671..da7e44b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyRedPacket.py
@@ -515,8 +515,17 @@
#找该红包的抢信息
grabRecordDict = __GetGrabRecord(redPacketID)
- if playerID in grabRecordDict or len(grabRecordDict) >= packetCnt:
- GameWorld.DebugLog(" 该玩家已抢过此红包！",playerID)
+ if playerID in grabRecordDict:
+ GameWorld.DebugLog(" 该玩家已抢过此红包！", playerID)
+ __NotifyGrabRedPacketInfo(curPlayer, redPacketID, grabRecordDict)
+ return
+
+ if len(grabRecordDict) >= packetCnt:
+ GameWorld.DebugLog(" 红包已被抢完！", playerID)
+ if state != State_HasAllGot:
+ redPacketRecData.SetValue4(State_HasAllGot)
+ #GameWorld.DebugLog(" 纠正红包已抢完状态! state=%s,updState=%s" % (state, State_HasAllGot))
+ __NotifyFamilyRedPacketInfo(curFamily, redPacketRecData, grabRecordDict.keys())
__NotifyGrabRedPacketInfo(curPlayer, redPacketID, grabRecordDict)
return
@@ -555,7 +564,7 @@
#{playerid:[抢到的钱,名字,job]}
g_grabDataDict[redPacketID] = grabRecordDict
- if len(grabRecordDict) == packetCnt:
+ if len(grabRecordDict) >= packetCnt:
redPacketRecData.SetValue4(State_HasAllGot)
#通知该玩家红包抢结果
@@ -804,11 +813,17 @@
if curPlayer.GetPlayerID() in grabHeroIDList:
state = State_HasGot
+ if sendPack.IsAll and state in [State_HasGot, State_HasAllGot]:
+ #GameWorld.DebugLog("已抢或抢完的不发: RedPacketID=%s,state=%s" % (packetInfo.RedPacketID, state))
+ continue
packetInfo.State = state
packetInfo.PacketCnt = int(packetData.GetStrValue2())
packetInfo.Wish = packetData.GetStrValue3()
sendPack.RedPacketInfo.append(packetInfo)
+ if len(sendPack.RedPacketInfo) > 250:
+ #GameWorld.DebugLog("红包太多了!")
+ break
sendPack.Count = len(sendPack.RedPacketInfo)
NetPackCommon.SendFakePack(curPlayer, sendPack)
--
Gitblit v1.8.0