Merge origin/main into main

tools/deck/cb/boot.mjs

@@ -16,7 +16,9 @@ uiInit = _TimerService:SetTimerRepeat(function()
 	uiTries = uiTries + 1
 	if _EntityService:GetEntityByPath("/ui/DeckUIGroup") ~= nil then
 		self:ActivateUIGroups()
-		self:ShowMainMenu()
+		-- MainMenu는 한동안 비활성화: 시작 시 바로 로비로 진입.
+		-- 추후 싱글/멀티/종료 선택 메뉴가 필요하면 self:ShowMainMenu()로 되돌린다(메서드·UI 유지됨).
+		self:ShowLobby()
 		_TimerService:ClearTimer(uiInit)
 	elseif uiTries > 80 then
 		_TimerService:ClearTimer(uiInit)

tools/deck/cb/charselect.mjs

@@ -10,53 +10,63 @@ self:RenderCharacterSelect()`),
 self:RenderCharacterSelect()`, [
       { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'className' },
     ]),
-    method('RenderCharacterSelect', `local warriorArt = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/WarriorButton/Art")
-if warriorArt ~= nil and warriorArt.SpriteGUIRendererComponent ~= nil and self.ClassPortraits ~= nil and self.ClassPortraits["warrior"] ~= nil then
-	warriorArt.SpriteGUIRendererComponent.ImageRUID = self.ClassPortraits["warrior"]
-end
-local mageArt = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/MageButton/Art")
-if mageArt ~= nil and mageArt.SpriteGUIRendererComponent ~= nil and self.ClassPortraits ~= nil and self.ClassPortraits["magician"] ~= nil then
-	mageArt.SpriteGUIRendererComponent.ImageRUID = self.ClassPortraits["magician"]
-end
-local thiefArt = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/ThiefButton/Art")
-if thiefArt ~= nil and thiefArt.SpriteGUIRendererComponent ~= nil and self.ClassPortraits ~= nil and self.ClassPortraits["bandit"] ~= nil then
-	thiefArt.SpriteGUIRendererComponent.ImageRUID = self.ClassPortraits["bandit"]
-end
-local warrior = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/WarriorButton")
-if warrior ~= nil and warrior.SpriteGUIRendererComponent ~= nil then
-	if self.SelectedClass == "warrior" then
-		warrior.SpriteGUIRendererComponent.Color = Color(1, 0.82, 0.3, 1)
-	else
-		warrior.SpriteGUIRendererComponent.Color = Color(0.16, 0.2, 0.26, 1)
+    method('RenderCharacterSelect', `local base = "/ui/SelectUIGroup/CharacterSelectHud"
+local arts = { { p = "/WarriorButton/Art", c = "warrior" }, { p = "/MageButton/Art", c = "magician" }, { p = "/BanditButton/Art", c = "bandit" } }
+for i = 1, #arts do
+	local e = _EntityService:GetEntityByPath(base .. arts[i].p)
+	if e ~= nil and e.SpriteGUIRendererComponent ~= nil and self.ClassPortraits ~= nil and self.ClassPortraits[arts[i].c] ~= nil then
+		e.SpriteGUIRendererComponent.ImageRUID = self.ClassPortraits[arts[i].c]
 	end
 end
-local mage = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/MageButton")
-if mage ~= nil and mage.SpriteGUIRendererComponent ~= nil then
-	if self.SelectedClass == "magician" then
-		mage.SpriteGUIRendererComponent.Color = Color(1, 0.82, 0.3, 1)
-	else
-		mage.SpriteGUIRendererComponent.Color = Color(0.16, 0.2, 0.26, 1)
-	end
-end
-local thief = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/ThiefButton")
-if thief ~= nil and thief.SpriteGUIRendererComponent ~= nil then
-	if self.SelectedClass == "bandit" then
-		thief.SpriteGUIRendererComponent.Color = Color(1, 0.82, 0.3, 1)
-	else
-		thief.SpriteGUIRendererComponent.Color = Color(0.16, 0.2, 0.26, 1)
+local btns = { { p = "/WarriorButton", c = "warrior" }, { p = "/MageButton", c = "magician" }, { p = "/BanditButton", c = "bandit" } }
+for i = 1, #btns do
+	local e = _EntityService:GetEntityByPath(base .. btns[i].p)
+	if e ~= nil then
+		if e.MaskComponent == nil then
+			e:AddComponent("MaskComponent")
+		end
+		if e.SpriteGUIRendererComponent ~= nil then
+			if self.SelectedClass == btns[i].c then
+				e.SpriteGUIRendererComponent.Color = Color(1, 1, 1, 1)
+			else
+				e.SpriteGUIRendererComponent.Color = Color(0.45, 0.5, 0.58, 1)
+			end
+		end
 	end
 end
+local nl = string.char(10)
+local name = ""
+local eng = ""
+local desc = "직업을 선택하고 시작하세요"
+local btnName = ""
 if self.SelectedClass == "warrior" then
-	self:SetText("/ui/SelectUIGroup/CharacterSelectHud/Status", "전사 선택됨")
+	name = "전사"
+	eng = "Warrior"
+	btnName = "/WarriorButton"
+	desc = "직업군 · 모험가" .. nl .. "방어를 쌓고 버티다 강하게 역공하는 단단한 탱커."
 elseif self.SelectedClass == "bandit" then
-	self:SetText("/ui/SelectUIGroup/CharacterSelectHud/Status", "도적 선택됨")
+	name = "도적"
+	eng = "Thief"
+	btnName = "/BanditButton"
+	desc = "직업군 · 모험가" .. nl .. "표창 난사와 독으로 빠르게 몰아치는 민첩한 직업."
 elseif self.SelectedClass == "magician" then
-	self:SetText("/ui/SelectUIGroup/CharacterSelectHud/Status", "마법사 선택됨")
-else
-	self:SetText("/ui/SelectUIGroup/CharacterSelectHud/Status", "직업을 선택하고 시작하세요")
-end`),
+	name = "법사"
+	eng = "Magician"
+	btnName = "/MageButton"
+	desc = "직업군 · 모험가" .. nl .. "약하지만 게이지 운용으로 화력을 집중하는 원소 마법사."
+end
+if btnName ~= "" then
+	local art = _EntityService:GetEntityByPath(base .. btnName .. "/Art")
+	local target = _EntityService:GetEntityByPath(base .. "/SelectedCharacterArt")
+	if art ~= nil and art.SpriteGUIRendererComponent ~= nil and target ~= nil and target.SpriteGUIRendererComponent ~= nil then
+		target.SpriteGUIRendererComponent.ImageRUID = art.SpriteGUIRendererComponent.ImageRUID
+	end
+end
+self:SetText(base .. "/SelectedClass", name)
+self:SetText(base .. "/SelectedClass/SelectedClassEng", eng)
+self:SetText(base .. "/SelectedClassStatus", desc)`),
     method('StartNewGame', `if self.SelectedClass ~= "warrior" and self.SelectedClass ~= "bandit" and self.SelectedClass ~= "magician" then
-	self:SetText("/ui/SelectUIGroup/CharacterSelectHud/Status", "직업을 먼저 선택하세요")
+	self:SetText("/ui/SelectUIGroup/CharacterSelectHud/SelectedClassStatus", "직업을 먼저 선택하세요")
 	return
 end
 self:StartRun()`),

tools/deck/cb/state.mjs

@@ -69,7 +69,7 @@ if warrior ~= nil and (warrior.ButtonComponent ~= nil or warrior:AddComponent("B
 	end
 	self.WarriorSelectHandler = warrior:ConnectEvent(ButtonClickEvent, function() self:SelectClass("warrior") end)
 end
-local thief = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/ThiefButton")
+local thief = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/BanditButton")
 if thief ~= nil and (thief.ButtonComponent ~= nil or thief:AddComponent("ButtonComponent") ~= nil) then
 	if self.ThiefSelectHandler ~= nil then
 		thief:DisconnectEvent(ButtonClickEvent, self.ThiefSelectHandler)