Mobile & SMS Remove

assets/root/game.py

@@ -691,13 +691,6 @@ class GameWindow(ui.ScriptWindow):
 	def RefreshGuildGradePage(self):
 		self.interface.RefreshGuildGradePage()
 
-	def RefreshMobile(self):
-		if self.interface:
-			self.interface.RefreshMobile()
-
-	def OnMobileAuthority(self):
-		self.interface.OnMobileAuthority()
-
 	def OnBlockMode(self, mode):
 		self.interface.OnBlockMode(mode)
 

assets/root/interfacemodule.py

@@ -617,12 +617,6 @@ class Interface(object):
 		self.wndMessenger.ClearGuildMember()
 		self.wndGuild.DeleteGuild()
 
-	def RefreshMobile(self):
-		self.dlgSystem.RefreshMobile()
-
-	def OnMobileAuthority(self):
-		self.dlgSystem.OnMobileAuthority()
-
 	def OnBlockMode(self, mode):
 		self.dlgSystem.OnBlockMode(mode)
 

assets/root/uigameoption.py

@@ -14,8 +14,6 @@ import interfaceModule #
 blockMode = 0
 viewChatMode = 0
 
-MOBILE = False
-
 class OptionDialog(ui.ScriptWindow):
 
 	def __init__(self):
@@ -83,22 +81,11 @@ class OptionDialog(ui.ScriptWindow):
 			self.showsalesTextButtonList.append(GetObject("salestext_on_button"))
 			self.showsalesTextButtonList.append(GetObject("salestext_off_button"))
 
-			global MOBILE
-			if MOBILE:
-				self.inputMobileButton = GetObject("input_mobile_button")
-				self.deleteMobileButton = GetObject("delete_mobile_button")
-
-
 		except:
 			import exception
 			exception.Abort("OptionDialog.__Load_BindObject")
 
-	def __Load(self):
+		self.__Load_LoadScript("uiscript/gameoptiondialog.py")
-		global MOBILE
-		if MOBILE:
-			self.__Load_LoadScript("uiscript/gameoptiondialog_formobile.py")
-		else:
-			self.__Load_LoadScript("uiscript/gameoptiondialog.py")
 
 		self.__Load_BindObject()
 
@@ -147,11 +134,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.__ClickRadioButton(self.viewTargetBoardButtonList, constInfo.GET_VIEW_OTHER_EMPIRE_PLAYER_TARGET_BOARD())
 		self.__SetPeacePKMode()
 
-		#global MOBILE
-		if MOBILE:
-			self.inputMobileButton.SetEvent(ui.__mem_func__(self.__OnChangeMobilePhoneNumber))
-			self.deleteMobileButton.SetEvent(ui.__mem_func__(self.__OnDeleteMobilePhoneNumber))
-
 	def __ClickRadioButton(self, buttonList, buttonIndex):
 		try:
 			selButton=buttonList[buttonIndex]
@@ -330,67 +312,6 @@ class OptionDialog(ui.ScriptWindow):
 	def OnChangePKMode(self):
 		self.__RefreshPVPButtonList()
 
