diff --git a/assets/level/enemy/enemy_level6.prefab b/assets/level/enemy/enemy_level6.prefab index c0fedaa..a64018b 100644 --- a/assets/level/enemy/enemy_level6.prefab +++ b/assets/level/enemy/enemy_level6.prefab @@ -1391,9 +1391,9 @@ ], "value": { "__type__": "cc.Vec3", - "x": 83.984, - "y": -2.033, - "z": -100.145 + "x": 78.066, + "y": -2.194, + "z": -104.246 } }, { diff --git a/assets/level/env/env_level3_Muyou.prefab b/assets/level/env/env_level3_Muyou.prefab index e6a3c86..647ef68 100644 --- a/assets/level/env/env_level3_Muyou.prefab +++ b/assets/level/env/env_level3_Muyou.prefab @@ -1668,7 +1668,7 @@ "__expectedType__": "cc.Mesh" }, "_convex": false, - "_id": "b4uigeuxxNw6Wm9PDFTWQX" + "_id": "1bS+8PZJ1HQ49YuVIWwg/y" }, { "__type__": "cc.Node", @@ -1718,7 +1718,7 @@ "y": 0, "z": 0 }, - "_id": "c6FrErwQVNfLc9soRaj5e0" + "_id": "53JHdoToVLPJs498IGtlF3" }, { "__type__": "cc.MeshRenderer", @@ -1755,7 +1755,7 @@ "_reflectionProbeBlendWeight": 0, "_enabledGlobalStandardSkinObject": false, "_enableMorph": true, - "_id": "ceM5H+nUpKQ4noAZT4VjPk" + "_id": "e8rpXoM7NLMp8tYD5wVuFR" }, { "__type__": "cc.CompPrefabInfo", @@ -2667,7 +2667,8 @@ "fileId": "fdHNWwRJ5aloz4aFccEjm8", "instance": { "__id__": 136 - } + }, + "targetOverrides": null }, { "__type__": "cc.PrefabInstance", @@ -3708,7 +3709,7 @@ "value": { "__type__": "cc.Vec3", "x": 0.812, - "y": -0.301, + "y": -0.512, "z": 1.534 } }, @@ -5235,7 +5236,7 @@ "__expectedType__": "cc.Mesh" }, "_convex": false, - "_id": "f9Gqlq0MJNcYxR9yADs1AQ" + "_id": "6dWk99ufpCDKqwEK7k4H4m" }, { "__type__": "cc.Node", @@ -5285,7 +5286,7 @@ "y": 0, "z": 0 }, - "_id": "9aF+UxBHlK6bxZAgfKTEcs" + "_id": "d3thNSK45JrIHJAJ3NiRjF" }, { "__type__": "cc.MeshRenderer", @@ -5322,7 +5323,7 @@ "_reflectionProbeBlendWeight": 0, "_enabledGlobalStandardSkinObject": false, "_enableMorph": true, - "_id": "dc719Cq2dOY62Ec3SEV4N1" + "_id": "fdjTNGiF5OfbnQhD9lZWNQ" }, { "__type__": "cc.CompPrefabInfo", @@ -5570,7 +5571,7 @@ "__expectedType__": "cc.Mesh" }, "_convex": false, - "_id": "54TKBQ/gxODZKmAvU77hM8" + "_id": "34fpaBp7BKFqqjrLJQFcgT" }, { "__type__": "cc.Node", @@ -5620,7 +5621,7 @@ "y": 0, "z": 0 }, - "_id": "bdDd8jgZZI9ZqatuTpMlCT" + "_id": "41mR5ddTROrKHYYMCJQWry" }, { "__type__": "cc.MeshRenderer", @@ -5657,7 +5658,7 @@ "_reflectionProbeBlendWeight": 0, "_enabledGlobalStandardSkinObject": false, "_enableMorph": true, - "_id": "2cXh0OEqlA2IxsuMvjtTd3" + "_id": "f7XclFC51KWoaadt3b6eqC" }, { "__type__": "cc.CompPrefabInfo", @@ -5909,7 +5910,7 @@ "__expectedType__": "cc.Mesh" }, "_convex": false, - "_id": "c9hM03VU9IHqcob++gqNzv" + "_id": "a1Ja9kjC1D+bb5FxnHe9GZ" }, { "__type__": "cc.Node", @@ -5959,7 +5960,7 @@ "y": 0, "z": 0 }, - "_id": "06KR4QSzFAnKVy3H7CfqZo" + "_id": "1fI2dzdSpMiqNYk9DaN3MZ" }, { "__type__": "cc.MeshRenderer", @@ -5996,7 +5997,7 @@ "_reflectionProbeBlendWeight": 0, "_enabledGlobalStandardSkinObject": false, "_enableMorph": true, - "_id": "b1x+CooP1H26x5aR8EPHp1" + "_id": "d0Nb5G/u9MOpTufLh4czz8" }, { "__type__": "cc.CompPrefabInfo", @@ -102967,6 +102968,8 @@ "__id__": 0 }, "fileId": "f2Ey6MQh5Jvoe4Ack6FJd+", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": [ { "__id__": 4569 diff --git a/assets/resources/ui/MainPanel.prefab b/assets/resources/ui/MainPanel.prefab index 7c950ef..f44bc61 100644 --- a/assets/resources/ui/MainPanel.prefab +++ b/assets/resources/ui/MainPanel.prefab @@ -2036,8 +2036,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -114.72399999999999, - "y": -2.8430000000000746, + "x": -140.416, + "y": -2.843, "z": 0 }, "_lrot": { @@ -2172,7 +2172,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -114.285, + "x": -139.977, "y": 0, "z": 0 }, @@ -2331,7 +2331,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 3.612, + "x": -18.65, "y": 0, "z": 0 }, @@ -2493,7 +2493,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 98.981, + "x": 96.881, "y": 0, "z": 7.225 }, @@ -2610,7 +2610,7 @@ "__id__": 78 }, "_left": 0, - "_right": -7.957000000000008, + "_right": -5.856999999999999, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -2784,6 +2784,8 @@ "__id__": 0 }, "fileId": "0fw0pkxO9EBKE9wKEq3IQb", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6455,6 +6457,8 @@ "__id__": 0 }, "fileId": "9foWqFDr9CeY3XyLvAXHP8", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/ui/PlayPanel.prefab b/assets/resources/ui/PlayPanel.prefab index 398b4a3..11f2772 100644 --- a/assets/resources/ui/PlayPanel.prefab +++ b/assets/resources/ui/PlayPanel.prefab @@ -4325,7 +4325,7 @@ "__id__": 197 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 208 @@ -7218,4 +7218,4 @@ "5bU6q1YxVOZYqFnc16PcJS" ] } -] \ No newline at end of file +] diff --git a/assets/scripts/ui/PlayPanel.ts b/assets/scripts/ui/PlayPanel.ts index 2cc4926..52de069 100644 --- a/assets/scripts/ui/PlayPanel.ts +++ b/assets/scripts/ui/PlayPanel.ts @@ -354,7 +354,7 @@ export class PlayPanel extends PanelBase { [(this["anim"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["node"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, !onAim], [(this["fire"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["node"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, onAim], [this["cancelLabel"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, onAim], - [(this["qingBao"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["node"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, !onAim && !hasQingBaoTarget], + [(this["qingBao"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["node"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, false], [this["qingBaoResultNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, !onAim && hasQingBaoTarget], [(this["saoMiao"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["node"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, !onAim], [this["aimContent"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, onAim], diff --git a/profiles/v2/packages/preview.json b/profiles/v2/packages/preview.json index a862cd9..01da33f 100644 --- a/profiles/v2/packages/preview.json +++ b/profiles/v2/packages/preview.json @@ -2,7 +2,7 @@ "__version__": "1.0.1", "preview": { "current": { - "platform": "gameView" + "platform": "browser" } }, "general": { diff --git a/profiles/v2/packages/reference-image.json b/profiles/v2/packages/reference-image.json index b2726a4..d0606c5 100644 --- a/profiles/v2/packages/reference-image.json +++ b/profiles/v2/packages/reference-image.json @@ -3,6 +3,6 @@ "config": { "images": [], "sceneUUID": {}, - "scene": "f102524c-73a2-4c5b-8b1c-63285b7b944e" + "scene": "ff55344a-f4c7-4de3-80c2-8ca3d7281004" } } diff --git a/profiles/v2/packages/scene.json b/profiles/v2/packages/scene.json index ca608b7..faf8db8 100644 --- a/profiles/v2/packages/scene.json +++ b/profiles/v2/packages/scene.json @@ -37,81 +37,6 @@ "snapThreshold": 4 }, "camera-infos": { - "d6628e72-1ac8-440b-9dd0-f52e42663f29": { - "position": { - "x": 14.348778704834523, - "y": 14.348778704834515, - "z": 14.348778704834515 - }, - "rotation": { - "x": -0.27984814233312133, - "y": 0.3647051996310009, - "z": 0.11591689595929512, - "w": 0.8804762392171493 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1500, - "height": 1000 - }, - "scale": 1 - }, - "90250c4d-e6c2-4112-b49c-2318ffab4dae": { - "position": { - "x": 24.92324649164432, - "y": 24.92324649164432, - "z": 24.923246491644317 - }, - "rotation": { - "x": -0.27984814233312133, - "y": 0.3647051996310009, - "z": 0.11591689595929512, - "w": 0.8804762392171493 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 507, - "height": 902 - }, - "scale": 1 - }, - "b77ce934-6413-4d7e-93ec-b449b08c39a3": { - "position": { - "x": -1.0406342175760805, - "y": -0.28628678850409767, - "z": 8.134464538841174 - }, - "rotation": { - "x": 0.01795157420601861, - "y": -0.0655557755428768, - "z": 0.0011795359594927596, - "w": 0.9976867193520309 - }, - "viewCenter": { - "x": 0, - "y": 0, - "z": 0.25 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1225, - "height": 750 - }, - "scale": 1 - }, "2b5d2c6b-2147-44c4-b726-cf608673e001": { "position": { "x": 23.78683772238349, @@ -1162,56 +1087,6 @@ }, "scale": 1 }, - "f102524c-73a2-4c5b-8b1c-63285b7b944e": { - "position": { - "x": 15.078625574291337, - "y": 49.235009053781454, - "z": -3.5586736062660123 - }, - "rotation": { - "x": -0.1644855469069437, - "y": 0.21643054472770243, - "z": 0.03702016865699328, - "w": 0.9616297786987444 - }, - "viewCenter": { - "x": 0, - "y": 36.832, - "z": -35.36 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1225, - "height": 954 - }, - "scale": 1 - }, - "9b5a0af9-4b68-43d7-9eb3-b8093e0d61c4": { - "position": { - "x": -9.432340665818188, - "y": 20.61947282230895, - "z": 295.7622883741316 - }, - "rotation": { - "x": 0.1314585707677256, - "y": -0.07631785424935249, - "z": 0.010151125261458352, - "w": 0.9883274679732461 - }, - "viewCenter": { - "x": -5.571944289637231, - "y": 27.429186954166738, - "z": 270.91498553150734 - }, - "contentRect": { - "x": 0, - "y": 0, - "width": 1225, - "height": 954 - }, - "scale": 1 - }, "f6fc939a-4859-43f5-b4b9-8c803c767ccf": { "position": { "x": -0.3914568017450293, @@ -1237,11 +1112,136 @@ }, "scale": 1 }, - "b2fa93b1-bd7c-4e5c-b8d8-b9e69481a8a5": { + "f102524c-73a2-4c5b-8b1c-63285b7b944e": { "position": { - "x": 22.309506322344408, - "y": 22.309506322344408, - "z": 22.309506322344404 + "x": 15.078625574291337, + "y": 49.235009053781454, + "z": -3.5586736062660123 + }, + "rotation": { + "x": -0.16448554690694328, + "y": 0.21643054472770193, + "z": 0.037020168656993174, + "w": 0.9616297786987473 + }, + "viewCenter": { + "x": 0, + "y": 36.832, + "z": -35.36 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1225, + "height": 954 + }, + "scale": 1 + }, + "c3d9a1af-8e7b-4cc9-a9f4-69160e77209e": { + "position": { + "x": 540, + "y": 960, + "z": 2912.090237537007 + }, + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "viewCenter": { + "x": 540, + "y": 960, + "z": 0 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1225, + "height": 954 + }, + "scale": 1 + }, + "9b5a0af9-4b68-43d7-9eb3-b8093e0d61c4": { + "position": { + "x": -9.432340665818174, + "y": 20.61947282230892, + "z": 295.76228837413146 + }, + "rotation": { + "x": 0.13145857076772563, + "y": -0.0763178542493525, + "z": 0.010151125261458354, + "w": 0.988327467973246 + }, + "viewCenter": { + "x": -5.571944289637231, + "y": 27.429186954166738, + "z": 270.91498553150734 + }, + "contentRect": { + "x": 0, + "y": 0, + "width": 1225, + "height": 954 + }, + "scale": 1 + }, + "29bc61af-9ade-4095-bb78-e7f6f6ffde45": { + "position": { + "x": 639.3448581131452, + "y": 955.9815224963177, + "z": 5000 + }, + "rotation": { + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "viewCenter": { + "x": 540, + "y": 960, + "z": 0 + }, + "contentRect": { + "x": 218.59598509647472, + "y": 207.98352602223713, + "width": 375.6375, + "height": 667.8 + }, + "scale": 0.44639156999609714 + }, + "2119c82b-f482-446b-9a28-bd02d34f5fff": { + "position": { + "x": 48.82259110971982, + "y": 61.81843407026153, + "z": 141.44138414617595 + }, + "rotation": { + "x": -0.2649466904505232, + "y": -0.2451716509217855, + "z": -0.06985011491298428, + "w": 0.9299543398738691 + }, + "viewCenter": { + "x": 104.5727123393876, + "y": -8.307980624741646, + "z": 43.05813792350965 + }, + "contentRect": { + "x": 83.89999999999998, + "y": -24.850000000000023, + "width": 0, + "height": 0 + }, + "scale": 1 + }, + "8c38a9ec-62e6-404f-bedb-6d7af129493d": { + "position": { + "x": 19.923047906896663, + "y": 19.923047906896663, + "z": 19.92304790689666 }, "rotation": { "x": -0.27984814233312133, @@ -1269,15 +1269,15 @@ "z": 15.907736922175054 }, "rotation": { - "x": 0.13145857076772563, - "y": -0.0763178542493525, - "z": 0.010151125261458354, - "w": 0.988327467973246 + "x": -0.15625748768215889, + "y": 0.04087422951024953, + "z": 0.006472017725557907, + "w": 0.9868490299391105 }, "viewCenter": { - "x": -27.31247625915112, - "y": -114.12297205675539, - "z": 144.10190118334077 + "x": 97.60786094391226, + "y": 19.23691151197339, + "z": -54.29008109374163 }, "contentRect": { "x": 0, @@ -1289,9 +1289,6 @@ } }, "camera-uuids": [ - "d6628e72-1ac8-440b-9dd0-f52e42663f29", - "90250c4d-e6c2-4112-b49c-2318ffab4dae", - "b77ce934-6413-4d7e-93ec-b449b08c39a3", "2b5d2c6b-2147-44c4-b726-cf608673e001", "38419e92-7407-437e-b1fc-09baec81ce16", "2ad4c146-150c-474c-bfba-cc454f729bd7", @@ -1334,10 +1331,13 @@ "7328ca7a-96e4-4721-958b-c218c1748436", "54f8343d-5632-4ace-ac17-455fb2f04be3", "d2bea724-03a9-4d97-aece-280b4192edd1", - "f102524c-73a2-4c5b-8b1c-63285b7b944e", - "9b5a0af9-4b68-43d7-9eb3-b8093e0d61c4", "f6fc939a-4859-43f5-b4b9-8c803c767ccf", - "b2fa93b1-bd7c-4e5c-b8d8-b9e69481a8a5", + "f102524c-73a2-4c5b-8b1c-63285b7b944e", + "c3d9a1af-8e7b-4cc9-a9f4-69160e77209e", + "9b5a0af9-4b68-43d7-9eb3-b8093e0d61c4", + "29bc61af-9ade-4095-bb78-e7f6f6ffde45", + "2119c82b-f482-446b-9a28-bd02d34f5fff", + "8c38a9ec-62e6-404f-bedb-6d7af129493d", "cce78068-e13a-47f5-ae44-d1ac5c097bd7" ], "camera": {