jann/m2dev-client
1
0
Fork 0
forked from metin-server/m2dev-client
Code Pull Requests Activity

py fixes

Browse Source
This commit is contained in:
d1str4ught
2026-02-09 00:55:18 +01:00
parent 1b326373ea
commit f85a52d239
32 changed files with 183 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
assets/locale/locale/ae/ui/characterwindow.py
View File

@@ -230,7 +230,7 @@ window = {
{ {
"name" : "Guild_Name", "name" : "Guild_Name",
"type":"text", "type":"text",
"text":"길드 이름", "text":"길드 이름",
"x":0, "x":0,
"y":0, "y":0,
"r":1.0, "r":1.0,
@@ -255,7 +255,7 @@ window = {
{ {
"name" : "Character_Name", "name" : "Character_Name",
"type":"text", "type":"text",
"text":"캐릭터 이름", "text":"캐릭터 이름",
"x":0, "x":0,
"y":0, "y":0,
"r":1.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_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" : "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, "name":"Status_Standard", "type":"window", "x":3, "y":100, "width":200, "height":250,
"children" : "children" :
( (
## 기본 능력 제목 ## 기본 능력 제목
{ "name":"Character_Bar_01", "type":"horizontalbar", "x":12, "y":8, "width":223, }, { "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":"Character_Bar_01_Text", "type" : "image", "x" : 13, "y" : 9, "image" : LOCALE_PATH+"label_std.sub", },
## 능력 수련 수치 ## 능력 수련 수치
{ {
"name":"Status_Plus_Label", "name":"Status_Plus_Label",
"type":"image", "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_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", }, {"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, "name":"Status_Extent", "type":"window", "x":3, "y":221, "width":200, "height":50,
"children" : "children" :
( (
## 부가 능력 제목 ## 부가 능력 제목
{ "name":"Status_Extent_Bar", "type":"horizontalbar", "x":12, "y":6, "width":223, }, { "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_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_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", }, {"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, "name":"MOV_Label", "type":"window", "x":66, "y":33, "width":50, "height":20,
"children" : "children" :
@@ -444,7 +444,7 @@ window = {
) )
}, },
## ASPD - 공격 속도 ## ASPD - 공격 속도
{ {
"name":"ASPD_Label", "type":"window", "x":66, "y":33+23, "width":50, "height":20, "name":"ASPD_Label", "type":"window", "x":66, "y":33+23, "width":50, "height":20,
"children" : "children" :
@@ -454,7 +454,7 @@ window = {
) )
}, },
## CSPD - 주문 속도 ## CSPD - 주문 속도
{ {
"name":"CSPD_Label", "type":"window", "x":66, "y":33+23*2, "width":50, "height":20, "name":"CSPD_Label", "type":"window", "x":66, "y":33+23*2, "width":50, "height":20,
"children" : "children" :
@@ -464,7 +464,7 @@ window = {
) )
}, },
## MATT - 마법 공격력 ## MATT - 마법 공격력
{ {
"name":"MATT_Label", "type":"window", "x":183, "y":33, "width":50, "height":20, "name":"MATT_Label", "type":"window", "x":183, "y":33, "width":50, "height":20,
"children" : "children" :
@@ -474,7 +474,7 @@ window = {
) )
}, },
## MDEF - 마법 방어력 ## MDEF - 마법 방어력
{ {
"name":"MDEF_Label", "type":"window", "x":183, "y":33+23, "width":50, "height":20, "name":"MDEF_Label", "type":"window", "x":183, "y":33+23, "width":50, "height":20,
"children" : "children" :
@@ -484,7 +484,7 @@ window = {
) )
}, },
## 회피율 ## 회피율
{ {
"name":"ER_Label", "type":"window", "x":183, "y":33+23*2, "width":50, "height":20, "name":"ER_Label", "type":"window", "x":183, "y":33+23*2, "width":50, "height":20,
"children" : "children" :
@@ -697,7 +697,7 @@ window = {
"children" : "children" :
( (
## 기본 액션 제목 ## 기본 액션 제목
{ "name":"Action_Bar", "type":"horizontalbar", "x":12, "y":11, "width":223, }, { "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 }, { "name":"Action_Bar_Text", "type":"text", "x":15, "y":13, "text":uiScriptLocale.CHARACTER_NORMAL_ACTION },
@@ -717,7 +717,7 @@ window = {
"image" : ICON_SLOT_FILE, "image" : ICON_SLOT_FILE,
}, },
## 상호 액션 제목 ## 상호 액션 제목
{ "name":"Reaction_Bar", "type":"horizontalbar", "x":12, "y":8+150, "width":223, }, { "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 }, { "name":"Reaction_Bar_Text", "type":"text", "x":15, "y":10+150, "text":uiScriptLocale.CHARACTER_MUTUAL_ACTION },
@@ -775,25 +775,25 @@ window = {
"horizontal_align" : "right", "horizontal_align" : "right",
}, },
{ "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 }, { "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 },
{ "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 }, { "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 },
{ "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 }, { "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 },
{ "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 }, { "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 },
{ "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 }, { "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 },
{ "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 }, { "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 },
{ "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 }, { "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 },
{ "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 }, { "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 },
{ "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 }, { "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 },
{ "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 }, { "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 },
{ "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 }, { "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 },
{ "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 }, { "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 },
{ "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 }, { "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 },
{ "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 }, { "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 },
{ "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 }, { "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 },
), ),
}, },

2
assets/locale/locale/ae/ui/energybar.py
View File

@@ -14,7 +14,7 @@ window = {
"children" : "children" :
( (
# ±â·? # ±â·?
{ {
"name" : "EnergyGauge_Board", "name" : "EnergyGauge_Board",
"type" : "image", "type" : "image",

8
assets/locale/locale/ae/ui/inventorywindow.py
View File

@@ -6,7 +6,7 @@ EQUIPMENT_START_INDEX = 90
window = { window = {
"name" : "InventoryWindow", "name" : "InventoryWindow",
## 600 - (width + 오른쪽으로 부터 띄우기 24 px) ## 600 - (width + 오른쪽으로 부터 띄우기 24 px)
"x" : SCREEN_WIDTH - 176, "x" : SCREEN_WIDTH - 176,
"y" : SCREEN_HEIGHT - 37 - 565, "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+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+9, "x":114, "y":2, "width":32, "height":32},
{"index":EQUIPMENT_START_INDEX+10, "x":75, "y":35, "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}, # {"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_RING2, "x":75, "y":106, "width":32, "height":32},
## 새 벨트 ## 새 벨트
{"index":item.EQUIPMENT_BELT, "x":39, "y":106, "width":32, "height":32}, {"index":item.EQUIPMENT_BELT, "x":39, "y":106, "width":32, "height":32},
), ),
}, },

10
assets/locale/locale/ae/ui/taskbar.py
View File

@@ -107,7 +107,7 @@ window = {
) )
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "HPGauge_Board", "name" : "HPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -153,7 +153,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "SPGauge_Board", "name" : "SPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -199,7 +199,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "STGauge_Board", "name" : "STGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -380,8 +380,8 @@ window = {
"children" : "children" :
( (
{ {
# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
# ExpandButton으로 바뀐 것이다. # ExpandButton으로 바뀐 것이다.
"name" : "ExpandButton", "name" : "ExpandButton",
"type" : "button", "type" : "button",

10
assets/locale/locale/ae/ui/taskbar_easter.py
View File

@@ -95,7 +95,7 @@ window = {
) )
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "HPGauge_Board", "name" : "HPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -141,7 +141,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "SPGauge_Board", "name" : "SPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -187,7 +187,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "STGauge_Board", "name" : "STGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -368,8 +368,8 @@ window = {
"children" : "children" :
( (
{ {
# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
# ExpandButton으로 바뀐 것이다. # ExpandButton으로 바뀐 것이다.
"name" : "ExpandButton", "name" : "ExpandButton",
"type" : "button", "type" : "button",

10
assets/locale/locale/ae/ui/taskbar_haloween.py
View File

@@ -107,7 +107,7 @@ window = {
) )
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "HPGauge_Board", "name" : "HPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -153,7 +153,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "SPGauge_Board", "name" : "SPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -199,7 +199,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "STGauge_Board", "name" : "STGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -380,8 +380,8 @@ window = {
"children" : "children" :
( (
{ {
# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
# ExpandButton으로 바뀐 것이다. # ExpandButton으로 바뀐 것이다.
"name" : "ExpandButton", "name" : "ExpandButton",
"type" : "button", "type" : "button",

10
assets/locale/locale/ae/ui/taskbar_valentine.py
View File

@@ -107,7 +107,7 @@ window = {
) )
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "HPGauge_Board", "name" : "HPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -153,7 +153,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "SPGauge_Board", "name" : "SPGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -199,7 +199,7 @@ window = {
), ),
}, },
{ {
## 툴팁을 띄우기 위한 윈도우 ## 툴팁을 띄우기 위한 윈도우
"name" : "STGauge_Board", "name" : "STGauge_Board",
"type" : "window", "type" : "window",
"style" : ("ltr", ), "style" : ("ltr", ),
@@ -380,8 +380,8 @@ window = {
"children" : "children" :
( (
{ {
# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여 # ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
# ExpandButton으로 바뀐 것이다. # ExpandButton으로 바뀐 것이다.
"name" : "ExpandButton", "name" : "ExpandButton",
"type" : "button", "type" : "button",

9
assets/root/introloading.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import ui import ui
import uiScriptLocale import uiScriptLocale
import net import net
@@ -18,7 +17,7 @@ import stringCommander
import emotion import emotion
#################################### ####################################
# 빠른 실행을 위한 모듈 로딩 분담 # 빠른 실행을 위한 모듈 로딩 분담
#################################### ####################################
import uiRefine import uiRefine
import uiToolTip import uiToolTip
@@ -163,7 +162,7 @@ class LoadingWindow(ui.ScriptWindow):
self.playerX=playerX self.playerX=playerX
self.playerY=playerY self.playerY=playerY
self.__RegisterSkill() ## 로딩 중간에 실행 하면 문제 발생 self.__RegisterSkill() ## 로딩 중간에 실행 하면 문제 발생
self.__RegisterTitleName() self.__RegisterTitleName()
self.__RegisterColor() self.__RegisterColor()
self.__InitData() self.__InitData()
@@ -184,7 +183,7 @@ class LoadingWindow(ui.ScriptWindow):
self.playerY=playerY self.playerY=playerY
self.__RegisterDungeonMapName() self.__RegisterDungeonMapName()
self.__RegisterSkill() ## 로딩 중간에 실행 하면 문제 발생 self.__RegisterSkill() ## 로딩 중간에 실행 하면 문제 발생
self.__RegisterTitleName() self.__RegisterTitleName()
self.__RegisterColor() self.__RegisterColor()
self.__RegisterEmotionIcon() self.__RegisterEmotionIcon()
@@ -222,7 +221,7 @@ class LoadingWindow(ui.ScriptWindow):
self.errMsg.Show() self.errMsg.Show()
self.loadStepList=[] self.loadStepList=[]
## 이곳에서 syserr.txt 를 보낸다. ## 이곳에서 syserr.txt 를 보낸다.
import dbg import dbg
dbg.TraceError(" !!! Failed to load game data : STEP [%d]" % (progress)) dbg.TraceError(" !!! Failed to load game data : STEP [%d]" % (progress))

9
assets/root/introselect.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import chr import chr
import grp import grp
import app import app
@@ -17,7 +16,7 @@ import musicInfo
import playerSettingModule import playerSettingModule
#################################### ####################################
# 빠른 실행을 위한 모듈 로딩 분담 # 빠른 실행을 위한 모듈 로딩 분담
#################################### ####################################
import uiCommon import uiCommon
import uiMapNameShower import uiMapNameShower
@@ -27,7 +26,7 @@ import uiCharacter
import uiTarget import uiTarget
import consoleModule import consoleModule
# interface module이 문제야... # interface module이 문제야...
import interfaceModule import interfaceModule
import uiTaskBar import uiTaskBar
import uiInventory import uiInventory
@@ -744,7 +743,7 @@ class SelectCharacterWindow(ui.Window):
if -1 != self.startIndex: if -1 != self.startIndex:
## Temporary ## Temporary
## BackGroundLoading이 지원 될때까지 임시로.. ## BackGroundLoading이 지원 될때까지 임시로..
if app.GetTime() - self.startReservingTime > 3.0: if app.GetTime() - self.startReservingTime > 3.0:
if False == self.openLoadingFlag: if False == self.openLoadingFlag:
chrSlot=self.stream.GetCharacterSlot() chrSlot=self.stream.GetCharacterSlot()
@@ -756,7 +755,7 @@ class SelectCharacterWindow(ui.Window):
import player import player
player.SetPlayTime(playTime) player.SetPlayTime(playTime)
import chat import chat
chat.Clear() ## 들어갈때 Chat 을 초기화. 임시 Pos. chat.Clear() ## 들어갈때 Chat 을 초기화. 임시 Pos.
## Temporary ## Temporary
####################################################### #######################################################

3
assets/root/servercommandparser.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import net import net
import background import background
import stringCommander import stringCommander
@@ -45,7 +44,7 @@ class ServerCommandParser(object):
def __ItemMall_Open(self): def __ItemMall_Open(self):
self.__PreserveCommand("item_mall") self.__PreserveCommand("item_mall")
## Àӽà ## 임시
def __XMasBoom_Enable(self, mode): def __XMasBoom_Enable(self, mode):
if "1"==mode: if "1"==mode:
self.__PreserveCommand("PRESERVE_DayMode dark") self.__PreserveCommand("PRESERVE_DayMode dark")

10
assets/root/uichat.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import ui import ui
import grp import grp
import chat import chat
@@ -37,7 +36,7 @@ class ChatModeButton(ui.Window):
def __init__(self): def __init__(self):
ui.Window.__init__(self) ui.Window.__init__(self)
self.state = None self.state = self.BUTTON_STATE_UP
self.buttonText = None self.buttonText = None
self.event = None self.event = None
self.SetWindowName("ChatModeButton") self.SetWindowName("ChatModeButton")
@@ -87,7 +86,6 @@ class ChatModeButton(ui.Window):
self.event() self.event()
def OnRender(self): def OnRender(self):
(x, y) = self.GetGlobalPosition() (x, y) = self.GetGlobalPosition()
grp.SetColor(self.OUTLINE_COLOR) grp.SetColor(self.OUTLINE_COLOR)
@@ -604,7 +602,7 @@ class ChatWindow(ui.Window):
self.scrollBar = scrollBar self.scrollBar = scrollBar
self.Refresh() self.Refresh()
self.chatInputSet.RefreshPosition() # RTL 시 위치를 제대로 잡으려면 위치 갱신이 필요하다 self.chatInputSet.RefreshPosition() # RTL 시 위치를 제대로 잡으려면 위치 갱신이 필요하다
def __del__(self): def __del__(self):
ui.Window.__del__(self) ui.Window.__del__(self)
@@ -798,7 +796,7 @@ class ChatWindow(ui.Window):
self.Refresh() self.Refresh()
if self.curHeightBar != self.heightBar: 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: if self.boardState == chat.BOARD_STATE_EDIT:
grp.SetColor(self.BOARD_MIDDLE_COLOR) grp.SetColor(self.BOARD_MIDDLE_COLOR)
@@ -1089,7 +1087,7 @@ class ChatLogWindow(ui.Window):
self.chatInputSet.SetSize(self.GetWidth() - 20, 20) self.chatInputSet.SetSize(self.GetWidth() - 20, 20)
self.chatInputSet.RefreshPosition() self.chatInputSet.RefreshPosition()
self.chatInputSet.SetChatMax(self.GetWidth() / 8) self.chatInputSet.SetChatMax(self.GetWidth() // 8)
def OnScroll(self): def OnScroll(self):
self.scrollBarPos = self.scrollBar.GetPos() self.scrollBarPos = self.scrollBar.GetPos()

5
assets/root/uigameoption.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import ui import ui
import snd import snd
import systemSetting import systemSetting
@@ -9,8 +8,8 @@ import localeInfo
import constInfo import constInfo
import chrmgr import chrmgr
import player import player
import uiPrivateShopBuilder # <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȣ import uiPrivateShopBuilder # 占쏙옙占쏙옙호
import interfaceModule # <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȣ import interfaceModule # 占쏙옙占쏙옙호
blockMode = 0 blockMode = 0
viewChatMode = 0 viewChatMode = 0

9
assets/root/uipointreset.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import net import net
import ui import ui
@@ -31,15 +30,15 @@ class PointResetDialog(ui.ScriptWindow):
import exception import exception
exception.Abort("PointResetDialog.LoadWindow.BindObject") exception.Abort("PointResetDialog.LoadWindow.BindObject")
self.GetChild("message1").SetText("스탯/스킬 포인트를 초기화해주겠네.") self.GetChild("message1").SetText("스탯/스킬 포인트를 초기화해주겠네.")
self.GetChild("message2").SetText("가격은 500원이야. 어때, 초기화할텐가?") self.GetChild("message2").SetText("가격은 500원이야. 어때, 초기화할텐가?")
self.GetChild("accept").SetEvent(ui.__mem_func__(self.OpenConfirmDialog)) self.GetChild("accept").SetEvent(ui.__mem_func__(self.OpenConfirmDialog))
self.GetChild("cancel").SetEvent(ui.__mem_func__(self.Close)) self.GetChild("cancel").SetEvent(ui.__mem_func__(self.Close))
## Confirm Dialog ## Confirm Dialog
self.ConfirmText.SetText("현재 레벨의 경험치가 모두 없어진다네.") self.ConfirmText.SetText("현재 레벨의 경험치가 모두 없어진다네.")
self.ConfirmText.SetFontColor(1.0, 0.3, 0.3) self.ConfirmText.SetFontColor(1.0, 0.3, 0.3)
self.ConfirmText2.SetText("정말 초기화하고 싶은가?") self.ConfirmText2.SetText("정말 초기화하고 싶은가?")
self.ConfirmAcceptButton.SetEvent(ui.__mem_func__(self.ResetPoint)) self.ConfirmAcceptButton.SetEvent(ui.__mem_func__(self.ResetPoint))
self.ConfirmCancelButton.SetEvent(ui.__mem_func__(self.Close)) self.ConfirmCancelButton.SetEvent(ui.__mem_func__(self.Close))

50
assets/root/uiquest.py
View File

@@ -76,7 +76,7 @@ class QuestCurtain(ui.Window):
self.CurtainMode = 0 self.CurtainMode = 0
self.lastclock = time.clock() self.lastclock = time.perf_counter()
def Close(self): def Close(self):
self.CurtainMode = 0 self.CurtainMode = 0
@@ -87,7 +87,7 @@ class QuestCurtain(ui.Window):
QuestCurtain.OnDoneEventList = [] QuestCurtain.OnDoneEventList = []
def OnUpdate(self): def OnUpdate(self):
dt = time.clock() - self.lastclock dt = time.perf_counter() - self.lastclock
if self.CurtainMode>0: if self.CurtainMode>0:
self.TopBar.SetPosition(0, int(self.TopBar.GetGlobalPosition()[1]+dt*self.CURTAIN_SPEED)) 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)) 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.BottomBar.SetPosition(0,wndMgr.GetScreenHeight()+1)
self.Close() self.Close()
self.lastclock = time.clock() self.lastclock = time.perf_counter()
class EventCurtain(ui.Bar): class EventCurtain(ui.Bar):
@@ -266,7 +266,7 @@ class QuestDialog(ui.ScriptWindow):
else: else:
event.SetRestrictedCount(idx,60) 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: if QuestCurtain.BarHeight<0:
QuestCurtain.BarHeight = 50 QuestCurtain.BarHeight = 50
@@ -414,9 +414,21 @@ class QuestDialog(ui.ScriptWindow):
## Set Variables ## Set Variables
def AddOnCloseEvent(self,f): def AddOnCloseEvent(self, f):
if self.OnCloseEvent: 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: else:
self.OnCloseEvent = f self.OnCloseEvent = f
@@ -446,7 +458,7 @@ class QuestDialog(ui.ScriptWindow):
b.SetParent(self.board) b.SetParent(self.board)
b.SetSize(100,26) 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; self.nextButtonType = button_type;
@@ -470,7 +482,7 @@ class QuestDialog(ui.ScriptWindow):
global entire_questbutton_number global entire_questbutton_number
global entire_questpage_number global entire_questpage_number
global cur_questpage_number global cur_questpage_number
entire_questpage_number = ((n-2)/7)+1 entire_questpage_number = ((n-2)//7)+1
entire_questbutton_number = n entire_questbutton_number = n
if not self.board: if not self.board:
@@ -480,12 +492,12 @@ class QuestDialog(ui.ScriptWindow):
import localeInfo import localeInfo
self.prevbutton = self.MakeNextPrevPageButton() 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.SetText(localeInfo.UI_PREVPAGE)
self.prevbutton.SetEvent(self.PrevQuestPageEvent, 1, n) self.prevbutton.SetEvent(self.PrevQuestPageEvent, 1, n)
self.nextbutton = self.MakeNextPrevPageButton() 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.SetText(localeInfo.UI_NEXTPAGE)
self.nextbutton.SetEvent(self.NextQuestPageEvent, 1, n) self.nextbutton.SetEvent(self.NextQuestPageEvent, 1, n)
@@ -497,7 +509,7 @@ class QuestDialog(ui.ScriptWindow):
button = BarButton("TOP_MOST",0x50000000, 0x50404040, 0x50606060) button = BarButton("TOP_MOST",0x50000000, 0x50404040, 0x50606060)
button.SetParent(self.board) button.SetParent(self.board)
button.SetSize(106,26) 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.SetText("a")
button.SetTextColor(0xff000000) button.SetTextColor(0xff000000)
else: else:
@@ -505,7 +517,7 @@ class QuestDialog(ui.ScriptWindow):
button = BarButton("TOP_MOST") button = BarButton("TOP_MOST")
button.SetParent(self.board) button.SetParent(self.board)
button.SetSize(200,26) 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.SetText("a")
button.SetTextColor(0xffffffff) button.SetTextColor(0xffffffff)
return button return button
@@ -766,7 +778,7 @@ class QuestDialog(ui.ScriptWindow):
img = ToolTipImageBox() img = ToolTipImageBox()
img.SetParent(self.board) img.SetParent(self.board)
img.LoadImage(filename) 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.SetPosition(pos_x, y)
#img.SetWindowHorizontalAlignCenter() #img.SetWindowHorizontalAlignCenter()
img.DestroyToolTip() img.DestroyToolTip()
@@ -781,7 +793,7 @@ class QuestDialog(ui.ScriptWindow):
if underTitle: if underTitle:
event.AddEventSetLocalYPosition(self.descIndex, 3) 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: if index != total - 1:
event.AddEventSetLocalYPosition(self.descIndex, -( 3 + 16 )) event.AddEventSetLocalYPosition(self.descIndex, -( 3 + 16 ))
else: else:
@@ -803,7 +815,7 @@ class QuestDialog(ui.ScriptWindow):
try: try:
img.SetWindowHorizontalAlignCenter() img.SetWindowHorizontalAlignCenter()
img.LoadImage(filename) 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.SetAlpha(0.0)
img.Show() img.Show()
except RuntimeError: except RuntimeError:
@@ -830,7 +842,7 @@ class QuestDialog(ui.ScriptWindow):
try: try:
self.imgLeft.LoadImage(imgfile) self.imgLeft.LoadImage(imgfile)
self.imgLeft.SetSize(400,450) 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() self.imgLeft.Show()
except RuntimeError: except RuntimeError:
import dbg import dbg
@@ -860,7 +872,7 @@ class QuestDialog(ui.ScriptWindow):
self.imgTop.SetSize(350,170) self.imgTop.SetSize(350,170)
bd.SetPosition(bx,190) bd.SetPosition(bx,190)
bd.SetSize(350,250) 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() self.imgTop.Show()
except RuntimeError: except RuntimeError:
dbg.TraceError("QuestDialog.OnTopImage(%s)" % imgfile) dbg.TraceError("QuestDialog.OnTopImage(%s)" % imgfile)
@@ -885,11 +897,11 @@ class QuestDialog(ui.ScriptWindow):
ih = 333 ih = 333
self.imgBackground.SetSize(iw,ih) self.imgBackground.SetSize(iw,ih)
if w < iw: if w < iw:
px -= (iw-w)/2 px -= (iw-w)//2
c.SetPosition(px,py) c.SetPosition(px,py)
w = iw w = iw
if h < ih: if h < ih:
py -= (ih-h)/2 py -= (ih-h)//2
c.SetPosition(px,py) c.SetPosition(px,py)
h = ih h = ih
if self.skin == 3: if self.skin == 3:

3
assets/root/uishop.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import net import net
import player import player
import item import item
@@ -275,7 +274,7 @@ class ShopDialog(ui.ScriptWindow):
self.pop = None self.pop = None
constInfo.SET_ITEM_QUESTION_DIALOG_STATUS(0) constInfo.SET_ITEM_QUESTION_DIALOG_STATUS(0)
## ¿ëÈ¥¼® Æȸ®´Â ±â´É Ãß°¡. ## 용혼석 팔리는 기능 추가.
def SellAttachedItem(self): def SellAttachedItem(self):
if shop.IsPrivateShop(): if shop.IsPrivateShop():

4
assets/root/uitaskbar.py
View File

@@ -736,11 +736,11 @@ class TaskBar(ui.ScriptWindow):
curPoint = max(curPoint, 0) curPoint = max(curPoint, 0)
maxPoint = max(maxPoint, 0) maxPoint = max(maxPoint, 0)
quarterPoint = maxPoint / 4 quarterPoint = maxPoint // 4
FullCount = 0 FullCount = 0
if 0 != quarterPoint: if 0 != quarterPoint:
FullCount = min(4, curPoint / quarterPoint) FullCount = min(4, curPoint // quarterPoint)
for i in range(4): for i in range(4):
self.expGauge[i].Hide() self.expGauge[i].Hide()

5
assets/root/uitip.py
View File

@@ -1,4 +1,3 @@
# -*- coding: cp949 -*-
import ui import ui
import grp import grp
import app import app
@@ -321,8 +320,8 @@ if __name__ == "__main__":
wnd = BigBoard() wnd = BigBoard()
wnd.Show() wnd.Show()
wnd.SetTip("안녕하세요") wnd.SetTip("안녕하세요")
wnd.SetTip("저는 빗자루 입니다") wnd.SetTip("저는 빗자루 입니다")
app.Loop() app.Loop()

2
assets/uiscript/uiscript/auctionwindow.py
View File

@@ -22,7 +22,7 @@ window = {
"width" : 376, "width" : 376,
"height" : 370, "height" : 370,
"title" : "¸Å¸Å µî·Ï", "title" : "매매 등록",
"children" : "children" :
( (

18
assets/uiscript/uiscript/auctionwindow_listpage.py
View File

@@ -18,21 +18,21 @@ window = {
"type" : "text", "type" : "text",
"x" : 18, "x" : 18,
"y" : 7, "y" : 7,
"text" : "번호", "text" : "번호",
}, },
{ {
"name" : "NamePrint", "name" : "NamePrint",
"type" : "text", "type" : "text",
"x" : 79, "x" : 79,
"y" : 7, "y" : 7,
"text" : "아이템 이름", "text" : "아이템 이름",
}, },
{ {
"name" : "NamePrint", "name" : "NamePrint",
"type" : "text", "type" : "text",
"x" : 228, "x" : 228,
"y" : 7, "y" : 7,
"text" : "가격", "text" : "가격",
}, },
{ {
@@ -51,7 +51,7 @@ window = {
"type" : "text", "type" : "text",
"x" : 0, "x" : 0,
"y" : 0, "y" : 0,
"text" : "아이템 검색하기", "text" : "아이템 검색하기",
"all_align" : "center", "all_align" : "center",
}, },
@@ -63,7 +63,7 @@ window = {
"type" : "text", "type" : "text",
"x" : SEARCHING_AREA_X_POS + 5, "x" : SEARCHING_AREA_X_POS + 5,
"y" : SEARCHING_AREA_Y_POS + 24, "y" : SEARCHING_AREA_Y_POS + 24,
"text" : "아이템이름", "text" : "아이템이름",
}, },
{ {
"name" : "SearchingNameSlot", "name" : "SearchingNameSlot",
@@ -78,7 +78,7 @@ window = {
"type" : "text", "type" : "text",
"x" : SEARCHING_AREA_X_POS + 5, "x" : SEARCHING_AREA_X_POS + 5,
"y" : SEARCHING_AREA_Y_POS + 44, "y" : SEARCHING_AREA_Y_POS + 44,
"text" : "번호로찾기", "text" : "번호로찾기",
}, },
{ {
"name" : "SearchingIDSlot", "name" : "SearchingIDSlot",
@@ -93,7 +93,7 @@ window = {
"type" : "text", "type" : "text",
"x" : SEARCHING_AREA_X_POS + 205, "x" : SEARCHING_AREA_X_POS + 205,
"y" : SEARCHING_AREA_Y_POS + 24, "y" : SEARCHING_AREA_Y_POS + 24,
"text" : "소켓여부", "text" : "소켓여부",
}, },
{ {
@@ -101,7 +101,7 @@ window = {
"type" : "button", "type" : "button",
"x" : SEARCHING_AREA_X_POS + 295, "x" : SEARCHING_AREA_X_POS + 295,
"y" : SEARCHING_AREA_Y_POS + 20, "y" : SEARCHING_AREA_Y_POS + 20,
"text" : "찾기", "text" : "찾기",
"default_image" : "d:/ymir work/ui/public/small_button_01.sub", "default_image" : "d:/ymir work/ui/public/small_button_01.sub",
"over_image" : "d:/ymir work/ui/public/small_button_02.sub", "over_image" : "d:/ymir work/ui/public/small_button_02.sub",
"down_image" : "d:/ymir work/ui/public/small_button_03.sub", "down_image" : "d:/ymir work/ui/public/small_button_03.sub",
@@ -111,7 +111,7 @@ window = {
"type" : "button", "type" : "button",
"x" : SEARCHING_AREA_X_POS + 295, "x" : SEARCHING_AREA_X_POS + 295,
"y" : SEARCHING_AREA_Y_POS + 40, "y" : SEARCHING_AREA_Y_POS + 40,
"text" : "찾기", "text" : "찾기",
"default_image" : "d:/ymir work/ui/public/small_button_01.sub", "default_image" : "d:/ymir work/ui/public/small_button_01.sub",
"over_image" : "d:/ymir work/ui/public/small_button_02.sub", "over_image" : "d:/ymir work/ui/public/small_button_02.sub",
"down_image" : "d:/ymir work/ui/public/small_button_03.sub", "down_image" : "d:/ymir work/ui/public/small_button_03.sub",

8
assets/uiscript/uiscript/auctionwindow_registerpage.py
View File

@@ -42,7 +42,7 @@ window = {
"y" : 150, "y" : 150,
"horizontal_align" : "center", "horizontal_align" : "center",
"text_horizontal_align" : "center", "text_horizontal_align" : "center",
"text" : "아이템을 이곳에 드래그하여 넣어주세요", "text" : "아이템을 이곳에 드래그하여 넣어주세요",
}, },
{ {
@@ -50,7 +50,7 @@ window = {
"type" : "text", "type" : "text",
"x" : 70, "x" : 70,
"y" : 185, "y" : 185,
"text" : "매매 최저가", "text" : "매매 최저가",
}, },
{ {
"name" : "LowerSellingPriceSlot", "name" : "LowerSellingPriceSlot",
@@ -76,7 +76,7 @@ window = {
"type" : "text", "type" : "text",
"x" : 70, "x" : 70,
"y" : 205, "y" : 205,
"text" : "매매 평균가", "text" : "매매 평균가",
}, },
{ {
"name" : "AverageSellingPriceSlot", "name" : "AverageSellingPriceSlot",
@@ -123,7 +123,7 @@ window = {
"x" : 230, "x" : 230,
"y" : 250 - 3, "y" : 250 - 3,
"text" : "등록", "text" : "등록",
"default_image" : "d:/ymir work/ui/public/small_button_01.sub", "default_image" : "d:/ymir work/ui/public/small_button_01.sub",
"over_image" : "d:/ymir work/ui/public/small_button_02.sub", "over_image" : "d:/ymir work/ui/public/small_button_02.sub",

2
assets/uiscript/uiscript/beltinventorywindow.py
View File

@@ -6,7 +6,7 @@ EQUIPMENT_START_INDEX = 90
window = { window = {
"name" : "BeltInventoryWindow", "name" : "BeltInventoryWindow",
## 600 - (width + ¿À¸¥ÂÊÀ¸·Î ºÎÅÍ ¶ç¿ì±â 24 px) ## 600 - (width + 오른쪽으로 부터 띄우기 24 px)
"x" : SCREEN_WIDTH - 176 - 148, "x" : SCREEN_WIDTH - 176 - 148,
"y" : SCREEN_HEIGHT - 37 - 565 + 209 + 32, "y" : SCREEN_HEIGHT - 37 - 565 + 209 + 32,
# "x" : -148, # "x" : -148,

64
assets/uiscript/uiscript/characterwindow.py
View File

@@ -230,7 +230,7 @@ window = {
{ {
"name" : "Guild_Name", "name" : "Guild_Name",
"type":"text", "type":"text",
"text":"길드 이름", "text":"길드 이름",
"x":0, "x":0,
"y":0, "y":0,
"r":1.0, "r":1.0,
@@ -255,7 +255,7 @@ window = {
{ {
"name" : "Character_Name", "name" : "Character_Name",
"type":"text", "type":"text",
"text":"캐릭터 이름", "text":"캐릭터 이름",
"x":0, "x":0,
"y":0, "y":0,
"r":1.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_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" : "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, "name":"Status_Standard", "type":"window", "x":3, "y":100, "width":200, "height":250,
"children" : "children" :
( (
## 기본 능력 제목 ## 기본 능력 제목
{ "name":"Character_Bar_01", "type":"horizontalbar", "x":12, "y":8, "width":223, }, { "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":"Character_Bar_01_Text", "type" : "image", "x" : 13, "y" : 9, "image" : LOCALE_PATH+"label_std.sub", },
## 능력 수련 수치 ## 능력 수련 수치
{ {
"name":"Status_Plus_Label", "name":"Status_Plus_Label",
"type":"image", "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_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", }, {"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, "name":"Status_Extent", "type":"window", "x":3, "y":221, "width":200, "height":50,
"children" : "children" :
( (
## 부가 능력 제목 ## 부가 능력 제목
{ "name":"Status_Extent_Bar", "type":"horizontalbar", "x":12, "y":6, "width":223, }, { "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_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_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", }, {"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, "name":"MOV_Label", "type":"window", "x":66, "y":33, "width":50, "height":20,
"children" : "children" :
@@ -444,7 +444,7 @@ window = {
) )
}, },
## ASPD - 공격 속도 ## ASPD - 공격 속도
{ {
"name":"ASPD_Label", "type":"window", "x":66, "y":33+23, "width":50, "height":20, "name":"ASPD_Label", "type":"window", "x":66, "y":33+23, "width":50, "height":20,
"children" : "children" :
@@ -454,7 +454,7 @@ window = {
) )
}, },
## CSPD - 주문 속도 ## CSPD - 주문 속도
{ {
"name":"CSPD_Label", "type":"window", "x":66, "y":33+23*2, "width":50, "height":20, "name":"CSPD_Label", "type":"window", "x":66, "y":33+23*2, "width":50, "height":20,
"children" : "children" :
@@ -464,7 +464,7 @@ window = {
) )
}, },
## MATT - 마법 공격력 ## MATT - 마법 공격력
{ {
"name":"MATT_Label", "type":"window", "x":183, "y":33, "width":50, "height":20, "name":"MATT_Label", "type":"window", "x":183, "y":33, "width":50, "height":20,
"children" : "children" :
@@ -474,7 +474,7 @@ window = {
) )
}, },
## MDEF - 마법 방어력 ## MDEF - 마법 방어력
{ {
"name":"MDEF_Label", "type":"window", "x":183, "y":33+23, "width":50, "height":20, "name":"MDEF_Label", "type":"window", "x":183, "y":33+23, "width":50, "height":20,
"children" : "children" :
@@ -484,7 +484,7 @@ window = {
) )
}, },
## 회피율 ## 회피율
{ {
"name":"ER_Label", "type":"window", "x":183, "y":33+23*2, "width":50, "height":20, "name":"ER_Label", "type":"window", "x":183, "y":33+23*2, "width":50, "height":20,
"children" : "children" :
@@ -697,7 +697,7 @@ window = {
"children" : "children" :
( (
## 기본 액션 제목 ## 기본 액션 제목
{ "name":"Action_Bar", "type":"horizontalbar", "x":12, "y":11, "width":223, }, { "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 }, { "name":"Action_Bar_Text", "type":"text", "x":15, "y":13, "text":uiScriptLocale.CHARACTER_NORMAL_ACTION },
@@ -718,7 +718,7 @@ window = {
"image" : ICON_SLOT_FILE, "image" : ICON_SLOT_FILE,
}, },
## 상호 액션 제목 ## 상호 액션 제목
{ "name":"Reaction_Bar", "type":"horizontalbar", "x":12, "y":8+150, "width":223, }, { "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 }, { "name":"Reaction_Bar_Text", "type":"text", "x":15, "y":10+150, "text":uiScriptLocale.CHARACTER_MUTUAL_ACTION },
@@ -776,25 +776,25 @@ window = {
"horizontal_align" : "right", "horizontal_align" : "right",
}, },
{ "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 }, { "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 },
{ "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 }, { "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 },
{ "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 }, { "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 },
{ "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 }, { "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 },
{ "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 }, { "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 },
{ "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 }, { "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 },
{ "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 }, { "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 },
{ "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 }, { "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 },
{ "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 }, { "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 },
{ "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 }, { "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 },
{ "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 }, { "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 },
{ "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 }, { "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 },
{ "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 }, { "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 },
{ "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 }, { "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 },
{ "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 }, { "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 },
), ),
}, },

4
assets/uiscript/uiscript/cuberesultwindow.py
View File

@@ -40,7 +40,7 @@ window = {
"children" : "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", "vertical_align" : "bottom",
"horizontal_align" : "center", "horizontal_align" : "center",
"text":"합성에 성공 했습니다", "text":"합성에 성공 했습니다",
"text_horizontal_align":"center", "text_horizontal_align":"center",
}, },

2
assets/uiscript/uiscript/dragonsoulrefinewindow.py
View File

@@ -3,7 +3,7 @@ import uiScriptLocale
window = { window = {
"name" : "DragonSoulRefineWindow", "name" : "DragonSoulRefineWindow",
## ¿ëÈ¥¼® â ¹Ù·Î ¿ÞÂÊ ## 용혼석 창 바로 왼쪽
"x" : SCREEN_WIDTH - 176 - 287 - 10 - 287, "x" : SCREEN_WIDTH - 176 - 287 - 10 - 287,
"y" : SCREEN_HEIGHT - 37 - 505, "y" : SCREEN_HEIGHT - 37 - 505,

2
assets/uiscript/uiscript/dragonsoulwindow.py
View File

@@ -3,7 +3,7 @@ import uiScriptLocale
window = { window = {
"name" : "InventoryWindow", "name" : "InventoryWindow",
## 600 - (width + ¿À¸¥ÂÊÀ¸·Î ºÎÅÍ ¶ç¿ì±â 24 px) ## 600 - (width + 오른쪽으로 부터 띄우기 24 px)
"x" : SCREEN_WIDTH - 176 - 287 - 10, "x" : SCREEN_WIDTH - 176 - 287 - 10,
"y" : SCREEN_HEIGHT - 37 - 505, "y" : SCREEN_HEIGHT - 37 - 505,

6
assets/uiscript/uiscript/equipmentdialog.py
View File

@@ -63,11 +63,11 @@ window = {
{"index":8, "x":75, "y":145, "width":32, "height":32}, {"index":8, "x":75, "y":145, "width":32, "height":32},
{"index":9, "x":114, "y":2, "width":32, "height":32}, {"index":9, "x":114, "y":2, "width":32, "height":32},
{"index":10, "x":75, "y":35, "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}, ##{"index":21, "x":2, "y":106, "width":32, "height":32},
## »õ ¹ÝÁö2 ## 새 반지2
##{"index":22, "x":75, "y":106, "width":32, "height":32}, ##{"index":22, "x":75, "y":106, "width":32, "height":32},
## »õ º§Æ® ## 새 벨트
{"index":23, "x":39, "y":106, "width":32, "height":32}, {"index":23, "x":39, "y":106, "width":32, "height":32},
), ),
}, },

6
assets/uiscript/uiscript/fishingwindow.py
View File

@@ -20,7 +20,7 @@ window = {
"y" : 0, "y" : 0,
"width" : 150, "width" : 150,
"height" : 195, "height" : 195,
"title" : "³¬½Ã", "title" : "낚시",
"children" : "children" :
( (
@@ -82,7 +82,7 @@ window = {
"x" : 10, "x" : 10,
"y" : 10, "y" : 10,
"text" : "¹°°í±â À̸§", "text" : "물고기 이름",
}, },
{ {
@@ -215,7 +215,7 @@ window = {
"x" : 0, "x" : 0,
"y" : 30, "y" : 30,
"text" : "³¬½Ã", "text" : "낚시",
"horizontal_align" : "center", "horizontal_align" : "center",
"vertical_align" : "bottom", "vertical_align" : "bottom",

6
assets/uiscript/uiscript/gameoptiondialog.py
View File

@@ -56,7 +56,7 @@ window = {
), ),
}, },
## À̸§»ö ## 이름색
{ {
"name" : "name_color", "name" : "name_color",
"type" : "text", "type" : "text",
@@ -93,7 +93,7 @@ window = {
"down_image" : ROOT_PATH + "Middle_Button_03.sub", "down_image" : ROOT_PATH + "Middle_Button_03.sub",
}, },
## Ÿ°Ùâ ## 타겟창
{ {
"name" : "target_board", "name" : "target_board",
"type" : "text", "type" : "text",
@@ -398,7 +398,7 @@ window = {
"down_image" : ROOT_PATH + "middle_button_03.sub", "down_image" : ROOT_PATH + "middle_button_03.sub",
}, },
## ÆǸŹ®±¸ ## 판매문구
{ {
"name" : "salestext_on_off", "name" : "salestext_on_off",
"type" : "text", "type" : "text",

6
assets/uiscript/uiscript/helpwindow2.py
View File

@@ -145,15 +145,15 @@ window = {
{ {
"name" : "help_02_01", "type" : "text", "outline" : 1, "name" : "help_02_01", "type" : "text", "outline" : 1,
"x" : 0, "y" : SCREEN_HEIGHT * HEIGHT_STEP*0, "x" : 0, "y" : SCREEN_HEIGHT * HEIGHT_STEP*0,
"text" : "- 가나다라마바사 01", "text" : "- 가나다라마바사 01",
}, },
{ {
"name" : "help_02_02", "type" : "text", "outline" : 1, "name" : "help_02_02", "type" : "text", "outline" : 1,
"x" : 0, "y" : HEIGHT_STEP*1, "x" : 0, "y" : HEIGHT_STEP*1,
"text" : "- 가나다라마바사 02", "text" : "- 가나다라마바사 02",
}, },
## 이 밑으로 텍스트를 추가 하시면 됩니다. ## 이 밑으로 텍스트를 추가 하시면 됩니다.
), ),
}, },

4
assets/uiscript/uiscript/passworddialog.py
View File

@@ -25,7 +25,7 @@ window = {
"children" : "children" :
( (
#³»¿ë #내용
{ {
"name" : "Desc1", "name" : "Desc1",
"type" : "text", "type" : "text",
@@ -36,7 +36,7 @@ window = {
"text" : uiScriptLocale.PASSWORD_DESC_1, "text" : uiScriptLocale.PASSWORD_DESC_1,
"text_horizontal_align":"center" "text_horizontal_align":"center"
}, },
#³»¿ë2 #내용2
{ {
"name" : "Desc2", "name" : "Desc2",
"type" : "text", "type" : "text",

4
assets/uiscript/uiscript/skillpointresetdialog.py
View File

@@ -31,7 +31,7 @@ window = {
"x" : 10, "x" : 10,
"y" : 17, "y" : 17,
"text" : "½ºÅ³Æ÷ÀÎÆ® ¸®¼Â", "text" : "스킬포인트 리셋",
"default_image" : ROOT + "XLarge_Button_01.sub", "default_image" : ROOT + "XLarge_Button_01.sub",
"over_image" : ROOT + "XLarge_Button_02.sub", "over_image" : ROOT + "XLarge_Button_02.sub",
@@ -45,7 +45,7 @@ window = {
"x" : 10, "x" : 10,
"y" : 57, "y" : 57,
"text" : "Ãë¼Ò", "text" : "취소",
"default_image" : ROOT + "XLarge_Button_01.sub", "default_image" : ROOT + "XLarge_Button_01.sub",
"over_image" : ROOT + "XLarge_Button_02.sub", "over_image" : ROOT + "XLarge_Button_02.sub",

8
assets/uiscript/uiscript/systemoptiondialog.py
View File

@@ -116,7 +116,7 @@ window = {
"y" : 50, "y" : 50,
}, },
## 카메라 ## 카메라
{ {
"name" : "camera_mode", "name" : "camera_mode",
"type" : "text", "type" : "text",
@@ -155,7 +155,7 @@ window = {
"down_image" : ROOT_PATH + "Middle_Button_03.sub", "down_image" : ROOT_PATH + "Middle_Button_03.sub",
}, },
## 안개 ## 안개
{ {
"name" : "fog_mode", "name" : "fog_mode",
"type" : "text", "type" : "text",
@@ -208,7 +208,7 @@ window = {
"down_image" : ROOT_PATH + "small_Button_03.sub", "down_image" : ROOT_PATH + "small_Button_03.sub",
}, },
## 타일 가속 ## 타일 가속
{ {
"name" : "tiling_mode", "name" : "tiling_mode",
"type" : "text", "type" : "text",
@@ -262,7 +262,7 @@ window = {
}, },
## 그림자 ## 그림자
# { # {
# "name" : "shadow_mode", # "name" : "shadow_mode",
# "type" : "text", # "type" : "text",