From: Caisking <3449750381@qq.com>
Date: Fri, 19 Jul 2024 03:02:45 +0000 (+0800)
Subject: 修改水母，运动表盘背景
X-Git-Tag: release_V1.2.70_20241020_135402~702^2~32
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=01c47deebb0957e9283ca8f2b7f40f6bb623a258;p=mirrors%2FFD230.git

修改水母，运动表盘背景
---

diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.lzma b/tools/dial_converter_tool/dial_lzma/101/sport.lzma
index 3739c48d9..abd63bc4b 100644
Binary files a/tools/dial_converter_tool/dial_lzma/101/sport.lzma and b/tools/dial_converter_tool/dial_lzma/101/sport.lzma differ
diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma
index 83ab5a290..fba028ced 100644
Binary files a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma and b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma differ
diff --git a/tools/dial_converter_tool/instance/101/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/101/MAIN_FACE_IMAGE.png
index e9369ea0d..340890023 100644
Binary files a/tools/dial_converter_tool/instance/101/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/101/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/101/sport.xml b/tools/dial_converter_tool/instance/101/sport.xml
index 39d3d2f98..7cf565887 100644
--- a/tools/dial_converter_tool/instance/101/sport.xml
+++ b/tools/dial_converter_tool/instance/101/sport.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="sport" description="运动" size="466 466" version="1.0" preview_img="./instance/101/sport.png">
-=======
-<dial title="运动" description="101" size="466 466" version="1.0" preview_img="./instance/101/sport.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <!-- 背景图像 -->
     <static_img id="back_ground" position="0 0" img_name="./instance/101/MAIN_FACE_IMAGE.png"></static_img>
 
diff --git a/tools/dial_converter_tool/instance/102/kaleidoscope.xml b/tools/dial_converter_tool/instance/102/kaleidoscope.xml
index f9d3d4f61..24927105e 100644
--- a/tools/dial_converter_tool/instance/102/kaleidoscope.xml
+++ b/tools/dial_converter_tool/instance/102/kaleidoscope.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="kaleidoscope" description="万花筒" size="466 466" version="1.0" preview_img="./instance/102/preview_img.png">
-=======
-<dial title="万花筒" description="kaleidoscope dial" size="466 466" version="1.0" preview_img="./instance/102/preview_img.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <!-- 万花筒图像 -->
     <kaleidoscope id="kale" img_name="./instance/102/rabbit466.png" crown_rotate_step="0.2" animator_rotate_step="0.1"></kaleidoscope>
 
diff --git a/tools/dial_converter_tool/instance/1028/KUMI.xml b/tools/dial_converter_tool/instance/1028/KUMI.xml
index 49710bc6b..22a36743f 100644
--- a/tools/dial_converter_tool/instance/1028/KUMI.xml
+++ b/tools/dial_converter_tool/instance/1028/KUMI.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="KUMI" description="KUMI" size="466 466" version="1.0" preview_img="./instance/1028/KUMI.png">
-=======
-<dial title="KUMI" description="KUMI clock" size="466 466" version="1.0" preview_img="./instance/1028/KUMI.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <static_img id="back_ground" position="0 0" img_name="./instance/1028/MAIN_FACE_IMAGE.png"></static_img>
 
     <!-- 日期标签 -->
diff --git a/tools/dial_converter_tool/instance/103/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/103/MAIN_FACE_IMAGE.png
index c4f291258..065c1f622 100644
Binary files a/tools/dial_converter_tool/instance/103/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/103/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/103/jellyfish.xml b/tools/dial_converter_tool/instance/103/jellyfish.xml
index 9adab398a..6055df057 100644
--- a/tools/dial_converter_tool/instance/103/jellyfish.xml
+++ b/tools/dial_converter_tool/instance/103/jellyfish.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="jellyfish" description="水母" size="466 466" version="1.0" preview_img="./instance/103/jellyfish.png">
-=======
-<dial title="水母" description="jellyfish clock" size="466 466" version="1.0" preview_img="./instance/103/jellyfish.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <static_img id="back_ground" position="0 0" img_name="./instance/103/MAIN_FACE_IMAGE.png"></static_img>
 
     <!-- 月份标签 -->
