pan/pixelheros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(hero): 修复血条显示逻辑，区分加血和扣血动画

Browse Source 
refactor(map): 优化地图预制体结构，移除无用节点
style(assets): 更新资源文件和元数据配置
This commit is contained in:
walkpan
2026-01-18 17:21:48 +08:00
parent a60fa91534
commit 1c333629b4
5 changed files with 1287 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1507
assets/resources/game/map/map_rpg.prefab
View File

File diff suppressed because it is too large Load Diff

285
assets/resources/gui/umps.plist
View File

@@ -17,7 +17,7 @@
<key>spriteSourceSize</key>
<string>{486,999}</string>
<key>textureRect</key>
<string>{{1,496},{486,999}}</string>
<string>{{1,1},{486,999}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -34,7 +34,7 @@
<key>spriteSourceSize</key>
<string>{330,347}</string>
<key>textureRect</key>
<string>{{977,1157},{330,347}}</string>
<string>{{862,1199},{330,347}}</string>
<key>textureRotated</key>
<true/>
</dict>
@@ -51,78 +51,10 @@
<key>spriteSourceSize</key>
<string>{486,142}</string>
<key>textureRect</key>
<string>{{1159,1489},{486,136}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>Background_Pass_Curtain_Left.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{245,212}</string>
<key>spriteSourceSize</key>
<string>{245,212}</string>
<key>textureRect</key>
<string>{{1592,68},{245,212}}</string>
<string>{{626,1531},{486,136}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>Background_Pass_Curtain_Right.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{245,212}</string>
<key>spriteSourceSize</key>
<string>{245,212}</string>
<key>textureRect</key>
<string>{{1592,282},{245,212}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>Background_Sample02.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{486,996}</string>
<key>spriteSourceSize</key>
<string>{486,996}</string>
<key>textureRect</key>
<string>{{489,496},{486,996}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>Background_Sample03.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{486,1053}</string>
<key>spriteSourceSize</key>
<string>{486,1053}</string>
<key>textureRect</key>
<string>{{1,1},{486,1053}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>Background_Stage01_Bg.png</key>
<dict>
<key>aliases</key>
@@ -136,7 +68,7 @@
<key>spriteSourceSize</key>
<string>{300,532}</string>
<key>textureRect</key>
<string>{{1,1497},{300,518}}</string>
<string>{{977,1},{300,518}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -153,7 +85,7 @@
<key>spriteSourceSize</key>
<string>{486,91}</string>
<key>textureRect</key>
<string>{{1297,1489},{486,91}}</string>
<string>{{1211,1199},{486,91}}</string>
<key>textureRotated</key>
<true/>
</dict>
@@ -170,27 +102,10 @@
<key>spriteSourceSize</key>
<string>{378,293}</string>
<key>textureRect</key>
<string>{{1159,862},{378,293}}</string>
<string>{{1,1499},{378,293}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>Background_Stage02_Bg.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{486,534}</string>
<key>spriteSourceSize</key>
<string>{486,534}</string>
<key>textureRect</key>
<string>{{1056,1},{486,534}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>Background_Stage02_Bg_bottom_1.png</key>
<dict>
<key>aliases</key>
@@ -204,7 +119,7 @@
<key>spriteSourceSize</key>
<string>{201,71}</string>
<key>textureRect</key>
<string>{{1326,1157},{201,71}}</string>
<string>{{489,1448},{201,71}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -221,9 +136,9 @@
<key>spriteSourceSize</key>
<string>{120,69}</string>
<key>textureRect</key>
<string>{{1326,1361},{120,69}}</string>
<string>{{692,1448},{120,69}}</string>
<key>textureRotated</key>
<true/>
<false/>
</dict>
<key>Background_Stage02_icon.png</key>
<dict>
@@ -238,7 +153,7 @@
<key>spriteSourceSize</key>
<string>{437,343}</string>
<key>textureRect</key>
<string>{{1397,1361},{437,343}}</string>
<string>{{489,710},{437,343}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -255,9 +170,9 @@
<key>spriteSourceSize</key>
<string>{486,339}</string>
<key>textureRect</key>
<string>{{1539,873},{486,339}}</string>
<string>{{489,369},{486,339}}</string>
<key>textureRotated</key>
<true/>
<false/>
</dict>
<key>Background_Stage03_Bg_bottom.png</key>
<dict>
@@ -272,9 +187,9 @@
<key>spriteSourceSize</key>
<string>{249,65}</string>
<key>textureRect</key>
<string>{{1592,1},{249,65}}</string>
<string>{{381,1499},{249,65}}</string>
<key>textureRotated</key>
<false/>
<true/>
</dict>
<key>Background_Stage03_bg_obj_1.png</key>
<dict>
@@ -289,9 +204,9 @@
<key>spriteSourceSize</key>
<string>{50,37}</string>
<key>textureRect</key>
<string>{{1839,68},{50,37}}</string>
<string>{{862,1055},{50,37}}</string>
<key>textureRotated</key>
<true/>
<false/>
</dict>
<key>Background_Stage03_bg_obj_2.png</key>
<dict>
@@ -306,9 +221,9 @@
<key>spriteSourceSize</key>
<string>{20,16}</string>
<key>textureRect</key>
<string>{{1843,1},{20,16}}</string>
<string>{{448,1499},{20,16}}</string>
<key>textureRotated</key>
<false/>
<true/>
</dict>
<key>Background_Stage03_icon.png</key>
<dict>
@@ -323,7 +238,7 @@
<key>spriteSourceSize</key>
<string>{352,299}</string>
<key>textureRect</key>
<string>{{1390,1706},{352,299}}</string>
<string>{{928,898},{352,299}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -340,9 +255,9 @@
<key>spriteSourceSize</key>
<string>{371,391}</string>
<key>textureRect</key>
<string>{{1159,489},{371,391}}</string>
<string>{{489,1055},{371,391}}</string>
<key>textureRotated</key>
<true/>
<false/>
</dict>
<key>Background_Stage05_bg.png</key>
<dict>
@@ -357,9 +272,9 @@
<key>spriteSourceSize</key>
<string>{486,370}</string>
<key>textureRect</key>
<string>{{791,1494},{486,366}}</string>
<string>{{489,1},{486,366}}</string>
<key>textureRotated</key>
<true/>
<false/>
</dict>
<key>Background_Stage05_bg_obj_1.png</key>
<dict>
@@ -374,9 +289,9 @@
<key>spriteSourceSize</key>
<string>{42,94}</string>
<key>textureRect</key>
<string>{{1400,1230},{42,94}}</string>
<string>{{928,710},{42,94}}</string>
<key>textureRotated</key>
<true/>
<false/>
</dict>
<key>Background_Stage05_bg_obj_2.png</key>
<dict>
@@ -391,7 +306,7 @@
<key>spriteSourceSize</key>
<string>{72,104}</string>
<key>textureRect</key>
<string>{{1326,1230},{72,104}}</string>
<string>{{1114,1531},{72,104}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -408,7 +323,7 @@
<key>spriteSourceSize</key>
<string>{176,122}</string>
<key>textureRect</key>
<string>{{977,489},{176,122}}</string>
<string>{{448,1521},{176,122}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -425,7 +340,7 @@
<key>spriteSourceSize</key>
<string>{176,121}</string>
<key>textureRect</key>
<string>{{977,613},{176,121}}</string>
<string>{{962,1669},{176,121}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -442,7 +357,143 @@
<key>spriteSourceSize</key>
<string>{375,315}</string>
<key>textureRect</key>
<string>{{1552,496},{375,315}}</string>
<string>{{977,521},{375,315}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>BackgroundsGradient09.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{1279,1},{16,512}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>BackgroundsGradient14.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{448,1669},{16,512}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>BackgroundsGradient18.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{448,1687},{16,512}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>BackgroundsGradient19.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{448,1705},{16,512}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>BackgroundsGradient20.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{448,1723},{16,512}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>BackgroundsGradient21.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{448,1741},{16,512}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>BackgroundsGradient22.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{381,1759},{16,512}}</string>
<key>textureRotated</key>
<true/>
</dict>
<key>BackgroundsGradient23.png</key>
<dict>
<key>aliases</key>
<array/>
<key>anchor</key>
<string>{0.5,0.5}</string>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{16,512}</string>
<key>spriteSourceSize</key>
<string>{16,512}</string>
<key>textureRect</key>
<string>{{381,1777},{16,512}}</string>
<key>textureRotated</key>
<true/>
</dict>
@@ -459,7 +510,7 @@
<key>spriteSourceSize</key>
<string>{486,495}</string>
<key>textureRect</key>
<string>{{303,1497},{486,495}}</string>
<string>{{1,1002},{486,495}}</string>
<key>textureRotated</key>
<false/>
</dict>
@@ -475,9 +526,9 @@
<key>realTextureFileName</key>
<string>umps.png</string>
<key>size</key>
<string>{1879,2016}</string>
<string>{1303,1794}</string>
<key>smartupdate</key>
<string>$TexturePacker:SmartUpdate:d4d12f82e33954e8e1f69245eb671242:f40ec2486e2b33d54341cbc3e2c4b78e:318abc3a8f3ad8d09018e87dff1f2449$</string>
<string>$TexturePacker:SmartUpdate:89a3ad42ed0c268a7d8564b013594dcb:f5caf18e77d7152f48faeeed97a7990b:318abc3a8f3ad8d09018e87dff1f2449$</string>
<key>textureFileName</key>
<string>umps.png</string>
</dict>

702
assets/resources/gui/umps.plist.meta
View File

@@ -18,8 +18,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1159,
"trimY": 862,
"trimX": 1,
"trimY": 1499,
"width": 378,
"height": 293,
"rawWidth": 378,
@@ -65,7 +65,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
"trimY": 496,
"trimY": 1,
"width": 486,
"height": 999,
"rawWidth": 486,
@@ -110,8 +110,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 977,
"trimY": 1157,
"trimX": 862,
"trimY": 1199,
"width": 330,
"height": 347,
"rawWidth": 330,
@@ -153,11 +153,11 @@
"name": "Background_Lobby_bg_bottom",
"userData": {
"trimThreshold": 1,
"rotated": true,
"rotated": false,
"offsetX": 0,
"offsetY": -3,
"trimX": 1159,
"trimY": 1489,
"trimX": 626,
"trimY": 1531,
"width": 486,
"height": 136,
"rawWidth": 486,
@@ -191,190 +191,6 @@
],
"subMetas": {}
},
"687a4": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@687a4",
"displayName": "",
"id": "687a4",
"name": "Background_Pass_Curtain_Left",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1592,
"trimY": 68,
"width": 245,
"height": 212,
"rawWidth": 245,
"rawHeight": 212,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"70a08": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@70a08",
"displayName": "",
"id": "70a08",
"name": "Background_Pass_Curtain_Right",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1592,
"trimY": 282,
"width": 245,
"height": 212,
"rawWidth": 245,
"rawHeight": 212,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"a50c6": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@a50c6",
"displayName": "",
"id": "a50c6",
"name": "Background_Sample02",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 489,
"trimY": 496,
"width": 486,
"height": 996,
"rawWidth": 486,
"rawHeight": 996,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"57c90": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@57c90",
"displayName": "",
"id": "57c90",
"name": "Background_Sample03",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
"trimY": 1,
"width": 486,
"height": 1053,
"rawWidth": 486,
"rawHeight": 1053,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"eb5f8": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@eb5f8",
@@ -386,8 +202,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -7,
"trimX": 1,
"trimY": 1497,
"trimX": 977,
"trimY": 1,
"width": 300,
"height": 518,
"rawWidth": 300,
@@ -432,8 +248,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1297,
"trimY": 1489,
"trimX": 1211,
"trimY": 1199,
"width": 486,
"height": 91,
"rawWidth": 486,
@@ -467,52 +283,6 @@
],
"subMetas": {}
},
"a4222": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@a4222",
"displayName": "",
"id": "a4222",
"name": "Background_Stage02_Bg",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1056,
"trimY": 1,
"width": 486,
"height": 534,
"rawWidth": 486,
"rawHeight": 534,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"2e027": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@2e027",
@@ -524,8 +294,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1326,
"trimY": 1157,
"trimX": 489,
"trimY": 1448,
"width": 201,
"height": 71,
"rawWidth": 201,
@@ -567,11 +337,11 @@
"name": "Background_Stage02_Bg_bottom_2",
"userData": {
"trimThreshold": 1,
"rotated": true,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1326,
"trimY": 1361,
"trimX": 692,
"trimY": 1448,
"width": 120,
"height": 69,
"rawWidth": 120,
@@ -616,8 +386,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1397,
"trimY": 1361,
"trimX": 489,
"trimY": 710,
"width": 437,
"height": 343,
"rawWidth": 437,
@@ -659,11 +429,11 @@
"name": "Background_Stage03_Bg",
"userData": {
"trimThreshold": 1,
"rotated": true,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1539,
"trimY": 873,
"trimX": 489,
"trimY": 369,
"width": 486,
"height": 339,
"rawWidth": 486,
@@ -705,11 +475,11 @@
"name": "Background_Stage03_Bg_bottom",
"userData": {
"trimThreshold": 1,
"rotated": false,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1592,
"trimY": 1,
"trimX": 381,
"trimY": 1499,
"width": 249,
"height": 65,
"rawWidth": 249,
@@ -751,11 +521,11 @@
"name": "Background_Stage03_bg_obj_1",
"userData": {
"trimThreshold": 1,
"rotated": true,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1839,
"trimY": 68,
"trimX": 862,
"trimY": 1055,
"width": 50,
"height": 37,
"rawWidth": 50,
@@ -797,11 +567,11 @@
"name": "Background_Stage03_bg_obj_2",
"userData": {
"trimThreshold": 1,
"rotated": false,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1843,
"trimY": 1,
"trimX": 448,
"trimY": 1499,
"width": 20,
"height": 16,
"rawWidth": 20,
@@ -846,8 +616,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1390,
"trimY": 1706,
"trimX": 928,
"trimY": 898,
"width": 352,
"height": 299,
"rawWidth": 352,
@@ -889,11 +659,11 @@
"name": "Background_Stage04_icon",
"userData": {
"trimThreshold": 1,
"rotated": true,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1159,
"trimY": 489,
"trimX": 489,
"trimY": 1055,
"width": 371,
"height": 391,
"rawWidth": 371,
@@ -935,11 +705,11 @@
"name": "Background_Stage05_bg",
"userData": {
"trimThreshold": 1,
"rotated": true,
"rotated": false,
"offsetX": 0,
"offsetY": -2,
"trimX": 791,
"trimY": 1494,
"trimX": 489,
"trimY": 1,
"width": 486,
"height": 366,
"rawWidth": 486,
@@ -981,11 +751,11 @@
"name": "Background_Stage05_bg_obj_1",
"userData": {
"trimThreshold": 1,
"rotated": true,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1400,
"trimY": 1230,
"trimX": 928,
"trimY": 710,
"width": 42,
"height": 94,
"rawWidth": 42,
@@ -1030,8 +800,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1326,
"trimY": 1230,
"trimX": 1114,
"trimY": 1531,
"width": 72,
"height": 104,
"rawWidth": 72,
@@ -1076,8 +846,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 977,
"trimY": 489,
"trimX": 448,
"trimY": 1521,
"width": 176,
"height": 122,
"rawWidth": 176,
@@ -1122,8 +892,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 977,
"trimY": 613,
"trimX": 962,
"trimY": 1669,
"width": 176,
"height": 121,
"rawWidth": 176,
@@ -1168,8 +938,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1552,
"trimY": 496,
"trimX": 977,
"trimY": 521,
"width": 375,
"height": 315,
"rawWidth": 375,
@@ -1203,6 +973,374 @@
],
"subMetas": {}
},
"6a155": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@6a155",
"displayName": "",
"id": "6a155",
"name": "BackgroundsGradient09",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1279,
"trimY": 1,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"577e1": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@577e1",
"displayName": "",
"id": "577e1",
"name": "BackgroundsGradient14",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 448,
"trimY": 1669,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"dc000": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@dc000",
"displayName": "",
"id": "dc000",
"name": "BackgroundsGradient18",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 448,
"trimY": 1687,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"858ff": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@858ff",
"displayName": "",
"id": "858ff",
"name": "BackgroundsGradient19",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 448,
"trimY": 1705,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"dde68": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@dde68",
"displayName": "",
"id": "dde68",
"name": "BackgroundsGradient20",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 448,
"trimY": 1723,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"afacc": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@afacc",
"displayName": "",
"id": "afacc",
"name": "BackgroundsGradient21",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 448,
"trimY": 1741,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"ff843": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@ff843",
"displayName": "",
"id": "ff843",
"name": "BackgroundsGradient22",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 381,
"trimY": 1759,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"3a313": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@3a313",
"displayName": "",
"id": "3a313",
"name": "BackgroundsGradient23",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 381,
"trimY": 1777,
"width": 16,
"height": 512,
"rawWidth": 16,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [],
"indexes": [],
"uv": [],
"nuv": [],
"minPos": [],
"maxPos": []
},
"isUuid": true,
"imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
"atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"54dda": {
"importer": "sprite-frame",
"uuid": "d7d869bc-06aa-4876-806f-487e68b96780@54dda",
@@ -1214,8 +1352,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 303,
"trimY": 1497,
"trimX": 1,
"trimY": 1002,
"width": 486,
"height": 495,
"rawWidth": 486,

BIN
assets/resources/gui/umps.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

19
assets/script/game/hero/HeroViewComp.ts
View File

@@ -199,10 +199,25 @@ export class HeroViewComp extends CCComp {
let hp=this.model.hp;
let hp_max=this.model.Attrs[Attrs.HP_MAX];
this.debugLog("hp_show",hp,hp_max)
this.top_node.getChildByName("hp").getComponent(ProgressBar).progress = hp / hp_max;;
let targetProgress = hp / hp_max;
let hpNode = this.top_node.getChildByName("hp");
let hpProgressBar = hpNode.getComponent(ProgressBar);
let hpbProgressBar = hpNode.getChildByName("hpb").getComponent(ProgressBar);
if (targetProgress < hpProgressBar.progress) {
// 扣血：先扣血（hp），再跟（hpb）
hpProgressBar.progress = targetProgress;
this.scheduleOnce(() => {
this.top_node.getChildByName("hp").getChildByName("hpb").getComponent(ProgressBar).progress = hp / hp_max;;
if(hpbProgressBar && hpbProgressBar.isValid) hpbProgressBar.progress = targetProgress;
}, 0.15);
} else {
// 加血：先加底（hpb），再加血（hp）
hpbProgressBar.progress = targetProgress;
this.scheduleOnce(() => {
if(hpProgressBar && hpProgressBar.isValid) hpProgressBar.progress = targetProgress;
}, 0.15);
}
}
/** 显示魔法值 */