Merge branch 'new0602' of https://e.coding.net/walker_pan/heros/heros into new0602

This commit is contained in:
2025-07-23 15:31:15 +08:00

View File

@@ -3105,6 +3105,9 @@
},
{
"__id__": 142
},
{
"__id__": 150
}
],
"_active": true,
@@ -3125,7 +3128,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 371.352,
"y": 250,
"z": 0
},
"_lrot": {
@@ -3326,6 +3329,181 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 133
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
},
{
"__id__": 145
},
{
"__id__": 147
}
],
"_prefab": {
"__id__": 149
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -360,
"y": -123.94799999999998,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 1073741824,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 142
},
"_enabled": true,
"__prefab": {
"__id__": 144
},
"_contentSize": {
"__type__": "cc.Size",
"width": 720,
"height": 400
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "91HAFRRERDN4ZEbm4IP45d"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 142
},
"_enabled": true,
"__prefab": {
"__id__": 146
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 238,
"g": 238,
"b": 238,
"a": 255
},
"_spriteFrame": {
"__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b36c4",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "dcXAnQLK5L3qEnWLmXSFl9"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 142
},
"_enabled": true,
"__prefab": {
"__id__": 148
},
"_alignFlags": 45,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 23.94799999999998,
"_bottom": -223.94799999999998,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 600,
"_originalHeight": 100,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "55kssJEBdDNoQ/T3KLFTTE"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "3alA3+hkRJd4BQRcc0RSuI",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "bar",
@@ -3335,9 +3513,6 @@
"__id__": 133
},
"_children": [
{
"__id__": 143
},
{
"__id__": 151
},
@@ -3393,7 +3568,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": -360,
"y": 68.11500000000001,
"y": 11.978999999999992,
"z": 0
},
"_lrot": {
@@ -3419,188 +3594,13 @@
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 144
},
{
"__id__": 146
},
{
"__id__": 148
}
],
"_prefab": {
"__id__": 150
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 62.578,
"y": -3.834,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 1073741824,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 143
},
"_enabled": true,
"__prefab": {
"__id__": 145
},
"_contentSize": {
"__type__": "cc.Size",
"width": 637.422,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "91HAFRRERDN4ZEbm4IP45d"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 143
},
"_enabled": true,
"__prefab": {
"__id__": 147
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@08146",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "dcXAnQLK5L3qEnWLmXSFl9"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 143
},
"_enabled": true,
"__prefab": {
"__id__": 149
},
"_alignFlags": 40,
"_target": null,
"_left": 62.578,
"_right": 20,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 600,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "55kssJEBdDNoQ/T3KLFTTE"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "3alA3+hkRJd4BQRcc0RSuI",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "hp",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -3628,7 +3628,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 152.26,
"y": 20.058,
"y": 32.734,
"z": 0
},
"_lrot": {
@@ -4485,8 +4485,6 @@
"__id__": 0
},
"fileId": "93RJvrJV9BSpYUIDpm/xjI",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -4495,7 +4493,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -5181,7 +5179,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [],
"_active": true,
@@ -5317,7 +5315,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -5794,7 +5792,9 @@
"_disabledSprite": null,
"_duration": 0.1,
"_zoomScale": 1.2,
"_target": null,
"_target": {
"__id__": 227
},
"_id": ""
},
{
@@ -5820,8 +5820,6 @@
"__id__": 0
},
"fileId": "481LT9zEFLna/zi4vnTkHi",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -5830,7 +5828,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -5851,8 +5849,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 103.087,
"y": -43.325,
"x": 38.727,
"y": -31.263,
"z": 0
},
"_lrot": {
@@ -6247,7 +6245,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -6275,7 +6273,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 454.542,
"y": 20.058,
"y": 32.734,
"z": 0
},
"_lrot": {
@@ -6955,8 +6953,6 @@
"__id__": 0
},
"fileId": "aeLtwSssdGmrG1rMeHxFBe",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -6965,7 +6961,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -6992,8 +6988,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 636.924,
"y": 20.058,
"x": 269.368,
"y": -33.324,
"z": 0
},
"_lrot": {
@@ -7673,8 +7669,6 @@
"__id__": 0
},
"fileId": "87gMliIqlJtLphbprnifht",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -7683,7 +7677,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -7711,7 +7705,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 268.513,
"y": -13.121,
"y": -0.445,
"z": 0
},
"_lrot": {
@@ -8391,8 +8385,6 @@
"__id__": 0
},
"fileId": "6dnEqlpnlDkKRPh/kBXDTf",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -8401,7 +8393,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -8429,7 +8421,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 427.283,
"y": -13.074,
"y": -0.398,
"z": 0
},
"_lrot": {
@@ -9109,8 +9101,6 @@
"__id__": 0
},
"fileId": "1acbcfH4xL8q5Fmz9eaLPl",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -9119,7 +9109,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -16903,7 +16893,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -16930,8 +16920,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 609.489,
"y": -13.074,
"x": 427.283,
"y": -33.324,
"z": 0
},
"_lrot": {
@@ -17611,8 +17601,6 @@
"__id__": 0
},
"fileId": "6ez8DlFIhCkZJJEFAFTf7y",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -17621,7 +17609,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 142
"__id__": 150
},
"_children": [
{
@@ -17654,8 +17642,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 69.751,
"y": -6.586,
"x": 600.057,
"y": 0.704,
"z": 0
},
"_lrot": {
@@ -17717,8 +17705,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 0.5,
"y": 0.5,
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
@@ -17745,8 +17733,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 180,
"height": 114
"width": 200,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -17881,7 +17869,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 64,
"width": 84,
"height": 54.4
},
"_anchorPoint": {
@@ -17920,8 +17908,8 @@
"_string": "强化",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 30,
"_fontSize": 30,
"_actualFontSize": 40,
"_fontSize": 40,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
@@ -18002,7 +17990,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -41.563,
"x": -97.699,
"y": 16.183,
"z": 0
},
@@ -18170,7 +18158,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 40.706,
"x": 71.447,
"y": -5.748,
"z": 0
},
@@ -18326,8 +18314,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 50
"width": 200,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -18466,7 +18454,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 142
"__id__": 150
},
"_enabled": true,
"__prefab": {
@@ -18475,7 +18463,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 720,
"height": 120
"height": 119.99999999999997
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -18494,7 +18482,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 142
"__id__": 150
},
"_enabled": true,
"__prefab": {
@@ -18504,8 +18492,8 @@
"_target": null,
"_left": 0,
"_right": 0,
"_top": -28.115000000000002,
"_bottom": 108.11500000000001,
"_top": 28.021000000000008,
"_bottom": 51.979000000000006,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -18530,7 +18518,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 142
"__id__": 150
},
"_enabled": true,
"__prefab": {
@@ -18647,12 +18635,12 @@
"__prefab": {
"__id__": 793
},
"_alignFlags": 40,
"_alignFlags": 44,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_bottom": 150,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -18744,7 +18732,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -120,
"x": -115,
"y": 10,
"z": 0
},
@@ -18797,8 +18785,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 110,
"x": -2.5,
"y": 80,
"z": 0
},
"_lrot": {
@@ -18838,8 +18826,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 480,
"height": 220
"width": 465,
"height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -18875,7 +18863,7 @@
"a": 255
},
"_spriteFrame": {
"__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b9426",
"__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d4108",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -18911,10 +18899,10 @@
},
"_alignFlags": 45,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_left": 5,
"_right": 10,
"_top": 70,
"_bottom": 10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -22429,7 +22417,7 @@
"__id__": 978
}
],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 984
@@ -27631,7 +27619,7 @@
"__id__": 1206
}
],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 1212
@@ -31087,7 +31075,7 @@
"__id__": 1358
}
],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 1364
@@ -38035,7 +38023,7 @@
"__id__": 1662
}
],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 1668
@@ -40662,7 +40650,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 201.069,
"y": 150.479,
"z": 0
},
"_lrot": {
@@ -40827,8 +40815,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -240,
"y": 227.128,
"x": -245,
"y": 173.829,
"z": 0
},
"_lrot": {
@@ -41387,7 +41375,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 480,
"width": 720,
"height": 15
},
"_anchorPoint": {
@@ -41415,8 +41403,8 @@
},
"_alignFlags": 40,
"_target": null,
"_left": 0,
"_right": 0,
"_left": -5,
"_right": -235,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
@@ -41492,7 +41480,7 @@
},
"_alignFlags": 12,
"_target": null,
"_left": 0,
"_left": 5,
"_right": 0,
"_top": 0,
"_bottom": 10,
@@ -41637,8 +41625,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 110,
"x": -2.5,
"y": 80,
"z": 0
},
"_lrot": {
@@ -41678,8 +41666,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 220
"width": 235,
"height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -41715,7 +41703,7 @@
"a": 255
},
"_spriteFrame": {
"__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@b9426",
"__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d4108",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -41752,9 +41740,9 @@
"_alignFlags": 45,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_right": 5,
"_top": 70,
"_bottom": 10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -41894,7 +41882,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -55,
"x": -60,
"y": 60,
"z": 0
},
@@ -43885,7 +43873,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 60,
"x": 55,
"y": 60,
"z": 0
},
@@ -47984,8 +47972,8 @@
"height": 40
},
"_startAxis": 0,
"_paddingLeft": 15,
"_paddingRight": 0,
"_paddingLeft": 10,
"_paddingRight": 5,
"_paddingTop": 10,
"_paddingBottom": 0,
"_spacingX": 15,
@@ -48778,7 +48766,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 201.069,
"y": 150.558,
"z": 0
},
"_lrot": {
@@ -49044,8 +49032,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 19.42500000000001,
"y": 295.016,
"x": 261.09,
"y": 381.086,
"z": 0
},
"_lrot": {
@@ -53022,10 +53010,10 @@
},
"_alignFlags": 44,
"_target": null,
"_left": 179.425,
"_right": 140.57500000000002,
"_left": 421.09,
"_right": -101.08999999999996,
"_top": 1180,
"_bottom": 220.01600000000002,
"_bottom": 306.086,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,