diff --git a/tools/dial_converter_tool/instance/104/dog.xml b/tools/dial_converter_tool/instance/104/dog.xml
index 4407eac3a..0410875fe 100644
--- a/tools/dial_converter_tool/instance/104/dog.xml
+++ b/tools/dial_converter_tool/instance/104/dog.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="dog" description="小狗" size="466 466" version="1.0" preview_img="./instance/104/dog.png">
-=======
-<dial title="小狗" description="dog clock" size="466 466" version="1.0" preview_img="./instance/104/dog.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <!-- 背景图像 -->
     <static_img id="back_ground" position="0 0" img_name="./instance/104/MAIN_FACE_IMAGE.png"></static_img>
 
diff --git a/tools/dial_converter_tool/instance/105/kitty.xml b/tools/dial_converter_tool/instance/105/kitty.xml
index 9779b74e3..aefeb9258 100644
--- a/tools/dial_converter_tool/instance/105/kitty.xml
+++ b/tools/dial_converter_tool/instance/105/kitty.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <dial title="kitty" description="小猫" size="466 466" version="1.0" preview_img="./instance/105/kitty.png">
     <sequence_img img_names="./instance/105/background/1.png,./instance/105/background/6.png,./instance/105/background/11.png,./instance/105/background/16.png,./instance/105/background/21.png,./instance/105/background/26.png,./instance/105/background/31.png,./instance/105/background/36.png,./instance/105/background/41.png,./instance/105/background/46.png,./instance/105/background/51.png,./instance/105/background/56.png,./instance/105/background/61.png,./instance/105/background/66.png,./instance/105/background/71.png,./instance/105/background/76.png,./instance/105/background/81.png,./instance/105/background/86.png,./instance/105/background/91.png,./instance/105/background/96.png,./instance/105/background/101.png,./instance/105/background/106.png,./instance/105/background/111.png,./instance/105/background/116.png,./instance/105/background/121.png,./instance/105/background/126.png,./instance/105/background/131.png,./instance/105/background/136.png,./instance/105/background/141.png,./instance/105/background/146.png,./instance/105/background/151.png,./instance/105/background/156.png,./instance/105/background/161.png,./instance/105/background/166.png,./instance/105/background/171.png,./instance/105/background/176.png,./instance/105/background/181.png,./instance/105/background/186.png,./instance/105/background/191.png,./instance/105/background/196.png,./instance/105/background/201.png" position="0 140" repeat="true" interval="100"></sequence_img>
     <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
@@ -10,41 +9,4 @@
     <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="101 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="15" period="10"></label>
     <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="259 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="14" period="10"></label>
     <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center" bind_data="15" period="10"></label>
