From 9deac44a1ef4e7fae59d1c53d8b14617608978b2 Mon Sep 17 00:00:00 2001 From: guojiaxv <3194589716@qq.com> Date: Tue, 21 Jul 2026 19:05:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(gameplay):=20=E4=BC=98=E5=8C=96=E6=95=8C?= =?UTF-8?q?=E4=BA=BA=E7=A2=B0=E6=92=9E=E4=BD=93=E4=B8=8E=E6=96=B0=E6=89=8B?= =?UTF-8?q?=E6=95=99=E7=A8=8B=E7=9E=84=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 扩大并重叠 14 个 Enemy 的胸腹部碰撞体 - 消除自动锁定点位于碰撞体边缘的问题 - 移除教程中写死的相机瞄准角度 - 根据目标实时位置动态调整教程相机 - 自动选择与初始镜头夹角最小的存活敌人 - 同步瞄准状态,避免后续滑动发生角度跳变 --- Config/~$LevelConfig.xlsx | Bin 165 -> 0 bytes assets/Prefab/Ememy/TeShu1.prefab | 24 +++++++-------- assets/Prefab/Ememy/TeShu2.prefab | 24 +++++++-------- assets/Prefab/Ememy/TeShu3.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZhanLi.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZhanLi2.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZhanLi3.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZhanLi4.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZhanLi5.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZhanLi6.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZhanLi7.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZuoZi.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZuoZi2.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZuoZi3.prefab | 24 +++++++-------- assets/Prefab/Ememy/ZuoZi4.prefab | 24 +++++++-------- assets/scripts/BattleLevel.ts | 29 ++++++++++++++++-- assets/scripts/FPSCameraController.ts | 8 +++-- .../framework/runtime/CameraAimState.ts | 16 ---------- assets/scripts/ui/PlayPanel.ts | 2 +- profiles/v2/packages/reference-image.json | 2 +- 20 files changed, 203 insertions(+), 190 deletions(-) delete mode 100644 Config/~$LevelConfig.xlsx diff --git a/Config/~$LevelConfig.xlsx b/Config/~$LevelConfig.xlsx deleted file mode 100644 index c5ee44da810836fa4f0e927de117617b11f4a42b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 fcmZQgOv%m6Qy>+vG9)sjFyu01GUPER&>R8)kb4ka diff --git a/assets/Prefab/Ememy/TeShu1.prefab b/assets/Prefab/Ememy/TeShu1.prefab index 74982f2..0453277 100644 --- a/assets/Prefab/Ememy/TeShu1.prefab +++ b/assets/Prefab/Ememy/TeShu1.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "d50DO+lKpPWLVMK/HsidFB" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "04l7UdTa9PxqdYrAekTlpM" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "00dPV63vFF6a+06pX9iObI" }, diff --git a/assets/Prefab/Ememy/TeShu2.prefab b/assets/Prefab/Ememy/TeShu2.prefab index 12ff5e6..80ad36f 100644 --- a/assets/Prefab/Ememy/TeShu2.prefab +++ b/assets/Prefab/Ememy/TeShu2.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "43YALw+7NO57es6oxh9N0s" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "6dpR3pw99Pb7kGKOC/cwLn" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "1a15FB1BpBu4qYMcSMtBvE" }, diff --git a/assets/Prefab/Ememy/TeShu3.prefab b/assets/Prefab/Ememy/TeShu3.prefab index 4d1ac94..c0e47a8 100644 --- a/assets/Prefab/Ememy/TeShu3.prefab +++ b/assets/Prefab/Ememy/TeShu3.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "b1RUCQOEdDIbpsOdW/yDiE" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "9crNqpfBNHBKZ4M/QNwRhv" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "b8I1I8WlBB5r/WYqeSo5XI" }, diff --git a/assets/Prefab/Ememy/ZhanLi.prefab b/assets/Prefab/Ememy/ZhanLi.prefab index e0e1b00..cca025b 100644 --- a/assets/Prefab/Ememy/ZhanLi.prefab +++ b/assets/Prefab/Ememy/ZhanLi.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "dbVGcTsLhHpKJzE57V45d7" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "77UoENSDdDz7lkU+r28Sec" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "bf/wWvOv5JqaS6r8wb/BQ1" }, diff --git a/assets/Prefab/Ememy/ZhanLi2.prefab b/assets/Prefab/Ememy/ZhanLi2.prefab index 0d16918..c06508d 100644 --- a/assets/Prefab/Ememy/ZhanLi2.prefab +++ b/assets/Prefab/Ememy/ZhanLi2.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "6cLcsSQ3VMQ5dmjvtgfV5Z" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "bcKWdmWG9Drb69dtRDAEO9" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "ebczjSs+pD0Z2BJmjB+f1C" }, diff --git a/assets/Prefab/Ememy/ZhanLi3.prefab b/assets/Prefab/Ememy/ZhanLi3.prefab index f690dbe..e0c283f 100644 --- a/assets/Prefab/Ememy/ZhanLi3.prefab +++ b/assets/Prefab/Ememy/ZhanLi3.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "5bH1hMFGJIprqC4+yVk7i7" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "a1VE/MQABFKrF+N8hXAXTJ" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "8d6f9oVexKAYzh5wb22PUp" }, diff --git a/assets/Prefab/Ememy/ZhanLi4.prefab b/assets/Prefab/Ememy/ZhanLi4.prefab index 3196008..83dde26 100644 --- a/assets/Prefab/Ememy/ZhanLi4.prefab +++ b/assets/Prefab/Ememy/ZhanLi4.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "47xVpvzJpCVJUysKEswOyM" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "c4qV7TVWxCN7dqxOlGae/R" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "2e4AkzIWNH164N98NHMwf9" }, diff --git a/assets/Prefab/Ememy/ZhanLi5.prefab b/assets/Prefab/Ememy/ZhanLi5.prefab index 8676e70..71120d5 100644 --- a/assets/Prefab/Ememy/ZhanLi5.prefab +++ b/assets/Prefab/Ememy/ZhanLi5.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "1dl/irwDpM8orl1bhiIB7I" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "30HuK0tnhIr6P/MMdDtPzw" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "81PPETs2tJLLhCx4+iQC92" }, diff --git a/assets/Prefab/Ememy/ZhanLi6.prefab b/assets/Prefab/Ememy/ZhanLi6.prefab index de57dd5..e13658d 100644 --- a/assets/Prefab/Ememy/ZhanLi6.prefab +++ b/assets/Prefab/Ememy/ZhanLi6.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "9bPKh3OsxMnZl7RtmG1ZOx" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "02SxT1YqVAh6Zc1Y9varnJ" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "7bHpn9uFFCrqVCqIMyvW6j" }, diff --git a/assets/Prefab/Ememy/ZhanLi7.prefab b/assets/Prefab/Ememy/ZhanLi7.prefab index 0256319..86c8876 100644 --- a/assets/Prefab/Ememy/ZhanLi7.prefab +++ b/assets/Prefab/Ememy/ZhanLi7.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "f3av3Aay5MbI8D0D3TXALg" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "95WnL+sX9Lx4Q4j7KHonrE" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "3aSnL07X1Bf5sRg57fmcWh" }, diff --git a/assets/Prefab/Ememy/ZuoZi.prefab b/assets/Prefab/Ememy/ZuoZi.prefab index fbd0001..ae00269 100644 --- a/assets/Prefab/Ememy/ZuoZi.prefab +++ b/assets/Prefab/Ememy/ZuoZi.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "4388CZJx5N2px5rYCVMlKe" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "8fy/geFdlIg4x1F7nTFsJI" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "a1OA8jvutInJXYnF/ZJqQz" }, diff --git a/assets/Prefab/Ememy/ZuoZi2.prefab b/assets/Prefab/Ememy/ZuoZi2.prefab index 73058cb..92f2c71 100644 --- a/assets/Prefab/Ememy/ZuoZi2.prefab +++ b/assets/Prefab/Ememy/ZuoZi2.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "c18isQeRlNzKzCwrI0BcI/" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "eenOAqh4RH5Kzw/t6jqLTu" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "1coWGf9gJJ8K2+Im0a36vP" }, diff --git a/assets/Prefab/Ememy/ZuoZi3.prefab b/assets/Prefab/Ememy/ZuoZi3.prefab index 95efdc2..3d015a8 100644 --- a/assets/Prefab/Ememy/ZuoZi3.prefab +++ b/assets/Prefab/Ememy/ZuoZi3.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "d13KNIHbhNoqSsL40jNucE" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "34CTA01gNGaYKM9Ly39e6S" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "1bsATL7SpL66qZDWrVUggk" }, diff --git a/assets/Prefab/Ememy/ZuoZi4.prefab b/assets/Prefab/Ememy/ZuoZi4.prefab index 957d288..a519048 100644 --- a/assets/Prefab/Ememy/ZuoZi4.prefab +++ b/assets/Prefab/Ememy/ZuoZi4.prefab @@ -2068,14 +2068,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.002, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.011, - "z": 0.009 + "x": 0.016, + "y": 0.018, + "z": 0.013 }, "_id": "8ak3617gJI5J+3gew3map0" }, @@ -2191,14 +2191,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00532, + "y": 0.003, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.011, - "y": 0.011, - "z": 0.009 + "x": 0.015, + "y": 0.017, + "z": 0.012 }, "_id": "fbHhBbrIpFa6KsaMv3wH1s" }, @@ -3968,14 +3968,14 @@ "_center": { "__type__": "cc.Vec3", "x": 0, - "y": 0.00456, + "y": 0.0035, "z": 0 }, "_size": { "__type__": "cc.Vec3", - "x": 0.012, - "y": 0.012, - "z": 0.01 + "x": 0.014, + "y": 0.016, + "z": 0.012 }, "_id": "07TR+fVYxE65rOdWChdMSe" }, diff --git a/assets/scripts/BattleLevel.ts b/assets/scripts/BattleLevel.ts index 6a00c0f..d06e579 100644 --- a/assets/scripts/BattleLevel.ts +++ b/assets/scripts/BattleLevel.ts @@ -1,5 +1,5 @@ // @structural-rewrite-v1 -import { _decorator, AssetManager, Camera, Component, instantiate, Node } from 'cc'; +import { _decorator, AssetManager, Camera, Component, instantiate, Node, Vec3 } from 'cc'; import { Ragdoll } from '../Ragdoll/Ragdoll'; import { EventCenter } from './EventCenter'; import { LevelState } from './EnumFile'; @@ -305,7 +305,32 @@ export class BattleLevel extends Component { switch (0 as number) { case 1: break; case 2: break; - default: return (this["enemies"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)[((this["enemies"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["length"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown) - 1]; + default: + const enemies = (this["enemies"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["filter"]((enemy) => enemy && !(enemy["isDie"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)); + if (enemies.length === 0) + return null; + const cameraNode = FPSCameraController["getInstance"]()["cameraNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown; + if (!cameraNode) + return enemies[0]; + const cameraPosition = cameraNode["getWorldPosition"](); + const cameraForward = cameraNode["forward"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown; + const direction = new Vec3(); + let target = enemies[0]; + let bestDot = -Infinity; + for (const enemy of enemies) { + if (!enemy["centerNode"]) + continue; + void (Vec3["subtract"](direction, enemy["centerNode"]["getWorldPosition"](), cameraPosition)); + if (Vec3["dot"](direction, direction) === 0) + continue; + void (direction["normalize"]()); + const dot = Vec3["dot"](cameraForward, direction); + if (dot > bestDot) { + void (bestDot = dot); + void (target = enemy); + } + } + return target; } } while (false); } diff --git a/assets/scripts/FPSCameraController.ts b/assets/scripts/FPSCameraController.ts index 19c62ec..16d6f43 100644 --- a/assets/scripts/FPSCameraController.ts +++ b/assets/scripts/FPSCameraController.ts @@ -83,13 +83,17 @@ export class FPSCameraController extends SingletonBase { finally { } } - setTutorialRotate(): void { + setTutorialRotate(targetNode: Node): void { try { do { switch (0 as number) { case 1: break; case 2: break; - default: void ((this["cameraNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["setWorldRotation"]((this["aimState"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["tutorialRotation"]())); + default: + if (!this["cameraNode"] || !targetNode) + return; + void ((this["cameraNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["lookAt"](targetNode["getWorldPosition"]())); + void ((this["aimState"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["initialize"](this["cameraNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)); } } while (false); } diff --git a/assets/scripts/framework/runtime/CameraAimState.ts b/assets/scripts/framework/runtime/CameraAimState.ts index 9b01cdc..a11c0bd 100644 --- a/assets/scripts/framework/runtime/CameraAimState.ts +++ b/assets/scripts/framework/runtime/CameraAimState.ts @@ -61,20 +61,4 @@ export class CameraAimState { finally { } } - tutorialRotation(): Quat { - try { - do { - switch (0 as number) { - case 1: break; - case 2: break; - default: - void (this["vertical"] = -3.99); - void (this["horizontal"] = -32.27); - return Quat["fromEuler"](new Quat(), this["vertical"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, this["horizontal"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, 0); - } - } while (false); - } - finally { - } - } } diff --git a/assets/scripts/ui/PlayPanel.ts b/assets/scripts/ui/PlayPanel.ts index 3be11ac..2cc4926 100644 --- a/assets/scripts/ui/PlayPanel.ts +++ b/assets/scripts/ui/PlayPanel.ts @@ -311,7 +311,7 @@ export class PlayPanel extends PanelBase { void ((this["targetNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["position"] = (FPSCameraController["getInstance"]()["camera"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["convertToUINode"]((target["centerNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["getWorldPosition"](), this["node"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)); if (((this["targetNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["position"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["y"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown < 0 && Math["abs"](((this["targetNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["position"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["x"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown) < 30) { void (this["EnterStep3"]()); - void (FPSCameraController["getInstance"]()["setTutorialRotate"]()); + void (FPSCameraController["getInstance"]()["setTutorialRotate"](target["centerNode"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)); } } } while (false); diff --git a/profiles/v2/packages/reference-image.json b/profiles/v2/packages/reference-image.json index 470954c..779779f 100644 --- a/profiles/v2/packages/reference-image.json +++ b/profiles/v2/packages/reference-image.json @@ -3,6 +3,6 @@ "config": { "images": [], "sceneUUID": {}, - "scene": "cce78068-e13a-47f5-ae44-d1ac5c097bd7" + "scene": "3eb6a584-bf66-49ad-9701-b92767edfbb0" } }