From a54fba3894b5d528bed16147f096b6a706a1fc0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 六月 2019 15:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/IPY_PlayerDefine.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_PlayerDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_PlayerDefine.py
index e0bc6be..99becc1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IPY_PlayerDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IPY_PlayerDefine.py
@@ -269,6 +269,8 @@
 psFemale = _IPY_PlayerDefine.psFemale
 gitNormal = _IPY_PlayerDefine.gitNormal
 gitFreeSDK = _IPY_PlayerDefine.gitFreeSDK
+gitMRGame = _IPY_PlayerDefine.gitMRGame
+gitSPGame = _IPY_PlayerDefine.gitSPGame
 gitFaceBook = _IPY_PlayerDefine.gitFaceBook
 gitToken = _IPY_PlayerDefine.gitToken
 gitMax = _IPY_PlayerDefine.gitMax
@@ -967,6 +969,8 @@
 fbtAllByCountry = _IPY_PlayerDefine.fbtAllByCountry
 fbtAll = _IPY_PlayerDefine.fbtAll
 fbtVsRoom = _IPY_PlayerDefine.fbtVsRoom
+fbtCrossVSRoom = _IPY_PlayerDefine.fbtCrossVSRoom
+fbtCrossAll = _IPY_PlayerDefine.fbtCrossAll
 vftNull = _IPY_PlayerDefine.vftNull
 vftViewAll = _IPY_PlayerDefine.vftViewAll
 vftFamilyWar = _IPY_PlayerDefine.vftFamilyWar

--
Gitblit v1.8.0