diff --git a/addons/enhanced_gridmap/meshlibrary/default.tres b/addons/enhanced_gridmap/meshlibrary/default.tres index 8f6e9d0..ae52807 100644 --- a/addons/enhanced_gridmap/meshlibrary/default.tres +++ b/addons/enhanced_gridmap/meshlibrary/default.tres @@ -1,19 +1,18 @@ [gd_resource type="MeshLibrary" format=4 uid="uid://kcv6ans86ug7"] -[ext_resource type="ArrayMesh" uid="uid://cr70nmk8djc1i" path="res://assets/models/meshes/tiles_armagedon_a3.res" id="1_ptqbt"] -[ext_resource type="ArrayMesh" uid="uid://dspusnbkr74hg" path="res://assets/models/meshes/hover.res" id="2_p5epg"] -[ext_resource type="ArrayMesh" uid="uid://dqguomxd16u0i" path="res://assets/models/meshes/start.res" id="3_8v5xv"] +[ext_resource type="BoxMesh" uid="uid://bb3b32qso3yab" path="res://addons/enhanced_gridmap/meshlibrary/tile_normal.tres" id="1_pgnbl"] +[ext_resource type="BoxMesh" uid="uid://c1wa5rjlu0fuo" path="res://addons/enhanced_gridmap/meshlibrary/tile_hover.tres" id="2_pgnbl"] [ext_resource type="ArrayMesh" uid="uid://brevl3ab0tdqe" path="res://assets/models/tiles/tile_wall.tres" id="4_8v5xv"] [ext_resource type="ArrayMesh" uid="uid://b5ta7tcw0iscd" path="res://assets/models/tiles/tile_coin.tres" id="4_76xkl"] -[ext_resource type="ArrayMesh" uid="uid://d4himvyb81in8" path="res://assets/models/meshes/non-walkable.res" id="4_sx8rm"] [ext_resource type="ArrayMesh" uid="uid://dqo83gvaay6sn" path="res://assets/models/tiles/tile_area_freeze.tres" id="5_sx8rm"] [ext_resource type="ArrayMesh" uid="uid://bqvqj3fhf5x51" path="res://assets/models/tiles/tile_ghost.tres" id="6_r32il"] [ext_resource type="ArrayMesh" uid="uid://cv4bedhida00g" path="res://assets/models/tiles/tile_star.tres" id="7_p5epg"] [ext_resource type="ArrayMesh" uid="uid://gpnl4cjrivor" path="res://assets/models/tiles/tile_speed.tres" id="7_sx8rm"] -[ext_resource type="ArrayMesh" uid="uid://onkud44h3we1" path="res://assets/models/meshes/safe_zone.res" id="8_cg50n"] -[ext_resource type="ArrayMesh" uid="uid://dx41n2x8v30r1" path="res://assets/models/meshes/crack.res" id="10_r32il"] +[ext_resource type="BoxMesh" uid="uid://fy4bhoeii40c" path="res://addons/enhanced_gridmap/meshlibrary/tile_safe_zone.tres" id="8_uwjsj"] +[ext_resource type="BoxMesh" uid="uid://dy5p77cjb3geo" path="res://addons/enhanced_gridmap/meshlibrary/tile_start.tres" id="9_pgnbl"] +[ext_resource type="BoxMesh" uid="uid://dcjdwbffgtutt" path="res://addons/enhanced_gridmap/meshlibrary/tile_non_walkable.tres" id="10_pgnbl"] [ext_resource type="Texture2D" uid="uid://dpkx1a780pvwv" path="res://assets/textures/tile_diamond.png" id="10_sx8rm"] -[ext_resource type="ArrayMesh" uid="uid://bj4qr20oxos13" path="res://assets/models/meshes/freeze_floor.res" id="11_pgnbl"] +[ext_resource type="BoxMesh" uid="uid://b5cc3prem52r6" path="res://addons/enhanced_gridmap/meshlibrary/tile_freeze.tres" id="11_pgnbl"] [sub_resource type="CompressedTexture2D" id="CompressedTexture2D_5d0gc"] load_path = "res://.godot/imported/tile_heart.png-deeef50755ca225f028608dfd16900e6.s3tc.ctex" @@ -83,35 +82,35 @@ blend_shape_mode = 0 [resource] item/0/name = "normal" -item/0/mesh = ExtResource("1_ptqbt") +item/0/mesh = ExtResource("1_pgnbl") item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/0/mesh_cast_shadow = 1 item/0/shapes = [] item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/0/navigation_layers = 1 item/1/name = "hover" -item/1/mesh = ExtResource("2_p5epg") +item/1/mesh = ExtResource("2_pgnbl") item/1/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/1/mesh_cast_shadow = 1 item/1/shapes = [] item/1/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/1/navigation_layers = 1 item/2/name = "safe_zone" -item/2/mesh = ExtResource("8_cg50n") +item/2/mesh = ExtResource("8_uwjsj") item/2/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/2/mesh_cast_shadow = 1 item/2/shapes = [] item/2/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/2/navigation_layers = 1 item/3/name = "end" -item/3/mesh = ExtResource("3_8v5xv") +item/3/mesh = ExtResource("9_pgnbl") item/3/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/3/mesh_cast_shadow = 1 item/3/shapes = [] item/3/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/3/navigation_layers = 1 item/4/name = "non-walkable" -item/4/mesh = ExtResource("4_sx8rm") +item/4/mesh = ExtResource("10_pgnbl") item/4/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/4/mesh_cast_shadow = 1 item/4/shapes = [] @@ -125,7 +124,7 @@ item/5/shapes = [] item/5/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/5/navigation_layers = 1 item/6/name = "crack" -item/6/mesh = ExtResource("10_r32il") +item/6/mesh = ExtResource("1_pgnbl") item/6/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) item/6/mesh_cast_shadow = 1 item/6/shapes = [] diff --git a/addons/enhanced_gridmap/meshlibrary/mat_end.tres b/addons/enhanced_gridmap/meshlibrary/mat_end.tres index 8490465..31a9e3d 100644 --- a/addons/enhanced_gridmap/meshlibrary/mat_end.tres +++ b/addons/enhanced_gridmap/meshlibrary/mat_end.tres @@ -1,4 +1,4 @@ -[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://0fexqt03j3cb"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://0fexqt03j3cb"] [resource] -albedo_color = Color(0.265987, 0.565787, 0.525347, 1) +albedo_color = Color(0.8235294, 0, 0, 1) diff --git a/addons/enhanced_gridmap/meshlibrary/mat_hover.tres b/addons/enhanced_gridmap/meshlibrary/mat_hover.tres index 9710bcd..b4d4db3 100644 --- a/addons/enhanced_gridmap/meshlibrary/mat_hover.tres +++ b/addons/enhanced_gridmap/meshlibrary/mat_hover.tres @@ -1,4 +1,6 @@ -[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://cn1pvqd4gf1u7"] +[gd_resource type="StandardMaterial3D" format=3 uid="uid://cn1pvqd4gf1u7"] + +[ext_resource type="Texture2D" uid="uid://cw1nmpknfgbuu" path="res://assets/textures/start_n_finish.jpg" id="1_3cw0q"] [resource] -albedo_color = Color(0.26944, 0.347152, 0.674841, 1) +albedo_texture = ExtResource("1_3cw0q") diff --git a/addons/enhanced_gridmap/meshlibrary/tile_end.tres b/addons/enhanced_gridmap/meshlibrary/tile_end.tres deleted file mode 100644 index 80ddbcd..0000000 --- a/addons/enhanced_gridmap/meshlibrary/tile_end.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="BoxMesh" load_steps=2 format=3 uid="uid://dcjdwbffgtutt"] - -[ext_resource type="Material" uid="uid://0fexqt03j3cb" path="res://addons/enhanced_gridmap/meshlibrary/mat_end.tres" id="1_dvekp"] - -[resource] -material = ExtResource("1_dvekp") -size = Vector3(1.9, 0.5, 1.9) diff --git a/addons/enhanced_gridmap/meshlibrary/tile_freeze.tres b/addons/enhanced_gridmap/meshlibrary/tile_freeze.tres new file mode 100644 index 0000000..7500db3 --- /dev/null +++ b/addons/enhanced_gridmap/meshlibrary/tile_freeze.tres @@ -0,0 +1,8 @@ +[gd_resource type="BoxMesh" format=3 uid="uid://b5cc3prem52r6"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e3p1j"] +albedo_color = Color(0.38039216, 1, 0.9607843, 1) + +[resource] +material = SubResource("StandardMaterial3D_e3p1j") +size = Vector3(1, 0.1, 1) diff --git a/addons/enhanced_gridmap/meshlibrary/tile_hover.tres b/addons/enhanced_gridmap/meshlibrary/tile_hover.tres index 99a9bb9..842544c 100644 --- a/addons/enhanced_gridmap/meshlibrary/tile_hover.tres +++ b/addons/enhanced_gridmap/meshlibrary/tile_hover.tres @@ -1,7 +1,8 @@ -[gd_resource type="BoxMesh" load_steps=2 format=3 uid="uid://c1wa5rjlu0fuo"] +[gd_resource type="BoxMesh" format=3 uid="uid://c1wa5rjlu0fuo"] -[ext_resource type="Material" uid="uid://cn1pvqd4gf1u7" path="res://addons/enhanced_gridmap/meshlibrary/mat_hover.tres" id="1_5fptl"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mf1g6"] +albedo_color = Color(0.90588236, 0.73333335, 0.22352941, 1) [resource] -material = ExtResource("1_5fptl") -size = Vector3(1.9, 0.5, 1.9) +material = SubResource("StandardMaterial3D_mf1g6") +size = Vector3(1, 0.1, 1) diff --git a/addons/enhanced_gridmap/meshlibrary/tile_non_walkable.tres b/addons/enhanced_gridmap/meshlibrary/tile_non_walkable.tres new file mode 100644 index 0000000..08f0294 --- /dev/null +++ b/addons/enhanced_gridmap/meshlibrary/tile_non_walkable.tres @@ -0,0 +1,7 @@ +[gd_resource type="BoxMesh" format=3 uid="uid://dcjdwbffgtutt"] + +[ext_resource type="Material" uid="uid://0fexqt03j3cb" path="res://addons/enhanced_gridmap/meshlibrary/mat_end.tres" id="1_1olya"] + +[resource] +material = ExtResource("1_1olya") +size = Vector3(1, 0.1, 1) diff --git a/addons/enhanced_gridmap/meshlibrary/tile_normal.tres b/addons/enhanced_gridmap/meshlibrary/tile_normal.tres index 9a384a9..fc5fac2 100644 --- a/addons/enhanced_gridmap/meshlibrary/tile_normal.tres +++ b/addons/enhanced_gridmap/meshlibrary/tile_normal.tres @@ -1,7 +1,7 @@ -[gd_resource type="BoxMesh" load_steps=2 format=3 uid="uid://bb3b32qso3yab"] +[gd_resource type="BoxMesh" format=3 uid="uid://bb3b32qso3yab"] [ext_resource type="Material" uid="uid://dqhmv78u8iy1d" path="res://addons/enhanced_gridmap/meshlibrary/mat_normal.tres" id="1_4kxai"] [resource] material = ExtResource("1_4kxai") -size = Vector3(1.9, 0.5, 1.9) +size = Vector3(1, 0.1, 1) diff --git a/addons/enhanced_gridmap/meshlibrary/tile_safe_zone.tres b/addons/enhanced_gridmap/meshlibrary/tile_safe_zone.tres new file mode 100644 index 0000000..0c19e7b --- /dev/null +++ b/addons/enhanced_gridmap/meshlibrary/tile_safe_zone.tres @@ -0,0 +1,8 @@ +[gd_resource type="BoxMesh" format=3 uid="uid://fy4bhoeii40c"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ou2ex"] +albedo_color = Color(0.38039216, 1, 0.33333334, 1) + +[resource] +material = SubResource("StandardMaterial3D_ou2ex") +size = Vector3(1, 0.1, 1) diff --git a/addons/enhanced_gridmap/meshlibrary/tile_start.tres b/addons/enhanced_gridmap/meshlibrary/tile_start.tres index ed42e97..dda5df9 100644 --- a/addons/enhanced_gridmap/meshlibrary/tile_start.tres +++ b/addons/enhanced_gridmap/meshlibrary/tile_start.tres @@ -1,7 +1,7 @@ -[gd_resource type="BoxMesh" load_steps=2 format=3 uid="uid://dy5p77cjb3geo"] +[gd_resource type="BoxMesh" format=3 uid="uid://dy5p77cjb3geo"] [ext_resource type="Material" uid="uid://cn1pvqd4gf1u7" path="res://addons/enhanced_gridmap/meshlibrary/mat_hover.tres" id="1_nrdsg"] [resource] material = ExtResource("1_nrdsg") -size = Vector3(1.9, 0.5, 1.9) +size = Vector3(1, 0.1, 1) diff --git a/assets/models/meshes/tile.glb.import b/assets/models/meshes/tile.glb.import index 1a2df23..3b67db2 100644 --- a/assets/models/meshes/tile.glb.import +++ b/assets/models/meshes/tile.glb.import @@ -44,7 +44,6 @@ _subresources={ "generate/lods": 0, "generate/shadow_meshes": 0, "lods/normal_merge_angle": 60.0, -"lods/normal_split_angle": 25.0, "save_to_file/enabled": true, "save_to_file/fallback_path": "res://assets/models/meshes/tiles.res", "save_to_file/path": "uid://bhlvvdtiykgnn" diff --git a/assets/models/meshes/tile_heart.tres b/assets/models/meshes/tile_heart.tres index 4e274eb..54bef1c 100644 --- a/assets/models/meshes/tile_heart.tres +++ b/assets/models/meshes/tile_heart.tres @@ -1,4 +1,4 @@ -[gd_resource type="ArrayMesh" load_steps=4 format=4 uid="uid://bl3x6wsft20n"] +[gd_resource type="ArrayMesh" format=4 uid="uid://bl3x6wsft20n"] [ext_resource type="Texture2D" uid="uid://cdnxwlysxnujd" path="res://assets/textures/tile_heart.png" id="1_22stv"] diff --git a/assets/models/meshes/tiles.res b/assets/models/meshes/tiles.res index d710bb9..a6ff67d 100644 Binary files a/assets/models/meshes/tiles.res and b/assets/models/meshes/tiles.res differ diff --git a/assets/models/meshes/tiles_armagedon_a1.res b/assets/models/meshes/tiles_armagedon_a1.res index 2a6841e..5fc2267 100644 Binary files a/assets/models/meshes/tiles_armagedon_a1.res and b/assets/models/meshes/tiles_armagedon_a1.res differ diff --git a/assets/models/meshes/tiles_armagedon_a3.res b/assets/models/meshes/tiles_armagedon_a3.res index 23abdea..5dec56c 100644 Binary files a/assets/models/meshes/tiles_armagedon_a3.res and b/assets/models/meshes/tiles_armagedon_a3.res differ diff --git a/project.godot b/project.godot index 05ef364..99f73ce 100644 --- a/project.godot +++ b/project.godot @@ -20,7 +20,7 @@ config/features=PackedStringArray("4.6", "Forward Plus") config/icon="res://icon.svg" [autoload] -SettingsManager="*uid://c1ouaaqnn0lrc" + Nakama="*uid://bueyqhhvxe0tx" NakamaManager="*res://scripts/nakama_manager.gd" AuthManager="*res://scripts/managers/auth_manager.gd" @@ -32,6 +32,7 @@ GoalManager="*res://scripts/managers/goal_manager.gd" PlayerManager="*res://scripts/managers/player_manager.gd" GoalsCycleManager="*res://scripts/managers/goals_cycle_manager.gd" Satori="*uid://b8vev00s34b7" +SettingsManager="*uid://c1ouaaqnn0lrc" [display]