-=======
-<dial title="小猫" description="kitty clock" size="466 466" version="1.0"
-    preview_img="./instance/105/kitty.png">
-    <sequence_img
-        img_names="./instance/105/background/1.png,./instance/105/background/6.png,./instance/105/background/11.png,./instance/105/background/16.png,./instance/105/background/21.png,./instance/105/background/26.png,./instance/105/background/31.png,./instance/105/background/36.png,./instance/105/background/41.png,./instance/105/background/46.png,./instance/105/background/51.png,./instance/105/background/56.png,./instance/105/background/61.png,./instance/105/background/66.png,./instance/105/background/71.png,./instance/105/background/76.png,./instance/105/background/81.png,./instance/105/background/86.png,./instance/105/background/91.png,./instance/105/background/96.png,./instance/105/background/101.png,./instance/105/background/106.png,./instance/105/background/111.png,./instance/105/background/116.png,./instance/105/background/121.png,./instance/105/background/126.png,./instance/105/background/131.png,./instance/105/background/136.png,./instance/105/background/141.png,./instance/105/background/146.png,./instance/105/background/151.png,./instance/105/background/156.png,./instance/105/background/161.png,./instance/105/background/166.png,./instance/105/background/171.png,./instance/105/background/176.png,./instance/105/background/181.png,./instance/105/background/186.png,./instance/105/background/191.png,./instance/105/background/196.png,./instance/105/background/201.png"
-        position="0 140" repeat="true" interval="100"></sequence_img>
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
-        break_mode="adapt" rect="142 390 60 30" text="%2.0f月" font_size="26" align="center"
-        bind_data="18" period="10"></label>
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt"
-        rect="185 390 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <option_img position="262 390"
-        img_names="./instance/105/week/7.png,./instance/105/week/1.png,./instance/105/week/2.png,./instance/105/week/3.png,./instance/105/week/4.png,./instance/105/week/5.png,./instance/105/week/6.png"
-        bind_data="17" period="10"></option_img>
-    <!-- <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" -->
-    <!-- break_mode="adapt" rect="262 390 60 30" text="星期%2.0f" font_size="26" align="center" -->
-    <!-- bind_data="17" period="10"></label> -->
-    <box_progress id="battery_progress" rect="180 43 31 19"
-        color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF"
-        bind_data="25"
-        period="10"></box_progress>
-    <option_img position="174 37"
-        img_names="./instance/105/Battery/Battery.png,./instance/105/Battery/BatteryCharge.png"
-        bind_data="20" period="10"></option_img>
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
-        break_mode="adapt" rect="226 35 200 60" text="%2.0f%%" font_size="26" align="center"
-        bind_data="8" period="10"></label>
-    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
-        break_mode="adapt" rect="101 295 200 60" text="%02.0f" font_size="90" align="center"
-        bind_data="15" period="10"></label>
-    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
-        break_mode="adapt" rect="259 295 200 60" text="%02.0f" font_size="90" align="center"
-        bind_data="14" period="10"></label>
-    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf"
-        break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center"
-        bind_data="15" period="10"></label>
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/1052/classic.xml b/tools/dial_converter_tool/instance/1052/classic.xml
index 6029c8626..c54d8a2cf 100644
--- a/tools/dial_converter_tool/instance/1052/classic.xml
+++ b/tools/dial_converter_tool/instance/1052/classic.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="classic" description="经典表盘" size="466 466" version="1.0" preview_img="./instance/1052/classic.png">
-=======
-<dial title="经典表盘" description="classic clock" size="466 466" version="1.0" preview_img="./instance/1052/classic.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <static_img id="back_ground" position="0 0" img_name="./instance/1052/MAIN_FACE_IMAGE.png"></static_img>
     <!-- 月份显示 -->
     <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 365 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
diff --git a/tools/dial_converter_tool/instance/106/galaxy.xml b/tools/dial_converter_tool/instance/106/galaxy.xml
index e87785798..7ff3eafd3 100644
--- a/tools/dial_converter_tool/instance/106/galaxy.xml
+++ b/tools/dial_converter_tool/instance/106/galaxy.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="galaxy" description="星空" size="466 466" version="1.0" preview_img="./instance/106/galaxy.png">
-=======
-<dial title="星空" description="galaxy clock" size="466 466" version="1.0" preview_img="./instance/106/galaxy.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <static_img id="back_ground" position="0 0" img_name="./instance/106/MAIN_FACE_IMAGE.png"></static_img>
 
     <!-- 月份显示 -->
