diff --git a/data/FirstPersonShooter.world b/data/FirstPersonShooter.world
index 0eb044d..d7bcd7a 100644
--- a/data/FirstPersonShooter.world
+++ b/data/FirstPersonShooter.world
@@ -2497,6 +2497,7 @@
guid://8c628a2a1e96b3815d3476ec7c87055be14f7afe
guid://dda131848d3d0f13356549567731f0bdb2587af8
+
-0.99999982 -8.7422492e-08 0 0.0 8.7422762e-08 -0.99999982 0 0.0 0 0 0.9999997 0.0 8 11.499999 0.99999994 1.0
@@ -2555,6 +2556,9 @@
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
@@ -2575,7 +2579,7 @@
guid://1052eb5f16b3c132e06baee99e58ab34533a5d03
- 1 0 0 0.0 0 1 0 0.0 0 0 1 0.0 0.075533859 5.9413724 0.99999994 1.0
+ 1 0 0 0.0 0 1 0 0.0 0 0 1 0.0 0.075533859 5.9413724 1.5 1.0
diff --git a/data/csharp_template/FP_controller/components/EnemyLogic.cs b/data/csharp_template/FP_controller/components/EnemyLogic.cs
index 0a73758..1ffe387 100644
--- a/data/csharp_template/FP_controller/components/EnemyLogic.cs
+++ b/data/csharp_template/FP_controller/components/EnemyLogic.cs
@@ -37,6 +37,8 @@ public class EnemyLogic : Component
// инициализируем состояние врага
private EnemyLogicState currentState = EnemyLogicState.Idle;
+ private Health health = null;
+
private bool targetIsVisible;
private Vec3 lastSeenPosition;
private vec3 lastSeenDirection;
@@ -80,6 +82,9 @@ private void Init()
targetIsVisible = false;
// берем компонент EnemyFireController
fireController = node.GetComponent();
+
+ health = node.GetComponentInChildren();
+
shouldUpdateRoute = true;
lastCalculationTime = Game.Time;
@@ -108,6 +113,11 @@ private void Update()
case EnemyLogicState.Attack: color = vec4.RED; break;
}
+ // проверяем, выставлен ли флаг IsDead
+ if (health && health.IsDead)
+ // удаляем врага со сцены, если он убит (IsDead)
+ node.DeleteLater();
+
// визуализируем состояния врага
Visualizer.RenderPoint3D(node.WorldPosition + vec3.UP * 2.0f, 0.25f, color);
Visualizer.RenderPoint3D(node.WorldPosition + vec3.UP * 3.0f, 0.25f, IsTargetVisible() ? vec4.GREEN : vec4.RED);
diff --git a/data/csharp_template/FP_controller/components/EnemyLogic.cs.meta b/data/csharp_template/FP_controller/components/EnemyLogic.cs.meta
index b9b3c99..8d88520 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
- a3aaceda
+ 0bbb0373
diff --git a/data/csharp_template/FP_controller/components/HUD.cs b/data/csharp_template/FP_controller/components/HUD.cs
index 035410f..310d240 100644
--- a/data/csharp_template/FP_controller/components/HUD.cs
+++ b/data/csharp_template/FP_controller/components/HUD.cs
@@ -10,6 +10,8 @@ public class HUD : Component
public AssetLink crosshairImage = null;
public int crosshairSize = 16;
+ private WidgetLabel label = null;
+
private WidgetSprite sprite = null;
private Gui screenGui = null;
private ivec2 prev_size = new ivec2(0, 0);
@@ -30,6 +32,16 @@ private void Init()
screenGui.AddChild(sprite, Gui.ALIGN_CENTER | Gui.ALIGN_OVERLAP);
// привязываем время жизни виджета к миру
sprite.Lifetime = Widget.LIFETIME.WORLD;
+
+ // добавляем виджет WidgetLabel для отображения здоровья игрока, устанавливаем его положение размер шрифта
+ label = new WidgetLabel(screenGui, "");
+ label.FontSize = 50;
+ label.SetPosition(10, 10);
+
+ // добавляем виджет к GUI
+ screenGui.AddChild(label, Gui.ALIGN_CENTER | Gui.ALIGN_OVERLAP);
+ // привязываем время жизни виджета к миру
+ label.Lifetime = Widget.LIFETIME.WORLD;
}
private void Update()
@@ -38,8 +50,14 @@ private void Update()
if (prev_size != new_size)
{
screenGui.RemoveChild(sprite);
- screenGui.AddChild(sprite, Gui.ALIGN_CENTER | Gui.ALIGN_OVERLAP);
+ screenGui.AddChild(sprite, Gui.ALIGN_OVERLAP | Gui.ALIGN_FIXED);
}
prev_size = new_size;
}
+
+ // обновление текущего уровня здоровья игрока
+ public void UpdateHealthInfo(int health)
+ {
+ label.Text = "Health: " + health.ToString();
+ }
}
\ No newline at end of file
diff --git a/data/csharp_template/FP_controller/components/HUD.cs.meta b/data/csharp_template/FP_controller/components/HUD.cs.meta
index 26715eb..5fced05 100644
--- a/data/csharp_template/FP_controller/components/HUD.cs.meta
+++ b/data/csharp_template/FP_controller/components/HUD.cs.meta
@@ -2,7 +2,7 @@
5faca71f8446cfac3ee60b883c3368aef60d5fab
component
- c4c7bfe4
+ 3964a462
diff --git a/data/csharp_template/FP_controller/components/Health.cs b/data/csharp_template/FP_controller/components/Health.cs
new file mode 100644
index 0000000..b121d5b
--- /dev/null
+++ b/data/csharp_template/FP_controller/components/Health.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Unigine;
+
+[Component(PropertyGuid = "51e877b3c29f323185bb02f9fb15bbc3f3022b4b")]
+public class Health : Component
+{
+ public int health = 5; // начальный уровень здоровья
+
+ // флаг, проверяющий, не достиг ли текущий уровень здоровья 0
+ public bool IsDead => health <= 0;
+
+ public void TakeDamage(int damage)
+ {
+ // применяем ущерб
+ health = MathLib.Max(health - damage, 0);
+ }
+}
\ No newline at end of file
diff --git a/data/csharp_template/FP_controller/components/Health.cs.meta b/data/csharp_template/FP_controller/components/Health.cs.meta
new file mode 100644
index 0000000..3282c69
--- /dev/null
+++ b/data/csharp_template/FP_controller/components/Health.cs.meta
@@ -0,0 +1,10 @@
+
+
+ 6629c61dbcf5668c3f0966d3e2f41c71b0b5b1b5
+ component
+ a2f4f621
+
+
+
+
+
diff --git a/data/csharp_template/FP_controller/components/PlayerLogic.cs b/data/csharp_template/FP_controller/components/PlayerLogic.cs
new file mode 100644
index 0000000..2b817b1
--- /dev/null
+++ b/data/csharp_template/FP_controller/components/PlayerLogic.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Unigine;
+
+[Component(PropertyGuid = "96c240040ff7888aa3804c36b43a466e1b430b9e")]
+public class PlayerLogic : Component
+{
+ private Health health = null;
+ private void Init()
+ {
+ // берем у ноды компонент Health
+ health = node.GetComponentInChildren();
+ // обновляем информацию об исходном здоровье игрока
+ ComponentSystem.FindComponentInWorld().UpdateHealthInfo(health.health);
+ }
+
+ private void Update()
+ {
+ // проверяем выставлен ли флаг IsDead
+ if (health && health.IsDead)
+ {
+ // обездвиживаем игрока, отключая компоненты
+ node.GetComponent().Enabled = false;
+ node.GetComponent().Enabled = false;
+ node.GetComponent().Enabled = false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/data/csharp_template/FP_controller/components/PlayerLogic.cs.meta b/data/csharp_template/FP_controller/components/PlayerLogic.cs.meta
new file mode 100644
index 0000000..af33bab
--- /dev/null
+++ b/data/csharp_template/FP_controller/components/PlayerLogic.cs.meta
@@ -0,0 +1,10 @@
+
+
+ c70564d6d805b75f7c23b858d839b1091b4f9c80
+ component
+ 8602d67f
+
+
+
+
+
diff --git a/data/csharp_template/FP_controller/components/WeaponController.cs b/data/csharp_template/FP_controller/components/WeaponController.cs
index a7bd731..62efb32 100644
--- a/data/csharp_template/FP_controller/components/WeaponController.cs
+++ b/data/csharp_template/FP_controller/components/WeaponController.cs
@@ -48,6 +48,10 @@ public void Shoot()
// визуализируем эффект попадания в точке пересечения
vfx.OnHit(hitInfo.Point, hitInfo.Normal, hitObject);
+
+ Health health = hitObject.GetComponent();
+ if (health)
+ health.TakeDamage(damage);
}
}
diff --git a/data/csharp_template/FP_controller/components/WeaponController.cs.meta b/data/csharp_template/FP_controller/components/WeaponController.cs.meta
index 7f45c98..34b32b3 100644
--- a/data/csharp_template/FP_controller/components/WeaponController.cs.meta
+++ b/data/csharp_template/FP_controller/components/WeaponController.cs.meta
@@ -2,7 +2,7 @@
1005e2b9f814eb840a73c08a2aabf58cc6fbbb65
component
- fbeaac5a
+ 9a8478aa
diff --git a/data/fps/robot/robot_enemy.node b/data/fps/robot/robot_enemy.node
index 0d58f5a..e7ce272 100644
--- a/data/fps/robot/robot_enemy.node
+++ b/data/fps/robot/robot_enemy.node
@@ -1,28 +1,27 @@
-
-
+
+
0 0 0
-
+
0.5
0.699999988
-
- 594287224
- 359711338
+
+ 1513852383
+ 1365570921
guid://ec33ae15d2782870bf95a10f4fab1b221b40e019
-
+
131174606
- 30316844
+ 1763698563
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
@@ -33,55 +32,58 @@
+
+
+
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 da19874..decbd2d 100644
--- a/data/guids.db
+++ b/data/guids.db
@@ -24,7 +24,6 @@
"d7ec2fb10dd3948d836dd5bb40a3ec18ed8e5638": "fps/bullet/bullet.node.meta",
"fbcb724bae88cd35278fc3650b6c465d2583342a": "fps/bullet/bullet_hit.node.meta",
"78548db02d654d1dce7dbd1ee3ccbd59070beaa1": "fps/robot/robot_enemy.node.meta",
- "ad678f664fe04b2a17760ae4b151dcd2c2fc87cf": "unigine_course_projects_addon_2.17.upackage.meta",
"c7e4ec50c59f2eded914cacea130d2fa1d7d1e47": "csharp_template/baked_lighting/env/ep_10.texture.meta",
"c30725c1f15ff05eb3857ffb3bde76520bb23066": "bake_lighting/lightmaps/fd5a278ce270bd7b28aa949ec7bd736521e50d80.texture.meta",
"895f8c9c93bf86cd2a50873af3853488a08d0b23": "core/textures/sky_base_mask_0.texture.meta",
@@ -141,7 +140,7 @@
"edf9a26ebe93af3e27f1b03c3d839e07def6dd8d": "core/gui/fontbi.ttf.meta",
"20ab46c165b37dcb4f3908fb60af754d57570566": "core/gui/fonti.ttf.meta",
"463d3fdb0e04fa1bd5e3a8a57cb2e5578e036188": "core/gui/font.ttf.meta",
- "ba3aa3438d22f904f3dd3e4d9cdb2e41f9d80810": "configs/default.config.meta",
+ "0cc8f97b99fe56af26bc8c497b95827c4d0c19ed": "configs/default.config.meta",
"5b68699ec4cc6ddc45ce165c2882f41b42d7ca67": "fps/hands/hand_a.png.meta",
"fec0988a1cf7f5b32425b9f87f55f1a3f6ce4cf9": "csharp_template/props/material_ball/textures/material_ball_a.png.meta",
"867f41329cca96ba83605dd00f03d8a28884e88b": "fps/pistol/pistol_a.png.meta",
@@ -264,10 +263,12 @@
"16cff7c5c01b21c228e42b9fb34c3af60ca9ea3a": "csharp_template/template_render_settings/template_medium.render.meta",
"2c111d90a9b866feb9aaca0e7bc71201cbdb3e87": "csharp_template/template_render_settings/template_low.render.meta",
"fe7e107fcadf21ef96ab03e986da74a12658a17c": "csharp_template/template_render_settings/template_virtual_reality.render.meta",
- "ea9d2d9f8f3d2a3b4d2c360902b89a2e21bcd11c": "configs/default.user.meta",
+ "a2a16124c6bec4c1a31668eec17221248085b268": "configs/default.user.meta",
"6b18eb69621c7af732ddd3fab60909c6ceedc515": "csharp_template/FP_controller/components/HUD.cs.meta",
+ "7751d1f8e3229e90a1f21d4a6e50a098a71c79b2": "csharp_template/FP_controller/components/PlayerLogic.cs.meta",
"5ba43a89968ee98f08942f6c3c90ba959cb72398": "csharp_template/FP_controller/components/EnemyLogic.cs.meta",
"cb3839fe5ac15e0145621fbc772e1e9caa5a4247": "fps/components/Lifetime.cs.meta",
+ "2ecdc69731f9baff81a29a3d4f3df1ea5db785af": "csharp_template/FP_controller/components/Health.cs.meta",
"b27eae5f554475bb72d78fc8446f0ebec0ed12eb": "csharp_template/FP_controller/components/VFXController.cs.meta",
"250dcf5fc4592814fceeb4c89d5c69e19dd8a3eb": "csharp_template/FP_controller/components/EnemyFireController.cs.meta",
"117116973d68f9d5d633e5a255fb6f67627b61ee": "csharp_template/FP_controller/components/HandAnimationController.cs.meta",
@@ -277,7 +278,7 @@
"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",
+ "65d3232258fc130cd47c2c5c9e1573346e6f7b46": "configs/default.controls.meta",
"4e7c41aea7b42e2f8860ed7c47e7cb76665ae3cd": "core/materials/base/debug/debug_f0.mat.meta",
"d1e76aeb2bf449331dd7723561ca654e15b897d8": "core/materials/base/objects/clouds/presets/clouds_cumulonimbus1.mat.meta",
"51f3132c5360a901387ae74ad572f451f4946073": "core/materials/base/objects/clouds/presets/clouds_cumulonimbus2.mat.meta",
@@ -381,8 +382,8 @@
"fdf3f2cd4c5f6628773531e7995bdc3148094ae2": "core/materials/base/objects/gui/text/text_base.basemat.meta",
"a62a4e98011711065d06c1d6cff58b7fea7b6bef": "core/materials/base/objects/sky/sky_base.basemat.meta",
"e2e9bc62819aac6f5fc31410728ccecf650b38f1": "editor2/materials/selection/editor_post_selection.basemat.meta",
- "96387fe481f10c26f03567421cab69649a12b9cb": "configs/editor.boot.meta",
- "6ce957b695b645b02bfb0244252ffc4499d9c435": "configs/default.boot.meta",
+ "7aec0d25e685b8bfd6ea70a32b7e154e747672a7": "configs/editor.boot.meta",
+ "e3cd1f61f7b8e0d212e244ff8dc446b7c53ffcc3": "configs/default.boot.meta",
"2a12c4f3c865a29adbcc6f7d9303c22947497580": "csharp_template/props/constructor/fbx/wall_0.fbx.meta",
"653d444f9dbfce7c62a8e43956981945b5d40f8c": "csharp_template/props/constructor/fbx/ramp_0.fbx.meta",
"87c7fc1902acda2fd37d1a1356dc9fd68084bc9e": "csharp_template/props/constructor/fbx/stairs_0.fbx.meta",
@@ -546,19 +547,18 @@
"8e347ca2bf00fae7de034a50330f4ce5d7818c31": "editor2/resources/nodes/node_dummy.node",
"5840798f2e6841f850cc3b79c3c7f5857ac525cc": "editor2/resources/nodes/player_dummy.node",
"d3a50b7274683de0a114e8a04975900df08e10c1": "editor2/resources/nodes/object_dummy.node",
- "82a27ad45a6a3ce401b3e20a446273a2c533a7f5": "unigine_course_projects_addon_2.17.upackage",
- "1774e0caf969334980c23838ec1b9b72e96a4839": "unigine.cache",
+ "daba44f5f6a89becf8cdd9f3e07ee5700ddffcf7": "unigine.cache",
"a8e8c6300dfea6b5a458d9aec978c5b46230dea7": "shader_vk.cache",
"45fecd3b249e62ee1ead6505a1018feb061ace68": "shader_gl.cache",
"a859991239075d92302215400983b7643589e9e1": "editor.cache",
- "7fd74f0817a786b19de26ab694fdb8660f1c34d9": "vk_nvidia_geforce_rtx_4070_linux.gpu_cache",
+ "62f981a611ad095d0c9459a8aabba90eb581c1d0": "vk_nvidia_geforce_rtx_4070_linux.gpu_cache",
"fc23adac710da81780c65dca285f4b1d8703b8f3": "core/locale/unigine.locale",
"816653ed122d681829e54807300601459470b682": ".cache_textures/5b/5b29a40c7a150ffb6361c51e7cdde9e5d6421200.texture",
"d911f6e316ef729b2ca9caedc7ca6fafdad95030": ".cache_textures/29/29b74b27b610d5fb7a20cb191a50a89fe7520e00.texture",
"d7c2274d6378a0480073c707d34bd8ba59cd10d1": "csharp_template/baked_lighting/env/ep_10.texture",
"92393a7086108690d992a3eeb743324ddb34e5e7": ".cache_textures/fd/fdbbaa2c83101f9b66fb503e6f38ba85b39e6a20.texture",
"440c53e92405218d5ddebe6392105ff41e448aae": ".cache_textures/a7/a77e4576162cc40f0c76811c6aec65c2a4439850.texture",
- "211d11479fa6ab80516b1bc109494c1020293336": ".cache_textures/35/35beca42a4a263479cbed89cd17865af68a5ca50.texture",
+ "36e27696fc289bd750702470b74b45104abc697a": ".cache_textures/35/35beca42a4a263479cbed89cd17865af68a5ca50.texture",
"4a8d3fcc6381d3e42dbedaea6ad73f2c879a4493": ".cache_textures/5c/5c850013a9101fad1758f061d105f588dd1cdb70.texture",
"ef58287b4d0ddce95132524571e3d09460b262a8": ".cache_textures/fd/fd5a278ce270bd7b28aa949ec7bd736521e50d80.texture",
"fd5a278ce270bd7b28aa949ec7bd736521e50d80": "bake_lighting/lightmaps/fd5a278ce270bd7b28aa949ec7bd736521e50d80.texture",
@@ -568,7 +568,7 @@
"5c3ebe9af0f9d5b3d7cf1cde772482c94638bd6c": "core/textures/brushes/brush_dirt_0.texture",
"85f5e2154a95cc27c8bfe66fd619768dffcdd4ca": ".cache_textures/32/32e9a2dce08f292cedf2dc9d208b019f27a586a0.texture",
"e7009799874f6e14e6dbe19399b02d88c9e16e1e": ".cache_textures/ef/ef22c5ac89c1851b55ee77be4ecebc05f8557da0.texture",
- "904dc84afbfc9290f8ab3b28e0a8d7974d65a583": ".cache_textures/f7/f72ef6ac96e6021bbf96d0be70d14105b0743ea0.texture",
+ "52c9439b0f564fd995f3e569d8550be484b1050d": ".cache_textures/f7/f72ef6ac96e6021bbf96d0be70d14105b0743ea0.texture",
"89db7e95545ac793e83616ef239028be91a0fb4a": ".cache_textures/e9/e9bbe3191da0c423f17ea1e3f877307ac3b506d0.texture",
"609c3f8080e900cf5d4bbe7e4b8085cdef0a1fb7": ".cache_textures/b1/b1114d0c046f1d7c4df1a44ae88c8ae95e69e3e0.texture",
"3dd97f12ec37d35c5b3a0b4025d00ddedf8217e1": ".cache_textures/8f/8f38428c5917842d6c60b140685947310369edf0.texture",
@@ -576,7 +576,7 @@
"af01455948fcf9b6e676a55328871f7e9b9ca6de": ".cache_textures/92/9211d3b2871938fac36f048de401c0db0a4ea311.texture",
"eaf146692cfe5cb4ebdd6083d7ec0c066ccbf3ad": "csharp_template/baked_lighting/env/ep_11.texture",
"7718a927656641bf4ef1f0d15481f6d92182ea44": ".cache_textures/ac/ac1a3a438bd1e86b966d072a9f16e2703460be21.texture",
- "7b9eb0dd6993ded86b27cfc71561b4a0729375b4": ".cache_textures/36/36c7a5adbe7a4b28f97eb46701ce269a3c524531.texture",
+ "5cd47e584f3fc3ffec3328c27a5d581dc3b05d5c": ".cache_textures/36/36c7a5adbe7a4b28f97eb46701ce269a3c524531.texture",
"eb652252039dc46dff81ac809c296c574ff53221": ".cache_textures/ea/ea515587c4fe8099a29d8c3fa333da5f7678de31.texture",
"a626370115623c36d44e133b02043ad08fc842a6": ".cache_textures/77/7724e20b1de4447268e4b36754f7f843fd238c51.texture",
"8f851d26b0f62ebf85c40e3446584e030faf7ee5": ".cache_textures/f0/f0cb51ed798b8a6885d26aa748ebe7da93149571.texture",
@@ -605,13 +605,13 @@
"0ad038dddba13923a14c0e77a6cc34c38833c432": ".cache_textures/f3/f34fddc5b2703f40fa58ee4eaa919efa35ada492.texture",
"cf2ba2910494fabc504296eb94e53f4e51ea3e55": "csharp_template/baked_lighting/env/ep_2.texture",
"8653f653c7a3b36784b86fddb7e02291a7e4b660": ".cache_textures/c3/c3b643ae67a5b7356b055f101825272f1785aac2.texture",
- "7497f0ce17c040b7073a220cdaaef831aa2de157": ".cache_textures/60/60128bb77a5ccb1c097a1f4e0051f16f3ec80ec2.texture",
+ "314bcc8b5df601fa099f76d9014ae19bbd2afd7d": ".cache_textures/60/60128bb77a5ccb1c097a1f4e0051f16f3ec80ec2.texture",
"e486f0a4ae32766ee4ccba026c0b4152b26f738b": ".cache_textures/52/5219d6ddb5dbd1520e843a369ad2b64326bb24e2.texture",
"09766f7f374604bf2c27fae9d6ead5f148130c7c": ".cache_textures/7b/7b6393ce9c7f88d55c3ac4307e4609cf831cece2.texture",
"33e6afd08b2bc775cdbb530e72a3667b64e6a9be": "core/textures/clouds/clouds_shadows_cumulonimbus2.texture",
"de8600485006b9b7fb9e500663404b21109089df": ".cache_textures/3c/3c39486f310adb027070de79a49f75849b3e8313.texture",
"c3b643ae67a5b7356b055f101825272f1785aac2": "csharp_template/baked_lighting/env/ep_13.texture",
- "432f2a8c258461ddc2e54c9aee969c9fe08d80ad": ".cache_textures/a0/a0e9e17f9d8f00d24b87aa09baf32bd4e5f2a523.texture",
+ "6795cca3d9d1d788e649fe31cd0770d354a00655": ".cache_textures/a0/a0e9e17f9d8f00d24b87aa09baf32bd4e5f2a523.texture",
"33c812c831896591e4d07e86d869aa2508dd3a5f": ".cache_textures/f2/f225c61ccb2a78ee75153c32ff600758eeffa623.texture",
"c793835f81b0eba01dd8e1c98149c2b4c8f1c1dc": ".cache_textures/50/50e9cbe4284624d6436da341e0b2ae11a2542243.texture",
"fbfa697ec802f8257c3e3ccc85bdc97fba54d55d": ".cache_textures/89/89f1a2df6c6012b2d824d2696e6478b4a934cc83.texture",
@@ -621,7 +621,7 @@
"d076fbb0cef1db4f86cf9062e212545941a9b1e4": "csharp_template/baked_lighting/env/ep_3.texture",
"529d06ca0730d6b9c2b86e38c21fef8c639bb639": ".cache_textures/ab/ab29875e5d1ba9e34d60ab8b7ff2829b1665d8a3.texture",
"5b639e40aa8218161f7acf3ea7de702141b5cf77": ".cache_textures/62/62d22818c89b9c4beb0394181b3d87db43f508d3.texture",
- "7222f695ac0f454d34aade3f5e7b820a641d848c": ".cache_textures/82/826ba53fe2e47192de8ae3c91edf9a94fdd4c4e3.texture",
+ "94934b65470205683a387ce34de0c4aa6a92f2e7": ".cache_textures/82/826ba53fe2e47192de8ae3c91edf9a94fdd4c4e3.texture",
"6b30c889824ed90d91845c8f3cb7825e5f33ef91": "core/textures/clouds/clouds_shadows_cumulonimbus3.texture",
"4cd85f91333fda2870b3d64b7ed54135a9d63876": ".cache_textures/88/88c26cc25544c3b1ada382ba3c6822c3e5392c04.texture",
"3db0f141e0270cbd60b0f77b6798af16baf051e6": ".cache_textures/cc/cc9700e0e0533ebfec503d122b993949182af214.texture",
@@ -675,13 +675,13 @@
"722dcc7373760ff17a6182fdc5cb800d5944a300": ".cache_textures/f2/f2211973347c1036ea774a1de8da44d8c00a8257.texture",
"8a0f2f0d67b3cdaf12216827e92247f8f1ffe422": ".cache_textures/82/82fb4683e414ba063e30c9ad87291f2886d77867.texture",
"eea0ebacaf38fadf0815ebca1f750c58e149def3": ".cache_textures/e2/e237a1333473ddcc4729b8cfa3bee53e75991b77.texture",
- "0c5cdb62c29e45cc2099c480da5c417a066a767b": ".cache_textures/bf/bf9408a3ca4f55a67bcc70cdfec75bc891a84c87.texture",
+ "2e87f169ebe7ecc95ca75ec79b44d1178f92590b": ".cache_textures/bf/bf9408a3ca4f55a67bcc70cdfec75bc891a84c87.texture",
"cc9700e0e0533ebfec503d122b993949182af214": "csharp_template/baked_lighting/env/ep_7.texture",
"708840840341a72e3ae7cee2915f7cfe280541eb": ".cache_textures/d1/d12281c346ee3c46a561e6ed318f1b6872c6c7a7.texture",
"787a3dd356ebcff2206ac35de82da8ea423a23e0": ".cache_textures/02/02358b899a7873ad172e9dd61476448db6e23db7.texture",
"2c4a06e0132085976a699ede25d2b828cd566f97": ".cache_textures/8e/8e31d3f3022488b64088689d145fd158e44da4d7.texture",
- "3a8521d1cf544f4ceec08cdb271902a75eba5fd8": ".cache_textures/4e/4e077af32f8803b63497a79db340045845023bd7.texture",
- "398b337ac7f6414c8b948ad874b0c73972650873": ".cache_textures/34/34e6f0b471a4e48305a5c00650f217ad1e0e1528.texture",
+ "eb27244579ee143a60652ec380447608c3d52ac7": ".cache_textures/4e/4e077af32f8803b63497a79db340045845023bd7.texture",
+ "1ce56b92f2eb9b13bc09e44c4442ef8a112470b6": ".cache_textures/34/34e6f0b471a4e48305a5c00650f217ad1e0e1528.texture",
"2d1aa8fc1fe6afa5328c749a2539e1133dda1c03": ".cache_textures/f4/f4ee40b8c4ae8bbefa997d03d00b5341ea459b28.texture",
"a5a478c7ef03a474553d59717703d4b24e1b0e64": ".cache_textures/2a/2a3d6d41edb8ac91336265af489c891e9d772658.texture",
"4b3d2a1b7286064827b73ce5f7777346a8c7d0c8": ".cache_textures/78/78592c1ce78ec682e89f5558ff40fcf7a8deae68.texture",
@@ -695,7 +695,7 @@
"f1e97fafe0c22e5964cffe99301b8cdf7c1d926c": ".cache_textures/b6/b6674b045b8932059769ee326a8eb293037aeb19.texture",
"a020930b38e0bdf2d37d275527e9c595d02f9e78": ".cache_textures/61/61b0b59df82cb279bd434ebf41e02e1eaed10c19.texture",
"33416085e949ede46091a25fd8f525a1c9dcb9fa": ".cache_textures/20/200386361225d7765ece91fb69d383014d0d2029.texture",
- "4dcb3eb03de3fea67259861ecee0e3c6389d2fa1": ".cache_textures/79/79c3f825bbde4b40b1f4459f661ad6720e5f4329.texture",
+ "f0fc2f6064c2e4ce2bfddc0a1a8aa3d477f359e4": ".cache_textures/79/79c3f825bbde4b40b1f4459f661ad6720e5f4329.texture",
"b712c6ba5d8ebcda3d3f50a85836a6945a0f5169": ".cache_textures/40/40a87da144af43d809a26a48d571fc15e32f4649.texture",
"b40fd1fabf87a0b5aef019e86609c5e7e50773a9": ".cache_textures/9c/9c3ce4cbe2acc28cc1f63f6e0e91ab8598e65e59.texture",
"4fe00eeed45b495d4e0628bc9e4766667abac00d": ".cache_textures/cd/cd518d3796c6bd6e996a25f695bace323b8f2b69.texture",
@@ -708,7 +708,7 @@
"73e3b135811aedd68eac1a8f5293c3d945f2e66a": ".cache_textures/68/687d64ea30955f5fb0cc46f68dfc256299f8d1b9.texture",
"77cd29d159dc843ff9b74a8ba70212f9e1bf17b6": ".cache_textures/e3/e3120f350170783531c278607a4b366265cfbfc9.texture",
"1d9266619f95f7624998419bd1b8bbc303f69186": ".cache_textures/fb/fb5a2298020b7d808846711ca13c57f8613732e9.texture",
- "24724736c02151834a2da63487c78c42b1526bdf": ".cache_textures/04/04c4a2f5bd45d7d0c047c8ef397a61827031b2f9.texture",
+ "a6087eeca9c9d321fc205ef62aed8153e96223b0": ".cache_textures/04/04c4a2f5bd45d7d0c047c8ef397a61827031b2f9.texture",
"f4eefec538aa7220138c0a9ff8b96de92600dd3a": ".cache_textures/7a/7a524e344adcf1c64aac9ba8feb410ab624d0ef9.texture",
"d352fd09abb6737814305c83bd256205cce9ee4e": ".cache_textures/d1/d15782a509aae84ba85cebcb4e69571f60a7e33a.texture",
"e9bad503fde6188ff24d260d2df1621cfed1a4d0": ".cache_textures/55/554fa1b16c38379783eca1193910a623c56bda4a.texture",
@@ -718,13 +718,13 @@
"2ba11db6568a8a760dcfd844c6db8e21a0295235": ".cache_textures/a8/a8106e01d8743fe2b0601f5d30c9eaf6cee2a4ca.texture",
"176c8c5dbe12c84019014df7d405b0d1217bcdb2": ".cache_textures/40/402da8fad66b8a38459d17751bc68613b40a59ea.texture",
"18f0eb9fb61857e59ec124095c0effcce498a71c": ".cache_textures/a5/a5f5da9b8ae7b8b810c6714fd8bb208bda61bfea.texture",
- "2f128d4dcfcb2450a01d65b7df426f2d671d1864": ".cache_textures/08/082045fa7881aeb1f8b8c590683c24fc96ff90fa.texture",
+ "46561ff176327e0e5446710f7c9c5f59346eedd3": ".cache_textures/08/082045fa7881aeb1f8b8c590683c24fc96ff90fa.texture",
"b0d94d3515b2e88572861ff7cd6966471dc4a90f": "core/textures/no_imagery_data.texture",
- "48585e614f160689804977eb56b5d94995c86a28": ".cache_textures/2e/2e2541e7dc24561a4d1faeb1d5ee585cb1ba180b.texture",
+ "ad022d119bbb1753821c752fcca3522410df5bf3": ".cache_textures/2e/2e2541e7dc24561a4d1faeb1d5ee585cb1ba180b.texture",
"ecb2e25ca6029db4222ef6fac67907ed7a2c25e3": ".cache_textures/cb/cb63a59ed35b9c747cd25c37a47412a55cf9691b.texture",
"32ffb91afffdfacffa97a4089b116060fdea9849": ".cache_textures/0c/0c5c7dca62e0f075bc7497f81bdfe9aec6b2ee1b.texture",
"c0cec9865c46f58111280b9490753520cb8767c5": ".cache_textures/bf/bf8a1014541b1072694c122404e4604dd578da2b.texture",
- "596a8bcf0f4cbe78fc99b789c75515c58d0ef99e": ".cache_textures/cd/cdaf27407da9119d950d1af45576b476a8cac44b.texture",
+ "3c2a24812c173e7b5509811fcd8153a0d23e62e3": ".cache_textures/cd/cdaf27407da9119d950d1af45576b476a8cac44b.texture",
"5148cf63378a83e36f69976d04ff2240c27282b0": ".cache_textures/d7/d798cb1e62ee2d61a673b602b3fd94acc56b564b.texture",
"6be0dd05f4527049f004b2dfa19093ae32b4407a": ".cache_textures/d0/d038f7e88295202f8d5905995a4a80dbadadbd4b.texture",
"ef72154daa7a4b05f6065867cfa29b32325faf62": ".cache_textures/df/df7a5f2766dedfe11a5f2a91917ef4deff3baa5b.texture",
@@ -764,10 +764,10 @@
"89461a14bb44576f0ca989f2eda00109f52b3e3b": "editor2/material_graph/node_head.texture",
"8395ae94aed7e6d74ee8ea72197e1f1004fec8bb": ".cache_textures/91/9154446becf4434fcabf82177bb1532fd0124fad.texture",
"4154b88989e01933ce4d44039606e080ddf93fce": ".cache_textures/27/273a674fad0cb1658ca1d293b73e48e3f6e629bd.texture",
- "ee21bf575011dcd3768274513319281cd4558d06": ".cache_textures/db/dba7e47998cec38478b9791316f2ab56d26beabd.texture",
+ "e5594664e4e4d07c391b882e16fa0945688a63a8": ".cache_textures/db/dba7e47998cec38478b9791316f2ab56d26beabd.texture",
"c8c0273f44ca9876920bd8a90090abf3018cc73c": ".cache_textures/26/26da2af870934f62e8d8e6cc83d390c8cd94abbd.texture",
"8b9e4ef773a7cb99da7893217a4c1639fa196254": ".cache_textures/75/751f5d9e449a632ea567dc7983da510b94f0b1ed.texture",
- "d3258473442c86ff8b3fd7cd2b835ea69d6047b2": ".cache_textures/28/283bfaa9a7db03f468f55ec395b17546ff01cbed.texture",
+ "7721bd1fb39e8ac954567ecd57f68409552587b1": ".cache_textures/28/283bfaa9a7db03f468f55ec395b17546ff01cbed.texture",
"a8106e01d8743fe2b0601f5d30c9eaf6cee2a4ca": "core/textures/common/red.texture",
"9154446becf4434fcabf82177bb1532fd0124fad": "core/textures/sky_base_background.texture",
"ba93f08d8803aaa424c7c5a7797a347d7da0b3a2": "editor2/material_graph/checker_background.texture",
@@ -776,16 +776,16 @@
"8822874216026cc7b2b61784d36abee999508e06": "core/textures/brushes/box_hard.texture",
"e1869ffb5e2cd13556a055c5d5bafb78e4884028": ".cache_textures/4a/4ad9b94d61fe5819fd6436ee3490736745d3be0e.texture",
"048edf7dc3fa5a0f20ffa617666839ffdae31352": ".cache_textures/73/73835d23b66f39eee5db1809aa9a383510ff871e.texture",
- "747f716be80d51c026790f8511b7e2982a0b0eca": ".cache_textures/79/7962a74a0b52ee211bbf310c9cdb38fb1cc7da1e.texture",
+ "fd0f98492f3bf32807636ea7b9886fa6275f1eeb": ".cache_textures/79/7962a74a0b52ee211bbf310c9cdb38fb1cc7da1e.texture",
"ae5328b25095564584c7f3e01b4e42d1196cdd01": ".cache_textures/b5/b54a67af925478f0947c2fcb4682cc89f2df454e.texture",
"fc5075ea4d8ce5ef00064058e4d7c3d15d1a82d9": ".cache_textures/2a/2a2f379487a69cc242e329b9d78583e1e51be54e.texture",
"eb0fe7dcb0a40dc7bb10207aee744f1614e0ed63": ".cache_textures/14/1482a8f602c5b1238b5c1d2403261f57c765f15e.texture",
"c27b8f37b0aac7f35f806d6194c6e47bb7753f94": ".cache_textures/cb/cb3dbb4e699ac80e4405d1d1cfe838e8a6819c5e.texture",
"525eb439ca99aa9e68a2df33f970275819917b3e": ".cache_textures/6c/6c10a7ccecca9a2170821e145fe1509368162c6e.texture",
- "94002b58801d70fceca3d686fca00c9597458369": ".cache_textures/d5/d589b4ba98993cd1fadb4ffc2b0c6b2bd5f6868e.texture",
+ "a562448d6db2c57c4d38e4cb7d40b1e3acd2e34f": ".cache_textures/d5/d589b4ba98993cd1fadb4ffc2b0c6b2bd5f6868e.texture",
"6076b96b153f76d1848ba4b5c1d2ce9e84cc3858": ".cache_textures/e7/e7653bca291f78a1a4d1398c96a8a77b70bd769e.texture",
"870f1bd2b0eb267f5101aa00b7c1b2d204653da1": ".cache_textures/33/33e6afd08b2bc775cdbb530e72a3667b64e6a9be.texture",
- "1f36c364d94e66865df8c5b2171336eabe149465": ".cache_textures/d0/d024b1face9f9911442f7f3c0c66516b9584b7ce.texture",
+ "4d691236e53e7828057be510d4bf6954eb3c531a": ".cache_textures/d0/d024b1face9f9911442f7f3c0c66516b9584b7ce.texture",
"07076425b604c5f852a45eff506f59abe547aa1a": ".cache_textures/fd/fdce52252458c90169b884999ed107ed4f612ffe.texture",
"b54a67af925478f0947c2fcb4682cc89f2df454e": "core/textures/clouds/default_coverage.texture",
"402da8fad66b8a38459d17751bc68613b40a59ea": "core/textures/clouds/cumulonimbus1_shape.texture",
@@ -802,10 +802,10 @@
"2a1fd85054ccff517ff8c967525de5aff0056bb4": "core/textures/render_hdr_lens_vignette.texture",
"46acc74bcf67800d0faf1595edf8bed9e5a75fb8": ".cache_textures/b0/b0d94d3515b2e88572861ff7cd6966471dc4a90f.texture",
"f3eca750f465858ceda14dcea74b2a23235f1d47": ".cache_textures/1d/1d69d10b4e2bf2ee70b31d7533b1105000bca76f.texture",
- "cecf8f99936d5c15082a7de3887e7fe49477ba80": ".cache_textures/86/86bb460b88ece3eed5855a750bac29507572ec6f.texture",
+ "148ff6b536db5fd746653db38a4b168a4a226cb7": ".cache_textures/86/86bb460b88ece3eed5855a750bac29507572ec6f.texture",
"80ca9b06abd3d9d0400021148ae2729bbce8ab45": ".cache_textures/00/001aa552ae1a40ccea9ed874a03721bf01053f8f.texture",
"f65406d70ae40d43588cbe011203e642dce6ebb4": ".cache_textures/42/4227c53bb3cc795eb05a9125737a1040525b469f.texture",
- "dd55293cb4a857225768c3ca14d8cdf94934111d": ".cache_textures/37/37b28c78c5d70a422728952736bac460e771dcaf.texture",
+ "5a52f077d3698166bca65f655d1843fea4fc51c9": ".cache_textures/37/37b28c78c5d70a422728952736bac460e771dcaf.texture",
"eca5312afb00863002fb39986e733eefc2a51519": ".cache_textures/83/837fb41b70ad8a04bbceacfcea1b2bc1698b4eaf.texture",
"b31e87575c8aaba7f02c7281c7f9219c34eea634": ".cache_textures/f4/f4ad89d310b325eb04dda69abdc763a2b8b4c3cf.texture",
"66f9cce85d374ab3bd7ae3a6e8e55fd9e8f81dff": ".cache_textures/71/71072b09cfdc22269143e05fa57467d2458d3acf.texture",
@@ -1264,7 +1264,7 @@
"209cfcf479763933a04539d2c402f4d11a54439b": "editor2/gui/manipulator_scaler.png",
"ea440b790422e571ee0a28732f7be5662ee54b7e": "editor2/gui/physical_water.png",
"0996fae54020b5a730ceb3bfc66a4f557895ffda": "editor2/gui/object_water.png",
- "41a5db98c2bf1487b56a46d6cf907f44b8ef14ef": ".thumbnails/FirstPersonShooter.png",
+ "4aaa37dc3cbc3790cfc8ab66564b0c5be95b65a0": ".thumbnails/FirstPersonShooter.png",
"1f55cafa95763d9ba7652ae8e1909d69d5b258a9": "editor2/gui/object_mesh_cluster.png",
"8babfb52816326c761149d8046bfe5fc9bcc7721": "editor2/gui/world_clutter.png",
"6d812417a1ceb28364b03d41599a4f52ce51c9f4": "editor2/gui/object_mesh_clutter.png",
@@ -1962,7 +1962,7 @@
"8a631eafc2771070eed035991830f83b02d03d6c": "editor2/upgrade/2.16.0.2/render.xml",
"32697cabc3f6d69c95cc39f51d4b720134b0d498": "editor2/upgrade/2.8.0.0/assets.xml",
"49b029653a881f98d8cfc63f421e9ce266fc605a": "editor2/upgrade/2.9.0.0/assets.xml",
- "3eb0b78053c8bfb3d37a7a6e63e6e759500364b1": ".editor2/.assemblytool",
+ "bf6d31b72d75ad1346e056a52104dfb490975d09": ".editor2/.assemblytool",
"0618cf62aee4875963a848e477497ef3f97a37b6": "fps/hands/hands_animations/hands_pistol_walk_b.anim",
"e61be599754592242eb5b733e6a292f613446ddd": "fps/hands/hands_animations/hands_pistol_idle.anim",
"5b9eff0f2598e1220b37ee19579500a41d4553b3": "fps/hands/hands_animations/hands_pistol_walk_f.anim",
@@ -2051,8 +2051,10 @@
"0c8e43c90ace7f55fc25e143ee2cb296e8fb540e": "configs/default.user",
"31882be4a9adaffa787a3342ade773c4defe75cb": "editor2/resources/template_graphs/material_graph_decal_water",
"5faca71f8446cfac3ee60b883c3368aef60d5fab": "csharp_template/FP_controller/components/HUD.cs",
+ "c70564d6d805b75f7c23b858d839b1091b4f9c80": "csharp_template/FP_controller/components/PlayerLogic.cs",
"5158593f996ef01aae4f3a2a8ce7a21d539470f6": "csharp_template/FP_controller/components/EnemyLogic.cs",
"4aed6f037c03c8869f9b862d692fb1a8ee0be8e7": "fps/components/Lifetime.cs",
+ "6629c61dbcf5668c3f0966d3e2f41c71b0b5b1b5": "csharp_template/FP_controller/components/Health.cs",
"b23baaa53cabf948b0118226ccc00803ae73be91": "csharp_template/FP_controller/components/VFXController.cs",
"4b3823a5c4fc24a3c73f5f268369b30430346791": "csharp_template/FP_controller/components/EnemyFireController.cs",
"4e28861d843434e837504ef0429bf99b43420c5c": "csharp_template/FP_controller/components/HandAnimationController.cs",