ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_GameObj.py
@@ -1637,6 +1637,7 @@
    def GetGMOperManager(self): return _IPY_GameObj.IPY_Player_GetGMOperManager(self)
    def GetIsConfronting(self): return _IPY_GameObj.IPY_Player_GetIsConfronting(self)
    def SetIsConfronting(self, *args): return _IPY_GameObj.IPY_Player_SetIsConfronting(self, *args)
    def SetForbiddenSyncClientState(self, *args): return _IPY_GameObj.IPY_Player_SetForbiddenSyncClientState(self, *args)
    def GetGMForbidenFight(self): return _IPY_GameObj.IPY_Player_GetGMForbidenFight(self)
    def SetGMForbidenFight(self, *args): return _IPY_GameObj.IPY_Player_SetGMForbidenFight(self, *args)
    def GetGMForbidenTalk(self): return _IPY_GameObj.IPY_Player_GetGMForbidenTalk(self)
@@ -1905,6 +1906,7 @@
    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 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)