Merge branch 'dev_hero' into dev_hero_2

2025-10-31 21:26:14 +08:00 · 2025-10-31 21:26:14 +08:00 · fbb3b526ba
commit fbb3b526ba
parent 28dc4d0547 f8cd5af72d
6 changed files with 9 additions and 4 deletions
--- a/Assets/arts/spines/ui/ui_action_title_1/ui_action_title_1.atlas.txt
+++ b/Assets/arts/spines/ui/ui_action_title_1/ui_action_title_1.atlas.txt
@ -2,4 +2,4 @@ ui_action_title_1.png
 size:512,512
 filter:Linear,Linear
 tiaofu
-bounds:1,315,396,82
+bounds:1,369,468,100
--- a/Assets/arts/spines/ui/ui_action_title_1/ui_action_title_1.png
+++ b/Assets/arts/spines/ui/ui_action_title_1/ui_action_title_1.png
--- a/Assets/arts/spines/ui/ui_action_title_1/ui_action_title_1.skel.bytes
+++ b/Assets/arts/spines/ui/ui_action_title_1/ui_action_title_1.skel.bytes
--- a/Assets/arts/spines/ui/ui_unlock_light_1/ui_unlock_light_1.atlas.txt
+++ b/Assets/arts/spines/ui/ui_unlock_light_1/ui_unlock_light_1.atlas.txt
@ -1,9 +1,14 @@
 ui_unlock_light_1.png
-size:512,512
+size:2048,2048
 filter:Linear,Linear
 g3
 bounds:2,2,23,32
 offsets:22,2,65,36
+guangquan1
+bounds:2,36,445,441
+offsets:9,10,461,461
+guangquan2
+bounds:754,831,407,407
+offsets:21,21,449,449
 quan1
-bounds:2,36,246,245
-offsets:6,4,256,256
+bounds:2,479,750,759
--- a/Assets/arts/spines/ui/ui_unlock_light_1/ui_unlock_light_1.png
+++ b/Assets/arts/spines/ui/ui_unlock_light_1/ui_unlock_light_1.png
--- a/Assets/arts/spines/ui/ui_unlock_light_1/ui_unlock_light_1.skel.bytes
+++ b/Assets/arts/spines/ui/ui_unlock_light_1/ui_unlock_light_1.skel.bytes