diff --git a/assets/locale/locale/ae/ui/characterwindow.py b/assets/locale/locale/ae/ui/characterwindow.py index 65037dac..37e312e1 100644 --- a/assets/locale/locale/ae/ui/characterwindow.py +++ b/assets/locale/locale/ae/ui/characterwindow.py @@ -230,7 +230,7 @@ window = { { "name" : "Guild_Name", "type":"text", - "text":" ̸", + "text":"길드 이름", "x":0, "y":0, "r":1.0, @@ -255,7 +255,7 @@ window = { { "name" : "Character_Name", "type":"text", - "text":"ij ̸", + "text":"캐릭터 이름", "x":0, "y":0, "r":1.0, @@ -307,16 +307,16 @@ window = { { "name" : "Face_Image", "type" : "image", "x" : 11, "y" : 11, "image" : "d:/ymir work/ui/game/windows/face_warrior.sub" }, { "name" : "Face_Slot", "type" : "image", "x" : 7, "y" : 7, "image" : FACE_SLOT_FILE, }, - ## ⺻ ɷ + ## 기본 능력 { "name":"Status_Standard", "type":"window", "x":3, "y":100, "width":200, "height":250, "children" : ( - ## ⺻ ɷ + ## 기본 능력 제목 { "name":"Character_Bar_01", "type":"horizontalbar", "x":12, "y":8, "width":223, }, { "name":"Character_Bar_01_Text", "type" : "image", "x" : 13, "y" : 9, "image" : LOCALE_PATH+"label_std.sub", }, - ## ɷ ġ + ## 능력 수련 수치 { "name":"Status_Plus_Label", "type":"image", @@ -329,7 +329,7 @@ window = { ), }, - ## ⺻ ɷ Ʈ + ## 기본 능력 아이템 리스트 {"name":"Status_Standard_ItemList1", "type" : "image", "x":17, "y":31, "image" : LOCALE_PATH+"label_std_item1.sub", }, {"name":"Status_Standard_ItemList2", "type" : "image", "x":100, "y":30, "image" : LOCALE_PATH+"label_std_item2.sub", }, @@ -420,21 +420,21 @@ window = { ), }, - ## ΰ ɷ + ## 부가 능력 { "name":"Status_Extent", "type":"window", "x":3, "y":221, "width":200, "height":50, "children" : ( - ## ΰ ɷ + ## 부가 능력 제목 { "name":"Status_Extent_Bar", "type":"horizontalbar", "x":12, "y":6, "width":223, }, { "name":"Status_Extent_Label", "type" : "image", "x" : 13, "y" : 8, "image" : LOCALE_PATH+"label_ext.sub", }, - ## ⺻ ɷ Ʈ + ## 기본 능력 아이템 리스트 {"name":"Status_Extent_ItemList1", "type" : "image", "x":11, "y":31, "image" : LOCALE_PATH+"label_ext_item1.sub", }, {"name":"Status_Extent_ItemList2", "type" : "image", "x":128, "y":32, "image" : LOCALE_PATH+"label_ext_item2.sub", }, - ## MSPD - ̵ ӵ + ## MSPD - 이동 속도 { "name":"MOV_Label", "type":"window", "x":66, "y":33, "width":50, "height":20, "children" : @@ -444,7 +444,7 @@ window = { ) }, - ## ASPD - ӵ + ## ASPD - 공격 속도 { "name":"ASPD_Label", "type":"window", "x":66, "y":33+23, "width":50, "height":20, "children" : @@ -454,7 +454,7 @@ window = { ) }, - ## CSPD - ֹ ӵ + ## CSPD - 주문 속도 { "name":"CSPD_Label", "type":"window", "x":66, "y":33+23*2, "width":50, "height":20, "children" : @@ -464,7 +464,7 @@ window = { ) }, - ## MATT - ݷ + ## MATT - 마법 공격력 { "name":"MATT_Label", "type":"window", "x":183, "y":33, "width":50, "height":20, "children" : @@ -474,7 +474,7 @@ window = { ) }, - ## MDEF - + ## MDEF - 마법 방어력 { "name":"MDEF_Label", "type":"window", "x":183, "y":33+23, "width":50, "height":20, "children" : @@ -484,7 +484,7 @@ window = { ) }, - ## ȸ + ## 회피율 { "name":"ER_Label", "type":"window", "x":183, "y":33+23*2, "width":50, "height":20, "children" : @@ -697,7 +697,7 @@ window = { "children" : ( - ## ⺻ ׼ + ## 기본 액션 제목 { "name":"Action_Bar", "type":"horizontalbar", "x":12, "y":11, "width":223, }, { "name":"Action_Bar_Text", "type":"text", "x":15, "y":13, "text":uiScriptLocale.CHARACTER_NORMAL_ACTION }, @@ -717,7 +717,7 @@ window = { "image" : ICON_SLOT_FILE, }, - ## ȣ ׼ + ## 상호 액션 제목 { "name":"Reaction_Bar", "type":"horizontalbar", "x":12, "y":8+150, "width":223, }, { "name":"Reaction_Bar_Text", "type":"text", "x":15, "y":10+150, "text":uiScriptLocale.CHARACTER_MUTUAL_ACTION }, @@ -775,25 +775,25 @@ window = { "horizontal_align" : "right", }, - { "name" : "Quest_Name_00", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 14 }, - { "name" : "Quest_LastTime_00", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 30 }, - { "name" : "Quest_LastCount_00", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 46 }, + { "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 }, + { "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 }, + { "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 }, - { "name" : "Quest_Name_01", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 74 }, - { "name" : "Quest_LastTime_01", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 90 }, - { "name" : "Quest_LastCount_01", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 106 }, + { "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 }, + { "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 }, + { "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 }, - { "name" : "Quest_Name_02", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 134 }, - { "name" : "Quest_LastTime_02", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 150 }, - { "name" : "Quest_LastCount_02", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 166 }, + { "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 }, + { "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 }, + { "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 }, - { "name" : "Quest_Name_03", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 194 }, - { "name" : "Quest_LastTime_03", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 210 }, - { "name" : "Quest_LastCount_03", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 226 }, + { "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 }, + { "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 }, + { "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 }, - { "name" : "Quest_Name_04", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 254 }, - { "name" : "Quest_LastTime_04", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 270 }, - { "name" : "Quest_LastCount_04", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 286 }, + { "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 }, + { "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 }, + { "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 }, ), }, diff --git a/assets/locale/locale/ae/ui/energybar.py b/assets/locale/locale/ae/ui/energybar.py index c77350a6..50b11e16 100644 --- a/assets/locale/locale/ae/ui/energybar.py +++ b/assets/locale/locale/ae/ui/energybar.py @@ -14,7 +14,7 @@ window = { "children" : ( - # ? + # ±â·? { "name" : "EnergyGauge_Board", "type" : "image", diff --git a/assets/locale/locale/ae/ui/inventorywindow.py b/assets/locale/locale/ae/ui/inventorywindow.py index 82d76903..fabc4d9a 100644 --- a/assets/locale/locale/ae/ui/inventorywindow.py +++ b/assets/locale/locale/ae/ui/inventorywindow.py @@ -6,7 +6,7 @@ EQUIPMENT_START_INDEX = 90 window = { "name" : "InventoryWindow", - ## 600 - (width + 24 px) + ## 600 - (width + 오른쪽으로 부터 띄우기 24 px) "x" : SCREEN_WIDTH - 176, "y" : SCREEN_HEIGHT - 37 - 565, @@ -85,11 +85,11 @@ window = { {"index":EQUIPMENT_START_INDEX+8, "x":75, "y":145, "width":32, "height":32}, {"index":EQUIPMENT_START_INDEX+9, "x":114, "y":2, "width":32, "height":32}, {"index":EQUIPMENT_START_INDEX+10, "x":75, "y":35, "width":32, "height":32}, - ## 1 + ## 새 반지1 # {"index":item.EQUIPMENT_RING1, "x":2, "y":106, "width":32, "height":32}, - ## 2 + ## 새 반지2 # {"index":item.EQUIPMENT_RING2, "x":75, "y":106, "width":32, "height":32}, - ## Ʈ + ## 새 벨트 {"index":item.EQUIPMENT_BELT, "x":39, "y":106, "width":32, "height":32}, ), }, diff --git a/assets/locale/locale/ae/ui/taskbar.py b/assets/locale/locale/ae/ui/taskbar.py index 6e4ae1da..5c27e02b 100644 --- a/assets/locale/locale/ae/ui/taskbar.py +++ b/assets/locale/locale/ae/ui/taskbar.py @@ -107,7 +107,7 @@ window = { ) }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "HPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -153,7 +153,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "SPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -199,7 +199,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "STGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -380,8 +380,8 @@ window = { "children" : ( { - # ExpandButton ChatButton̾, ChatButton ȿ뼺 ǴϿ - # ExpandButton ٲ ̴. + # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 + # ExpandButton으로 바뀐 것이다. "name" : "ExpandButton", "type" : "button", diff --git a/assets/locale/locale/ae/ui/taskbar_easter.py b/assets/locale/locale/ae/ui/taskbar_easter.py index 4f085af9..5c200065 100644 --- a/assets/locale/locale/ae/ui/taskbar_easter.py +++ b/assets/locale/locale/ae/ui/taskbar_easter.py @@ -95,7 +95,7 @@ window = { ) }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "HPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -141,7 +141,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "SPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -187,7 +187,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "STGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -368,8 +368,8 @@ window = { "children" : ( { - # ExpandButton ChatButton̾, ChatButton ȿ뼺 ǴϿ - # ExpandButton ٲ ̴. + # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 + # ExpandButton으로 바뀐 것이다. "name" : "ExpandButton", "type" : "button", diff --git a/assets/locale/locale/ae/ui/taskbar_haloween.py b/assets/locale/locale/ae/ui/taskbar_haloween.py index 330b809a..21eba075 100644 --- a/assets/locale/locale/ae/ui/taskbar_haloween.py +++ b/assets/locale/locale/ae/ui/taskbar_haloween.py @@ -107,7 +107,7 @@ window = { ) }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "HPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -153,7 +153,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "SPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -199,7 +199,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "STGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -380,8 +380,8 @@ window = { "children" : ( { - # ExpandButton ChatButton̾, ChatButton ȿ뼺 ǴϿ - # ExpandButton ٲ ̴. + # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 + # ExpandButton으로 바뀐 것이다. "name" : "ExpandButton", "type" : "button", diff --git a/assets/locale/locale/ae/ui/taskbar_valentine.py b/assets/locale/locale/ae/ui/taskbar_valentine.py index 8944a561..5dda17c7 100644 --- a/assets/locale/locale/ae/ui/taskbar_valentine.py +++ b/assets/locale/locale/ae/ui/taskbar_valentine.py @@ -107,7 +107,7 @@ window = { ) }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "HPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -153,7 +153,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "SPGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -199,7 +199,7 @@ window = { ), }, { - ## + ## 툴팁을 띄우기 위한 윈도우 "name" : "STGauge_Board", "type" : "window", "style" : ("ltr", ), @@ -380,8 +380,8 @@ window = { "children" : ( { - # ExpandButton ChatButton̾, ChatButton ȿ뼺 ǴϿ - # ExpandButton ٲ ̴. + # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 + # ExpandButton으로 바뀐 것이다. "name" : "ExpandButton", "type" : "button", diff --git a/assets/root/introloading.py b/assets/root/introloading.py index 97bd33ba..8604f5ff 100644 --- a/assets/root/introloading.py +++ b/assets/root/introloading.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import ui import uiScriptLocale import net @@ -18,7 +17,7 @@ import stringCommander import emotion #################################### -# ε д +# 빠른 실행을 위한 모듈 로딩 분담 #################################### import uiRefine import uiToolTip @@ -163,7 +162,7 @@ class LoadingWindow(ui.ScriptWindow): self.playerX=playerX self.playerY=playerY - self.__RegisterSkill() ## ε ߰ ϸ ߻ + self.__RegisterSkill() ## 로딩 중간에 실행 하면 문제 발생 self.__RegisterTitleName() self.__RegisterColor() self.__InitData() @@ -184,7 +183,7 @@ class LoadingWindow(ui.ScriptWindow): self.playerY=playerY self.__RegisterDungeonMapName() - self.__RegisterSkill() ## ε ߰ ϸ ߻ + self.__RegisterSkill() ## 로딩 중간에 실행 하면 문제 발생 self.__RegisterTitleName() self.__RegisterColor() self.__RegisterEmotionIcon() @@ -222,7 +221,7 @@ class LoadingWindow(ui.ScriptWindow): self.errMsg.Show() self.loadStepList=[] - ## ̰ syserr.txt . + ## 이곳에서 syserr.txt 를 보낸다. import dbg dbg.TraceError(" !!! Failed to load game data : STEP [%d]" % (progress)) diff --git a/assets/root/introselect.py b/assets/root/introselect.py index 0c916dec..e446ce26 100644 --- a/assets/root/introselect.py +++ b/assets/root/introselect.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import chr import grp import app @@ -17,7 +16,7 @@ import musicInfo import playerSettingModule #################################### -# ε д +# 빠른 실행을 위한 모듈 로딩 분담 #################################### import uiCommon import uiMapNameShower @@ -27,7 +26,7 @@ import uiCharacter import uiTarget import consoleModule -# interface module ... +# interface module이 문제야... import interfaceModule import uiTaskBar import uiInventory @@ -744,7 +743,7 @@ class SelectCharacterWindow(ui.Window): if -1 != self.startIndex: ## Temporary - ## BackGroundLoading ɶ ӽ÷.. + ## BackGroundLoading이 지원 될때까지 임시로.. if app.GetTime() - self.startReservingTime > 3.0: if False == self.openLoadingFlag: chrSlot=self.stream.GetCharacterSlot() @@ -756,7 +755,7 @@ class SelectCharacterWindow(ui.Window): import player player.SetPlayTime(playTime) import chat - chat.Clear() ##  Chat ʱȭ. ӽ Pos. + chat.Clear() ## 들어갈때 Chat 을 초기화. 임시 Pos. ## Temporary ####################################################### diff --git a/assets/root/servercommandparser.py b/assets/root/servercommandparser.py index def89884..6227f132 100644 --- a/assets/root/servercommandparser.py +++ b/assets/root/servercommandparser.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import net import background import stringCommander @@ -45,7 +44,7 @@ class ServerCommandParser(object): def __ItemMall_Open(self): self.__PreserveCommand("item_mall") - ## ӽ + ## 임시 def __XMasBoom_Enable(self, mode): if "1"==mode: self.__PreserveCommand("PRESERVE_DayMode dark") diff --git a/assets/root/uichat.py b/assets/root/uichat.py index 586b3497..ec08edea 100644 --- a/assets/root/uichat.py +++ b/assets/root/uichat.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import ui import grp import chat @@ -37,7 +36,7 @@ class ChatModeButton(ui.Window): def __init__(self): ui.Window.__init__(self) - self.state = None + self.state = self.BUTTON_STATE_UP self.buttonText = None self.event = None self.SetWindowName("ChatModeButton") @@ -87,7 +86,6 @@ class ChatModeButton(ui.Window): self.event() def OnRender(self): - (x, y) = self.GetGlobalPosition() grp.SetColor(self.OUTLINE_COLOR) @@ -604,7 +602,7 @@ class ChatWindow(ui.Window): self.scrollBar = scrollBar self.Refresh() - self.chatInputSet.RefreshPosition() # RTL ġ ġ ʿϴ + self.chatInputSet.RefreshPosition() # RTL 시 위치를 제대로 잡으려면 위치 갱신이 필요하다 def __del__(self): ui.Window.__del__(self) @@ -798,7 +796,7 @@ class ChatWindow(ui.Window): self.Refresh() if self.curHeightBar != self.heightBar: - self.curHeightBar += (self.heightBar - self.curHeightBar) / 10 + self.curHeightBar += (self.heightBar - self.curHeightBar) // 10 if self.boardState == chat.BOARD_STATE_EDIT: grp.SetColor(self.BOARD_MIDDLE_COLOR) @@ -1089,7 +1087,7 @@ class ChatLogWindow(ui.Window): self.chatInputSet.SetSize(self.GetWidth() - 20, 20) self.chatInputSet.RefreshPosition() - self.chatInputSet.SetChatMax(self.GetWidth() / 8) + self.chatInputSet.SetChatMax(self.GetWidth() // 8) def OnScroll(self): self.scrollBarPos = self.scrollBar.GetPos() diff --git a/assets/root/uigameoption.py b/assets/root/uigameoption.py index 939aa813..56919877 100644 --- a/assets/root/uigameoption.py +++ b/assets/root/uigameoption.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import ui import snd import systemSetting @@ -9,8 +8,8 @@ import localeInfo import constInfo import chrmgr import player -import uiPrivateShopBuilder # ����ȣ -import interfaceModule # ����ȣ +import uiPrivateShopBuilder # 占쏙옙占쏙옙호 +import interfaceModule # 占쏙옙占쏙옙호 blockMode = 0 viewChatMode = 0 diff --git a/assets/root/uipointreset.py b/assets/root/uipointreset.py index 2d901220..bc31ad68 100644 --- a/assets/root/uipointreset.py +++ b/assets/root/uipointreset.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import net import ui @@ -31,15 +30,15 @@ class PointResetDialog(ui.ScriptWindow): import exception exception.Abort("PointResetDialog.LoadWindow.BindObject") - self.GetChild("message1").SetText("/ų Ʈ ʱȭְڳ.") - self.GetChild("message2").SetText(" 500̾. , ʱȭٰ?") + self.GetChild("message1").SetText("스탯/스킬 포인트를 초기화해주겠네.") + self.GetChild("message2").SetText("가격은 500원이야. 어때, 초기화할텐가?") self.GetChild("accept").SetEvent(ui.__mem_func__(self.OpenConfirmDialog)) self.GetChild("cancel").SetEvent(ui.__mem_func__(self.Close)) ## Confirm Dialog - self.ConfirmText.SetText(" ġ ٳ.") + self.ConfirmText.SetText("현재 레벨의 경험치가 모두 없어진다네.") self.ConfirmText.SetFontColor(1.0, 0.3, 0.3) - self.ConfirmText2.SetText(" ʱȭϰ ?") + self.ConfirmText2.SetText("정말 초기화하고 싶은가?") self.ConfirmAcceptButton.SetEvent(ui.__mem_func__(self.ResetPoint)) self.ConfirmCancelButton.SetEvent(ui.__mem_func__(self.Close)) diff --git a/assets/root/uiquest.py b/assets/root/uiquest.py index 16fe3a62..88f6ede6 100644 --- a/assets/root/uiquest.py +++ b/assets/root/uiquest.py @@ -76,7 +76,7 @@ class QuestCurtain(ui.Window): self.CurtainMode = 0 - self.lastclock = time.clock() + self.lastclock = time.perf_counter() def Close(self): self.CurtainMode = 0 @@ -87,7 +87,7 @@ class QuestCurtain(ui.Window): QuestCurtain.OnDoneEventList = [] def OnUpdate(self): - dt = time.clock() - self.lastclock + dt = time.perf_counter() - self.lastclock if self.CurtainMode>0: self.TopBar.SetPosition(0, int(self.TopBar.GetGlobalPosition()[1]+dt*self.CURTAIN_SPEED)) self.BottomBar.SetPosition(0, int(self.BottomBar.GetGlobalPosition()[1]-dt*self.CURTAIN_SPEED)) @@ -104,7 +104,7 @@ class QuestCurtain(ui.Window): self.BottomBar.SetPosition(0,wndMgr.GetScreenHeight()+1) self.Close() - self.lastclock = time.clock() + self.lastclock = time.perf_counter() class EventCurtain(ui.Bar): @@ -266,7 +266,7 @@ class QuestDialog(ui.ScriptWindow): else: event.SetRestrictedCount(idx,60) - QuestCurtain.BarHeight = (wndMgr.GetScreenHeight()-wndMgr.GetScreenWidth()*9/16)/2 + QuestCurtain.BarHeight = (wndMgr.GetScreenHeight()-wndMgr.GetScreenWidth() * 9 // 16) // 2 if QuestCurtain.BarHeight<0: QuestCurtain.BarHeight = 50 @@ -414,9 +414,21 @@ class QuestDialog(ui.ScriptWindow): ## Set Variables - def AddOnCloseEvent(self,f): + def AddOnCloseEvent(self, f): if self.OnCloseEvent: - self.OnCloseEvent = lambda z=[self.OnCloseEvent, f]:list(map(apply,z)) + old = self.OnCloseEvent + + def combined(*args, **kwargs): + err = None + try: + old(*args, **kwargs) + except Exception as e: + err = e + f(*args, **kwargs) + if err: + raise err + + self.OnCloseEvent = combined else: self.OnCloseEvent = f @@ -446,7 +458,7 @@ class QuestDialog(ui.ScriptWindow): b.SetParent(self.board) b.SetSize(100,26) - b.SetPosition(self.sx+self.board.GetWidth()/2-50,self.sy+yPos) + b.SetPosition(self.sx+self.board.GetWidth()//2-50,self.sy+yPos) self.nextButtonType = button_type; @@ -470,7 +482,7 @@ class QuestDialog(ui.ScriptWindow): global entire_questbutton_number global entire_questpage_number global cur_questpage_number - entire_questpage_number = ((n-2)/7)+1 + entire_questpage_number = ((n-2)//7)+1 entire_questbutton_number = n if not self.board: @@ -480,12 +492,12 @@ class QuestDialog(ui.ScriptWindow): import localeInfo self.prevbutton = self.MakeNextPrevPageButton() - self.prevbutton.SetPosition(self.sx+self.board.GetWidth()/2-164, self.board.GetHeight()/2-16) + self.prevbutton.SetPosition(self.sx+self.board.GetWidth()//2-164, self.board.GetHeight()//2-16) self.prevbutton.SetText(localeInfo.UI_PREVPAGE) self.prevbutton.SetEvent(self.PrevQuestPageEvent, 1, n) self.nextbutton = self.MakeNextPrevPageButton() - self.nextbutton.SetPosition(self.sx+self.board.GetWidth()/2+112, self.board.GetHeight()/2-16) + self.nextbutton.SetPosition(self.sx+self.board.GetWidth()//2+112, self.board.GetHeight()//2-16) self.nextbutton.SetText(localeInfo.UI_NEXTPAGE) self.nextbutton.SetEvent(self.NextQuestPageEvent, 1, n) @@ -497,7 +509,7 @@ class QuestDialog(ui.ScriptWindow): button = BarButton("TOP_MOST",0x50000000, 0x50404040, 0x50606060) button.SetParent(self.board) button.SetSize(106,26) - button.SetPosition(self.sx + self.board.GetWidth()/2+((i*2)-1)*56-56, self.sy+(event.GetLineCount(self.descIndex))*16+20+5) + button.SetPosition(self.sx + self.board.GetWidth()//2+((i*2)-1)*56-56, self.sy+(event.GetLineCount(self.descIndex))*16+20+5) button.SetText("a") button.SetTextColor(0xff000000) else: @@ -505,7 +517,7 @@ class QuestDialog(ui.ScriptWindow): button = BarButton("TOP_MOST") button.SetParent(self.board) button.SetSize(200,26) - button.SetPosition(self.sx + self.board.GetWidth()/2-100,self.sy+(event.GetLineCount(self.descIndex)+i*2)*16+20+5) + button.SetPosition(self.sx + self.board.GetWidth()//2-100,self.sy+(event.GetLineCount(self.descIndex)+i*2)*16+20+5) button.SetText("a") button.SetTextColor(0xffffffff) return button @@ -766,7 +778,7 @@ class QuestDialog(ui.ScriptWindow): img = ToolTipImageBox() img.SetParent(self.board) img.LoadImage(filename) - pos_x = (self.board.GetWidth() * (index + 1) / (total + 1)) - (img.GetWidth() / 2) + pos_x = (self.board.GetWidth() * (index + 1) // (total + 1)) - (img.GetWidth() // 2) img.SetPosition(pos_x, y) #img.SetWindowHorizontalAlignCenter() img.DestroyToolTip() @@ -781,7 +793,7 @@ class QuestDialog(ui.ScriptWindow): if underTitle: event.AddEventSetLocalYPosition(self.descIndex, 3) - event.InsertTextInline(self.descIndex, underTitle, (self.board.GetWidth() * (index + 1) / (total + 1))) + event.InsertTextInline(self.descIndex, underTitle, (self.board.GetWidth() * (index + 1) // (total + 1))) if index != total - 1: event.AddEventSetLocalYPosition(self.descIndex, -( 3 + 16 )) else: @@ -803,7 +815,7 @@ class QuestDialog(ui.ScriptWindow): try: img.SetWindowHorizontalAlignCenter() img.LoadImage(filename) - img.SetPosition(0, wndMgr.GetScreenHeight() - (75/2) - (32/2)) + img.SetPosition(0, wndMgr.GetScreenHeight() - (75//2) - (32//2)) img.SetAlpha(0.0) img.Show() except RuntimeError: @@ -830,7 +842,7 @@ class QuestDialog(ui.ScriptWindow): try: self.imgLeft.LoadImage(imgfile) self.imgLeft.SetSize(400,450) - self.imgLeft.SetOrigin(self.imgLeft.GetWidth()/2,self.imgLeft.GetHeight()/2) + self.imgLeft.SetOrigin(self.imgLeft.GetWidth()//2,self.imgLeft.GetHeight()//2) self.imgLeft.Show() except RuntimeError: import dbg @@ -860,7 +872,7 @@ class QuestDialog(ui.ScriptWindow): self.imgTop.SetSize(350,170) bd.SetPosition(bx,190) bd.SetSize(350,250) - self.imgTop.SetOrigin(self.imgTop.GetWidth()/2,self.imgTop.GetHeight()/2) + self.imgTop.SetOrigin(self.imgTop.GetWidth()//2,self.imgTop.GetHeight()//2) self.imgTop.Show() except RuntimeError: dbg.TraceError("QuestDialog.OnTopImage(%s)" % imgfile) @@ -885,11 +897,11 @@ class QuestDialog(ui.ScriptWindow): ih = 333 self.imgBackground.SetSize(iw,ih) if w < iw: - px -= (iw-w)/2 + px -= (iw-w)//2 c.SetPosition(px,py) w = iw if h < ih: - py -= (ih-h)/2 + py -= (ih-h)//2 c.SetPosition(px,py) h = ih if self.skin == 3: diff --git a/assets/root/uishop.py b/assets/root/uishop.py index 2bcdfe0c..8feb6b14 100644 --- a/assets/root/uishop.py +++ b/assets/root/uishop.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import net import player import item @@ -275,7 +274,7 @@ class ShopDialog(ui.ScriptWindow): self.pop = None constInfo.SET_ITEM_QUESTION_DIALOG_STATUS(0) - ## ȥ ȸ ߰. + ## 용혼석 팔리는 기능 추가. def SellAttachedItem(self): if shop.IsPrivateShop(): diff --git a/assets/root/uitaskbar.py b/assets/root/uitaskbar.py index d0cb7686..b4d1bdd2 100644 --- a/assets/root/uitaskbar.py +++ b/assets/root/uitaskbar.py @@ -736,11 +736,11 @@ class TaskBar(ui.ScriptWindow): curPoint = max(curPoint, 0) maxPoint = max(maxPoint, 0) - quarterPoint = maxPoint / 4 + quarterPoint = maxPoint // 4 FullCount = 0 if 0 != quarterPoint: - FullCount = min(4, curPoint / quarterPoint) + FullCount = min(4, curPoint // quarterPoint) for i in range(4): self.expGauge[i].Hide() diff --git a/assets/root/uitip.py b/assets/root/uitip.py index 0a70523a..f8f09afa 100644 --- a/assets/root/uitip.py +++ b/assets/root/uitip.py @@ -1,4 +1,3 @@ -# -*- coding: cp949 -*- import ui import grp import app @@ -321,8 +320,8 @@ if __name__ == "__main__": wnd = BigBoard() wnd.Show() - wnd.SetTip("ȳϼ") - wnd.SetTip(" ڷ Դϴ") + wnd.SetTip("안녕하세요") + wnd.SetTip("저는 빗자루 입니다") app.Loop() diff --git a/assets/uiscript/uiscript/auctionwindow.py b/assets/uiscript/uiscript/auctionwindow.py index 4b1d0884..62aaba54 100644 --- a/assets/uiscript/uiscript/auctionwindow.py +++ b/assets/uiscript/uiscript/auctionwindow.py @@ -22,7 +22,7 @@ window = { "width" : 376, "height" : 370, - "title" : "Ÿ ", + "title" : "매매 등록", "children" : ( diff --git a/assets/uiscript/uiscript/auctionwindow_listpage.py b/assets/uiscript/uiscript/auctionwindow_listpage.py index b6a638c2..38d53d3e 100644 --- a/assets/uiscript/uiscript/auctionwindow_listpage.py +++ b/assets/uiscript/uiscript/auctionwindow_listpage.py @@ -18,21 +18,21 @@ window = { "type" : "text", "x" : 18, "y" : 7, - "text" : "ȣ", + "text" : "번호", }, { "name" : "NamePrint", "type" : "text", "x" : 79, "y" : 7, - "text" : " ̸", + "text" : "아이템 이름", }, { "name" : "NamePrint", "type" : "text", "x" : 228, "y" : 7, - "text" : "", + "text" : "가격", }, { @@ -51,7 +51,7 @@ window = { "type" : "text", "x" : 0, "y" : 0, - "text" : " ˻ϱ", + "text" : "아이템 검색하기", "all_align" : "center", }, @@ -63,7 +63,7 @@ window = { "type" : "text", "x" : SEARCHING_AREA_X_POS + 5, "y" : SEARCHING_AREA_Y_POS + 24, - "text" : "̸", + "text" : "아이템이름", }, { "name" : "SearchingNameSlot", @@ -78,7 +78,7 @@ window = { "type" : "text", "x" : SEARCHING_AREA_X_POS + 5, "y" : SEARCHING_AREA_Y_POS + 44, - "text" : "ȣã", + "text" : "번호로찾기", }, { "name" : "SearchingIDSlot", @@ -93,7 +93,7 @@ window = { "type" : "text", "x" : SEARCHING_AREA_X_POS + 205, "y" : SEARCHING_AREA_Y_POS + 24, - "text" : "Ͽ", + "text" : "소켓여부", }, { @@ -101,7 +101,7 @@ window = { "type" : "button", "x" : SEARCHING_AREA_X_POS + 295, "y" : SEARCHING_AREA_Y_POS + 20, - "text" : "ã", + "text" : "찾기", "default_image" : "d:/ymir work/ui/public/small_button_01.sub", "over_image" : "d:/ymir work/ui/public/small_button_02.sub", "down_image" : "d:/ymir work/ui/public/small_button_03.sub", @@ -111,7 +111,7 @@ window = { "type" : "button", "x" : SEARCHING_AREA_X_POS + 295, "y" : SEARCHING_AREA_Y_POS + 40, - "text" : "ã", + "text" : "찾기", "default_image" : "d:/ymir work/ui/public/small_button_01.sub", "over_image" : "d:/ymir work/ui/public/small_button_02.sub", "down_image" : "d:/ymir work/ui/public/small_button_03.sub", diff --git a/assets/uiscript/uiscript/auctionwindow_registerpage.py b/assets/uiscript/uiscript/auctionwindow_registerpage.py index 3389a7d6..9a5bdc26 100644 --- a/assets/uiscript/uiscript/auctionwindow_registerpage.py +++ b/assets/uiscript/uiscript/auctionwindow_registerpage.py @@ -42,7 +42,7 @@ window = { "y" : 150, "horizontal_align" : "center", "text_horizontal_align" : "center", - "text" : " ̰ 巡Ͽ ־ּ", + "text" : "아이템을 이곳에 드래그하여 넣어주세요", }, { @@ -50,7 +50,7 @@ window = { "type" : "text", "x" : 70, "y" : 185, - "text" : "Ÿ ", + "text" : "매매 최저가", }, { "name" : "LowerSellingPriceSlot", @@ -76,7 +76,7 @@ window = { "type" : "text", "x" : 70, "y" : 205, - "text" : "Ÿ հ", + "text" : "매매 평균가", }, { "name" : "AverageSellingPriceSlot", @@ -123,7 +123,7 @@ window = { "x" : 230, "y" : 250 - 3, - "text" : "", + "text" : "등록", "default_image" : "d:/ymir work/ui/public/small_button_01.sub", "over_image" : "d:/ymir work/ui/public/small_button_02.sub", diff --git a/assets/uiscript/uiscript/beltinventorywindow.py b/assets/uiscript/uiscript/beltinventorywindow.py index 629c0c69..27c53f23 100644 --- a/assets/uiscript/uiscript/beltinventorywindow.py +++ b/assets/uiscript/uiscript/beltinventorywindow.py @@ -6,7 +6,7 @@ EQUIPMENT_START_INDEX = 90 window = { "name" : "BeltInventoryWindow", - ## 600 - (width + 24 px) + ## 600 - (width + 오른쪽으로 부터 띄우기 24 px) "x" : SCREEN_WIDTH - 176 - 148, "y" : SCREEN_HEIGHT - 37 - 565 + 209 + 32, # "x" : -148, diff --git a/assets/uiscript/uiscript/characterwindow.py b/assets/uiscript/uiscript/characterwindow.py index 626d38e1..1e67fba5 100644 --- a/assets/uiscript/uiscript/characterwindow.py +++ b/assets/uiscript/uiscript/characterwindow.py @@ -230,7 +230,7 @@ window = { { "name" : "Guild_Name", "type":"text", - "text":" ̸", + "text":"길드 이름", "x":0, "y":0, "r":1.0, @@ -255,7 +255,7 @@ window = { { "name" : "Character_Name", "type":"text", - "text":"ij ̸", + "text":"캐릭터 이름", "x":0, "y":0, "r":1.0, @@ -307,16 +307,16 @@ window = { { "name" : "Face_Image", "type" : "image", "x" : 11, "y" : 11, "image" : "d:/ymir work/ui/game/windows/face_warrior.sub" }, { "name" : "Face_Slot", "type" : "image", "x" : 7, "y" : 7, "image" : FACE_SLOT_FILE, }, - ## ⺻ ɷ + ## 기본 능력 { "name":"Status_Standard", "type":"window", "x":3, "y":100, "width":200, "height":250, "children" : ( - ## ⺻ ɷ + ## 기본 능력 제목 { "name":"Character_Bar_01", "type":"horizontalbar", "x":12, "y":8, "width":223, }, { "name":"Character_Bar_01_Text", "type" : "image", "x" : 13, "y" : 9, "image" : LOCALE_PATH+"label_std.sub", }, - ## ɷ ġ + ## 능력 수련 수치 { "name":"Status_Plus_Label", "type":"image", @@ -329,7 +329,7 @@ window = { ), }, - ## ⺻ ɷ Ʈ + ## 기본 능력 아이템 리스트 {"name":"Status_Standard_ItemList1", "type" : "image", "x":17, "y":31, "image" : LOCALE_PATH+"label_std_item1.sub", }, {"name":"Status_Standard_ItemList2", "type" : "image", "x":100, "y":30, "image" : LOCALE_PATH+"label_std_item2.sub", }, @@ -420,21 +420,21 @@ window = { ), }, - ## ΰ ɷ + ## 부가 능력 { "name":"Status_Extent", "type":"window", "x":3, "y":221, "width":200, "height":50, "children" : ( - ## ΰ ɷ + ## 부가 능력 제목 { "name":"Status_Extent_Bar", "type":"horizontalbar", "x":12, "y":6, "width":223, }, { "name":"Status_Extent_Label", "type" : "image", "x" : 13, "y" : 8, "image" : LOCALE_PATH+"label_ext.sub", }, - ## ⺻ ɷ Ʈ + ## 기본 능력 아이템 리스트 {"name":"Status_Extent_ItemList1", "type" : "image", "x":11, "y":31, "image" : LOCALE_PATH+"label_ext_item1.sub", }, {"name":"Status_Extent_ItemList2", "type" : "image", "x":128, "y":32, "image" : LOCALE_PATH+"label_ext_item2.sub", }, - ## MSPD - ̵ ӵ + ## MSPD - 이동 속도 { "name":"MOV_Label", "type":"window", "x":66, "y":33, "width":50, "height":20, "children" : @@ -444,7 +444,7 @@ window = { ) }, - ## ASPD - ӵ + ## ASPD - 공격 속도 { "name":"ASPD_Label", "type":"window", "x":66, "y":33+23, "width":50, "height":20, "children" : @@ -454,7 +454,7 @@ window = { ) }, - ## CSPD - ֹ ӵ + ## CSPD - 주문 속도 { "name":"CSPD_Label", "type":"window", "x":66, "y":33+23*2, "width":50, "height":20, "children" : @@ -464,7 +464,7 @@ window = { ) }, - ## MATT - ݷ + ## MATT - 마법 공격력 { "name":"MATT_Label", "type":"window", "x":183, "y":33, "width":50, "height":20, "children" : @@ -474,7 +474,7 @@ window = { ) }, - ## MDEF - + ## MDEF - 마법 방어력 { "name":"MDEF_Label", "type":"window", "x":183, "y":33+23, "width":50, "height":20, "children" : @@ -484,7 +484,7 @@ window = { ) }, - ## ȸ + ## 회피율 { "name":"ER_Label", "type":"window", "x":183, "y":33+23*2, "width":50, "height":20, "children" : @@ -697,7 +697,7 @@ window = { "children" : ( - ## ⺻ ׼ + ## 기본 액션 제목 { "name":"Action_Bar", "type":"horizontalbar", "x":12, "y":11, "width":223, }, { "name":"Action_Bar_Text", "type":"text", "x":15, "y":13, "text":uiScriptLocale.CHARACTER_NORMAL_ACTION }, @@ -718,7 +718,7 @@ window = { "image" : ICON_SLOT_FILE, }, - ## ȣ ׼ + ## 상호 액션 제목 { "name":"Reaction_Bar", "type":"horizontalbar", "x":12, "y":8+150, "width":223, }, { "name":"Reaction_Bar_Text", "type":"text", "x":15, "y":10+150, "text":uiScriptLocale.CHARACTER_MUTUAL_ACTION }, @@ -776,25 +776,25 @@ window = { "horizontal_align" : "right", }, - { "name" : "Quest_Name_00", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 14 }, - { "name" : "Quest_LastTime_00", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 30 }, - { "name" : "Quest_LastCount_00", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 46 }, + { "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 }, + { "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 }, + { "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 }, - { "name" : "Quest_Name_01", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 74 }, - { "name" : "Quest_LastTime_01", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 90 }, - { "name" : "Quest_LastCount_01", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 106 }, + { "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 }, + { "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 }, + { "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 }, - { "name" : "Quest_Name_02", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 134 }, - { "name" : "Quest_LastTime_02", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 150 }, - { "name" : "Quest_LastCount_02", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 166 }, + { "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 }, + { "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 }, + { "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 }, - { "name" : "Quest_Name_03", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 194 }, - { "name" : "Quest_LastTime_03", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 210 }, - { "name" : "Quest_LastCount_03", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 226 }, + { "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 }, + { "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 }, + { "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 }, - { "name" : "Quest_Name_04", "type" : "text", "text" : "̸Դϴ", "x" : 60, "y" : 254 }, - { "name" : "Quest_LastTime_04", "type" : "text", "text" : " ð Դϴ", "x" : 60, "y" : 270 }, - { "name" : "Quest_LastCount_04", "type" : "text", "text" : " Դϴ", "x" : 60, "y" : 286 }, + { "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 }, + { "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 }, + { "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 }, ), }, diff --git a/assets/uiscript/uiscript/cuberesultwindow.py b/assets/uiscript/uiscript/cuberesultwindow.py index 5515993d..8a39f870 100644 --- a/assets/uiscript/uiscript/cuberesultwindow.py +++ b/assets/uiscript/uiscript/cuberesultwindow.py @@ -40,7 +40,7 @@ window = { "children" : ( - { "name":"TitleName", "type":"text", "x":77, "y":3, "text":"ռ ", "text_horizontal_align":"center" }, + { "name":"TitleName", "type":"text", "x":77, "y":3, "text":"합성 결과", "text_horizontal_align":"center" }, ), }, @@ -72,7 +72,7 @@ window = { "vertical_align" : "bottom", "horizontal_align" : "center", - "text":"ռ ߽ϴ", + "text":"합성에 성공 했습니다", "text_horizontal_align":"center", }, diff --git a/assets/uiscript/uiscript/dragonsoulrefinewindow.py b/assets/uiscript/uiscript/dragonsoulrefinewindow.py index fde7109d..6a29976d 100644 --- a/assets/uiscript/uiscript/dragonsoulrefinewindow.py +++ b/assets/uiscript/uiscript/dragonsoulrefinewindow.py @@ -3,7 +3,7 @@ import uiScriptLocale window = { "name" : "DragonSoulRefineWindow", - ## ȥ â ٷ + ## 용혼석 창 바로 왼쪽 "x" : SCREEN_WIDTH - 176 - 287 - 10 - 287, "y" : SCREEN_HEIGHT - 37 - 505, diff --git a/assets/uiscript/uiscript/dragonsoulwindow.py b/assets/uiscript/uiscript/dragonsoulwindow.py index 87adaebd..9f971556 100644 --- a/assets/uiscript/uiscript/dragonsoulwindow.py +++ b/assets/uiscript/uiscript/dragonsoulwindow.py @@ -3,7 +3,7 @@ import uiScriptLocale window = { "name" : "InventoryWindow", - ## 600 - (width + 24 px) + ## 600 - (width + 오른쪽으로 부터 띄우기 24 px) "x" : SCREEN_WIDTH - 176 - 287 - 10, "y" : SCREEN_HEIGHT - 37 - 505, diff --git a/assets/uiscript/uiscript/equipmentdialog.py b/assets/uiscript/uiscript/equipmentdialog.py index 61fed004..8089642f 100644 --- a/assets/uiscript/uiscript/equipmentdialog.py +++ b/assets/uiscript/uiscript/equipmentdialog.py @@ -63,11 +63,11 @@ window = { {"index":8, "x":75, "y":145, "width":32, "height":32}, {"index":9, "x":114, "y":2, "width":32, "height":32}, {"index":10, "x":75, "y":35, "width":32, "height":32}, - ## 1 + ## 새 반지1 ##{"index":21, "x":2, "y":106, "width":32, "height":32}, - ## 2 + ## 새 반지2 ##{"index":22, "x":75, "y":106, "width":32, "height":32}, - ## Ʈ + ## 새 벨트 {"index":23, "x":39, "y":106, "width":32, "height":32}, ), }, diff --git a/assets/uiscript/uiscript/fishingwindow.py b/assets/uiscript/uiscript/fishingwindow.py index fb290b5f..1a2df97e 100644 --- a/assets/uiscript/uiscript/fishingwindow.py +++ b/assets/uiscript/uiscript/fishingwindow.py @@ -20,7 +20,7 @@ window = { "y" : 0, "width" : 150, "height" : 195, - "title" : "", + "title" : "낚시", "children" : ( @@ -82,7 +82,7 @@ window = { "x" : 10, "y" : 10, - "text" : " ̸", + "text" : "물고기 이름", }, { @@ -215,7 +215,7 @@ window = { "x" : 0, "y" : 30, - "text" : "", + "text" : "낚시", "horizontal_align" : "center", "vertical_align" : "bottom", diff --git a/assets/uiscript/uiscript/gameoptiondialog.py b/assets/uiscript/uiscript/gameoptiondialog.py index ec0d60c1..95fd4cf4 100644 --- a/assets/uiscript/uiscript/gameoptiondialog.py +++ b/assets/uiscript/uiscript/gameoptiondialog.py @@ -56,7 +56,7 @@ window = { ), }, - ## ̸ + ## 이름색 { "name" : "name_color", "type" : "text", @@ -93,7 +93,7 @@ window = { "down_image" : ROOT_PATH + "Middle_Button_03.sub", }, - ## Ÿâ + ## 타겟창 { "name" : "target_board", "type" : "text", @@ -398,7 +398,7 @@ window = { "down_image" : ROOT_PATH + "middle_button_03.sub", }, - ## ǸŹ + ## 판매문구 { "name" : "salestext_on_off", "type" : "text", diff --git a/assets/uiscript/uiscript/helpwindow2.py b/assets/uiscript/uiscript/helpwindow2.py index 8de00575..ebbd5f32 100644 --- a/assets/uiscript/uiscript/helpwindow2.py +++ b/assets/uiscript/uiscript/helpwindow2.py @@ -145,15 +145,15 @@ window = { { "name" : "help_02_01", "type" : "text", "outline" : 1, "x" : 0, "y" : SCREEN_HEIGHT * HEIGHT_STEP*0, - "text" : "- ٶ󸶹ٻ 01", + "text" : "- 가나다라마바사 01", }, { "name" : "help_02_02", "type" : "text", "outline" : 1, "x" : 0, "y" : HEIGHT_STEP*1, - "text" : "- ٶ󸶹ٻ 02", + "text" : "- 가나다라마바사 02", }, - ## ؽƮ ߰ Ͻø ˴ϴ. + ## 이 밑으로 텍스트를 추가 하시면 됩니다. ), }, diff --git a/assets/uiscript/uiscript/passworddialog.py b/assets/uiscript/uiscript/passworddialog.py index e8301388..f0bf50e7 100644 --- a/assets/uiscript/uiscript/passworddialog.py +++ b/assets/uiscript/uiscript/passworddialog.py @@ -25,7 +25,7 @@ window = { "children" : ( - # + #내용 { "name" : "Desc1", "type" : "text", @@ -36,7 +36,7 @@ window = { "text" : uiScriptLocale.PASSWORD_DESC_1, "text_horizontal_align":"center" }, - #2 + #내용2 { "name" : "Desc2", "type" : "text", diff --git a/assets/uiscript/uiscript/skillpointresetdialog.py b/assets/uiscript/uiscript/skillpointresetdialog.py index a4ed8c1c..a60d58fb 100644 --- a/assets/uiscript/uiscript/skillpointresetdialog.py +++ b/assets/uiscript/uiscript/skillpointresetdialog.py @@ -31,7 +31,7 @@ window = { "x" : 10, "y" : 17, - "text" : "ųƮ ", + "text" : "스킬포인트 리셋", "default_image" : ROOT + "XLarge_Button_01.sub", "over_image" : ROOT + "XLarge_Button_02.sub", @@ -45,7 +45,7 @@ window = { "x" : 10, "y" : 57, - "text" : "", + "text" : "취소", "default_image" : ROOT + "XLarge_Button_01.sub", "over_image" : ROOT + "XLarge_Button_02.sub", diff --git a/assets/uiscript/uiscript/systemoptiondialog.py b/assets/uiscript/uiscript/systemoptiondialog.py index 2e24ce0a..9a714efb 100644 --- a/assets/uiscript/uiscript/systemoptiondialog.py +++ b/assets/uiscript/uiscript/systemoptiondialog.py @@ -116,7 +116,7 @@ window = { "y" : 50, }, - ## ī޶ + ## 카메라 { "name" : "camera_mode", "type" : "text", @@ -155,7 +155,7 @@ window = { "down_image" : ROOT_PATH + "Middle_Button_03.sub", }, - ## Ȱ + ## 안개 { "name" : "fog_mode", "type" : "text", @@ -208,7 +208,7 @@ window = { "down_image" : ROOT_PATH + "small_Button_03.sub", }, - ## Ÿ + ## 타일 가속 { "name" : "tiling_mode", "type" : "text", @@ -262,7 +262,7 @@ window = { }, - ## ׸ + ## 그림자 # { # "name" : "shadow_mode", # "type" : "text",