-	def __OnChangeMobilePhoneNumber(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		import uiCommon
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE)
-		inputDialog.SetMaxLength(13)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
-	def __OnDeleteMobilePhoneNumber(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		import uiCommon
-		questionDialog = uiCommon.QuestionDialog()
-		questionDialog.SetText(localeInfo.MESSENGER_DO_YOU_DELETE_PHONE_NUMBER)
-		questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnDeleteMobile))
-		questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseQuestionDialog))
-		questionDialog.Open()
-		self.questionDialog = questionDialog
-
-	def OnInputMobilePhoneNumber(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		text.replace('-', '')
-		net.SendChatPacket("/mobile " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnInputMobileAuthorityCode(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-		net.SendChatPacket("/mobile_auth " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnDeleteMobile(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		net.SendChatPacket("/mobile")
-		self.OnCloseQuestionDialog()
-		return True
-
 	def OnCloseInputDialog(self):
 		self.inputDialog.Close()
 		self.inputDialog = None
@@ -405,34 +326,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.Close()
 		return True
 
-	def RefreshMobile(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		if player.HasMobilePhoneNumber():
-			self.inputMobileButton.Hide()
-			self.deleteMobileButton.Show()
-		else:
-			self.inputMobileButton.Show()
-			self.deleteMobileButton.Hide()
-
-	def OnMobileAuthority(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		import uiCommon
-		inputDialog = uiCommon.InputDialogWithDescription()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_TITLE)
-		inputDialog.SetDescription(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_DESCRIPTION)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileAuthorityCode))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.SetMaxLength(4)
-		inputDialog.SetBoardWidth(310)
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
 	def RefreshBlock(self):
 		global blockMode
 		for i in xrange(len(self.blockButtonList)):
@@ -479,7 +372,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.RefreshBlock()
 
 	def Show(self):
-		self.RefreshMobile()
 		self.RefreshBlock()
 		ui.ScriptWindow.Show(self)
 

assets/root/uimessenger.py

@@ -71,15 +71,9 @@ class MessengerItem(ui.Window):
 	def IsOnline(self):
 		return False
 
-	def IsMobile(self):
-		return False
-
 	def OnWhisper(self):
 		pass
 
-	def OnMobileMessage(self):
-		pass
-
 	# Remove
 	def CanRemove(self):
 		return False
@@ -123,17 +117,14 @@ class MessengerMemberItem(MessengerItem):
 
 	STATE_OFFLINE = 0
 	STATE_ONLINE = 1
-	STATE_MOBILE = 2
 
 	IMAGE_FILE_NAME = {	"ONLINE" : "d:/ymir work/ui/game/windows/messenger_list_online.sub",
-						"OFFLINE" : "d:/ymir work/ui/game/windows/messenger_list_offline.sub",
+						"OFFLINE" : "d:/ymir work/ui/game/windows/messenger_list_offline.sub", }
-						"MOBILE" : "d:/ymir work/ui/game/windows/messenger_list_mobile.sub", }
 
 	def __init__(self, getParentEvent):
 		MessengerItem.__init__(self, getParentEvent)
 		self.key = None
 		self.state = self.STATE_OFFLINE
-		self.mobileFlag = False
 		self.Offline()
 
 	def GetStepWidth(self):
@@ -151,30 +142,13 @@ class MessengerMemberItem(MessengerItem):
 
 		return False
 
-	def IsMobile(self):
-		if self.STATE_MOBILE == self.state:
-			return True
-
-		return False
-
 	def Online(self):
 		self.image.LoadImage(self.IMAGE_FILE_NAME["ONLINE"])
 		self.state = self.STATE_ONLINE
 
 	def Offline(self):
-		if self.mobileFlag:
+		self.image.LoadImage(self.IMAGE_FILE_NAME["OFFLINE"])
-			self.image.LoadImage(self.IMAGE_FILE_NAME["MOBILE"])
+		self.state = self.STATE_OFFLINE
-			self.state = self.STATE_MOBILE
-
-		else:
-			self.image.LoadImage(self.IMAGE_FILE_NAME["OFFLINE"])
-			self.state = self.STATE_OFFLINE
-
-	def SetMobile(self, flag):
-		self.mobileFlag = flag
-
-		if not self.IsOnline():
-			self.Offline()
 
 	def CanWhisper(self):
 		if self.IsOnline():
@@ -186,15 +160,6 @@ class MessengerMemberItem(MessengerItem):
 		if self.IsOnline():
 			self.getParentEvent().whisperButtonEvent(self.GetName())
 
-	def OnMobileMessage(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		if not self.IsMobile():
-			return
-
-		self.getParentEvent().SendMobileMessage(self.GetName())
-
 	def Select(self):
 		MessengerItem.Select(self)
 
@@ -370,8 +335,6 @@ class MessengerWindow(ui.ScriptWindow):
 
 		self.showingPageSize = 0
 		self.startLine = 0
-		self.hasMobilePhoneNumber = True
-
 		self.isLoaded = 0
 
 		self.__AddGroup()
@@ -404,7 +367,6 @@ class MessengerWindow(ui.ScriptWindow):
 			self.board = self.GetChild("board")
 			self.scrollBar = self.GetChild("ScrollBar")
 			self.whisperButton = self.GetChild("WhisperButton")
-			self.mobileButton = self.GetChild("MobileButton")
 			self.removeButton = self.GetChild("RemoveButton")
 			self.addFriendButton = self.GetChild("AddFriendButton")
 			self.guildButton = self.GetChild("GuildButton")
@@ -415,22 +377,16 @@ class MessengerWindow(ui.ScriptWindow):
 		self.board.SetCloseEvent(ui.__mem_func__(self.Close))
 		self.scrollBar.SetScrollEvent(ui.__mem_func__(self.OnScroll))
 		self.whisperButton.SetEvent(ui.__mem_func__(self.OnPressWhisperButton))
-		self.mobileButton.SetEvent(ui.__mem_func__(self.OnPressMobileButton))
 		self.removeButton.SetEvent(ui.__mem_func__(self.OnPressRemoveButton))
 		self.addFriendButton.SetEvent(ui.__mem_func__(self.OnPressAddFriendButton))
 		self.guildButton.SetEvent(ui.__mem_func__(self.OnPressGuildButton))
 
-		if not uiGameOption.MOBILE: #constInfo.SEND_MOBILE_PHONE_MESSAGE_ENABLE:
+		self.addFriendButton.SetPosition(-60, 30)
-			self.mobileButton.Hide()
+		self.whisperButton.SetPosition(-20, 30)
-			width = self.GetWidth()
+		self.removeButton.SetPosition(20, 30)
-			height = self.GetHeight()
+		self.guildButton.SetPosition(60, 30)
-			self.addFriendButton.SetPosition(-60, 30)
-			self.whisperButton.SetPosition(-20, 30)
-			self.removeButton.SetPosition(20, 30)
-			self.guildButton.SetPosition(60, 30)
 
 		self.whisperButton.Disable()
-		self.mobileButton.Disable()
 		self.removeButton.Disable()
 
 		resizeButton = self.ResizeButton()
@@ -462,7 +418,6 @@ class MessengerWindow(ui.ScriptWindow):
 		self.familyGroup = None
 
 		self.whisperButton = None
-		self.mobileButton = None
 		self.removeButton = None
 
 	def OnCloseQuestionDialog(self):
@@ -551,79 +506,6 @@ class MessengerWindow(ui.ScriptWindow):
 	def SetGuildButtonEvent(self, event):
 		self.guildButtonEvent=event
 
-	def SendMobileMessage(self, name):
-		if not uiGameOption.MOBILE:
-			return
-
-		if not self.hasMobilePhoneNumber:
-			questionDialog = uiCommon.QuestionDialog2()
-			questionDialog.SetText1(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_1)
-			questionDialog.SetText2(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_2)
-			questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnAcceptInputMobilePhoneNumber))
-			questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCancelInputMobilePhoneNumber))
-			questionDialog.SetWidth(400)
-			questionDialog.Open()
-			self.questionDialog = questionDialog
-			return
-
-		## Input Sending Mobile Message
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_SEND_MOBILE_MESSAGE_TITLE)
-		inputDialog.SetMaxLength(50)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileMessage))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.name = name
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
-	def OnAcceptInputMobilePhoneNumber(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		## Input Mobile Phone Number
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE)
-		inputDialog.SetMaxLength(13)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-		self.OnCancelInputMobilePhoneNumber()
-
-	def OnCancelInputMobilePhoneNumber(self):
-		if not uiGameOption.MOBILE:
-			return
-		self.questionDialog.Close()
-		self.questionDialog = None
-		return True
-
-	def OnInputMobilePhoneNumber(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		text.replace('-', '')
-		net.SendChatPacket("/mobile " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnInputMobileMessage(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		net.SendMobileMessagePacket(self.inputDialog.name, text)
-		self.OnCloseInputDialog()
-		return True
-
 	def OnCloseInputDialog(self):
 		self.inputDialog.Close()
 		self.inputDialog = None
@@ -657,10 +539,6 @@ class MessengerWindow(ui.ScriptWindow):
 		if self.selectedItem:
 			self.selectedItem.OnWhisper()
 
-	def OnPressMobileButton(self):
-		if self.selectedItem:
-			self.selectedItem.OnMobileMessage()
-
 	def OnPressRemoveButton(self):
 		if self.selectedItem:
 			if self.selectedItem.CanRemove():
@@ -679,9 +557,7 @@ class MessengerWindow(ui.ScriptWindow):
 				self.selectedItem = None
 
 				self.whisperButton.Disable()
-				self.mobileButton.Disable()
 				self.removeButton.Disable()
-
 				self.OnRefreshList()
 
 		self.OnCloseQuestionDialog()
@@ -715,11 +591,6 @@ class MessengerWindow(ui.ScriptWindow):
 			else:
 				self.whisperButton.Disable()
 
-			if self.selectedItem.IsMobile():
-				self.mobileButton.Enable()
-			else:
-				self.mobileButton.Disable()
-
 			if self.selectedItem.CanRemove():
 				self.removeButton.Enable()
 			else:
@@ -733,9 +604,6 @@ class MessengerWindow(ui.ScriptWindow):
 		if self.selectedItem.IsOnline():
 			self.OnPressWhisperButton()
 
-		elif self.selectedItem.IsMobile():
-			self.OnPressMobileButton()
-
 	def GetSelf(self):
 		return self
 
@@ -795,7 +663,6 @@ class MessengerWindow(ui.ScriptWindow):
 
 			# Optional: also disable buttons to mirror local delete flow
 			self.whisperButton.Disable()
-			self.mobileButton.Disable()
 			self.removeButton.Disable()
 
 		member.Hide()
@@ -826,14 +693,6 @@ class MessengerWindow(ui.ScriptWindow):
 		member.Offline()
 		self.OnRefreshList()
 
-	def OnMobile(self, groupIndex, key, mobileFlag):
-		group = self.groupList[groupIndex]
-		member = group.FindMember(key)
-		if not member:
-			return
-		member.SetMobile(mobileFlag)
-		self.OnRefreshList()
-
 	def OnAddLover(self, name, lovePoint):
 		if not self.familyGroup:
 			self.__AddFamilyGroup()

assets/root/uioption.py

@@ -9,8 +9,6 @@ import constInfo
 import chrmgr
 import player
 
-MOBILE = False
-
 blockMode = 0
 
 class OptionDialog(ui.ScriptWindow):
@@ -42,16 +40,10 @@ class OptionDialog(ui.ScriptWindow):
 		print " -------------------------------------- DESTROY OPTION DIALOG"
 		
 	def __LoadDialog(self):
-		global NO_MOBILE
-
 		try:
 			pyScriptLoader = ui.PythonScriptLoader()
+			pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog.py")
 
-			if MOBILE:
-				pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog_formobile.py")
-			else:
-				pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog.py")
-				
 		except:
 			import exception
 			exception.Abort("OptionDialog.__LoadDialog.LoadObject")
@@ -79,10 +71,6 @@ class OptionDialog(ui.ScriptWindow):
 			self.blockButtonList.append(GetObject("block_guild_button"))
 			self.blockButtonList.append(GetObject("block_whisper_button"))
 			self.blockButtonList.append(GetObject("block_friend_button"))
-
-			if MOBILE:
-				self.inputMobileButton = GetObject("input_mobile_button")
-				self.deleteMobileButton = GetObject("delete_mobile_button")
 				
 		except:
 			import exception
@@ -131,10 +119,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.__ClickRadioButton(self.viewTargetBoardButtonList, constInfo.GET_VIEW_OTHER_EMPIRE_PLAYER_TARGET_BOARD())
 		self.__SetPeacePKMode()
 
-		if MOBILE:
-			self.inputMobileButton.SetEvent(ui.__mem_func__(self.__OnChangeMobilePhoneNumber))
-			self.deleteMobileButton.SetEvent(ui.__mem_func__(self.__OnDeleteMobilePhoneNumber))
-
 	def __ClickRadioButton(self, buttonList, buttonIndex):
 		try:
 			selButton=buttonList[buttonIndex]
@@ -291,48 +275,6 @@ class OptionDialog(ui.ScriptWindow):
 		snd.SetSoundVolume(pos)
 		systemSetting.SetSoundVolume(pos)
 
-	def __OnChangeMobilePhoneNumber(self):
-
-		import uiCommon
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE)
-		inputDialog.SetMaxLength(13)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
-	def __OnDeleteMobilePhoneNumber(self):
-		import uiCommon
-		questionDialog = uiCommon.QuestionDialog()
-		questionDialog.SetText(localeInfo.MESSENGER_DO_YOU_DELETE_PHONE_NUMBER)
-		questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnDeleteMobile))
-		questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseQuestionDialog))
-		questionDialog.Open()
-		self.questionDialog = questionDialog
-
-	def OnInputMobilePhoneNumber(self):
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		text.replace('-', '')
-		net.SendChatPacket("/mobile " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnInputMobileAuthorityCode(self):
-		text = self.inputDialog.GetText()
-		net.SendChatPacket("/mobile_auth " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnDeleteMobile(self):
-		net.SendChatPacket("/mobile")
-		self.OnCloseQuestionDialog()
-		return True
-
 	def OnCloseInputDialog(self):
 		self.inputDialog.Close()
 		self.inputDialog = None
@@ -347,30 +289,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.Close()
 		return True
 
-	def RefreshMobile(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		if player.HasMobilePhoneNumber():
-			self.inputMobileButton.Hide()
-			self.deleteMobileButton.Show()
-		else:
-			self.inputMobileButton.Show()
-			self.deleteMobileButton.Hide()
-
-	def OnMobileAuthority(self):
-		import uiCommon
-		inputDialog = uiCommon.InputDialogWithDescription()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_TITLE)
-		inputDialog.SetDescription(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_DESCRIPTION)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileAuthorityCode))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.SetMaxLength(4)
-		inputDialog.SetBoardWidth(310)
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
 	def RefreshBlock(self):
 		global blockMode
 		for i in xrange(len(self.blockButtonList)):
