From 023ac4a624af7205b7c295f47f73091c218cbf8d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 27 十一月 2018 21:53:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 11 ++++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py | 28 ++++---------
ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.py | 11 -----
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 11 ++++-
4 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 0985258..3e87679 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -24491,6 +24491,7 @@
CallPlayerID = 0 #(DWORD CallPlayerID)// 助战的玩家ID，有值时代表真实助战，没有值时为自己打的
NameLen = 0 #(BYTE NameLen)
CallPlayerName = "" #(String CallPlayerName)// 助战的玩家名，size = NameLen
+ Reason = 0 #(BYTE Reason)//仙缘币为0时的原因：1-助战次数上限；2-每日获得上限
data = None
def __init__(self):
@@ -24508,6 +24509,7 @@
self.CallPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.CallPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ self.Reason,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -24521,6 +24523,7 @@
self.CallPlayerID = 0
self.NameLen = 0
self.CallPlayerName = ""
+ self.Reason = 0
return
def GetLength(self):
@@ -24532,6 +24535,7 @@
length += 4
length += 1
length += len(self.CallPlayerName)
+ length += 1
return length
@@ -24544,6 +24548,7 @@
data = CommFunc.WriteDWORD(data, self.CallPlayerID)
data = CommFunc.WriteBYTE(data, self.NameLen)
data = CommFunc.WriteString(data, self.NameLen, self.CallPlayerName)
+ data = CommFunc.WriteBYTE(data, self.Reason)
return data
def OutputString(self):
@@ -24554,7 +24559,8 @@
XianyuanCoinAdd:%d,
CallPlayerID:%d,
NameLen:%d,
- CallPlayerName:%s
+ CallPlayerName:%s,
+ Reason:%d
'''\
%(
self.Head.OutputString(),
@@ -24563,7 +24569,8 @@
self.XianyuanCoinAdd,
self.CallPlayerID,
self.NameLen,
- self.CallPlayerName
+ self.CallPlayerName,
+ self.Reason
)
return DumpString
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.py
index 2b8cd1e..4a6c378 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.py
@@ -33,21 +33,12 @@
if not gmList or len(gmList) < 2:
GameWorld.DebugAnswer(curPlayer, "-------------------------------")
GameWorld.DebugAnswer(curPlayer, "查看登记信息: HelpCheckInInfo")
- GameWorld.DebugAnswer(curPlayer, "设置已登记次数: HelpCheckInInfo 1 x")
- GameWorld.DebugAnswer(curPlayer, "设置今日仙缘币: HelpCheckInInfo 2 x")
GameWorld.DebugAnswer(curPlayer, "设置今日助战数: HelpCheckInInfo 地图 线路 次数")
__PrintCheckInInfo(curPlayer, helpBattlePlayer)
return
- setType = gmList[0]
- if setType == 1:
- helpBattlePlayer.checkInCount = gmList[1]
- GameWorld.DebugAnswer(curPlayer, "设置登记次数: %s" % helpBattlePlayer.checkInCount)
- elif setType == 2:
- helpBattlePlayer.todayXianyuanCoin = gmList[1]
- GameWorld.DebugAnswer(curPlayer, "设置今日仙缘币: %s" % helpBattlePlayer.todayXianyuanCoin)
- elif len(gmList) == 3:
+ if len(gmList) == 3:
mapID, lineID, helpCount = gmList
helpBattlePlayer.todayHelpCountDict[(mapID, lineID)] = helpCount
GameWorld.DebugAnswer(curPlayer, "设置今日助战数: %s" % helpBattlePlayer.todayHelpCountDict)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 0985258..3e87679 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -24491,6 +24491,7 @@
CallPlayerID = 0 #(DWORD CallPlayerID)// 助战的玩家ID，有值时代表真实助战，没有值时为自己打的
NameLen = 0 #(BYTE NameLen)
CallPlayerName = "" #(String CallPlayerName)// 助战的玩家名，size = NameLen
+ Reason = 0 #(BYTE Reason)//仙缘币为0时的原因：1-助战次数上限；2-每日获得上限
data = None
def __init__(self):
@@ -24508,6 +24509,7 @@
self.CallPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.CallPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ self.Reason,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -24521,6 +24523,7 @@
self.CallPlayerID = 0
self.NameLen = 0
self.CallPlayerName = ""
+ self.Reason = 0
return
def GetLength(self):
@@ -24532,6 +24535,7 @@
length += 4
length += 1
length += len(self.CallPlayerName)
+ length += 1
return length
@@ -24544,6 +24548,7 @@
data = CommFunc.WriteDWORD(data, self.CallPlayerID)
data = CommFunc.WriteBYTE(data, self.NameLen)
data = CommFunc.WriteString(data, self.NameLen, self.CallPlayerName)
+ data = CommFunc.WriteBYTE(data, self.Reason)
return data
def OutputString(self):
@@ -24554,7 +24559,8 @@
XianyuanCoinAdd:%d,
CallPlayerID:%d,
NameLen:%d,
- CallPlayerName:%s
+ CallPlayerName:%s,
+ Reason:%d
'''\
%(
self.Head.OutputString(),
@@ -24563,7 +24569,8 @@
self.XianyuanCoinAdd,
self.CallPlayerID,
self.NameLen,
- self.CallPlayerName
+ self.CallPlayerName,
+ self.Reason
)
return DumpString
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
index 845519d..64f8809 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
@@ -501,7 +501,15 @@
PlayerControl.AddTodayXianyuanCoin(curPlayer, coinAddReal)
# 通知自己获得仙缘币
- Sync_AddXianyuanCoinMsg(curPlayer, mapID, lineID, coinAddReal, relationPlayerID, relationPlayerName)
+ msgPack = ChPyNetSendPack.tagMCAddXianyuanCoinMsg()
+ msgPack.MapID = mapID
+ msgPack.FuncLineID = lineID
+ msgPack.XianyuanCoinAdd = coinAddReal
+ msgPack.CallPlayerID = relationPlayerID
+ msgPack.CallPlayerName = relationPlayerName
+ msgPack.NameLen = len(msgPack.CallPlayerName)
+ msgPack.Reason = reason
+ NetPackCommon.SendFakePack(curPlayer, msgPack)
return coinAddReal, reason
def __GetTeamFBMemRelationInfo(curPlayer, relationCoinAddDict, isHelp):
@@ -554,22 +562,4 @@
relationAdd += relationAddList[0] if len(relationAddList) == 2 else 0
return relationAdd, relationPlayerID, relationPlayerName
-
-def Sync_AddXianyuanCoinMsg(curPlayer, mapID, funcLineID, addXianyuanCoin, callPlayerID=0, callPlayerName=""):
- '''同步自己主动战斗获得仙缘币信息
- 1. 主动发起通关镜像助战副本，此时 callPlayerID 及 name 为空
- 2. 参与通关真实助战的副本，次数如果自己是助战的，则 callPlayer 及 name 有值
- @param addXianyuanCoin: 增加的仙缘币，可能为0，代表已达本日上限，但是前端扔需要展示记录
- @param callPlayerID: 助战别人时，对方玩家的playerID
- @param callPlayerName: 助战别人时，对方玩家的名字
- '''
- msgPack = ChPyNetSendPack.tagMCAddXianyuanCoinMsg()
- msgPack.MapID = mapID
- msgPack.FuncLineID = funcLineID
- msgPack.XianyuanCoinAdd = addXianyuanCoin
- msgPack.CallPlayerID = callPlayerID
- msgPack.CallPlayerName = callPlayerName
- msgPack.NameLen = len(msgPack.CallPlayerName)
- NetPackCommon.SendFakePack(curPlayer, msgPack)
- return
--
Gitblit v1.8.0