Mobile UI scaling and live safe-area relayout (mobile step 5)
Phones and tablets pick the logical UI size from the screen (height 600..768 from the dp height, width from the aspect ratio) instead of letterboxing 1024x768; metin2.cfg is left untouched via a display-size override. --phone/--safe-insets/--ui-height simulate on desktop. The mobile HUD rebuilds and re-adopts the original windows when the safe area changes. Keeps HUD gauge backgrounds alive and fixes the step-4 disc pixel check threshold. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
11bd94d1ce
commit
ed2c185135
@@ -11,6 +11,7 @@ import ui_mobile_drawer
|
||||
import ui_mobile_widgets as widgets
|
||||
import touch
|
||||
import uiCharacter
|
||||
import constInfo
|
||||
|
||||
def unsigned32(n):
|
||||
return n & 0xFFFFFFFFL
|
||||
@@ -50,16 +51,15 @@ class MobileHUD(ui.Window):
|
||||
self.AddFlag("not_pick")
|
||||
|
||||
self.safe_area = touch.GetSafeArea()
|
||||
self.race = -1
|
||||
self.lastBeltRefresh = 0
|
||||
self.root = None
|
||||
self.__BuildUI(sw, sh)
|
||||
|
||||
def __del__(self):
|
||||
ui.Window.__del__(self)
|
||||
|
||||
def __Container(self, x, y, w, h):
|
||||
def __Container(self, x, y, w, h, parent=None):
|
||||
wnd = ui.Window()
|
||||
wnd.SetParent(self)
|
||||
wnd.SetParent(parent or self.root)
|
||||
wnd.AddFlag("not_pick")
|
||||
wnd.SetPosition(x, y)
|
||||
wnd.SetSize(w, h)
|
||||
@@ -88,10 +88,20 @@ class MobileHUD(ui.Window):
|
||||
frame.SetSize(w + 2, h + 2)
|
||||
frame.SetColor(grp.GenerateColor(0.55, 0.42, 0.25, 0.9))
|
||||
frame.Show()
|
||||
# 底条和边框不保留引用会被立即销毁
|
||||
self.gauge_parts += [bg, frame]
|
||||
return bar
|
||||
|
||||
# 所有控件挂在 root 下;安全区变化时整棵重建(旧 root 失去引用即销毁)
|
||||
def __BuildUI(self, w, h):
|
||||
safe_l, safe_t, safe_r, safe_b = self.safe_area
|
||||
self.race = -1
|
||||
self.lastBeltRefresh = 0
|
||||
self.gauge_parts = []
|
||||
if self.root:
|
||||
# 旧控件之间若有循环引用,Python 2 不会回收带 __del__ 的对象,先整体隐藏
|
||||
self.root.Hide()
|
||||
self.root = self.__Container(0, 0, w, h, self)
|
||||
|
||||
# 1. 左上:主角状态
|
||||
self.player_hud = self.__Container(safe_l + 12, safe_t + 8, 300, self.FACE_DIAMETER + 4)
|
||||
@@ -118,9 +128,9 @@ class MobileHUD(ui.Window):
|
||||
|
||||
# 2. 右上:入口按钮行 + 菜单面板
|
||||
self.drawer = ui_mobile_drawer.MobileDrawer(self.interface)
|
||||
self.drawer.SetParent(self)
|
||||
self.drawer.SetParent(self.root)
|
||||
self.drawer.Show()
|
||||
self.drawer.AttachPanel(self)
|
||||
self.drawer.AttachPanel(self.root)
|
||||
|
||||
# 3. 左侧竖排按钮
|
||||
side = [
|
||||
@@ -133,7 +143,7 @@ class MobileHUD(ui.Window):
|
||||
top = safe_t + 8 + self.FACE_DIAMETER + 48
|
||||
for i, (label, icon, event) in enumerate(side):
|
||||
btn = widgets.RoundButton(self.SIDE_DIAMETER)
|
||||
btn.SetParent(self)
|
||||
btn.SetParent(self.root)
|
||||
btn.SetPosition(safe_l + 12, top + i * self.SIDE_STEP)
|
||||
if not icon or not btn.SetIcon(icon):
|
||||
btn.SetLabel(label)
|
||||
@@ -143,12 +153,12 @@ class MobileHUD(ui.Window):
|
||||
|
||||
# 4. 左下:摇杆显示层
|
||||
self.joystick = ui_mobile_joystick.MobileJoystick(base_x=safe_l + 160, base_y=h - safe_b - 180)
|
||||
self.joystick.SetParent(self)
|
||||
self.joystick.SetParent(self.root)
|
||||
self.joystick.Show()
|
||||
|
||||
# 5. 右下:战斗轮盘
|
||||
self.combat_wheel = ui_mobile_combat.MobileCombatWheel(origin_x=w - safe_r - 120, origin_y=h - safe_b - 120)
|
||||
self.combat_wheel.SetParent(self)
|
||||
self.combat_wheel.SetParent(self.root)
|
||||
self.combat_wheel.Show()
|
||||
|
||||
# 6. 底部:药水栏(第 4 快捷页)与经验条
|
||||
@@ -164,7 +174,7 @@ class MobileHUD(ui.Window):
|
||||
self.quick_slots.append(slot)
|
||||
|
||||
self.exp_width = w - safe_l - safe_r
|
||||
self.exp_bar = self.__Gauge(self, safe_l, h - safe_b - 4, self.exp_width, 3,
|
||||
self.exp_bar = self.__Gauge(self.root, safe_l, h - safe_b - 4, self.exp_width, 3,
|
||||
grp.GenerateColor(0.05, 0.05, 0.05, 0.6), grp.GenerateColor(0.85, 0.70, 0.25, 0.9))
|
||||
|
||||
def __ToggleCharacter(self, state):
|
||||
@@ -261,7 +271,21 @@ class MobileHUD(ui.Window):
|
||||
pct = min(1.0, max(0.0, float(cur) / float(maximum)))
|
||||
bar.SetSize(int(width * pct), height)
|
||||
|
||||
# 刘海/手势条位置变了(例如手机旋转 180 度):按新安全区重建 HUD,并重新摆放原版窗口
|
||||
def Relayout(self, safeArea):
|
||||
self.safe_area = safeArea
|
||||
self.__BuildUI(wndMgr.GetScreenWidth(), wndMgr.GetScreenHeight())
|
||||
if self.IsShow():
|
||||
self.AdoptDefaultWindows()
|
||||
game = constInfo.GetGameInstance()
|
||||
if game and getattr(game, "interface", None) is self.interface:
|
||||
self.AdoptGameWindows(game)
|
||||
|
||||
def OnUpdate(self):
|
||||
safeArea = touch.GetSafeArea()
|
||||
if safeArea != self.safe_area:
|
||||
self.Relayout(safeArea)
|
||||
|
||||
# 1. 主角状态
|
||||
self.__SetGauge(self.hp_bar, self.HP_WIDTH, 12, player.GetStatus(player.HP), player.GetStatus(player.MAX_HP))
|
||||
self.__SetGauge(self.mp_bar, self.SP_WIDTH, 9, player.GetStatus(player.SP), player.GetStatus(player.MAX_SP))
|
||||
|
||||
Reference in New Issue
Block a user