diff --git a/tools/dial_converter_tool/instance/107/geometry.xml b/tools/dial_converter_tool/instance/107/geometry.xml
index aa182d994..68e5a9c29 100644
--- a/tools/dial_converter_tool/instance/107/geometry.xml
+++ b/tools/dial_converter_tool/instance/107/geometry.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="geometry" description="数码几何" size="466 466" version="1.0" preview_img="./instance/107/geometry.png">
-=======
-<dial title="数码几何" description="geometry clock" size="466 466" version="1.0" preview_img="./instance/107/geometry.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <!-- 几何动画序列 -->
     <sequence_img img_names="./instance/107/geometry/1.png,./instance/107/geometry/2.png,./instance/107/geometry/3.png,./instance/107/geometry/4.png,./instance/107/geometry/5.png,./instance/107/geometry/6.png,./instance/107/geometry/7.png,./instance/107/geometry/8.png,./instance/107/geometry/9.png,./instance/107/geometry/10.png,./instance/107/geometry/11.png" position="138 132" repeat="true" interval="100"></sequence_img>
 
diff --git a/tools/dial_converter_tool/instance/108/maomao.xml b/tools/dial_converter_tool/instance/108/maomao.xml
index ba4e9e7ff..a6427516b 100644
--- a/tools/dial_converter_tool/instance/108/maomao.xml
+++ b/tools/dial_converter_tool/instance/108/maomao.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="maoamo" description="招财猫" size="466 466" version="1.0" preview_img="./instance/108/maomao.png">
-=======
-<dial title="招财猫" description="maoamo clock" size="466 466" version="1.0" preview_img="./instance/108/maomao.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <!-- 背景 -->
     <static_img id="back_ground" position="0 0" img_name="./instance/108/MAIN_FACE_IMAGE.png"></static_img>
 
diff --git a/tools/dial_converter_tool/instance/109/succulents.xml b/tools/dial_converter_tool/instance/109/succulents.xml
index 6f5c98009..b09820f57 100644
--- a/tools/dial_converter_tool/instance/109/succulents.xml
+++ b/tools/dial_converter_tool/instance/109/succulents.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="succulents" description="多肉" size="466 466" version="1.0" preview_img="./instance/109/succulents.png">
-=======
-<dial title="多肉" description="succulents clock" size="466 466" version="1.0" preview_img="./instance/109/succulents.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
     <static_img id="back_ground" position="0 0" img_name="./instance/109/MAIN_FACE_IMAGE.png"></static_img>
 
     <!-- 电量进度条 -->
diff --git a/tools/dial_converter_tool/instance/110/spaceman.xml b/tools/dial_converter_tool/instance/110/spaceman.xml
index d6c37649e..138f10897 100644
--- a/tools/dial_converter_tool/instance/110/spaceman.xml
+++ b/tools/dial_converter_tool/instance/110/spaceman.xml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <dial title="spaceman" description="宇航员" size="466 466" version="1.0" preview_img="./instance/110/spaceman.png">
-=======
-<dial title="宇航员" description="spaceman clock" size="466 466" version="1.0" preview_img="./instance/110/spaceman.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
 
     <video id="video" rect="0 0 466 466" source="./instance/110/spaceman.mp4" color_key="0xff212324" preview_frame="./instance/110/preview_spaceman.png"></video>
 
diff --git a/tools/dial_converter_tool/instance/111/satellite.xml b/tools/dial_converter_tool/instance/111/satellite.xml
index d1c347a77..eeaf21821 100644
--- a/tools/dial_converter_tool/instance/111/satellite.xml
+++ b/tools/dial_converter_tool/instance/111/satellite.xml
@@ -1,9 +1,5 @@
 
-<<<<<<< HEAD
 <dial title="satellite" description="卫星" size="466 466" version="1.0" preview_img="./instance/111/satellite.png">
-=======
-<dial title="卫星" description="satellite clock" size="466 466" version="1.0" preview_img="./instance/111/satellite.png">
->>>>>>> 48353ea12559c269a40dde792d2ad9f1d1e389c1
 
     <video id="video" rect="0 0 466 466" source="./instance/111/satellite.mp4" color_key="0xff212324" preview_frame="./instance/111/preview_satellite.png"></video>