From a6dea7e613db9663d62fac3028bc04842f27282f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 九月 2018 15:24:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalkByIP.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalk.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTUnForbidTalk.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalk.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py | 6 ++++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTForbidTalk.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 5 ++++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalkByIP.py | 2 +-
Tool/VoiceApp/webapp.py | 6 ++----
11 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py
index a118afe..f39b17a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py
@@ -380,7 +380,8 @@
lineID = FBCommon.GetFBPropertyMark()
leaveTick = invadeCfg[Def_Time_Leave] * 1000
overDict = {FBCommon.Over_costTime:costTime,FBCommon.Over_grade:curStar, FBCommon.Over_leaderID:leaderPlayerID}
- for i in xrange(copyMapPlayerManager.GetPlayerCount()):
+ playerCnt = copyMapPlayerManager.GetPlayerCount()
+ for i in xrange(playerCnt):
curPlayer = copyMapPlayerManager.GetPlayerByIndex(i)
@@ -408,7 +409,8 @@
if realmIpyData and realmIpyData.GetIsBigRealm():
#成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DujieFBHelpPass, 1)
-
+ if playerCnt > 1: #多人组队渡劫
+ EventShell.EventRespons_FBEvent(curPlayer, 'teamdujie')
return
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 b295e14..cf37216 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -554,7 +554,10 @@
tjgTime = PlayerTJG.GetTJGTime(curPlayer)
if tjgTime:
curPlayer.SendGameServerRefreshState(IPY_GameWorld.CDBPlayerRefresh_HappyPoint, tjgTime)
-
+
+ # 如果被禁言的，上线同步前端
+ if curPlayer.GetGMForbidenTalk():
+ curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, curPlayer.GetGMForbidenTalk(), False)
return
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 6a74f27..07322d1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -5524,6 +5524,7 @@
def SetGMForbidenTalk(curPlayer, value):
curPlayer.SetGMForbidenTalk(value)
curPlayer.SendGameServerRefreshState(ShareDefine.CDBPlayerRefresh_ForbidenTalk, value)
+ curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, value, False)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
index fac69d7..0272c4d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
@@ -261,7 +261,7 @@
def __CheckTalk(curPlayer, content, length, tick, checkGMForbidenTalk = True, checkSameMsg = True):
if checkGMForbidenTalk and GetGMToolForbidTalk(curPlayer):
#GeRen_chenxin_921745 对不起，您已被GM禁言，发送信息失败
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_921745")
+ #PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_921745")
return False
#间隔时间
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalk.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalk.py
index c11913e..b76c4f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalk.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalk.py
@@ -46,7 +46,7 @@
curFindPlayer_GMOper.Sync_SaveToDB()
PlayerControl.SetGMForbidenTalk(curFindPlayer, 1)
- PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
+ #PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
return
#---------------------------------------------------------------------
#执行结果
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalkByIP.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalkByIP.py
index 0db65e3..9e2b892 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalkByIP.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalkByIP.py
@@ -42,7 +42,7 @@
#直接禁
PlayerControl.SetGMForbidenTalk(curFindPlayer, 1)
- PlayerControl.NotifyCode(curFindPlayer , "ForbidIP_Talk" )
+ #PlayerControl.NotifyCode(curFindPlayer , "ForbidIP_Talk" )
return
#---------------------------------------------------------------------
## 执行结果
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTForbidTalk.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTForbidTalk.py
index ea524fb..dc32e88 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTForbidTalk.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTForbidTalk.py
@@ -64,7 +64,7 @@
curFindPlayer_GMOper.Sync_SaveToDB()
PlayerControl.SetGMForbidenTalk(curFindPlayer, 1)
- PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
+ #PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
curFindName = curFindPlayer.GetPlayerName()
#流向
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTUnForbidTalk.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTUnForbidTalk.py
index 707f179..d9cac89 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTUnForbidTalk.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTUnForbidTalk.py
@@ -61,7 +61,7 @@
break
PlayerControl.SetGMForbidenTalk(curFindPlayer, 0)
- PlayerControl.NotifyCode(curFindPlayer, "GeRen_liubo_97211")
+ #PlayerControl.NotifyCode(curFindPlayer, "GeRen_liubo_97211")
return ''
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalk.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalk.py
index e9fe581..22298a9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalk.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalk.py
@@ -50,7 +50,7 @@
if result:
PlayerControl.SetGMForbidenTalk(curFindPlayer, 0)
- PlayerControl.NotifyCode(curFindPlayer, "Player_Operate_RegainTalk")
+ #PlayerControl.NotifyCode(curFindPlayer, "Player_Operate_RegainTalk")
return
#---------------------------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalkByIP.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalkByIP.py
index f668bda..6e4b10a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalkByIP.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalkByIP.py
@@ -40,7 +40,7 @@
#直接禁
PlayerControl.SetGMForbidenTalk(curFindPlayer, 0)
- PlayerControl.NotifyCode(curFindPlayer , "RestoreIP_Talk" )
+ #PlayerControl.NotifyCode(curFindPlayer , "RestoreIP_Talk" )
return
#---------------------------------------------------------------------
#执行结果
diff --git a/Tool/VoiceApp/webapp.py b/Tool/VoiceApp/webapp.py
index 3f33ff7..06f42e4 100644
--- a/Tool/VoiceApp/webapp.py
+++ b/Tool/VoiceApp/webapp.py
@@ -61,8 +61,7 @@
keyStr = '%s_%s'%(playerID, voiceID)
curTime = int(time.time())
- if not voiceInfoDict:
- voiceInfoDict = shelve.open('voice.db')
+
if dotype == 'upload': #瀛樺偍
saveData = [curTime, content]
voiceInfoDict[keyStr] = saveData
@@ -107,8 +106,7 @@
def __DelOldVoice():
global voiceInfoDict
- if not voiceInfoDict:
- voiceInfoDict = shelve.open('voice.db')
+
tick = int(time.time())
for voiceKey, voiceData in voiceInfoDict.items():
saveTime = voiceData[0]
--
Gitblit v1.8.0