修复黑耀表盘时间重叠

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
index c703ad6..cae986b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e216b822c0eb079b5a09f1665993633059316450e5345bd5ea52c14ab867f42e
-size 1399839
+oid sha256:17a299cfd1cf84c9390be3eb50ff84d89e91b100463710df07d9e74d9c36be28
+size 1399243

diff --git a/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma
index bbfe193..ff1cce8 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma and b/tools/dial_converter_tool/dial_lzma/114/obsidianrhythm.lzma differ

diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
index d944f92..2cf759e 100644 (file)
--- a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
+++ b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
@@ -49,17 +49,18 @@
     <!-- <label id="minute_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="331 222 77 104" text="%02.f" font_size="20" align="center" bind_data="14" period="10"></label> -->\r
 \r
  \r
+    <label id="hour_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="300 222 100 33" text="%s" font_size="20" align="center" bind_data="20483" period="10"></label>\r
 \r
     <!-- 小时十位显示-->\r
-    <label id="hour_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="313 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="26" period="10"></label>\r
+    <!-- <label id="hour_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="313 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="26" period="10"></label> -->\r
     <!-- 小时个位显示 -->\r
-    <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="323 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="27" period="10"></label>\r
+    <!-- <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="323 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="27" period="10"></label> -->\r
     <!-- 分号显示    -->\r
-    <label id="point_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="340 220 28 139" text=":" font_size="22" align="center"></label>\r
+    <!-- <label id="point_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="340 220 28 139" text=":" font_size="22" align="center"></label> -->\r
     <!-- 分钟十位显示 -->\r
-    <label id="minute_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="355 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="28" period="10"></label>\r
+    <!-- <label id="minute_ten_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="355 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="28" period="10"></label> -->\r
     <!-- 分钟个位显示 -->\r
-    <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="370 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="29" period="10"></label>\r
+    <!-- <label id="hour_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="370 222 64 33" text="%1.0f" font_size="20" align="center" bind_data="29" period="10"></label> -->\r
 \r
 \r
     <!-- 小时 -->\r