From 62d340853de758e48f4c8ea4843599b320ecc26f Mon Sep 17 00:00:00 2001 From: Brajanowski Date: Fri, 18 Apr 2025 11:36:40 +0200 Subject: [PATCH] idk --- .../Windows/addressables_content_state.bin | Bin 2136 -> 2136 bytes Assets/RebootKit | 2 +- Assets/Resources/PerformanceTestRunInfo.json | 1 + .../PerformanceTestRunInfo.json.meta | 7 + .../Resources/PerformanceTestRunSettings.json | 1 + .../PerformanceTestRunSettings.json.meta | 7 + ...niversalRenderPipelineGlobalSettings.asset | 142 +- Assets/jelycho/Code.meta | 8 + .../{game => Code}/ActiveRagdollBone.cs | 2 +- .../{game => Code}/ActiveRagdollBone.cs.meta | 0 .../{game => Code}/ActiveRagdollDummy.cs | 2 +- .../{game => Code}/ActiveRagdollDummy.cs.meta | 0 Assets/jelycho/{ => Code}/GameConsts.cs | 0 Assets/jelycho/{ => Code}/GameConsts.cs.meta | 0 Assets/jelycho/Code/GutRenderer.cs | 56 + .../{game => Code}/GutRenderer.cs.meta | 0 .../{game => Code}/HumanoidActiveRagdoll.cs | 2 +- .../HumanoidActiveRagdoll.cs.meta | 0 Assets/jelycho/{game => Code}/Player.meta | 0 .../{game => Code}/Player/PlayerController.cs | 2 +- .../Player/PlayerController.cs.meta | 0 .../Player/PlayerControllerAsset.cs | 2 +- .../Player/PlayerControllerAsset.cs.meta | 0 Assets/jelycho/{game => Code}/PlayerActor.cs | 5 +- .../{game => Code}/PlayerActor.cs.meta | 0 Assets/jelycho/{game => Code}/Rope.cs | 2 +- Assets/jelycho/{game => Code}/Rope.cs.meta | 0 Assets/jelycho/{game => Code}/ZombieActor.cs | 2 +- .../{game => Code}/ZombieActor.cs.meta | 0 Assets/jelycho/Materials.meta | 8 + .../jelycho/Materials/AnimatedGut.shadergraph | 775 ++++++++ .../Materials/AnimatedGut.shadergraph.meta | 10 + Assets/jelycho/Materials/m_gut.mat | 136 ++ Assets/jelycho/Materials/m_gut.mat.meta | 8 + .../{game/prefabs.meta => Prefabs.meta} | 0 .../prefabs => Prefabs}/RopeSegment.prefab | 0 .../RopeSegment.prefab.meta | 0 Assets/jelycho/{maps.meta => Worlds.meta} | 0 Assets/jelycho/{maps => Worlds}/dev.meta | 0 .../{maps => Worlds}/dev/Ch36_nonPBR.fbx | Bin .../{maps => Worlds}/dev/Ch36_nonPBR.fbx.meta | 0 .../dev/SG_Decal_Blood_Splat.shadergraph | 0 .../dev/SG_Decal_Blood_Splat.shadergraph.meta | 0 .../dev/SG_Triplanar_Grid.shadergraph | 0 .../dev/SG_Triplanar_Grid.shadergraph.meta | 0 .../{maps => Worlds}/dev/Y Bot@Idle.fbx | Bin .../{maps => Worlds}/dev/Y Bot@Idle.fbx.meta | 0 .../dev/Y Bot@Standard Idle.fbx | Bin .../dev/Y Bot@Standard Idle.fbx.meta | 0 .../{maps => Worlds}/dev/Y Bot@T-Pose.fbx | Bin .../dev/Y Bot@T-Pose.fbx.meta | 0 .../{maps => Worlds}/dev/grid_bw_2x2.png | Bin .../{maps => Worlds}/dev/grid_bw_2x2.png.meta | 0 .../{maps => Worlds}/dev/kenney_splats.meta | 0 .../dev/kenney_splats/splat00.png | Bin .../dev/kenney_splats/splat00.png.meta | 0 .../dev/kenney_splats/splat01.png | Bin .../dev/kenney_splats/splat01.png.meta | 0 .../dev/kenney_splats/splat02.png | Bin .../dev/kenney_splats/splat02.png.meta | 0 .../dev/kenney_splats/splat03.png | Bin .../dev/kenney_splats/splat03.png.meta | 0 .../dev/kenney_splats/splat04.png | Bin .../dev/kenney_splats/splat04.png.meta | 0 .../dev/kenney_splats/splat05.png | Bin .../dev/kenney_splats/splat05.png.meta | 0 .../dev/kenney_splats/splat06.png | Bin .../dev/kenney_splats/splat06.png.meta | 0 .../dev/kenney_splats/splat07.png | Bin .../dev/kenney_splats/splat07.png.meta | 0 .../dev/kenney_splats/splat08.png | Bin .../dev/kenney_splats/splat08.png.meta | 0 .../dev/kenney_splats/splat09.png | Bin .../dev/kenney_splats/splat09.png.meta | 0 .../dev/kenney_splats/splat10.png | Bin .../dev/kenney_splats/splat10.png.meta | 0 .../dev/kenney_splats/splat11.png | Bin .../dev/kenney_splats/splat11.png.meta | 0 .../dev/kenney_splats/splat12.png | Bin .../dev/kenney_splats/splat12.png.meta | 0 .../dev/kenney_splats/splat13.png | Bin .../dev/kenney_splats/splat13.png.meta | 0 .../dev/kenney_splats/splat14.png | Bin .../dev/kenney_splats/splat14.png.meta | 0 .../dev/kenney_splats/splat15.png | Bin .../dev/kenney_splats/splat15.png.meta | 0 .../dev/kenney_splats/splat16.png | Bin .../dev/kenney_splats/splat16.png.meta | 0 .../dev/kenney_splats/splat17.png | Bin .../dev/kenney_splats/splat17.png.meta | 0 .../dev/kenney_splats/splat18.png | Bin .../dev/kenney_splats/splat18.png.meta | 0 .../dev/kenney_splats/splat19.png | Bin .../dev/kenney_splats/splat19.png.meta | 0 .../dev/kenney_splats/splat20.png | Bin .../dev/kenney_splats/splat20.png.meta | 0 .../dev/kenney_splats/splat21.png | Bin .../dev/kenney_splats/splat21.png.meta | 0 .../dev/kenney_splats/splat22.png | Bin .../dev/kenney_splats/splat22.png.meta | 0 .../dev/kenney_splats/splat23.png | Bin .../dev/kenney_splats/splat23.png.meta | 0 .../dev/kenney_splats/splat24.png | Bin .../dev/kenney_splats/splat24.png.meta | 0 .../dev/kenney_splats/splat25.png | Bin .../dev/kenney_splats/splat25.png.meta | 0 .../dev/kenney_splats/splat26.png | Bin .../dev/kenney_splats/splat26.png.meta | 0 .../dev/kenney_splats/splat27.png | Bin .../dev/kenney_splats/splat27.png.meta | 0 .../dev/kenney_splats/splat28.png | Bin .../dev/kenney_splats/splat28.png.meta | 0 .../dev/kenney_splats/splat29.png | Bin .../dev/kenney_splats/splat29.png.meta | 0 .../dev/kenney_splats/splat30.png | Bin .../dev/kenney_splats/splat30.png.meta | 0 .../dev/kenney_splats/splat31.png | Bin .../dev/kenney_splats/splat31.png.meta | 0 .../dev/kenney_splats/splat32.png | Bin .../dev/kenney_splats/splat32.png.meta | 0 .../dev/kenney_splats/splat33.png | Bin .../dev/kenney_splats/splat33.png.meta | 0 .../dev/kenney_splats/splat34.png | Bin .../dev/kenney_splats/splat34.png.meta | 0 .../dev/kenney_splats/splat35.png | Bin .../dev/kenney_splats/splat35.png.meta | 0 .../dev/mat_decal_blood_splat_0.mat | 0 .../dev/mat_decal_blood_splat_0.mat.meta | 0 .../{maps => Worlds}/dev/mat_decal_rr.mat | 0 .../dev/mat_decal_rr.mat.meta | 0 .../{maps => Worlds}/dev/mat_dev_rope.mat | 0 .../dev/mat_dev_rope.mat.meta | 0 .../{maps => Worlds}/dev/mat_grid_1m_a.mat | 0 .../dev/mat_grid_1m_a.mat.meta | 0 .../{maps => Worlds}/dev/mat_grid_1m_b.mat | 0 .../dev/mat_grid_1m_b.mat.meta | 0 .../{maps => Worlds}/dev/mat_grid_1m_c.mat | 0 .../dev/mat_grid_1m_c.mat.meta | 0 .../{maps => Worlds}/dev/mat_grid_1m_d.mat | 0 .../dev/mat_grid_1m_d.mat.meta | 0 .../{maps => Worlds}/dev/mat_grid_1m_e.mat | 0 .../dev/mat_grid_1m_e.mat.meta | 0 .../dev/mat_line_renderer_gut.mat | 0 .../dev/mat_line_renderer_gut.mat.meta | 0 .../{maps => Worlds}/dev/mat_skybox.mat | 0 .../{maps => Worlds}/dev/mat_skybox.mat.meta | 0 .../{maps => Worlds}/dev/mat_zombie_skin.mat | 0 .../dev/mat_zombie_skin.mat.meta | 0 .../{maps => Worlds}/dev/scn_map_dev.unity | 1641 +++-------------- .../dev/scn_map_dev.unity.meta | 0 .../{maps => Worlds}/dev/world_dev.asset | 0 .../{maps => Worlds}/dev/world_dev.asset.meta | 0 Assets/jelycho/actors.meta | 2 +- .../actors/{enemies.meta => Zombie.meta} | 0 .../{enemies => Zombie}/actor_zombie.prefab | 0 .../actor_zombie.prefab.meta | 0 .../animator_zombie.controller | 0 .../animator_zombie.controller.meta | 0 .../zombie_bone_strength.asset | 0 .../zombie_bone_strength.asset.meta | 0 .../{enemies => Zombie}/zombie_mixamo.meta | 0 .../zombie_mixamo/Y Bot@Walking (3).fbx | Bin .../zombie_mixamo/Y Bot@Walking (3).fbx.meta | 0 .../zombie_mixamo/Y Bot@Zombie Crawl.fbx | Bin .../zombie_mixamo/Y Bot@Zombie Crawl.fbx.meta | 0 .../zombie_mixamo/Y Bot@Zombie Idle.fbx | Bin .../zombie_mixamo/Y Bot@Zombie Idle.fbx.meta | 0 .../zombie_mixamo/Y Bot@Zombie Punching.fbx | Bin .../Y Bot@Zombie Punching.fbx.meta | 0 .../zombie_mixamo/Y Bot@Zombie Scream.fbx | Bin .../Y Bot@Zombie Scream.fbx.meta | 0 .../zombie_mixamo/Y Bot@Zombie Walk.fbx | Bin .../zombie_mixamo/Y Bot@Zombie Walk.fbx.meta | 0 .../zombie_mixamo/avatar_mask_zombie.mask | 0 .../avatar_mask_zombie.mask.meta | 0 Assets/jelycho/game.meta | 3 - Assets/jelycho/game/GutRenderer.cs | 19 - .../code/DefaultGameModeAsset.cs | 2 +- ProjectSettings/ProjectSettings.asset | 6 +- RealityReboot.jelycho.csproj.DotSettings | 1 + 180 files changed, 1387 insertions(+), 1467 deletions(-) create mode 100644 Assets/Resources/PerformanceTestRunInfo.json create mode 100644 Assets/Resources/PerformanceTestRunInfo.json.meta create mode 100644 Assets/Resources/PerformanceTestRunSettings.json create mode 100644 Assets/Resources/PerformanceTestRunSettings.json.meta create mode 100644 Assets/jelycho/Code.meta rename Assets/jelycho/{game => Code}/ActiveRagdollBone.cs (97%) rename Assets/jelycho/{game => Code}/ActiveRagdollBone.cs.meta (100%) rename Assets/jelycho/{game => Code}/ActiveRagdollDummy.cs (83%) rename Assets/jelycho/{game => Code}/ActiveRagdollDummy.cs.meta (100%) rename Assets/jelycho/{ => Code}/GameConsts.cs (100%) rename Assets/jelycho/{ => Code}/GameConsts.cs.meta (100%) create mode 100644 Assets/jelycho/Code/GutRenderer.cs rename Assets/jelycho/{game => Code}/GutRenderer.cs.meta (100%) rename Assets/jelycho/{game => Code}/HumanoidActiveRagdoll.cs (92%) rename Assets/jelycho/{game => Code}/HumanoidActiveRagdoll.cs.meta (100%) rename Assets/jelycho/{game => Code}/Player.meta (100%) rename Assets/jelycho/{game => Code}/Player/PlayerController.cs (98%) rename Assets/jelycho/{game => Code}/Player/PlayerController.cs.meta (100%) rename Assets/jelycho/{game => Code}/Player/PlayerControllerAsset.cs (90%) rename Assets/jelycho/{game => Code}/Player/PlayerControllerAsset.cs.meta (100%) rename Assets/jelycho/{game => Code}/PlayerActor.cs (95%) rename Assets/jelycho/{game => Code}/PlayerActor.cs.meta (100%) rename Assets/jelycho/{game => Code}/Rope.cs (98%) rename Assets/jelycho/{game => Code}/Rope.cs.meta (100%) rename Assets/jelycho/{game => Code}/ZombieActor.cs (89%) rename Assets/jelycho/{game => Code}/ZombieActor.cs.meta (100%) create mode 100644 Assets/jelycho/Materials.meta create mode 100644 Assets/jelycho/Materials/AnimatedGut.shadergraph create mode 100644 Assets/jelycho/Materials/AnimatedGut.shadergraph.meta create mode 100644 Assets/jelycho/Materials/m_gut.mat create mode 100644 Assets/jelycho/Materials/m_gut.mat.meta rename Assets/jelycho/{game/prefabs.meta => Prefabs.meta} (100%) rename Assets/jelycho/{game/prefabs => Prefabs}/RopeSegment.prefab (100%) rename Assets/jelycho/{game/prefabs => Prefabs}/RopeSegment.prefab.meta (100%) rename Assets/jelycho/{maps.meta => Worlds.meta} (100%) rename Assets/jelycho/{maps => Worlds}/dev.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/Ch36_nonPBR.fbx (100%) rename Assets/jelycho/{maps => Worlds}/dev/Ch36_nonPBR.fbx.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/SG_Decal_Blood_Splat.shadergraph (100%) rename Assets/jelycho/{maps => Worlds}/dev/SG_Decal_Blood_Splat.shadergraph.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/SG_Triplanar_Grid.shadergraph (100%) rename Assets/jelycho/{maps => Worlds}/dev/SG_Triplanar_Grid.shadergraph.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/Y Bot@Idle.fbx (100%) rename Assets/jelycho/{maps => Worlds}/dev/Y Bot@Idle.fbx.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/Y Bot@Standard Idle.fbx (100%) rename Assets/jelycho/{maps => Worlds}/dev/Y Bot@Standard Idle.fbx.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/Y Bot@T-Pose.fbx (100%) rename Assets/jelycho/{maps => Worlds}/dev/Y Bot@T-Pose.fbx.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/grid_bw_2x2.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/grid_bw_2x2.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat00.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat00.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat01.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat01.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat02.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat02.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat03.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat03.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat04.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat04.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat05.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat05.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat06.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat06.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat07.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat07.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat08.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat08.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat09.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat09.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat10.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat10.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat11.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat11.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat12.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat12.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat13.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat13.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat14.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat14.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat15.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat15.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat16.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat16.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat17.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat17.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat18.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat18.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat19.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat19.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat20.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat20.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat21.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat21.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat22.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat22.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat23.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat23.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat24.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat24.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat25.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat25.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat26.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat26.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat27.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat27.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat28.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat28.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat29.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat29.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat30.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat30.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat31.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat31.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat32.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat32.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat33.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat33.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat34.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat34.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat35.png (100%) rename Assets/jelycho/{maps => Worlds}/dev/kenney_splats/splat35.png.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_decal_blood_splat_0.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_decal_blood_splat_0.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_decal_rr.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_decal_rr.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_dev_rope.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_dev_rope.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_a.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_a.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_b.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_b.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_c.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_c.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_d.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_d.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_e.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_grid_1m_e.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_line_renderer_gut.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_line_renderer_gut.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_skybox.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_skybox.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_zombie_skin.mat (100%) rename Assets/jelycho/{maps => Worlds}/dev/mat_zombie_skin.mat.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/scn_map_dev.unity (67%) rename Assets/jelycho/{maps => Worlds}/dev/scn_map_dev.unity.meta (100%) rename Assets/jelycho/{maps => Worlds}/dev/world_dev.asset (100%) rename Assets/jelycho/{maps => Worlds}/dev/world_dev.asset.meta (100%) rename Assets/jelycho/actors/{enemies.meta => Zombie.meta} (100%) rename Assets/jelycho/actors/{enemies => Zombie}/actor_zombie.prefab (100%) rename Assets/jelycho/actors/{enemies => Zombie}/actor_zombie.prefab.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/animator_zombie.controller (100%) rename Assets/jelycho/actors/{enemies => Zombie}/animator_zombie.controller.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_bone_strength.asset (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_bone_strength.asset.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Walking (3).fbx (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Walking (3).fbx.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Crawl.fbx (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Crawl.fbx.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Idle.fbx (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Idle.fbx.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Punching.fbx (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Punching.fbx.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Scream.fbx (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Scream.fbx.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Walk.fbx (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/Y Bot@Zombie Walk.fbx.meta (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/avatar_mask_zombie.mask (100%) rename Assets/jelycho/actors/{enemies => Zombie}/zombie_mixamo/avatar_mask_zombie.mask.meta (100%) delete mode 100644 Assets/jelycho/game.meta delete mode 100644 Assets/jelycho/game/GutRenderer.cs diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index 691c06901f54262834be73ba099e9e21cf5393a2..095d96227f77618005bd5cc538fb14ae2e36b1db 100644 GIT binary patch delta 148 zcmWN{yA8rH5CBlwL2^Np7AVLFcmAET3ytq$iwTe@5wuiZfQB9^8!$yWHed#L^;`O- ze_fTr`KI1#01UvwWEous&lN%yqzE>}=)tzy9fwpQv-KQ(ijt6srvOud;FyRqw(mb- rVhK|z=&T=;6Uk$75;!8}nv0uHtB3BM_g&kVs`a{E%t3GW?PJbAdxa{u delta 148 zcmWN|u?@m75CA|qM2bX#(o!I0g#WkW*t^i!?|(4?5+#BSyZ|F0Wdo*&XxM;)2}pmp z^h^J|83Xg(yv*Q60#9kOs>DS(pl6?ojfruh%vCq10U0=Z$WojSj*4K^kb%e}iMp|V tS44qW()tmdOpY)YixGH4D-t5i=l0QT+MTKUPMi0(Ub|!SJJe5i`2)UID>MKA diff --git a/Assets/RebootKit b/Assets/RebootKit index 72b8a37..1e190fe 160000 --- a/Assets/RebootKit +++ b/Assets/RebootKit @@ -1 +1 @@ -Subproject commit 72b8a373459bc9215841b1112a9ec08b5fa06450 +Subproject commit 1e190fe94b58e8b3bc79cc3b7efc98a11064e9b5 diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json new file mode 100644 index 0000000..36a3f95 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json @@ -0,0 +1 @@ +{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"GraphicsJobs","GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"Mono2x","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"StandaloneWindows64","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.40f1","Branch":"6000.0/staging","Changeset":"157d81624ddf","Date":1739809545},"Dependencies":["com.cysharp.r3@1.3.0","com.cysharp.unitask@2.5.10","com.cysharp.zlinq@0.7.2","com.github-glitchenzo.nugetforunity@4.3.0","com.unity.2d.sprite@1.0.0","com.unity.addressables@2.2.2","com.unity.ai.navigation@2.0.6","com.unity.animation.rigging@1.3.0","com.unity.cinemachine@3.1.3","com.unity.collab-proxy@2.7.1","com.unity.ide.rider@3.0.31","com.unity.ide.visualstudio@2.0.22","com.unity.inputsystem@1.13.0","com.unity.multiplayer.center@1.0.0","com.unity.render-pipelines.universal@17.0.4","com.unity.test-framework@1.4.6","com.unity.timeline@1.8.7","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.5","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.0.4","com.unity.shadergraph@17.0.4","com.unity.render-pipelines.universal-config@17.0.3","com.unity.splines@2.7.2","com.unity.burst@1.8.19","com.unity.profiling.core@1.0.2","com.unity.scriptablebuildpipeline@2.1.4","com.unity.searcher@4.9.3","com.unity.mathematics@1.3.2","com.unity.collections@2.5.1","com.unity.rendering.light-transport@1.0.1","com.unity.settings-manager@2.0.1","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.0.3"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta new file mode 100644 index 0000000..4c2a06e --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 737fa7d9715472e47a70014d4d269bd9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json new file mode 100644 index 0000000..49438ae --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json @@ -0,0 +1 @@ +{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta new file mode 100644 index 0000000..7af616a --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 31a89dc20c7f9794b8bc39e817ac20f6 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index eb26545..b238d01 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 6852985685364965376 - - rid: 6852985685364965377 + - rid: 8778033960401502208 + - rid: 8778033960401502209 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 6852985685364965382 - - rid: 6852985685364965383 + - rid: 8778033960401502210 + - rid: 8778033960401502211 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 6852985685364965386 - - rid: 6852985685364965387 - - rid: 6852985685364965388 - - rid: 6852985685364965389 - - rid: 6852985685364965390 - - rid: 6852985685364965391 + - rid: 8778033960401502212 + - rid: 8778033960401502213 + - rid: 8778033960401502214 + - rid: 8778033960401502215 + - rid: 8778033960401502216 + - rid: 8778033960401502217 - rid: 6852985685364965392 - - rid: 6852985685364965393 + - rid: 8778033960401502218 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 260979669776728064 - - rid: 260979669776728065 + - rid: 8778033960401502219 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -103,29 +103,6 @@ MonoBehaviour: m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} - - rid: 260979669776728065 - type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 6852985685364965376 - type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_StripUnusedPostProcessingVariants: 1 - m_StripUnusedVariants: 1 - m_StripScreenCoordOverrideVariants: 1 - - rid: 6852985685364965377 - type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} - m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} - m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} - m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} - m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - rid: 6852985685364965378 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -159,7 +136,54 @@ MonoBehaviour: m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3} - - rid: 6852985685364965382 + - rid: 6852985685364965384 + type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_VolumeProfile: {fileID: 11400000, guid: ab09877e2e707104187f6f83e2f62510, type: 2} + - rid: 6852985685364965385 + type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_EnableRenderCompatibilityMode: 0 + - rid: 6852985685364965392 + type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 + - rid: 6852985685364965394 + type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_EnableCompilationCaching: 1 + m_EnableValidityChecks: 1 + - rid: 8712630790384254976 + type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + - rid: 8778033960401502208 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 8778033960401502209 + type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 8778033960401502210 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -174,7 +198,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 6852985685364965383 + - rid: 8778033960401502211 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -183,17 +207,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 6852985685364965384 - type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_VolumeProfile: {fileID: 11400000, guid: ab09877e2e707104187f6f83e2f62510, type: 2} - - rid: 6852985685364965385 - type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_EnableRenderCompatibilityMode: 0 - - rid: 6852985685364965386 + - rid: 8778033960401502212 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -206,13 +220,13 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 6852985685364965387 + - rid: 8778033960401502213 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 6852985685364965388 + - rid: 8778033960401502214 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -225,12 +239,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 6852985685364965389 + - rid: 8778033960401502215 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 6852985685364965390 + - rid: 8778033960401502216 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -240,35 +254,21 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 6852985685364965391 + - rid: 8778033960401502217 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 6852985685364965392 - type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 0 - m_ExportShaderVariants: 1 - m_ShaderVariantLogLevel: 0 - m_StripRuntimeDebugShaders: 1 - - rid: 6852985685364965393 + - rid: 8778033960401502218 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 6852985685364965394 - type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + - rid: 8778033960401502219 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: - m_version: 0 - m_EnableCompilationCaching: 1 - m_EnableValidityChecks: 1 - - rid: 8712630790384254976 - type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 0 - m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} diff --git a/Assets/jelycho/Code.meta b/Assets/jelycho/Code.meta new file mode 100644 index 0000000..ed05046 --- /dev/null +++ b/Assets/jelycho/Code.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 350a0ec7c054a7841857f633874debd8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/game/ActiveRagdollBone.cs b/Assets/jelycho/Code/ActiveRagdollBone.cs similarity index 97% rename from Assets/jelycho/game/ActiveRagdollBone.cs rename to Assets/jelycho/Code/ActiveRagdollBone.cs index f5e80b9..762d8f7 100644 --- a/Assets/jelycho/game/ActiveRagdollBone.cs +++ b/Assets/jelycho/Code/ActiveRagdollBone.cs @@ -1,7 +1,7 @@ using RebootKit.Engine.Foundation; using UnityEngine; -namespace RealityReboot.jelycho.game { +namespace RealityReboot.jelycho { [RequireComponent(typeof(Rigidbody))] [AddComponentMenu(GameConsts.k_AddComponentMenu + "Active Ragdoll/Bone")] public class ActiveRagdollBone : MonoBehaviour { diff --git a/Assets/jelycho/game/ActiveRagdollBone.cs.meta b/Assets/jelycho/Code/ActiveRagdollBone.cs.meta similarity index 100% rename from Assets/jelycho/game/ActiveRagdollBone.cs.meta rename to Assets/jelycho/Code/ActiveRagdollBone.cs.meta diff --git a/Assets/jelycho/game/ActiveRagdollDummy.cs b/Assets/jelycho/Code/ActiveRagdollDummy.cs similarity index 83% rename from Assets/jelycho/game/ActiveRagdollDummy.cs rename to Assets/jelycho/Code/ActiveRagdollDummy.cs index 14be88e..2dd89a6 100644 --- a/Assets/jelycho/game/ActiveRagdollDummy.cs +++ b/Assets/jelycho/Code/ActiveRagdollDummy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace RealityReboot.jelycho.game { +namespace RealityReboot.jelycho { [AddComponentMenu(GameConsts.k_AddComponentMenu + "Active Ragdoll/Dummy")] public class ActiveRagdollDummy : MonoBehaviour { [SerializeField] Animator m_Animator; diff --git a/Assets/jelycho/game/ActiveRagdollDummy.cs.meta b/Assets/jelycho/Code/ActiveRagdollDummy.cs.meta similarity index 100% rename from Assets/jelycho/game/ActiveRagdollDummy.cs.meta rename to Assets/jelycho/Code/ActiveRagdollDummy.cs.meta diff --git a/Assets/jelycho/GameConsts.cs b/Assets/jelycho/Code/GameConsts.cs similarity index 100% rename from Assets/jelycho/GameConsts.cs rename to Assets/jelycho/Code/GameConsts.cs diff --git a/Assets/jelycho/GameConsts.cs.meta b/Assets/jelycho/Code/GameConsts.cs.meta similarity index 100% rename from Assets/jelycho/GameConsts.cs.meta rename to Assets/jelycho/Code/GameConsts.cs.meta diff --git a/Assets/jelycho/Code/GutRenderer.cs b/Assets/jelycho/Code/GutRenderer.cs new file mode 100644 index 0000000..c85f599 --- /dev/null +++ b/Assets/jelycho/Code/GutRenderer.cs @@ -0,0 +1,56 @@ +using System.Collections.Generic; +using Unity.Collections; +using Unity.Mathematics; +using UnityEngine; + +namespace RealityReboot.jelycho { + [ExecuteInEditMode] + public class GutRenderer : MonoBehaviour { + static readonly List s_worldPositions = new(1024); + + [SerializeField] Rope m_Rope; + [SerializeField] Material m_Material; + + [SerializeField] float3[] m_Positions; + + [SerializeField, Range(3, 128)] int m_Resolution = 16; + + + [SerializeField] Mesh m_Mesh; + + void Update() { + if (m_Mesh == null) { + m_Mesh = new Mesh { + name = "GutMesh", + indexFormat = UnityEngine.Rendering.IndexFormat.UInt32 + }; + m_Mesh.MarkDynamic(); + } + + if (m_Positions.Length < 2) { + return; + } + + int segmentCount = m_Positions.Length - 1; + int vertexCount = m_Resolution * segmentCount; + int triangleCount = (segmentCount - 1) * m_Resolution * 2; + + NativeArray positions = new(vertexCount, Allocator.Temp); + NativeArray normals = new(vertexCount, Allocator.Temp); + NativeArray uvs = new(vertexCount, Allocator.Temp); + NativeArray indices = new(triangleCount * 3, Allocator.Temp); + + for (int i = 0; i < m_Positions.Length - 1; i++) { + + } + + m_Mesh.Clear(); + m_Mesh.SetVertices(positions); + m_Mesh.SetNormals(normals); + m_Mesh.SetUVs(0, uvs); + m_Mesh.SetIndices(indices, MeshTopology.Triangles, 0, false); + + Graphics.DrawMesh(m_Mesh, Matrix4x4.identity, m_Material, 0); + } + } +} \ No newline at end of file diff --git a/Assets/jelycho/game/GutRenderer.cs.meta b/Assets/jelycho/Code/GutRenderer.cs.meta similarity index 100% rename from Assets/jelycho/game/GutRenderer.cs.meta rename to Assets/jelycho/Code/GutRenderer.cs.meta diff --git a/Assets/jelycho/game/HumanoidActiveRagdoll.cs b/Assets/jelycho/Code/HumanoidActiveRagdoll.cs similarity index 92% rename from Assets/jelycho/game/HumanoidActiveRagdoll.cs rename to Assets/jelycho/Code/HumanoidActiveRagdoll.cs index d4536e5..6c92b38 100644 --- a/Assets/jelycho/game/HumanoidActiveRagdoll.cs +++ b/Assets/jelycho/Code/HumanoidActiveRagdoll.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace RealityReboot.jelycho.game { +namespace RealityReboot.jelycho { [AddComponentMenu(GameConsts.k_AddComponentMenu + "Active Ragdoll/Humanoid Ragdoll")] public class HumanoidActiveRagdoll : MonoBehaviour { [SerializeField] ActiveRagdollBone m_Head; diff --git a/Assets/jelycho/game/HumanoidActiveRagdoll.cs.meta b/Assets/jelycho/Code/HumanoidActiveRagdoll.cs.meta similarity index 100% rename from Assets/jelycho/game/HumanoidActiveRagdoll.cs.meta rename to Assets/jelycho/Code/HumanoidActiveRagdoll.cs.meta diff --git a/Assets/jelycho/game/Player.meta b/Assets/jelycho/Code/Player.meta similarity index 100% rename from Assets/jelycho/game/Player.meta rename to Assets/jelycho/Code/Player.meta diff --git a/Assets/jelycho/game/Player/PlayerController.cs b/Assets/jelycho/Code/Player/PlayerController.cs similarity index 98% rename from Assets/jelycho/game/Player/PlayerController.cs rename to Assets/jelycho/Code/Player/PlayerController.cs index fa123cf..04b1244 100644 --- a/Assets/jelycho/game/Player/PlayerController.cs +++ b/Assets/jelycho/Code/Player/PlayerController.cs @@ -11,7 +11,7 @@ using UnityEngine.InputSystem; using UnityEngine.Serialization; using Object = UnityEngine.Object; -namespace RealityReboot.jelycho.game.Player { +namespace RealityReboot.jelycho.Player { public class PlayerController : IController { readonly Config m_Config; PlayerActor m_FPPActor; diff --git a/Assets/jelycho/game/Player/PlayerController.cs.meta b/Assets/jelycho/Code/Player/PlayerController.cs.meta similarity index 100% rename from Assets/jelycho/game/Player/PlayerController.cs.meta rename to Assets/jelycho/Code/Player/PlayerController.cs.meta diff --git a/Assets/jelycho/game/Player/PlayerControllerAsset.cs b/Assets/jelycho/Code/Player/PlayerControllerAsset.cs similarity index 90% rename from Assets/jelycho/game/Player/PlayerControllerAsset.cs rename to Assets/jelycho/Code/Player/PlayerControllerAsset.cs index a36d294..cd4cb94 100644 --- a/Assets/jelycho/game/Player/PlayerControllerAsset.cs +++ b/Assets/jelycho/Code/Player/PlayerControllerAsset.cs @@ -1,7 +1,7 @@ using RebootKit.Engine.Foundation; using UnityEngine; -namespace RealityReboot.jelycho.game.Player { +namespace RealityReboot.jelycho.Player { [CreateAssetMenu(menuName = GameConsts.k_CreateAssetMenu + "Player/Player Controller")] public class PlayerControllerAsset : ControllerAsset { [SerializeField] PlayerController.Config m_Config; diff --git a/Assets/jelycho/game/Player/PlayerControllerAsset.cs.meta b/Assets/jelycho/Code/Player/PlayerControllerAsset.cs.meta similarity index 100% rename from Assets/jelycho/game/Player/PlayerControllerAsset.cs.meta rename to Assets/jelycho/Code/Player/PlayerControllerAsset.cs.meta diff --git a/Assets/jelycho/game/PlayerActor.cs b/Assets/jelycho/Code/PlayerActor.cs similarity index 95% rename from Assets/jelycho/game/PlayerActor.cs rename to Assets/jelycho/Code/PlayerActor.cs index c51790a..98ba6f0 100644 --- a/Assets/jelycho/game/PlayerActor.cs +++ b/Assets/jelycho/Code/PlayerActor.cs @@ -1,5 +1,4 @@ -using System; -using RebootKit.Engine.Extensions; +using RebootKit.Engine.Extensions; using RebootKit.Engine.Foundation; using RebootKit.Engine.Services.Simulation; using RebootKit.FPPKit; @@ -7,7 +6,7 @@ using Unity.Mathematics; using UnityEngine; using Logger = RebootKit.Engine.Foundation.Logger; -namespace RealityReboot.jelycho.game { +namespace RealityReboot.jelycho { public class PlayerActor : Actor { static readonly Logger s_logger = new(nameof(PlayerActor)); diff --git a/Assets/jelycho/game/PlayerActor.cs.meta b/Assets/jelycho/Code/PlayerActor.cs.meta similarity index 100% rename from Assets/jelycho/game/PlayerActor.cs.meta rename to Assets/jelycho/Code/PlayerActor.cs.meta diff --git a/Assets/jelycho/game/Rope.cs b/Assets/jelycho/Code/Rope.cs similarity index 98% rename from Assets/jelycho/game/Rope.cs rename to Assets/jelycho/Code/Rope.cs index ae933d6..0235481 100644 --- a/Assets/jelycho/game/Rope.cs +++ b/Assets/jelycho/Code/Rope.cs @@ -3,7 +3,7 @@ using RebootKit.Engine.Extensions; using UnityEngine; using UnityEngine.Events; -namespace RealityReboot.jelycho.game { +namespace RealityReboot.jelycho { public class Rope : MonoBehaviour { [SerializeField] ConfigurableJoint m_JointPrefab; [SerializeField] float m_SegmentDistance = 0.1f; diff --git a/Assets/jelycho/game/Rope.cs.meta b/Assets/jelycho/Code/Rope.cs.meta similarity index 100% rename from Assets/jelycho/game/Rope.cs.meta rename to Assets/jelycho/Code/Rope.cs.meta diff --git a/Assets/jelycho/game/ZombieActor.cs b/Assets/jelycho/Code/ZombieActor.cs similarity index 89% rename from Assets/jelycho/game/ZombieActor.cs rename to Assets/jelycho/Code/ZombieActor.cs index d95bfd8..6240222 100644 --- a/Assets/jelycho/game/ZombieActor.cs +++ b/Assets/jelycho/Code/ZombieActor.cs @@ -1,7 +1,7 @@ using RebootKit.Engine.Services.Simulation; using UnityEngine; -namespace RealityReboot.jelycho.game { +namespace RealityReboot.jelycho { [AddComponentMenu(GameConsts.k_AddComponentMenu + "Zombie Actor")] public class ZombieActor : Actor { [SerializeField] HumanoidActiveRagdoll m_ActiveRagdoll; diff --git a/Assets/jelycho/game/ZombieActor.cs.meta b/Assets/jelycho/Code/ZombieActor.cs.meta similarity index 100% rename from Assets/jelycho/game/ZombieActor.cs.meta rename to Assets/jelycho/Code/ZombieActor.cs.meta diff --git a/Assets/jelycho/Materials.meta b/Assets/jelycho/Materials.meta new file mode 100644 index 0000000..e0b2dcb --- /dev/null +++ b/Assets/jelycho/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0bf6718b05cd2d438bb183b4c358e12 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Materials/AnimatedGut.shadergraph b/Assets/jelycho/Materials/AnimatedGut.shadergraph new file mode 100644 index 0000000..061f10c --- /dev/null +++ b/Assets/jelycho/Materials/AnimatedGut.shadergraph @@ -0,0 +1,775 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "0f4ac38cca4b437d889205dd783f2fb3", + "m_Properties": [ + { + "m_Id": "28c19a270ae04fac948017859541a833" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "ead52be8797e4ef2a4fc2538781b2333" + } + ], + "m_Nodes": [ + { + "m_Id": "ba1c84eb09fd4a809fadcd07d8d27c4c" + }, + { + "m_Id": "deac28feaf10486e9d8c19c8962b2c04" + }, + { + "m_Id": "6ac8cff940ce4f65a8f6b1df5e532c6e" + }, + { + "m_Id": "df6d015b30c14f0d9507b7be797bb9c7" + }, + { + "m_Id": "51dfb09011dc403ab0ca82683720e492" + }, + { + "m_Id": "3447d52b124b49569a854efb4582aca3" + }, + { + "m_Id": "9dac02a179034fb2b7f992a3f1b5af6f" + }, + { + "m_Id": "532b14f35a514f22b83bcc8c84c7fa05" + }, + { + "m_Id": "695b5b1aa85c42d3a95de7cbc07e7f63" + }, + { + "m_Id": "98eb91c30c0e46d09342cf07193f6baf" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "98eb91c30c0e46d09342cf07193f6baf" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "df6d015b30c14f0d9507b7be797bb9c7" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "ba1c84eb09fd4a809fadcd07d8d27c4c" + }, + { + "m_Id": "deac28feaf10486e9d8c19c8962b2c04" + }, + { + "m_Id": "6ac8cff940ce4f65a8f6b1df5e532c6e" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "df6d015b30c14f0d9507b7be797bb9c7" + }, + { + "m_Id": "51dfb09011dc403ab0ca82683720e492" + }, + { + "m_Id": "3447d52b124b49569a854efb4582aca3" + }, + { + "m_Id": "9dac02a179034fb2b7f992a3f1b5af6f" + }, + { + "m_Id": "532b14f35a514f22b83bcc8c84c7fa05" + }, + { + "m_Id": "695b5b1aa85c42d3a95de7cbc07e7f63" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"fileID\":10200,\"guid\":\"0000000000000000e000000000000000\",\"type\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "087eb530ab6d43ecac0732cf69deb6a0" + } + ] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "087eb530ab6d43ecac0732cf69deb6a0", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "3b832e697af1458f880be8f8178fbb4a" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "28c19a270ae04fac948017859541a833", + "m_Guid": { + "m_GuidSerialized": "22fc1d71-c1dc-455b-b188-c103d90f18ec" + }, + "m_Name": "BaseColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "BaseColor", + "m_DefaultReferenceName": "_BaseColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 1.0, + "g": 0.17582951486110688, + "b": 0.13679248094558717, + "a": 1.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2c1e73766e0e4d4192482ece73450e43", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "2fee5897aeca4c85aff22089757e20b3", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3447d52b124b49569a854efb4582aca3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e8402ab4f00d423db2e7f50a273488fe" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "3b832e697af1458f880be8f8178fbb4a", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "441f9b1d86444bc281f78ee5718a0a3b", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "51dfb09011dc403ab0ca82683720e492", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "441f9b1d86444bc281f78ee5718a0a3b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "532b14f35a514f22b83bcc8c84c7fa05", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "89da9c9e52f24c1a83f87659845f25e4" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "68a5c1d5adcb4fba8ce2eeeb984bb7ae", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "695b5b1aa85c42d3a95de7cbc07e7f63", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "2c1e73766e0e4d4192482ece73450e43" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "6ac8cff940ce4f65a8f6b1df5e532c6e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "a57880c66ebe40e4b1da9f4cac4a774a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "89da9c9e52f24c1a83f87659845f25e4", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "98eb91c30c0e46d09342cf07193f6baf", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -698.4254760742188, + "y": 154.0254364013672, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "d7914deeb7ea49b4ac7b3e35c6abf510" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "28c19a270ae04fac948017859541a833" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "9dac02a179034fb2b7f992a3f1b5af6f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "68a5c1d5adcb4fba8ce2eeeb984bb7ae" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "a57880c66ebe40e4b1da9f4cac4a774a", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "ba1c84eb09fd4a809fadcd07d8d27c4c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "f5442aab1e8f436e9c42b08845fad5a7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "c026ced6aaa14642b2ebeb23254a8fba", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d7914deeb7ea49b4ac7b3e35c6abf510", + "m_Id": 0, + "m_DisplayName": "BaseColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "deac28feaf10486e9d8c19c8962b2c04", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "2fee5897aeca4c85aff22089757e20b3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "df6d015b30c14f0d9507b7be797bb9c7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "c026ced6aaa14642b2ebeb23254a8fba" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e8402ab4f00d423db2e7f50a273488fe", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "ead52be8797e4ef2a4fc2538781b2333", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "28c19a270ae04fac948017859541a833" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "f5442aab1e8f436e9c42b08845fad5a7", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + diff --git a/Assets/jelycho/Materials/AnimatedGut.shadergraph.meta b/Assets/jelycho/Materials/AnimatedGut.shadergraph.meta new file mode 100644 index 0000000..9d6e8d9 --- /dev/null +++ b/Assets/jelycho/Materials/AnimatedGut.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 53eac444bb53e5346ac68041cd0812d4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/jelycho/Materials/m_gut.mat b/Assets/jelycho/Materials/m_gut.mat new file mode 100644 index 0000000..2d0a002 --- /dev/null +++ b/Assets/jelycho/Materials/m_gut.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m_gut + m_Shader: {fileID: -6465566751694194690, guid: 53eac444bb53e5346ac68041cd0812d4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2424857614362107544 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/jelycho/Materials/m_gut.mat.meta b/Assets/jelycho/Materials/m_gut.mat.meta new file mode 100644 index 0000000..c1ad2e6 --- /dev/null +++ b/Assets/jelycho/Materials/m_gut.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a1dad1a9d40a4c498aa7e08bcef586e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/game/prefabs.meta b/Assets/jelycho/Prefabs.meta similarity index 100% rename from Assets/jelycho/game/prefabs.meta rename to Assets/jelycho/Prefabs.meta diff --git a/Assets/jelycho/game/prefabs/RopeSegment.prefab b/Assets/jelycho/Prefabs/RopeSegment.prefab similarity index 100% rename from Assets/jelycho/game/prefabs/RopeSegment.prefab rename to Assets/jelycho/Prefabs/RopeSegment.prefab diff --git a/Assets/jelycho/game/prefabs/RopeSegment.prefab.meta b/Assets/jelycho/Prefabs/RopeSegment.prefab.meta similarity index 100% rename from Assets/jelycho/game/prefabs/RopeSegment.prefab.meta rename to Assets/jelycho/Prefabs/RopeSegment.prefab.meta diff --git a/Assets/jelycho/maps.meta b/Assets/jelycho/Worlds.meta similarity index 100% rename from Assets/jelycho/maps.meta rename to Assets/jelycho/Worlds.meta diff --git a/Assets/jelycho/maps/dev.meta b/Assets/jelycho/Worlds/dev.meta similarity index 100% rename from Assets/jelycho/maps/dev.meta rename to Assets/jelycho/Worlds/dev.meta diff --git a/Assets/jelycho/maps/dev/Ch36_nonPBR.fbx b/Assets/jelycho/Worlds/dev/Ch36_nonPBR.fbx similarity index 100% rename from Assets/jelycho/maps/dev/Ch36_nonPBR.fbx rename to Assets/jelycho/Worlds/dev/Ch36_nonPBR.fbx diff --git a/Assets/jelycho/maps/dev/Ch36_nonPBR.fbx.meta b/Assets/jelycho/Worlds/dev/Ch36_nonPBR.fbx.meta similarity index 100% rename from Assets/jelycho/maps/dev/Ch36_nonPBR.fbx.meta rename to Assets/jelycho/Worlds/dev/Ch36_nonPBR.fbx.meta diff --git a/Assets/jelycho/maps/dev/SG_Decal_Blood_Splat.shadergraph b/Assets/jelycho/Worlds/dev/SG_Decal_Blood_Splat.shadergraph similarity index 100% rename from Assets/jelycho/maps/dev/SG_Decal_Blood_Splat.shadergraph rename to Assets/jelycho/Worlds/dev/SG_Decal_Blood_Splat.shadergraph diff --git a/Assets/jelycho/maps/dev/SG_Decal_Blood_Splat.shadergraph.meta b/Assets/jelycho/Worlds/dev/SG_Decal_Blood_Splat.shadergraph.meta similarity index 100% rename from Assets/jelycho/maps/dev/SG_Decal_Blood_Splat.shadergraph.meta rename to Assets/jelycho/Worlds/dev/SG_Decal_Blood_Splat.shadergraph.meta diff --git a/Assets/jelycho/maps/dev/SG_Triplanar_Grid.shadergraph b/Assets/jelycho/Worlds/dev/SG_Triplanar_Grid.shadergraph similarity index 100% rename from Assets/jelycho/maps/dev/SG_Triplanar_Grid.shadergraph rename to Assets/jelycho/Worlds/dev/SG_Triplanar_Grid.shadergraph diff --git a/Assets/jelycho/maps/dev/SG_Triplanar_Grid.shadergraph.meta b/Assets/jelycho/Worlds/dev/SG_Triplanar_Grid.shadergraph.meta similarity index 100% rename from Assets/jelycho/maps/dev/SG_Triplanar_Grid.shadergraph.meta rename to Assets/jelycho/Worlds/dev/SG_Triplanar_Grid.shadergraph.meta diff --git a/Assets/jelycho/maps/dev/Y Bot@Idle.fbx b/Assets/jelycho/Worlds/dev/Y Bot@Idle.fbx similarity index 100% rename from Assets/jelycho/maps/dev/Y Bot@Idle.fbx rename to Assets/jelycho/Worlds/dev/Y Bot@Idle.fbx diff --git a/Assets/jelycho/maps/dev/Y Bot@Idle.fbx.meta b/Assets/jelycho/Worlds/dev/Y Bot@Idle.fbx.meta similarity index 100% rename from Assets/jelycho/maps/dev/Y Bot@Idle.fbx.meta rename to Assets/jelycho/Worlds/dev/Y Bot@Idle.fbx.meta diff --git a/Assets/jelycho/maps/dev/Y Bot@Standard Idle.fbx b/Assets/jelycho/Worlds/dev/Y Bot@Standard Idle.fbx similarity index 100% rename from Assets/jelycho/maps/dev/Y Bot@Standard Idle.fbx rename to Assets/jelycho/Worlds/dev/Y Bot@Standard Idle.fbx diff --git a/Assets/jelycho/maps/dev/Y Bot@Standard Idle.fbx.meta b/Assets/jelycho/Worlds/dev/Y Bot@Standard Idle.fbx.meta similarity index 100% rename from Assets/jelycho/maps/dev/Y Bot@Standard Idle.fbx.meta rename to Assets/jelycho/Worlds/dev/Y Bot@Standard Idle.fbx.meta diff --git a/Assets/jelycho/maps/dev/Y Bot@T-Pose.fbx b/Assets/jelycho/Worlds/dev/Y Bot@T-Pose.fbx similarity index 100% rename from Assets/jelycho/maps/dev/Y Bot@T-Pose.fbx rename to Assets/jelycho/Worlds/dev/Y Bot@T-Pose.fbx diff --git a/Assets/jelycho/maps/dev/Y Bot@T-Pose.fbx.meta b/Assets/jelycho/Worlds/dev/Y Bot@T-Pose.fbx.meta similarity index 100% rename from Assets/jelycho/maps/dev/Y Bot@T-Pose.fbx.meta rename to Assets/jelycho/Worlds/dev/Y Bot@T-Pose.fbx.meta diff --git a/Assets/jelycho/maps/dev/grid_bw_2x2.png b/Assets/jelycho/Worlds/dev/grid_bw_2x2.png similarity index 100% rename from Assets/jelycho/maps/dev/grid_bw_2x2.png rename to Assets/jelycho/Worlds/dev/grid_bw_2x2.png diff --git a/Assets/jelycho/maps/dev/grid_bw_2x2.png.meta b/Assets/jelycho/Worlds/dev/grid_bw_2x2.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/grid_bw_2x2.png.meta rename to Assets/jelycho/Worlds/dev/grid_bw_2x2.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats.meta b/Assets/jelycho/Worlds/dev/kenney_splats.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats.meta rename to Assets/jelycho/Worlds/dev/kenney_splats.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat00.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat00.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat00.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat00.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat00.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat00.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat00.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat00.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat01.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat01.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat01.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat01.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat01.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat01.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat01.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat01.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat02.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat02.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat02.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat02.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat02.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat02.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat02.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat02.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat03.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat03.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat03.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat03.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat03.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat03.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat03.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat03.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat04.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat04.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat04.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat04.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat04.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat04.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat04.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat04.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat05.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat05.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat05.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat05.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat05.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat05.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat05.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat05.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat06.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat06.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat06.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat06.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat06.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat06.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat06.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat06.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat07.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat07.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat07.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat07.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat07.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat07.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat07.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat07.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat08.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat08.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat08.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat08.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat08.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat08.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat08.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat08.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat09.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat09.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat09.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat09.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat09.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat09.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat09.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat09.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat10.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat10.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat10.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat10.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat10.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat10.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat10.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat10.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat11.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat11.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat11.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat11.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat11.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat11.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat11.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat11.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat12.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat12.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat12.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat12.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat12.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat12.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat12.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat12.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat13.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat13.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat13.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat13.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat13.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat13.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat13.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat13.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat14.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat14.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat14.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat14.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat14.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat14.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat14.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat14.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat15.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat15.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat15.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat15.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat15.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat15.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat15.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat15.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat16.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat16.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat16.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat16.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat16.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat16.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat16.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat16.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat17.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat17.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat17.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat17.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat17.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat17.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat17.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat17.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat18.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat18.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat18.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat18.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat18.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat18.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat18.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat18.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat19.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat19.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat19.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat19.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat19.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat19.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat19.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat19.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat20.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat20.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat20.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat20.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat20.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat20.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat20.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat20.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat21.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat21.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat21.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat21.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat21.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat21.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat21.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat21.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat22.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat22.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat22.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat22.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat22.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat22.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat22.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat22.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat23.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat23.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat23.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat23.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat23.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat23.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat23.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat23.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat24.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat24.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat24.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat24.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat24.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat24.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat24.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat24.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat25.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat25.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat25.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat25.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat25.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat25.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat25.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat25.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat26.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat26.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat26.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat26.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat26.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat26.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat26.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat26.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat27.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat27.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat27.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat27.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat27.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat27.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat27.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat27.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat28.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat28.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat28.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat28.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat28.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat28.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat28.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat28.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat29.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat29.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat29.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat29.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat29.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat29.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat29.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat29.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat30.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat30.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat30.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat30.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat30.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat30.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat30.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat30.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat31.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat31.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat31.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat31.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat31.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat31.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat31.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat31.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat32.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat32.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat32.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat32.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat32.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat32.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat32.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat32.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat33.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat33.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat33.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat33.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat33.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat33.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat33.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat33.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat34.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat34.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat34.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat34.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat34.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat34.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat34.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat34.png.meta diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat35.png b/Assets/jelycho/Worlds/dev/kenney_splats/splat35.png similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat35.png rename to Assets/jelycho/Worlds/dev/kenney_splats/splat35.png diff --git a/Assets/jelycho/maps/dev/kenney_splats/splat35.png.meta b/Assets/jelycho/Worlds/dev/kenney_splats/splat35.png.meta similarity index 100% rename from Assets/jelycho/maps/dev/kenney_splats/splat35.png.meta rename to Assets/jelycho/Worlds/dev/kenney_splats/splat35.png.meta diff --git a/Assets/jelycho/maps/dev/mat_decal_blood_splat_0.mat b/Assets/jelycho/Worlds/dev/mat_decal_blood_splat_0.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_decal_blood_splat_0.mat rename to Assets/jelycho/Worlds/dev/mat_decal_blood_splat_0.mat diff --git a/Assets/jelycho/maps/dev/mat_decal_blood_splat_0.mat.meta b/Assets/jelycho/Worlds/dev/mat_decal_blood_splat_0.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_decal_blood_splat_0.mat.meta rename to Assets/jelycho/Worlds/dev/mat_decal_blood_splat_0.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_decal_rr.mat b/Assets/jelycho/Worlds/dev/mat_decal_rr.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_decal_rr.mat rename to Assets/jelycho/Worlds/dev/mat_decal_rr.mat diff --git a/Assets/jelycho/maps/dev/mat_decal_rr.mat.meta b/Assets/jelycho/Worlds/dev/mat_decal_rr.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_decal_rr.mat.meta rename to Assets/jelycho/Worlds/dev/mat_decal_rr.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_dev_rope.mat b/Assets/jelycho/Worlds/dev/mat_dev_rope.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_dev_rope.mat rename to Assets/jelycho/Worlds/dev/mat_dev_rope.mat diff --git a/Assets/jelycho/maps/dev/mat_dev_rope.mat.meta b/Assets/jelycho/Worlds/dev/mat_dev_rope.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_dev_rope.mat.meta rename to Assets/jelycho/Worlds/dev/mat_dev_rope.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_a.mat b/Assets/jelycho/Worlds/dev/mat_grid_1m_a.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_a.mat rename to Assets/jelycho/Worlds/dev/mat_grid_1m_a.mat diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_a.mat.meta b/Assets/jelycho/Worlds/dev/mat_grid_1m_a.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_a.mat.meta rename to Assets/jelycho/Worlds/dev/mat_grid_1m_a.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_b.mat b/Assets/jelycho/Worlds/dev/mat_grid_1m_b.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_b.mat rename to Assets/jelycho/Worlds/dev/mat_grid_1m_b.mat diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_b.mat.meta b/Assets/jelycho/Worlds/dev/mat_grid_1m_b.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_b.mat.meta rename to Assets/jelycho/Worlds/dev/mat_grid_1m_b.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_c.mat b/Assets/jelycho/Worlds/dev/mat_grid_1m_c.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_c.mat rename to Assets/jelycho/Worlds/dev/mat_grid_1m_c.mat diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_c.mat.meta b/Assets/jelycho/Worlds/dev/mat_grid_1m_c.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_c.mat.meta rename to Assets/jelycho/Worlds/dev/mat_grid_1m_c.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_d.mat b/Assets/jelycho/Worlds/dev/mat_grid_1m_d.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_d.mat rename to Assets/jelycho/Worlds/dev/mat_grid_1m_d.mat diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_d.mat.meta b/Assets/jelycho/Worlds/dev/mat_grid_1m_d.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_d.mat.meta rename to Assets/jelycho/Worlds/dev/mat_grid_1m_d.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_e.mat b/Assets/jelycho/Worlds/dev/mat_grid_1m_e.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_e.mat rename to Assets/jelycho/Worlds/dev/mat_grid_1m_e.mat diff --git a/Assets/jelycho/maps/dev/mat_grid_1m_e.mat.meta b/Assets/jelycho/Worlds/dev/mat_grid_1m_e.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_grid_1m_e.mat.meta rename to Assets/jelycho/Worlds/dev/mat_grid_1m_e.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_line_renderer_gut.mat b/Assets/jelycho/Worlds/dev/mat_line_renderer_gut.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_line_renderer_gut.mat rename to Assets/jelycho/Worlds/dev/mat_line_renderer_gut.mat diff --git a/Assets/jelycho/maps/dev/mat_line_renderer_gut.mat.meta b/Assets/jelycho/Worlds/dev/mat_line_renderer_gut.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_line_renderer_gut.mat.meta rename to Assets/jelycho/Worlds/dev/mat_line_renderer_gut.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_skybox.mat b/Assets/jelycho/Worlds/dev/mat_skybox.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_skybox.mat rename to Assets/jelycho/Worlds/dev/mat_skybox.mat diff --git a/Assets/jelycho/maps/dev/mat_skybox.mat.meta b/Assets/jelycho/Worlds/dev/mat_skybox.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_skybox.mat.meta rename to Assets/jelycho/Worlds/dev/mat_skybox.mat.meta diff --git a/Assets/jelycho/maps/dev/mat_zombie_skin.mat b/Assets/jelycho/Worlds/dev/mat_zombie_skin.mat similarity index 100% rename from Assets/jelycho/maps/dev/mat_zombie_skin.mat rename to Assets/jelycho/Worlds/dev/mat_zombie_skin.mat diff --git a/Assets/jelycho/maps/dev/mat_zombie_skin.mat.meta b/Assets/jelycho/Worlds/dev/mat_zombie_skin.mat.meta similarity index 100% rename from Assets/jelycho/maps/dev/mat_zombie_skin.mat.meta rename to Assets/jelycho/Worlds/dev/mat_zombie_skin.mat.meta diff --git a/Assets/jelycho/maps/dev/scn_map_dev.unity b/Assets/jelycho/Worlds/dev/scn_map_dev.unity similarity index 67% rename from Assets/jelycho/maps/dev/scn_map_dev.unity rename to Assets/jelycho/Worlds/dev/scn_map_dev.unity index 1b10cec..016ded1 100644 --- a/Assets/jelycho/maps/dev/scn_map_dev.unity +++ b/Assets/jelycho/Worlds/dev/scn_map_dev.unity @@ -579,114 +579,171 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &262329907 -GameObject: +--- !u!43 &328708626 +Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 262329908} - - component: {fileID: 262329911} - - component: {fileID: 262329910} - - component: {fileID: 262329909} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &262329908 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262329907} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 652530921} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &262329909 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262329907} - m_Material: {fileID: 0} - m_IncludeLayers: + m_Name: GutMesh + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 0 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 0 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 25 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 800 + _typelessdata: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &262329910 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262329907} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &262329911 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262329907} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} + offset: 0 + size: 0 + path: --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -808,422 +865,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!1 &415622161 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 415622162} - - component: {fileID: 415622165} - - component: {fileID: 415622164} - - component: {fileID: 415622163} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &415622162 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 415622161} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1270889318} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &415622163 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 415622161} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &415622164 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 415622161} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &415622165 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 415622161} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &462445845 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 462445846} - - component: {fileID: 462445849} - - component: {fileID: 462445848} - - component: {fileID: 462445847} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &462445846 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462445845} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 516038582} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &462445847 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462445845} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &462445848 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462445845} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &462445849 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462445845} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &516038579 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 516038582} - - component: {fileID: 516038581} - - component: {fileID: 516038580} - m_Layer: 0 - m_Name: aaa (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!59 &516038580 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516038579} - serializedVersion: 3 - m_ConnectedBody: {fileID: 528143614} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_ExtendedLimits: 0 - m_UseAcceleration: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 ---- !u!54 &516038581 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516038579} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!4 &516038582 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516038579} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3969998, y: 1.9099996, z: 0.08800003} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 462445846} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &528143612 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 528143613} - - component: {fileID: 528143614} - - component: {fileID: 528143615} - m_Layer: 0 - m_Name: aaa - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &528143613 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528143612} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.397, y: 2.11, z: 0.088} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1339246015} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &528143614 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528143612} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &528143615 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528143612} - serializedVersion: 3 - m_ConnectedBody: {fileID: 0} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_ExtendedLimits: 0 - m_UseAcceleration: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 --- !u!1 &559053459 GameObject: m_ObjectHideFlags: 0 @@ -1327,7 +968,7 @@ Transform: m_GameObject: {fileID: 559053459} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.85, y: 2, z: 0.561} + m_LocalPosition: {x: 4.85, y: 1.81, z: 0.561} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1472,106 +1113,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &652530918 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 652530921} - - component: {fileID: 652530919} - - component: {fileID: 652530920} - m_Layer: 0 - m_Name: aaa (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!54 &652530919 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 652530918} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &652530920 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 652530918} - serializedVersion: 3 - m_ConnectedBody: {fileID: 1165229960} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_ExtendedLimits: 0 - m_UseAcceleration: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 ---- !u!4 &652530921 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 652530918} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3969998, y: 1.3099997, z: 0.08800003} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 262329908} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &729232292 GameObject: m_ObjectHideFlags: 0 @@ -1680,6 +1221,116 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729232292} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &786966143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 786966147} + - component: {fileID: 786966146} + - component: {fileID: 786966145} + - component: {fileID: 786966144} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!136 &786966144 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 786966143} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!23 &786966145 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 786966143} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1a1dad1a9d40a4c498aa7e08bcef586e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &786966146 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 786966143} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &786966147 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 786966143} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.547, y: 3.5343502, z: 2.7098167} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -2096,206 +1747,6 @@ Transform: - {fileID: 1280003784} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1165229959 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1165229962} - - component: {fileID: 1165229960} - - component: {fileID: 1165229961} - m_Layer: 0 - m_Name: aaa (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!54 &1165229960 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165229959} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &1165229961 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165229959} - serializedVersion: 3 - m_ConnectedBody: {fileID: 1919080195} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_ExtendedLimits: 0 - m_UseAcceleration: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 ---- !u!4 &1165229962 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165229959} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3969998, y: 1.5099995, z: 0.08800003} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1923186261} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1270889315 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1270889318} - - component: {fileID: 1270889317} - - component: {fileID: 1270889316} - m_Layer: 0 - m_Name: aaa (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!59 &1270889316 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1270889315} - serializedVersion: 3 - m_ConnectedBody: {fileID: 652530919} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_ExtendedLimits: 0 - m_UseAcceleration: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 ---- !u!54 &1270889317 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1270889315} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!4 &1270889318 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1270889315} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.471, y: 2.027, z: 0.08800003} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 415622162} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1280003783 GameObject: m_ObjectHideFlags: 0 @@ -2404,114 +1855,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280003783} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1339246014 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1339246015} - - component: {fileID: 1339246018} - - component: {fileID: 1339246017} - - component: {fileID: 1339246016} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1339246015 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339246014} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 528143613} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1339246016 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339246014} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1339246017 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339246014} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1339246018 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339246014} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1545139734 GameObject: m_ObjectHideFlags: 0 @@ -2784,114 +2127,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} ---- !u!1 &1810404403 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1810404404} - - component: {fileID: 1810404407} - - component: {fileID: 1810404406} - - component: {fileID: 1810404405} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1810404404 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1810404403} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1919080197} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1810404405 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1810404403} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1810404406 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1810404403} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1810404407 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1810404403} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1913099148 GameObject: m_ObjectHideFlags: 0 @@ -3000,214 +2235,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1913099148} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1919080194 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1919080197} - - component: {fileID: 1919080195} - - component: {fileID: 1919080196} - m_Layer: 0 - m_Name: aaa (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!54 &1919080195 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919080194} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!59 &1919080196 -HingeJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919080194} - serializedVersion: 3 - m_ConnectedBody: {fileID: 516038581} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 0 - m_Spring: - spring: 0 - damper: 0 - targetPosition: 0 - m_UseMotor: 0 - m_Motor: - targetVelocity: 0 - force: 0 - freeSpin: 0 - m_UseLimits: 0 - m_ExtendedLimits: 0 - m_UseAcceleration: 0 - m_Limits: - min: 0 - max: 0 - bounciness: 0 - bounceMinVelocity: 0.2 - contactDistance: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 ---- !u!4 &1919080197 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919080194} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3969998, y: 1.7099993, z: 0.08800003} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1810404404} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1923186260 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1923186261} - - component: {fileID: 1923186264} - - component: {fileID: 1923186263} - - component: {fileID: 1923186262} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1923186261 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1923186260} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1165229962} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1923186262 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1923186260} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1923186263 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1923186260} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1923186264 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1923186260} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2047055848 GameObject: m_ObjectHideFlags: 0 @@ -3219,7 +2246,6 @@ GameObject: - component: {fileID: 2047055849} - component: {fileID: 2047055850} - component: {fileID: 2047055851} - - component: {fileID: 2047055852} m_Layer: 0 m_Name: rope m_TagString: Untagged @@ -3236,7 +2262,7 @@ Transform: m_GameObject: {fileID: 2047055848} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.858, y: 6.841, z: 4.051} + m_LocalPosition: {x: 2.858, y: 4.047, z: 4.051} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3275,114 +2301,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Rope: {fileID: 2047055850} - m_LineRenderer: {fileID: 2047055852} ---- !u!120 &2047055852 -LineRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2047055848} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 76560a44524baed4e90f7b8c9a48af25, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_Material: {fileID: 2100000, guid: 1a1dad1a9d40a4c498aa7e08bcef586e, type: 2} m_Positions: - - {x: 5, y: 5, z: 0} - - {x: 5, y: 4.5, z: 0} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.1 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 8 - numCapVertices: 0 - alignment: 0 - textureMode: 0 - textureScale: {x: 1, y: 1} - shadowBias: 0.5 - generateLightingData: 0 - m_MaskInteraction: 0 - m_UseWorldSpace: 1 - m_Loop: 0 - m_ApplyActiveColorSpace: 1 + - x: 2.858 + y: 4.047 + z: 4.051 + - x: 2.858 + y: 2.27 + z: 4.051 + m_Resolution: 25 + m_Mesh: {fileID: 328708626} --- !u!1 &2142333103 GameObject: m_ObjectHideFlags: 0 @@ -3664,11 +2592,6 @@ SceneRoots: - {fileID: 1790104249} - {fileID: 8300169490738461655} - {fileID: 2047055849} - - {fileID: 528143613} - - {fileID: 516038582} - - {fileID: 1919080197} - - {fileID: 1165229962} - - {fileID: 652530921} - - {fileID: 1270889318} - {fileID: 559053463} - {fileID: 167904378} + - {fileID: 786966147} diff --git a/Assets/jelycho/maps/dev/scn_map_dev.unity.meta b/Assets/jelycho/Worlds/dev/scn_map_dev.unity.meta similarity index 100% rename from Assets/jelycho/maps/dev/scn_map_dev.unity.meta rename to Assets/jelycho/Worlds/dev/scn_map_dev.unity.meta diff --git a/Assets/jelycho/maps/dev/world_dev.asset b/Assets/jelycho/Worlds/dev/world_dev.asset similarity index 100% rename from Assets/jelycho/maps/dev/world_dev.asset rename to Assets/jelycho/Worlds/dev/world_dev.asset diff --git a/Assets/jelycho/maps/dev/world_dev.asset.meta b/Assets/jelycho/Worlds/dev/world_dev.asset.meta similarity index 100% rename from Assets/jelycho/maps/dev/world_dev.asset.meta rename to Assets/jelycho/Worlds/dev/world_dev.asset.meta diff --git a/Assets/jelycho/actors.meta b/Assets/jelycho/actors.meta index ed05046..a4d8a64 100644 --- a/Assets/jelycho/actors.meta +++ b/Assets/jelycho/actors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 350a0ec7c054a7841857f633874debd8 +guid: 864843b3216e6fa4c905a761aa22f619 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/jelycho/actors/enemies.meta b/Assets/jelycho/actors/Zombie.meta similarity index 100% rename from Assets/jelycho/actors/enemies.meta rename to Assets/jelycho/actors/Zombie.meta diff --git a/Assets/jelycho/actors/enemies/actor_zombie.prefab b/Assets/jelycho/actors/Zombie/actor_zombie.prefab similarity index 100% rename from Assets/jelycho/actors/enemies/actor_zombie.prefab rename to Assets/jelycho/actors/Zombie/actor_zombie.prefab diff --git a/Assets/jelycho/actors/enemies/actor_zombie.prefab.meta b/Assets/jelycho/actors/Zombie/actor_zombie.prefab.meta similarity index 100% rename from Assets/jelycho/actors/enemies/actor_zombie.prefab.meta rename to Assets/jelycho/actors/Zombie/actor_zombie.prefab.meta diff --git a/Assets/jelycho/actors/enemies/animator_zombie.controller b/Assets/jelycho/actors/Zombie/animator_zombie.controller similarity index 100% rename from Assets/jelycho/actors/enemies/animator_zombie.controller rename to Assets/jelycho/actors/Zombie/animator_zombie.controller diff --git a/Assets/jelycho/actors/enemies/animator_zombie.controller.meta b/Assets/jelycho/actors/Zombie/animator_zombie.controller.meta similarity index 100% rename from Assets/jelycho/actors/enemies/animator_zombie.controller.meta rename to Assets/jelycho/actors/Zombie/animator_zombie.controller.meta diff --git a/Assets/jelycho/actors/enemies/zombie_bone_strength.asset b/Assets/jelycho/actors/Zombie/zombie_bone_strength.asset similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_bone_strength.asset rename to Assets/jelycho/actors/Zombie/zombie_bone_strength.asset diff --git a/Assets/jelycho/actors/enemies/zombie_bone_strength.asset.meta b/Assets/jelycho/actors/Zombie/zombie_bone_strength.asset.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_bone_strength.asset.meta rename to Assets/jelycho/actors/Zombie/zombie_bone_strength.asset.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Walking (3).fbx b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Walking (3).fbx similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Walking (3).fbx rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Walking (3).fbx diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Walking (3).fbx.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Walking (3).fbx.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Walking (3).fbx.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Walking (3).fbx.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Crawl.fbx b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Crawl.fbx similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Crawl.fbx rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Crawl.fbx diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Crawl.fbx.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Crawl.fbx.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Crawl.fbx.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Crawl.fbx.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Idle.fbx b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Idle.fbx similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Idle.fbx rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Idle.fbx diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Idle.fbx.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Idle.fbx.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Idle.fbx.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Idle.fbx.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Punching.fbx b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Punching.fbx similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Punching.fbx rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Punching.fbx diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Punching.fbx.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Punching.fbx.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Punching.fbx.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Punching.fbx.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Scream.fbx b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Scream.fbx similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Scream.fbx rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Scream.fbx diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Scream.fbx.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Scream.fbx.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Scream.fbx.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Scream.fbx.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Walk.fbx b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Walk.fbx similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Walk.fbx rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Walk.fbx diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Walk.fbx.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Walk.fbx.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/Y Bot@Zombie Walk.fbx.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo/Y Bot@Zombie Walk.fbx.meta diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/avatar_mask_zombie.mask b/Assets/jelycho/actors/Zombie/zombie_mixamo/avatar_mask_zombie.mask similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/avatar_mask_zombie.mask rename to Assets/jelycho/actors/Zombie/zombie_mixamo/avatar_mask_zombie.mask diff --git a/Assets/jelycho/actors/enemies/zombie_mixamo/avatar_mask_zombie.mask.meta b/Assets/jelycho/actors/Zombie/zombie_mixamo/avatar_mask_zombie.mask.meta similarity index 100% rename from Assets/jelycho/actors/enemies/zombie_mixamo/avatar_mask_zombie.mask.meta rename to Assets/jelycho/actors/Zombie/zombie_mixamo/avatar_mask_zombie.mask.meta diff --git a/Assets/jelycho/game.meta b/Assets/jelycho/game.meta deleted file mode 100644 index eea91c7..0000000 --- a/Assets/jelycho/game.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d15f9657bd8546d39d46dfacb19b3a72 -timeCreated: 1743790185 \ No newline at end of file diff --git a/Assets/jelycho/game/GutRenderer.cs b/Assets/jelycho/game/GutRenderer.cs deleted file mode 100644 index 4f2b60f..0000000 --- a/Assets/jelycho/game/GutRenderer.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -namespace RealityReboot.jelycho.game { - public class GutRenderer : MonoBehaviour { - static readonly List s_worldPositions = new(1024); - - [SerializeField] Rope m_Rope; - [SerializeField] LineRenderer m_LineRenderer; - - void Update() { - m_Rope.GetWorldPositions(s_worldPositions); - m_LineRenderer.positionCount = s_worldPositions.Count; - for (int i = 0; i < s_worldPositions.Count; i++) { - m_LineRenderer.SetPosition(i, s_worldPositions[i]); - } - } - } -} \ No newline at end of file diff --git a/Assets/jelycho/gamemode_default/code/DefaultGameModeAsset.cs b/Assets/jelycho/gamemode_default/code/DefaultGameModeAsset.cs index 072883c..e4d77fd 100644 --- a/Assets/jelycho/gamemode_default/code/DefaultGameModeAsset.cs +++ b/Assets/jelycho/gamemode_default/code/DefaultGameModeAsset.cs @@ -1,7 +1,7 @@ using System; using System.Threading; using Cysharp.Threading.Tasks; -using RealityReboot.jelycho.game.Player; +using RealityReboot.jelycho.Player; using RebootKit.Engine; using RebootKit.Engine.Foundation; using RebootKit.Engine.Services.Game; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index aa2acfb..2c46f22 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -142,8 +142,10 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.1 - preloadedAssets: [] + bundleVersion: 0.1.2 + preloadedAssets: + - {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + - {fileID: 11400000, guid: 5e0d3796a45800e429656e78e50c710e, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/RealityReboot.jelycho.csproj.DotSettings b/RealityReboot.jelycho.csproj.DotSettings index eb0cde2..9ac55cd 100644 --- a/RealityReboot.jelycho.csproj.DotSettings +++ b/RealityReboot.jelycho.csproj.DotSettings @@ -1,4 +1,5 @@  True + True True True \ No newline at end of file