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/PlayerUniversalGameRec.py | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerUniversalGameRec.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerUniversalGameRec.py
index 2d3c890..865ffdb 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerUniversalGameRec.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerUniversalGameRec.py
@@ -35,6 +35,7 @@
import ShareDefine
import ChPyNetSendPack
import NetPackCommon
+import PlayerControl
import time
#---------------------------------------------------------------------
@@ -45,7 +46,7 @@
@param recType: 记录类型
@param valueList: [Value1,...,Value5]
@param strValueList: [StrValue1, StrValue2, StrValue3]
- @param notifyType: 0-不通知; 1-通知本人; 2-通知全服
+ @param notifyType: 0-不通知; 1-通知本人; 2-通知全服;3-通知本人单条;4-通知全服单条
@param isSort: 删除时是否需要先排序, 默认是
'''
if recType not in ShareDefine.Def_UniversalGameRecTypeList:
@@ -109,6 +110,10 @@
SendUniversalGameRecInfo(curPlayer, recType)
elif notifyType == 2:
SendUniversalGameRecInfo(None, recType)
+ elif notifyType == 3:
+ SendUniversalGameRecSingle(curPlayer, recObj)
+ elif notifyType == 4:
+ SendUniversalGameRecSingle(None, recObj)
return recObj
@@ -271,7 +276,7 @@
playerManager = GameWorld.GetPlayerManager()
for i in range(0, playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
- if curPlayer == None or not curPlayer.GetInitOK():
+ if curPlayer == None or not curPlayer.GetInitOK() or PlayerControl.GetIsTJG(curPlayer):
continue
NetPackCommon.SendFakePack(curPlayer, universalGameRecInfo)
--
Gitblit v1.8.0