@@ -385,7 +303,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.RefreshBlock()
 
 	def Show(self):
-		self.RefreshMobile()
 		self.RefreshBlock()
 		ui.ScriptWindow.Show(self)
 

assets/root/uisystem.py

@@ -130,16 +130,6 @@ class SystemDialog(ui.ScriptWindow):
 		self.Hide()
 		return True
 
-	def RefreshMobile(self):
-		if self.gameOptionDlg:
-			self.gameOptionDlg.RefreshMobile()
-		#self.optionDialog.RefreshMobile()
-
-	def OnMobileAuthority(self):
-		if self.gameOptionDlg:
-			self.gameOptionDlg.OnMobileAuthority()
-		#self.optionDialog.OnMobileAuthority()
-
 	def OnBlockMode(self, mode):
 		uiGameOption.blockMode = mode
 		if self.gameOptionDlg:

assets/uiscript/uiscript/gameoptiondialog_formobile.py

@@ -1,479 +0,0 @@
-import uiScriptLocale
-
-ROOT_PATH = "d:/ymir work/ui/public/"
-
-TEMPORARY_X = +13
-BUTTON_TEMPORARY_X = 5
-PVP_X = -10
-
-LINE_LABEL_X 	= 30
-LINE_DATA_X 	= 90
-LINE_STEP	= 0
-SMALL_BUTTON_WIDTH 	= 45
-MIDDLE_BUTTON_WIDTH 	= 65
-
-window = {
-	"name" : "GameOptionDialog",
-	"style" : ("movable", "float",),
-
-	"x" : 0,
-	"y" : 0,
-
-	"width" : 300,
-	"height" : (258+25),
-
-	"children" :
-	(
-		{
-			"name" : "board",
-			"type" : "board",
-
-			"x" : 0,
-			"y" : 0,
-
-			"width" : 300,
-			"height" : 25*12+8,
-
-			"children" :
-			(
-				## Title
-				{
-					"name" : "titlebar",
-					"type" : "titlebar",
-					"style" : ("attach",),
-
-					"x" : 8,
-					"y" : 8,
-
-					"width" : 284,
-					"color" : "gray",
-
-					"children" :
-					(
-						{ "name":"titlename", "type":"text", "x":0, "y":3, 
-						"text" : uiScriptLocale.GAMEOPTION_TITLE, 
-						"horizontal_align":"center", "text_horizontal_align":"center" },
-					),
-				},
-
-				## À̸§»ö
-				{
-					"name" : "name_color",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 40+2,
-
-					"text" : uiScriptLocale.OPTION_NAME_COLOR,
-				},
-				{
-					"name" : "name_color_normal",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 40,
-
-					"text" : uiScriptLocale.OPTION_NAME_COLOR_NORMAL,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-				{
-					"name" : "name_color_empire",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 40,
-
-					"text" : uiScriptLocale.OPTION_NAME_COLOR_EMPIRE,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-
-				## Ÿ°Ùâ
-				{
-					"name" : "target_board",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 65+2,
-
-					"text" : uiScriptLocale.OPTION_TARGET_BOARD,
-				},
-				{
-					"name" : "target_board_no_view",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 65,
-
-					"text" : uiScriptLocale.OPTION_TARGET_BOARD_NO_VIEW,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-				{
-					"name" : "target_board_view",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 65,
-
-					"text" : uiScriptLocale.OPTION_TARGET_BOARD_VIEW,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-
-				
-				## PvP Mode
-				{
-					"name" : "pvp_mode",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 90+2,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE,
-				},
-				{
-					"name" : "pvp_peace",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*0,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_PEACE,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_PEACE_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-				{
-					"name" : "pvp_revenge",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*1,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_REVENGE,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_REVENGE_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-				{
-					"name" : "pvp_guild",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*2,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_GUILD,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_GUILD_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-				{
-					"name" : "pvp_free",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*3,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_FREE,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_FREE_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-
-				## Block
-				{
-					"name" : "block",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 115+2,
-
-					"text" : uiScriptLocale.OPTION_BLOCK,
-				},
-				{
-					"name" : "block_exchange_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 115,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_EXCHANGE,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_party_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 115,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_PARTY,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_guild_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*2,
-					"y" : 115,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_GUILD,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_whisper_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 140,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_WHISPER,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_friend_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 140,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_FRIEND,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_party_request_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*2,
-					"y" : 140,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_PARTY_REQUEST,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-
-				## Chat
-				{
-					"name" : "chat",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 165+2,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT,
-				},
-				{
-					"name" : "view_chat_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 165,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "view_chat_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 165,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-
-				## Always Show Name
-				{
-					"name" : "always_show_name",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 190+2,
-
-					"text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME,
-				},
-				{
-					"name" : "always_show_name_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 190,
-
-					"text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "always_show_name_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 190,
-
-					"text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-
-				## Mobile
-				{
-					"name" : "mobile",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 215+2,
-
-					"text" : uiScriptLocale.OPTION_MOBILE,
-				},
-				{
-					"name" : "input_mobile_button",
-					"type" : "button",
-
-					"x" : LINE_DATA_X,
-					"y" : 215,
-
-					"text" : uiScriptLocale.OPTION_INPUT_MOBILE_BUTTON,
-
-					"default_image" : ROOT_PATH + "Large_Button_01.sub",
-					"over_image" : ROOT_PATH + "Large_Button_02.sub",
-					"down_image" : ROOT_PATH + "Large_Button_03.sub",
-				},
-				{
-					"name" : "delete_mobile_button",
-					"type" : "button",
-
-					"x" : 90,
-					"y" : 215,
-
-					"text" : uiScriptLocale.OPTION_DELETE_MOBILE_BUTTON,
-
-					"default_image" : ROOT_PATH + "Large_Button_01.sub",
-					"over_image" : ROOT_PATH + "Large_Button_02.sub",
-					"down_image" : ROOT_PATH + "Large_Button_03.sub",
-				},
-
-				## Effect On/Off
-				{
-					"name" : "effect_on_off",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 240+2,
-
-					"text" : uiScriptLocale.OPTION_EFFECT,
-				},
-				{
-					"name" : "show_damage_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 240,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "show_damage_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 240,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				
-			## ÆǸŹ®±¸
-				
-				{
-					"name" : "salestext_on_off",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 265+2,
-
-					"text" : uiScriptLocale.OPTION_SALESTEXT,
-				},
-				{
-					"name" : "salestext_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 265,
-
-					"text" : uiScriptLocale.OPTION_SALESTEXT_VIEW_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "salestext_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 265,
-
-					"text" : uiScriptLocale.OPTION_SALESTEXT_VIEW_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},				
-
-			),
-		},
-	),
-}

assets/uiscript/uiscript/messengerwindow.py

@@ -56,6 +56,7 @@ window = {
 			"down_image" : "d:/ymir work/ui/game/windows/messenger_add_friend_03.sub",
 			"disable_image" : "d:/ymir work/ui/game/windows/messenger_add_friend_04.sub",
 		},
+
 		{
 			"name" : "WhisperButton",
 			"type" : "button",
@@ -73,28 +74,12 @@ window = {
 			"down_image" : "d:/ymir work/ui/game/windows/messenger_whisper_03.sub",
 			"disable_image" : "d:/ymir work/ui/game/windows/messenger_whisper_04.sub",
 		},
-		{
-			"name" : "MobileButton",
-			"type" : "button",
 
-			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*2,
-			"y" : 30,
-			"horizontal_align" : "center",
-			"vertical_align" : "bottom",
-			"tooltip_text" : uiScriptLocale.MESSENGER_MOBILE,
-			"tooltip_x" : 0,
-			"tooltip_y" : 35,
-
-			"default_image" : "d:/ymir work/ui/game/windows/messenger_mobile_01.sub",
-			"over_image" : "d:/ymir work/ui/game/windows/messenger_mobile_02.sub",
-			"down_image" : "d:/ymir work/ui/game/windows/messenger_mobile_03.sub",
-			"disable_image" : "d:/ymir work/ui/game/windows/messenger_mobile_04.sub",
-		},
 		{
 			"name" : "RemoveButton",
 			"type" : "button",
 
-			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*3,
+			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*2,
 			"y" : 30,
 			"horizontal_align" : "center",
 			"vertical_align" : "bottom",
@@ -107,11 +92,12 @@ window = {
 			"down_image" : "d:/ymir work/ui/game/windows/messenger_delete_03.sub",
 			"disable_image" : "d:/ymir work/ui/game/windows/messenger_delete_04.sub",
 		},
+
 		{
 			"name" : "GuildButton",
 			"type" : "button",
 
-			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*4,
+			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*3,
 			"y" : 30,
 			"horizontal_align" : "center",
 			"vertical_align" : "bottom",
@@ -125,5 +111,5 @@ window = {
 			"disable_image" : "d:/ymir work/ui/game/windows/messenger_guild_04.sub",
 		},
 
-	), ## end of main window
+	),
-}
+}