feat(combat-ui): ShowState 가시성 통일 + 전투 시작 시 Result 초기화
This commit is contained in:
@@ -1732,10 +1732,22 @@ self:SetEntityEnabled("/ui/DefaultGroup/RewardHud", false)
|
|||||||
self:SetEntityEnabled("/ui/DefaultGroup/MapHud", false)
|
self:SetEntityEnabled("/ui/DefaultGroup/MapHud", false)
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/ShopHud", false)
|
self:SetEntityEnabled("/ui/DefaultGroup/ShopHud", false)
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/RestHud", false)`),
|
self:SetEntityEnabled("/ui/DefaultGroup/RestHud", false)`),
|
||||||
|
method('ShowState', `self:HideGameHud()
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/MainMenu", state == "menu")
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/CharacterSelectHud", state == "charselect")
|
||||||
|
if state == "map" then
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/MapHud", true)
|
||||||
|
elseif state == "combat" then
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/CombatHud", true)
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/DeckHud", true)
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/CardHand", true)
|
||||||
|
elseif state == "shop" then
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/ShopHud", true)
|
||||||
|
elseif state == "rest" then
|
||||||
|
self:SetEntityEnabled("/ui/DefaultGroup/RestHud", true)
|
||||||
|
end`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'state' }]),
|
||||||
method('ShowMainMenu', `self.SelectedClass = ""
|
method('ShowMainMenu', `self.SelectedClass = ""
|
||||||
self:HideGameHud()
|
self:ShowState("menu")
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/MainMenu", true)
|
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/CharacterSelectHud", false)
|
|
||||||
self:SetText("/ui/DefaultGroup/MainMenu/Title", "메이플 덱 어드벤처")
|
self:SetText("/ui/DefaultGroup/MainMenu/Title", "메이플 덱 어드벤처")
|
||||||
self:SetText("/ui/DefaultGroup/MainMenu/Subtitle", "캐릭터를 고르고 덱을 만들어 모험을 시작하세요")
|
self:SetText("/ui/DefaultGroup/MainMenu/Subtitle", "캐릭터를 고르고 덱을 만들어 모험을 시작하세요")
|
||||||
self:SetText("/ui/DefaultGroup/MainMenu/NewGameButton", "새 게임")
|
self:SetText("/ui/DefaultGroup/MainMenu/NewGameButton", "새 게임")
|
||||||
@@ -1765,9 +1777,7 @@ if start ~= nil and start.ButtonComponent ~= nil then
|
|||||||
self.StartGameHandler = start:ConnectEvent(ButtonClickEvent, function() self:StartNewGame() end)
|
self.StartGameHandler = start:ConnectEvent(ButtonClickEvent, function() self:StartNewGame() end)
|
||||||
end`),
|
end`),
|
||||||
method('ShowCharacterSelect', `self.SelectedClass = ""
|
method('ShowCharacterSelect', `self.SelectedClass = ""
|
||||||
self:HideGameHud()
|
self:ShowState("charselect")
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/MainMenu", false)
|
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/CharacterSelectHud", true)
|
|
||||||
self:RenderCharacterSelect()`),
|
self:RenderCharacterSelect()`),
|
||||||
method('SelectClass', `self.SelectedClass = className
|
method('SelectClass', `self.SelectedClass = className
|
||||||
self:RenderCharacterSelect()`, [
|
self:RenderCharacterSelect()`, [
|
||||||
@@ -1790,8 +1800,6 @@ end`),
|
|||||||
self:SetText("/ui/DefaultGroup/CharacterSelectHud/Status", "현재는 전사만 선택할 수 있습니다")
|
self:SetText("/ui/DefaultGroup/CharacterSelectHud/Status", "현재는 전사만 선택할 수 있습니다")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/MainMenu", false)
|
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/CharacterSelectHud", false)
|
|
||||||
self:StartRun()`),
|
self:StartRun()`),
|
||||||
method('SetEntityEnabled', `local e = _EntityService:GetEntityByPath(path)
|
method('SetEntityEnabled', `local e = _EntityService:GetEntityByPath(path)
|
||||||
if e ~= nil then
|
if e ~= nil then
|
||||||
@@ -1818,10 +1826,8 @@ self.CurrentEnemyId = ""
|
|||||||
self:BindButtons()
|
self:BindButtons()
|
||||||
self:AddRelic("${RELICS.startingRelic}")
|
self:AddRelic("${RELICS.startingRelic}")
|
||||||
self:ShowMap()`),
|
self:ShowMap()`),
|
||||||
method('StartCombat', `self:SetEntityEnabled("/ui/DefaultGroup/MapHud", false)
|
method('StartCombat', `self:ShowState("combat")
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/DeckHud", true)
|
self:SetEntityEnabled("/ui/DefaultGroup/CombatHud/Result", false)
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/CardHand", true)
|
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/CombatHud", true)
|
|
||||||
self.MaxEnergy = 3
|
self.MaxEnergy = 3
|
||||||
self.Turn = 0
|
self.Turn = 0
|
||||||
self.PlayerBlock = 0
|
self.PlayerBlock = 0
|
||||||
@@ -2541,14 +2547,8 @@ if names == "" then
|
|||||||
names = "없음"
|
names = "없음"
|
||||||
end
|
end
|
||||||
self:SetText("/ui/DefaultGroup/CombatHud/TopBar/Relics", "유물: " .. names)`),
|
self:SetText("/ui/DefaultGroup/CombatHud/TopBar/Relics", "유물: " .. names)`),
|
||||||
method('ShowMap', `self:SetEntityEnabled("/ui/DefaultGroup/DeckHud", false)
|
method('ShowMap', `self:ShowState("map")
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/CardHand", false)
|
self:RenderMap()`),
|
||||||
self:SetEntityEnabled("/ui/DefaultGroup/CombatHud", false)
|
|
||||||
self:RenderMap()
|
|
||||||
local hud = _EntityService:GetEntityByPath("/ui/DefaultGroup/MapHud")
|
|
||||||
if hud ~= nil then
|
|
||||||
hud.Enable = true
|
|
||||||
end`),
|
|
||||||
method('IsReachable', `local list
|
method('IsReachable', `local list
|
||||||
if self.CurrentNodeId == "" then
|
if self.CurrentNodeId == "" then
|
||||||
list = self.MapStart
|
list = self.MapStart
|
||||||
@@ -2613,10 +2613,7 @@ end
|
|||||||
self.ShopRelic = self.RelicPool[math.random(1, #self.RelicPool)]
|
self.ShopRelic = self.RelicPool[math.random(1, #self.RelicPool)]
|
||||||
self.ShopRelicBought = false
|
self.ShopRelicBought = false
|
||||||
self:RenderShop()
|
self:RenderShop()
|
||||||
local hud = _EntityService:GetEntityByPath("/ui/DefaultGroup/ShopHud")
|
self:ShowState("shop")`),
|
||||||
if hud ~= nil then
|
|
||||||
hud.Enable = true
|
|
||||||
end`),
|
|
||||||
method('RenderShop', `self:SetText("/ui/DefaultGroup/ShopHud/Gold", "골드 " .. string.format("%d", self.Gold))
|
method('RenderShop', `self:SetText("/ui/DefaultGroup/ShopHud/Gold", "골드 " .. string.format("%d", self.Gold))
|
||||||
for i = 1, 3 do
|
for i = 1, 3 do
|
||||||
local cid = self.ShopChoices[i]
|
local cid = self.ShopChoices[i]
|
||||||
@@ -2684,10 +2681,7 @@ end
|
|||||||
local healed = self.PlayerHp - old
|
local healed = self.PlayerHp - old
|
||||||
self:SetText("/ui/DefaultGroup/RestHud/Info", "HP " .. string.format("%d", old) .. " → " .. string.format("%d", self.PlayerHp) .. " (+" .. string.format("%d", healed) .. ")")
|
self:SetText("/ui/DefaultGroup/RestHud/Info", "HP " .. string.format("%d", old) .. " → " .. string.format("%d", self.PlayerHp) .. " (+" .. string.format("%d", healed) .. ")")
|
||||||
self:RenderCombat()
|
self:RenderCombat()
|
||||||
local hud = _EntityService:GetEntityByPath("/ui/DefaultGroup/RestHud")
|
self:ShowState("rest")`),
|
||||||
if hud ~= nil then
|
|
||||||
hud.Enable = true
|
|
||||||
end`),
|
|
||||||
method('LeaveNode', `local s = _EntityService:GetEntityByPath("/ui/DefaultGroup/ShopHud")
|
method('LeaveNode', `local s = _EntityService:GetEntityByPath("/ui/DefaultGroup/ShopHud")
|
||||||
if s ~= nil then
|
if s ~= nil then
|
||||||
s.Enable = false
|
s.Enable = false
|
||||||
|
|||||||
Reference in New Issue
Block a user