Merge branch 'main' into main

assets/root/intrologin.py

@@ -447,7 +447,9 @@ class LoginWindow(ui.ScriptWindow):
 			self.serverExitButton		= GetObject("ServerExitButton")
 			self.connectBoard			= GetObject("ConnectBoard")
 			self.loginBoard				= GetObject("LoginBoard")
+			self.idText					= GetObject("ID_Text")
 			self.idEditLine				= GetObject("ID_EditLine")
+			self.pwdText				= GetObject("Password_Text")
 			self.pwdEditLine			= GetObject("Password_EditLine")
 			self.serverInfo				= GetObject("ConnectName")
 			self.selectConnectButton	= GetObject("SelectConnectButton")
@@ -641,6 +643,8 @@ class LoginWindow(ui.ScriptWindow):
 				self.loginExitButton: "LOGIN_EXIT",
 				self.serverSelectButton: "OK",
 				self.serverExitButton: "LOGIN_SELECT_EXIT",
+				self.idText: "LOGIN_ID",
+				self.pwdText: "LOGIN_PASSWORD",
 			}
 			uiLocaleRefresh.RefreshByMapping(elementMapping)
 

assets/root/localeinfo.py

@@ -13,8 +13,6 @@ BLEND_POTION_NO_INFO				= 'BLEND_POTION_NO_INFO'
 LOGIN_FAILURE_WRONG_SOCIALID 		= 'LOGIN_FAILURE_WRONG_SOCIALID'
 LOGIN_FAILURE_SHUTDOWN_TIME 		= 'LOGIN_FAILURE_SHUTDOWN_TIME'
 
-LOCALE_CHANGE_CONFIRM				= 'Change language to %s and reload the game?'
-
 GUILD_MEMBER_COUNT_INFINITY 		= 'INFINITY'
 GUILD_MARK_MIN_LEVEL				= '3'
 GUILD_BUILDING_LIST_TXT				= '{:s}/GuildBuildingList.txt'.format(APP_GET_LOCALE_PATH)

assets/root/playersettingmodule.py

@@ -256,12 +256,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_WARRIOR_M)
 	chrmgr.SelectRace(RACE_WARRIOR_M)	
-	chrmgr.LoadLocalRaceData("warrior_m.msm")
+	chrmgr.LoadLocalRaceData("msm/warrior_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/warrior/intro/")
 
 	chrmgr.CreateRace(RACE_WARRIOR_W)
 	chrmgr.SelectRace(RACE_WARRIOR_W)	
-	chrmgr.LoadLocalRaceData("warrior_w.msm")
+	chrmgr.LoadLocalRaceData("msm/warrior_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/warrior/intro/")
 
 
@@ -270,12 +270,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_ASSASSIN_W)
 	chrmgr.SelectRace(RACE_ASSASSIN_W)
-	chrmgr.LoadLocalRaceData("assassin_w.msm")
+	chrmgr.LoadLocalRaceData("msm/assassin_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/assassin/intro/")
 
 	chrmgr.CreateRace(RACE_ASSASSIN_M)
 	chrmgr.SelectRace(RACE_ASSASSIN_M)
-	chrmgr.LoadLocalRaceData("assassin_m.msm")
+	chrmgr.LoadLocalRaceData("msm/assassin_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/assassin/intro/")
 
 
@@ -284,12 +284,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_SURA_M)
 	chrmgr.SelectRace(RACE_SURA_M)	
-	chrmgr.LoadLocalRaceData("sura_m.msm")
+	chrmgr.LoadLocalRaceData("msm/sura_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/sura/intro/")
 
 	chrmgr.CreateRace(RACE_SURA_W)
 	chrmgr.SelectRace(RACE_SURA_W)	
-	chrmgr.LoadLocalRaceData("sura_w.msm")
+	chrmgr.LoadLocalRaceData("msm/sura_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/sura/intro/")
 
 
@@ -298,12 +298,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_SHAMAN_W)
 	chrmgr.SelectRace(RACE_SHAMAN_W)
-	chrmgr.LoadLocalRaceData("shaman_w.msm")
+	chrmgr.LoadLocalRaceData("msm/shaman_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/shaman/intro/")
 
 	chrmgr.CreateRace(RACE_SHAMAN_M)
 	chrmgr.SelectRace(RACE_SHAMAN_M)
-	chrmgr.LoadLocalRaceData("shaman_m.msm")
+	chrmgr.LoadLocalRaceData("msm/shaman_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/shaman/intro/")