ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_GameObj.py
@@ -1903,9 +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)
@@ -2394,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)