From 4522a07fe53f63a2ff97701ee6a166e80e329181 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 二月 2019 12:01:09 +0800
Subject: [PATCH] 6249 【后端】【2.0】拍卖行（拍卖物品表、拍卖记录表定义）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_GameObj.py | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_GameObj.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_GameObj.py
index b6002bb..d203c93 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_GameObj.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_GameObj.py
@@ -1903,10 +1903,12 @@
def GetOrderAmount(self): return _IPY_GameObj.IPY_Player_GetOrderAmount(self)
def SendDBFinishRecharge(self, *args): return _IPY_GameObj.IPY_Player_SendDBFinishRecharge(self, *args)
def SendDBQueryRecharge(self): return _IPY_GameObj.IPY_Player_SendDBQueryRecharge(self)
+ def GetMergePlayerData(self): return _IPY_GameObj.IPY_Player_GetMergePlayerData(self)
def SendMergeRegisterPlayer(self, selectMapID = 0, selectDataMapID = 0, selectCopyMapID = 0,
selectPosX = 0, selectPosY = 0): return _IPY_GameObj.IPY_Player_SendMergeRegisterPlayer(self, selectMapID, selectDataMapID, selectCopyMapID, selectPosX,
selectPosY)
def SendMergeRegisterPlayerAfterChange(self, *args): return _IPY_GameObj.IPY_Player_SendMergeRegisterPlayerAfterChange(self, *args)
+ def SendMergePlayerData(self, *args): return _IPY_GameObj.IPY_Player_SendMergePlayerData(self, *args)
def SendMergeQueryNewAccount(self): return _IPY_GameObj.IPY_Player_SendMergeQueryNewAccount(self)
def SetPlayerName(self, *args): return _IPY_GameObj.IPY_Player_SetPlayerName(self, *args)
def UpdatePlayerNameResult(self, *args): return _IPY_GameObj.IPY_Player_UpdatePlayerNameResult(self, *args)
@@ -2395,6 +2397,8 @@
def FindPetByID(self, *args): return _IPY_GameObj.IPY_GameNPCManager_FindPetByID(self, *args)
def GetNPCByIndex(self, *args): return _IPY_GameObj.IPY_GameNPCManager_GetNPCByIndex(self, *args)
def GetNPCCount(self): return _IPY_GameObj.IPY_GameNPCManager_GetNPCCount(self)
+ def GetNPCByIndexByGWIndex(self, *args): return _IPY_GameObj.IPY_GameNPCManager_GetNPCByIndexByGWIndex(self, *args)
+ def GetNPCCountByGWIndex(self, *args): return _IPY_GameObj.IPY_GameNPCManager_GetNPCCountByGWIndex(self, *args)
def GetActiveNPCByIndex(self, *args): return _IPY_GameObj.IPY_GameNPCManager_GetActiveNPCByIndex(self, *args)
def GetActiveNPCCount(self): return _IPY_GameObj.IPY_GameNPCManager_GetActiveNPCCount(self)
def FindNPCByID(self, *args): return _IPY_GameObj.IPY_GameNPCManager_FindNPCByID(self, *args)
--
Gitblit v1.8.0