diff --git a/data/FirstPersonShooter.world b/data/FirstPersonShooter.world index 4b77c2c..0eb044d 100644 --- a/data/FirstPersonShooter.world +++ b/data/FirstPersonShooter.world @@ -2491,6 +2491,7 @@ 036d975119765037c8ffff946a805cb6d3ccf640 1277251179 89f9e2eb8cec4e8579167ee622b67d8f601db972 + 0x1 guid://8c628a2a1e96b3815d3476ec7c87055be14f7afe @@ -2553,7 +2554,7 @@ 0 0 guid://89640b0d7ffa9f7f02a1a97753abc138ef6e3f24 - + 1 -7.1054274e-15 2.9611872e-16 0.0 7.1054274e-15 1 2.4335929e-08 0.0 -2.9611893e-16 -2.4335929e-08 1 0.0 5.5368699e-21 3.765877e-14 0 1.0 diff --git a/data/csharp_template/FP_controller/components/EnemyLogic.cs b/data/csharp_template/FP_controller/components/EnemyLogic.cs index 2546a34..0a73758 100644 --- a/data/csharp_template/FP_controller/components/EnemyLogic.cs +++ b/data/csharp_template/FP_controller/components/EnemyLogic.cs @@ -130,7 +130,7 @@ private void UpdateRoute() if (shouldUpdateRoute) { // рассчитываем путь до игрока - route.Create2D(node.WorldPosition, lastSeenPosition, 1); + route.Create2D(node.WorldPosition + vec3.UP * 0.5f, lastSeenPosition, 1); shouldUpdateRoute = false; } diff --git a/data/csharp_template/FP_controller/components/EnemyLogic.cs.meta b/data/csharp_template/FP_controller/components/EnemyLogic.cs.meta index e7cee7b..b9b3c99 100644 --- a/data/csharp_template/FP_controller/components/EnemyLogic.cs.meta +++ b/data/csharp_template/FP_controller/components/EnemyLogic.cs.meta @@ -2,7 +2,7 @@ 5158593f996ef01aae4f3a2a8ce7a21d539470f6 component - bc5e00f5 + a3aaceda diff --git a/data/csharp_template/props/constructor/glass.node b/data/csharp_template/props/constructor/glass.node index d89252c..6e855dc 100644 --- a/data/csharp_template/props/constructor/glass.node +++ b/data/csharp_template/props/constructor/glass.node @@ -1,8 +1,10 @@ - + + 0 + 0 guid://6e10090b18eccaeeaa8e15759a9fa850236a5f6f - - 0.9999997 -1.1368683e-13 -3.8213786e-15 0.0 0 0.99999976 8.7422222e-08 0.0 3.821365e-15 -8.7422734e-08 0.99999964 0.0 0 -3.7959126e-08 0 1.0 + + 0.99999958 -1.1368681e-13 -3.8213786e-15 0.0 1.6940659e-21 0.99999958 8.7422109e-08 0.0 3.8213637e-15 -8.7422791e-08 0.99999952 0.0 5.2106638e-14 0 4.4711669e-08 1.0 diff --git a/data/default.bitmasks b/data/default.bitmasks new file mode 100644 index 0000000..90e3205 --- /dev/null +++ b/data/default.bitmasks @@ -0,0 +1,7 @@ + + + + Trace + PlayerHit + + diff --git a/data/default.bitmasks.meta b/data/default.bitmasks.meta new file mode 100644 index 0000000..8e498c5 --- /dev/null +++ b/data/default.bitmasks.meta @@ -0,0 +1,9 @@ + + + 7ae7286bf9e7d49f149b3572bb1ffc03c8aa521b + file + 1ded9d65 + + + + diff --git a/data/fps/bullet/bullet.node b/data/fps/bullet/bullet.node index 70e866d..f042e51 100644 --- a/data/fps/bullet/bullet.node +++ b/data/fps/bullet/bullet.node @@ -1,20 +1,20 @@ - + 0 0 guid://0527657119e3201c2e7ebccb87ea6bae0e3bbf35 - + 5 - + guid://8c628a2a1e96b3815d3476ec7c87055be14f7afe 1 2.208811e-29 2.1175814e-21 0.0 -2.2087505e-29 0.99999988 -2.8421701e-13 0.0 -2.1175814e-21 2.8421704e-13 1 0.0 1.9073486e-06 -2.8610229e-06 0.73676425 1.0 - + 2 2 1 0.200000003 0 @@ -89,7 +89,7 @@ - + 1 -2.2087513e-29 -2.1175824e-21 0.0 2.2088104e-29 1.0000005 2.8421728e-13 0.0 2.1175818e-21 -2.8421734e-13 1.0000002 0.0 0 0.11498165 1.9639169e-12 1.0 diff --git a/data/fps/robot/robot_enemy.node b/data/fps/robot/robot_enemy.node index 9e9f8cf..0d58f5a 100644 --- a/data/fps/robot/robot_enemy.node +++ b/data/fps/robot/robot_enemy.node @@ -1,27 +1,28 @@ - - + + 0 0 0 - + 0.5 0.699999988 - - 1481376270 - 390761584 + + 594287224 + 359711338 guid://ec33ae15d2782870bf95a10f4fab1b221b40e019 - + 131174606 - 981409570 - 0xffffffff + 30316844 + 0x2 + 1177965118 1 0 0 0.0 0 1 0 0.0 0 0 1 0.0 0 0 0 1.0 - + guid://113ec57667d1fe5d0486ec1847b280978e7aa50a -1 30 @@ -29,58 +30,58 @@ guid://746550e169c6b4cc6f7b69bb6516d3de27b029a5 1 30 - - - + + + 0.49999994 -3.7865182e-29 4.2351652e-22 0.0 3.7865191e-29 0.5 -3.5527162e-15 0.0 -4.2351657e-22 3.5527162e-15 0.5 0.0 0 0 0 1.0 - + joint_2 0.71341574 -0.69943857 0.042703133 0.0 0.55578786 0.60190356 0.57342124 0.0 -0.42677617 -0.38535389 0.818147 0.0 0.27450061 0.27222845 0.76832491 1.0 - + guid://0a134f9336798fd67bd0853d9e11057894320a77 2.0000455 4.5448542e-07 7.7486038e-07 0.0 -2.2940338e-05 2.0000837 4.7683716e-07 0.0 1.5363097e-05 1.3530254e-05 2.0000713 0.0 -1.9073486e-06 -1.6391277e-06 -0.23828951 1.0 - + joint_3 -0.69019872 -0.71501589 -0.11125735 0.0 0.64177847 -0.67588562 0.36235246 0.0 -0.33428502 0.17869264 0.92537683 0.0 0.27457523 -0.2628285 0.76287109 1.0 - + guid://0a134f9336798fd67bd0853d9e11057894320a77 2.0000529 7.1525574e-07 -2.8312206e-07 0.0 2.5868416e-05 2.0000694 0 0.0 -6.1839819e-06 5.0067902e-06 2.0000868 0.0 8.3446503e-07 -7.1525574e-07 -0.24650681 1.0 - + joint_4 -0.66923231 0.73246187 -0.12501162 0.0 -0.695288 -0.55793941 0.45307654 0.0 0.26211244 0.39013252 0.88266277 0.0 -0.25062135 -0.26249185 0.72265375 1.0 - + guid://0a134f9336798fd67bd0853d9e11057894320a77 2.0000427 -6.92904e-07 2.9802322e-07 0.0 -2.2009015e-05 2.0000668 -2.3841858e-07 0.0 1.4021993e-05 1.5318394e-05 2.0000677 0.0 -1.3113022e-06 -2.0861626e-06 -0.23225865 1.0 - + joint_5 0.73238534 0.6773814 0.069038153 0.0 -0.6677205 0.69467193 0.26754504 0.0 0.13327116 -0.24204428 0.96106887 0.0 -0.250696 0.2725651 0.72810757 1.0 - + guid://0a134f9336798fd67bd0853d9e11057894320a77 2.0000515 -1.0430813e-07 4.4703484e-08 0.0 2.669543e-05 2.000087 0 0.0 -7.0631504e-06 6.0796738e-06 2.0000861 0.0 1.0430813e-06 -9.5367432e-07 -0.2365478 1.0 - + joint_8 0.99988168 -1.7359685e-05 0.015381269 0.0 -0.00013943078 0.99994802 0.010192467 0.0 -0.015380647 -0.010193406 0.99982971 0.0 -0.63721955 0.39293978 1.4175342 1.0 - + 0.99999994 0 0 0.0 0 0.99999994 0 0.0 0 0 0.99999988 0.0 0 0.80000001 -1.1920929e-07 1.0 - + joint_11 0.99988168 -1.7359685e-05 0.015381269 0.0 -0.00013943078 0.99994802 0.010192467 0.0 -0.015380647 -0.010193406 0.99982971 0.0 0.62459785 0.39291796 1.4369448 1.0 - + 1 1.4551915e-11 0 0.0 0 1 -9.3132257e-10 0.0 9.3132257e-10 0 0.99999994 0.0 0 0.80000001 0 1.0 - + 1 0 0 0.0 0 1 0 0.0 0 0 1 0.0 0 0 0.90023208 1.0 diff --git a/data/guids.db b/data/guids.db index be8e242..da19874 100644 --- a/data/guids.db +++ b/data/guids.db @@ -276,6 +276,7 @@ "f3ec078f3b4f18aab54af5b819464b7260a2c11b": "csharp_template/FP_controller/components/Bullet.cs.meta", "720f8709336da3c5346e8e1a4a1710b611222eb5": "csharp_template/FP_controller/components/ShootInput.cs.meta", "373e54478e60df440dd556c14a217d4a0dab2a36": "fps/particles/textures/normal.dds.meta", + "422cf595cbe8a7e975ca1bf4278201d8582a1105": "default.bitmasks.meta", "606e65e9f22fcdbe867c20631e72229baa3c44ae": "configs/default.controls.meta", "4e7c41aea7b42e2f8860ed7c47e7cb76665ae3cd": "core/materials/base/debug/debug_f0.mat.meta", "d1e76aeb2bf449331dd7723561ca654e15b897d8": "core/materials/base/objects/clouds/presets/clouds_cumulonimbus1.mat.meta", @@ -2060,6 +2061,7 @@ "27288c553eaee1ae73cc529616f559e6334c2941": "csharp_template/FP_controller/components/Bullet.cs", "37c301bff495e86069da00a84295485df343e04b": "csharp_template/FP_controller/components/ShootInput.cs", "6fbaf9250d79793e257226fcbca7afaeb81f7c26": "fps/particles/textures/normal.dds", + "7ae7286bf9e7d49f149b3572bb1ffc03c8aa521b": "default.bitmasks", "14cf5f169cc59cb3e00722a41fee17ee6a0dcc15": "configs/default.controls", "85ddba584016b8e6ae75d7966a0b77e18e3804af": "core/systems/tracker/parameters/sound.parameters", "4d97ef4aed349542f37602b88678f3f50b4224b9": "core/systems/tracker/parameters/node.parameters",