From c8b66ed3af87e65ed1d5ac3d721d46bdfc3e6633 Mon Sep 17 00:00:00 2001 From: Brajanowski Date: Wed, 16 Jul 2025 23:04:04 +0200 Subject: [PATCH] stuff --- .../AddressableAssetSettings.asset | 3 +- .../AssetGroups/Jelycho Core.asset | 29 +- .../AssetGroups/Jelycho Dev.asset | 12 +- .../Windows/addressables_content_state.bin | Bin 2660 -> 2894 bytes Assets/DefaultNetworkPrefabs.asset | 15 - .../Editor/Data/RainbowFoldersRuleset.asset | 36 + Assets/RebootKit | 2 +- .../Resources/TheGame/RealityRebootKit.asset | 2 +- Assets/Scenes/scn_main.unity | 707 ---- Assets/jelycho/Code/ActorSpawner.cs | 52 + Assets/jelycho/Code/ActorSpawner.cs.meta | 3 + Assets/jelycho/Code/ButtonActor.cs | 9 + Assets/jelycho/Code/Enemies/ZombieActor.cs | 21 + .../jelycho/Code/Enemies/ZombieActor.cs.meta | 3 + Assets/jelycho/Code/Items/Inventory.cs | 19 +- Assets/jelycho/Code/Items/ItemConfig.cs | 19 +- Assets/jelycho/Code/Main/JelychoGame.cs | 26 +- .../Code/MainMenu/MainMenuController.cs | 21 +- Assets/jelycho/Code/Player/PlayerActor.cs | 841 ++-- .../jelycho/Code/Player/PlayerController.cs | 51 +- .../Code/Player/PlayerFPPLocomotion.cs | 8 +- .../{GenericSensor.cs => SingleRaySensor.cs} | 4 +- ...Sensor.cs.meta => SingleRaySensor.cs.meta} | 0 Assets/jelycho/MainMenu/panel_main_menu.asset | 2 +- Assets/jelycho/MainMenu/scn_main_menu.unity | 576 ++- .../scn_main_menu/Global Volume Profile.asset | 51 +- Assets/jelycho/MainMenu/tss_main_menu.tss | 13 + .../jelycho/MainMenu/tss_main_menu.tss.meta | 11 + Assets/jelycho/MainMenu/ui_main_menu.uxml | 15 +- ...beacon_egg.mat => m_beacon_egg_liquid.mat} | 10 +- ....mat.meta => m_beacon_egg_liquid.mat.meta} | 0 .../jelycho/Materials/m_beacon_egg_plant.mat | 140 + .../Materials/m_beacon_egg_plant.mat.meta | 8 + .../jelycho/Materials/sg_liquid.shadergraph | 3618 +++++++++++++++++ .../Materials/sg_liquid.shadergraph.meta | 10 + .../Beacon_Seed/Beacon_Seed_Embryo.fbx.meta | 35 +- .../animator_Beacon_Seed_Embryo.controller | 95 + ...nimator_Beacon_Seed_Embryo.controller.meta | 8 + .../Beacon_Seed/m_beacon_seed_embryo.mat | 137 + .../Beacon_Seed/m_beacon_seed_embryo.mat.meta | 8 + .../VersionOverlay.meta} | 3 +- .../VersionOverlay/ui_game_version.uxml | 5 + .../VersionOverlay/ui_game_version.uxml.meta | 10 + Assets/jelycho/Worlds/dev/scn_map_dev.unity | 2229 ++++++++-- .../jelycho/actors/Zombie/actor_zombie.prefab | 152 - Assets/jelycho/{actors.meta => core.meta} | 0 Assets/jelycho/{ => core}/Items.meta | 0 .../Shikashi's Fantasy Icons Pack v2.meta | 0 .../#1 - Transparent Icons.png | Bin .../#1 - Transparent Icons.png.meta | 0 .../#2 - Transparent Icons & Drop Shadow.png | Bin ...- Transparent Icons & Drop Shadow.png.meta | 0 .../BG 10.png | Bin .../BG 10.png.meta | 0 .../BG 11.png | Bin .../BG 11.png.meta | 0 .../BG 3a.png | Bin .../BG 3a.png.meta | 0 .../BG 3b.png | Bin .../BG 3b.png.meta | 0 .../BG 3c.png | Bin .../BG 3c.png.meta | 0 .../BG 4a.png | Bin .../BG 4a.png.meta | 0 .../BG 4b.png | Bin .../BG 4b.png.meta | 0 .../Shikashi's Fantasy Icons Pack v2/BG 5.png | Bin .../BG 5.png.meta | 0 .../Shikashi's Fantasy Icons Pack v2/BG 6.png | Bin .../BG 6.png.meta | 0 .../Shikashi's Fantasy Icons Pack v2/BG 7.png | Bin .../BG 7.png.meta | 0 .../Shikashi's Fantasy Icons Pack v2/BG 8.png | Bin .../BG 8.png.meta | 0 .../Shikashi's Fantasy Icons Pack v2/BG 9.png | Bin .../BG 9.png.meta | 0 .../Background 1a.png | Bin .../Background 1a.png.meta | 0 .../Background 1b.png | Bin .../Background 1b.png.meta | 0 .../Background 2.png | Bin .../Background 2.png.meta | 0 .../Shikashi's Fantasy Icons Pack.txt | 0 .../Shikashi's Fantasy Icons Pack.txt.meta | 0 .../{ => core}/Items/item_dagger.prefab | 55 +- .../{ => core}/Items/item_dagger.prefab.meta | 0 Assets/jelycho/core/Items/item_egg.prefab | 310 ++ .../jelycho/core/Items/item_egg.prefab.meta | 7 + Assets/jelycho/core/base.meta | 8 + .../{Prefabs => core/base}/beacon_0.prefab | 100 +- .../base}/beacon_0.prefab.meta | 0 Assets/jelycho/core/enemies.meta | 8 + .../{actors => core/enemies}/Zombie.meta | 0 .../core/enemies/Zombie/actor_zombie.prefab | 234 ++ .../enemies}/Zombie/actor_zombie.prefab.meta | 0 .../Zombie/animator_zombie.controller | 0 .../Zombie/animator_zombie.controller.meta | 0 .../core/enemies/Zombie/dev_materials.meta | 8 + .../Zombie/dev_materials/m_human_boots_0.mat | 136 + .../dev_materials/m_human_boots_0.mat.meta | 8 + .../Zombie/dev_materials/m_human_boots_1.mat | 136 + .../dev_materials/m_human_boots_1.mat.meta | 8 + .../Zombie/dev_materials/m_human_cloth.mat | 136 + .../dev_materials/m_human_cloth.mat.meta | 8 + .../Zombie/dev_materials/m_human_eyes.mat | 136 + .../dev_materials/m_human_eyes.mat.meta | 8 + .../Zombie/dev_materials/m_human_gold.mat | 136 + .../dev_materials/m_human_gold.mat.meta | 8 + .../Zombie/dev_materials/m_human_silver.mat | 136 + .../dev_materials/m_human_silver.mat.meta | 8 + .../Zombie/dev_materials/m_human_skin.mat | 136 + .../dev_materials/m_human_skin.mat.meta | 8 + .../enemies/Zombie/dev_materials}/m_mask.mat | 0 .../Zombie/dev_materials/m_mask.mat.meta | 8 + .../enemies}/Zombie/zombie_mixamo.meta | 0 .../zombie_mixamo/avatar_mask_zombie.mask | 0 .../avatar_mask_zombie.mask.meta | 0 Assets/jelycho/{HUD.meta => core/hud.meta} | 0 .../hud}/hud_inventory_slot_template.uxml | 0 .../hud_inventory_slot_template.uxml.meta | 0 .../jelycho/{HUD => core/hud}/hud_main.uxml | 0 .../{HUD => core/hud}/hud_main.uxml.meta | 0 .../hud}/hud_objects_label_template.uxml | 0 .../hud}/hud_objects_label_template.uxml.meta | 0 .../jelycho/{HUD => core/hud}/hud_styles.tss | 0 .../{HUD => core/hud}/hud_styles.tss.meta | 0 .../hud}/panel_settings_hud.asset | 0 .../hud}/panel_settings_hud.asset.meta | 0 .../{HUD => core/hud}/player_hud.prefab | 0 .../{HUD => core/hud}/player_hud.prefab.meta | 0 .../jelycho/{Input.meta => core/input.meta} | 0 .../input}/controls_jelycho.inputactions | 20 + .../input}/controls_jelycho.inputactions.meta | 0 .../{Prefabs => core}/jelycho_game.prefab | 8 +- .../jelycho_game.prefab.meta | 0 Assets/jelycho/{actors => core}/player.meta | 0 .../player/Character_Player.fbx | Bin .../player/Character_Player.fbx.meta | 0 .../{actors => core}/player/Player_Tet_I.fbx | Bin .../player/Player_Tet_I.fbx.meta | 0 .../{actors => core}/player/a_player.prefab | 145 +- .../player/a_player.prefab.meta | 0 .../player/animator_player.controller | 0 .../player/animator_player.controller.meta | 0 .../{actors => core}/player/anims.meta | 0 .../player/anims/Y Bot@Falling Idle.fbx | Bin .../player/anims/Y Bot@Falling Idle.fbx.meta | 0 .../player/anims/Y Bot@Kicking.fbx | Bin .../player/anims/Y Bot@Kicking.fbx.meta | 0 .../player/anims/Y Bot@Ready Idle.fbx | Bin .../player/anims/Y Bot@Ready Idle.fbx.meta | 0 .../player/anims/Y Bot@Sprint Backward.fbx | Bin .../anims/Y Bot@Sprint Backward.fbx.meta | 0 .../player/anims/Y Bot@Turn Left.fbx | Bin .../player/anims/Y Bot@Turn Left.fbx.meta | 0 .../anims/Y Bot@Turning Right 45 Degrees.fbx | Bin .../Y Bot@Turning Right 45 Degrees.fbx.meta | 0 .../player/anims/Y Bot@Walk Forward Left.fbx | Bin .../anims/Y Bot@Walk Forward Left.fbx.meta | 0 .../player/anims/Y Bot@Walk Left.fbx | Bin .../player/anims/Y Bot@Walk Left.fbx.meta | 0 .../player/anims/Y Bot@Walk Right.fbx | Bin .../player/anims/Y Bot@Walk Right.fbx.meta | 0 .../player/avatar_mask_player_fpp.mask | 0 .../player/avatar_mask_player_fpp.mask.meta | 0 .../player/avatar_mask_player_fpp_hands.mask | 0 .../avatar_mask_player_fpp_hands.mask.meta | 0 .../player/avatar_mask_player_fpp_legs.mask | 0 .../avatar_mask_player_fpp_legs.mask.meta | 0 .../player/cc_fpp Noise Profile.asset | 0 .../player/cc_fpp Noise Profile.asset.meta | 0 .../{actors => core}/player/mat_player_0.mat | 0 .../player/mat_player_0.mat.meta | 0 .../{actors => core}/player/mat_player_1.mat | 0 .../player/mat_player_1.mat.meta | 0 .../{actors => core}/player/materials.meta | 0 .../player/materials/m_accessory_0.mat | 0 .../player/materials/m_accessory_0.mat.meta | 0 .../player/materials/m_accessory_1.mat | 0 .../player/materials/m_accessory_1.mat.meta | 0 .../player/materials/m_accessory_2.mat | 0 .../player/materials/m_accessory_2.mat.meta | 0 .../player/materials/m_accessory_3.mat | 0 .../player/materials/m_accessory_3.mat.meta | 0 .../player/materials/m_accessory_eyes.mat | 0 .../materials/m_accessory_eyes.mat.meta | 0 .../player/materials/m_boots_0.mat | 0 .../player/materials/m_boots_0.mat.meta | 0 .../player/materials/m_boots_1.mat | 0 .../player/materials/m_boots_1.mat.meta | 0 .../player/materials/m_cloth_0.mat | 0 .../player/materials/m_cloth_0.mat.meta | 0 .../jelycho/core/player/materials/m_mask.mat | 136 + .../player/materials/m_mask.mat.meta | 0 .../player/materials/m_skin.mat | 0 .../player/materials/m_skin.mat.meta | 0 .../player_controller.prefab | 1 + .../player_controller.prefab.meta | 0 .../{Prefabs => core}/ropes_manager.prefab | 0 .../ropes_manager.prefab.meta | 0 Assets/jelycho/core/stations.meta | 8 + .../stations}/workbench_0.prefab | 0 .../stations}/workbench_0.prefab.meta | 0 Packages/manifest.json | 1 + Packages/packages-lock.json | 10 + ProjectSettings/DynamicsManager.asset | 2 +- ProjectSettings/EditorBuildSettings.asset | 2 +- ProjectSettings/ProjectAuditorSettings.asset | 35 + ProjectSettings/ProjectSettings.asset | 4 +- ProjectSettings/TagManager.asset | 2 +- RebootKit.Editor.csproj.DotSettings | 3 + steam_appid.txt | 2 +- 212 files changed, 9332 insertions(+), 1812 deletions(-) delete mode 100755 Assets/Scenes/scn_main.unity create mode 100644 Assets/jelycho/Code/ActorSpawner.cs create mode 100644 Assets/jelycho/Code/ActorSpawner.cs.meta create mode 100644 Assets/jelycho/Code/Enemies/ZombieActor.cs create mode 100644 Assets/jelycho/Code/Enemies/ZombieActor.cs.meta rename Assets/jelycho/Code/Player/{GenericSensor.cs => SingleRaySensor.cs} (90%) rename Assets/jelycho/Code/Player/{GenericSensor.cs.meta => SingleRaySensor.cs.meta} (100%) create mode 100644 Assets/jelycho/MainMenu/tss_main_menu.tss create mode 100644 Assets/jelycho/MainMenu/tss_main_menu.tss.meta rename Assets/jelycho/Materials/{m_beacon_egg.mat => m_beacon_egg_liquid.mat} (93%) rename Assets/jelycho/Materials/{m_beacon_egg.mat.meta => m_beacon_egg_liquid.mat.meta} (100%) create mode 100644 Assets/jelycho/Materials/m_beacon_egg_plant.mat create mode 100644 Assets/jelycho/Materials/m_beacon_egg_plant.mat.meta create mode 100644 Assets/jelycho/Materials/sg_liquid.shadergraph create mode 100644 Assets/jelycho/Materials/sg_liquid.shadergraph.meta create mode 100644 Assets/jelycho/Models/Beacon_Seed/animator_Beacon_Seed_Embryo.controller create mode 100644 Assets/jelycho/Models/Beacon_Seed/animator_Beacon_Seed_Embryo.controller.meta create mode 100644 Assets/jelycho/Models/Beacon_Seed/m_beacon_seed_embryo.mat create mode 100644 Assets/jelycho/Models/Beacon_Seed/m_beacon_seed_embryo.mat.meta rename Assets/{Scenes/scn_main.unity.meta => jelycho/VersionOverlay.meta} (67%) mode change 100755 => 100644 create mode 100644 Assets/jelycho/VersionOverlay/ui_game_version.uxml create mode 100644 Assets/jelycho/VersionOverlay/ui_game_version.uxml.meta delete mode 100755 Assets/jelycho/actors/Zombie/actor_zombie.prefab rename Assets/jelycho/{actors.meta => core.meta} (100%) mode change 100755 => 100644 rename Assets/jelycho/{ => core}/Items.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/#1 - Transparent Icons.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/#1 - Transparent Icons.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/#2 - Transparent Icons & Drop Shadow.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/#2 - Transparent Icons & Drop Shadow.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 10.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 10.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 11.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 11.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 3a.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 3a.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 3b.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 3b.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 3c.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 3c.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 4a.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 4a.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 4b.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 4b.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 5.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 5.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 6.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 6.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 7.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 7.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 8.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 8.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 9.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/BG 9.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Background 1a.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Background 1a.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Background 1b.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Background 1b.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Background 2.png (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Background 2.png.meta (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Shikashi's Fantasy Icons Pack.txt (100%) rename Assets/jelycho/{ => core}/Items/Shikashi's Fantasy Icons Pack v2/Shikashi's Fantasy Icons Pack.txt.meta (100%) rename Assets/jelycho/{ => core}/Items/item_dagger.prefab (89%) rename Assets/jelycho/{ => core}/Items/item_dagger.prefab.meta (100%) create mode 100644 Assets/jelycho/core/Items/item_egg.prefab create mode 100644 Assets/jelycho/core/Items/item_egg.prefab.meta create mode 100644 Assets/jelycho/core/base.meta rename Assets/jelycho/{Prefabs => core/base}/beacon_0.prefab (79%) rename Assets/jelycho/{Prefabs => core/base}/beacon_0.prefab.meta (100%) create mode 100644 Assets/jelycho/core/enemies.meta rename Assets/jelycho/{actors => core/enemies}/Zombie.meta (100%) mode change 100755 => 100644 create mode 100644 Assets/jelycho/core/enemies/Zombie/actor_zombie.prefab rename Assets/jelycho/{actors => core/enemies}/Zombie/actor_zombie.prefab.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core/enemies}/Zombie/animator_zombie.controller (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core/enemies}/Zombie/animator_zombie.controller.meta (100%) mode change 100755 => 100644 create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials.meta create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_boots_0.mat create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_boots_0.mat.meta create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_boots_1.mat create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_boots_1.mat.meta create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_cloth.mat create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_cloth.mat.meta create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_eyes.mat create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_eyes.mat.meta create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_gold.mat create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_gold.mat.meta create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_silver.mat create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_silver.mat.meta create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_skin.mat create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_skin.mat.meta rename Assets/jelycho/{actors/player/materials => core/enemies/Zombie/dev_materials}/m_mask.mat (100%) create mode 100644 Assets/jelycho/core/enemies/Zombie/dev_materials/m_mask.mat.meta rename Assets/jelycho/{actors => core/enemies}/Zombie/zombie_mixamo.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core/enemies}/Zombie/zombie_mixamo/avatar_mask_zombie.mask (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core/enemies}/Zombie/zombie_mixamo/avatar_mask_zombie.mask.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{HUD.meta => core/hud.meta} (100%) rename Assets/jelycho/{HUD => core/hud}/hud_inventory_slot_template.uxml (100%) rename Assets/jelycho/{HUD => core/hud}/hud_inventory_slot_template.uxml.meta (100%) rename Assets/jelycho/{HUD => core/hud}/hud_main.uxml (100%) rename Assets/jelycho/{HUD => core/hud}/hud_main.uxml.meta (100%) rename Assets/jelycho/{HUD => core/hud}/hud_objects_label_template.uxml (100%) rename Assets/jelycho/{HUD => core/hud}/hud_objects_label_template.uxml.meta (100%) rename Assets/jelycho/{HUD => core/hud}/hud_styles.tss (100%) rename Assets/jelycho/{HUD => core/hud}/hud_styles.tss.meta (100%) rename Assets/jelycho/{HUD => core/hud}/panel_settings_hud.asset (100%) rename Assets/jelycho/{HUD => core/hud}/panel_settings_hud.asset.meta (100%) rename Assets/jelycho/{HUD => core/hud}/player_hud.prefab (100%) rename Assets/jelycho/{HUD => core/hud}/player_hud.prefab.meta (100%) rename Assets/jelycho/{Input.meta => core/input.meta} (100%) rename Assets/jelycho/{Input => core/input}/controls_jelycho.inputactions (96%) rename Assets/jelycho/{Input => core/input}/controls_jelycho.inputactions.meta (100%) rename Assets/jelycho/{Prefabs => core}/jelycho_game.prefab (91%) rename Assets/jelycho/{Prefabs => core}/jelycho_game.prefab.meta (100%) rename Assets/jelycho/{actors => core}/player.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/Character_Player.fbx (100%) rename Assets/jelycho/{actors => core}/player/Character_Player.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/Player_Tet_I.fbx (100%) rename Assets/jelycho/{actors => core}/player/Player_Tet_I.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/a_player.prefab (95%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/a_player.prefab.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/animator_player.controller (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/animator_player.controller.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/anims.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Falling Idle.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Falling Idle.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Kicking.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Kicking.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Ready Idle.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Ready Idle.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Sprint Backward.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Sprint Backward.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Turn Left.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Turn Left.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Turning Right 45 Degrees.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Turning Right 45 Degrees.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Walk Forward Left.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Walk Forward Left.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Walk Left.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Walk Left.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Walk Right.fbx (100%) rename Assets/jelycho/{actors => core}/player/anims/Y Bot@Walk Right.fbx.meta (100%) rename Assets/jelycho/{actors => core}/player/avatar_mask_player_fpp.mask (100%) rename Assets/jelycho/{actors => core}/player/avatar_mask_player_fpp.mask.meta (100%) rename Assets/jelycho/{actors => core}/player/avatar_mask_player_fpp_hands.mask (100%) rename Assets/jelycho/{actors => core}/player/avatar_mask_player_fpp_hands.mask.meta (100%) rename Assets/jelycho/{actors => core}/player/avatar_mask_player_fpp_legs.mask (100%) rename Assets/jelycho/{actors => core}/player/avatar_mask_player_fpp_legs.mask.meta (100%) rename Assets/jelycho/{actors => core}/player/cc_fpp Noise Profile.asset (100%) rename Assets/jelycho/{actors => core}/player/cc_fpp Noise Profile.asset.meta (100%) rename Assets/jelycho/{actors => core}/player/mat_player_0.mat (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/mat_player_0.mat.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/mat_player_1.mat (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/mat_player_1.mat.meta (100%) mode change 100755 => 100644 rename Assets/jelycho/{actors => core}/player/materials.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_0.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_0.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_1.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_1.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_2.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_2.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_3.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_3.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_eyes.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_accessory_eyes.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_boots_0.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_boots_0.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_boots_1.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_boots_1.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_cloth_0.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_cloth_0.mat.meta (100%) create mode 100644 Assets/jelycho/core/player/materials/m_mask.mat rename Assets/jelycho/{actors => core}/player/materials/m_mask.mat.meta (100%) rename Assets/jelycho/{actors => core}/player/materials/m_skin.mat (100%) rename Assets/jelycho/{actors => core}/player/materials/m_skin.mat.meta (100%) rename Assets/jelycho/{Prefabs => core}/player_controller.prefab (97%) rename Assets/jelycho/{Prefabs => core}/player_controller.prefab.meta (100%) rename Assets/jelycho/{Prefabs => core}/ropes_manager.prefab (100%) rename Assets/jelycho/{Prefabs => core}/ropes_manager.prefab.meta (100%) create mode 100644 Assets/jelycho/core/stations.meta rename Assets/jelycho/{Prefabs => core/stations}/workbench_0.prefab (100%) rename Assets/jelycho/{Prefabs => core/stations}/workbench_0.prefab.meta (100%) create mode 100644 ProjectSettings/ProjectAuditorSettings.asset create mode 100644 RebootKit.Editor.csproj.DotSettings diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index c0c8415..688a9f3 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 64326db70156abe409df70a80bc62dc5 m_currentHash: serializedVersion: 2 - Hash: aab44a0d1164f0a9fb166437f4cc9ec3 + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 @@ -105,6 +105,7 @@ MonoBehaviour: - world - actor - game_mode + - item m_SchemaTemplates: [] m_GroupTemplateObjects: - {fileID: 11400000, guid: ce67ab8e01be15442bd2911cedb156c4, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset b/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset index b4dc57a..1d1a87a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset @@ -15,11 +15,25 @@ MonoBehaviour: m_GroupName: Jelycho Core m_GUID: 64326db70156abe409df70a80bc62dc5 m_SerializeEntries: - - m_GUID: 25696e225f604c542bd24bec74319866 - m_Address: Assets/jelycho/Worlds/dev/world_dev.asset + - m_GUID: 0258297780346e648b9fca3bb5f89543 + m_Address: Assets/jelycho/Items/item_egg.prefab m_ReadOnly: 0 m_SerializedLabels: - - world + - actor + - item + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 2fb503c7c7d54464f9bc16d97113b9e8 + m_Address: Assets/jelycho/Prefabs/beacon_0.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - actor + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 50a5e87baaedf5b46ba52646e8e88b74 + m_Address: Assets/jelycho/Prefabs/Items/item_dagger.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - actor + - item FlaggedDuringContentUpdateRestriction: 0 - m_GUID: abb7fe7f372ba7640b0ab138239c7f78 m_Address: Assets/jelycho/Main/scn_main_menu.unity @@ -35,7 +49,14 @@ MonoBehaviour: - m_GUID: be292ae0883a3be4090cdc42a4c7c131 m_Address: Assets/jelycho/actors/player/a_player.prefab m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializedLabels: + - actor + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: cc37529a52919b443aa04c484902cb68 + m_Address: Assets/jelycho/core/enemies/Zombie/actor_zombie.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - actor FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 93969247b34433f44bfa755967945828, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Jelycho Dev.asset b/Assets/AddressableAssetsData/AssetGroups/Jelycho Dev.asset index 87c1eef..a5f805b 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Jelycho Dev.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Jelycho Dev.asset @@ -15,15 +15,11 @@ MonoBehaviour: m_GroupName: Jelycho Dev m_GUID: 9d65553015c8f6e47b61ba7892ccbb3e m_SerializeEntries: - - m_GUID: 2fb503c7c7d54464f9bc16d97113b9e8 - m_Address: Assets/jelycho/Prefabs/beacon_0.prefab + - m_GUID: 25696e225f604c542bd24bec74319866 + m_Address: Assets/jelycho/Worlds/dev/world_dev.asset m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 50a5e87baaedf5b46ba52646e8e88b74 - m_Address: Assets/jelycho/Prefabs/Items/item_dagger.prefab - m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializedLabels: + - world FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 9ad3292f4f1ed8e4fb37da9cdd43b38b m_Address: Assets/jelycho/maps/dev/scn_map_dev.unity diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index d3b90d2e16427d7d15113f25089a0d55e6bbf1a8..124455d69271987c32d6c2a257fc8711ba6a609b 100644 GIT binary patch delta 668 zcmYk2J!=#}7{_;#+r8T)X75alF?z;GmWbjpFFS9Am0v(@taoO1NFjm*3u`rPh+}PS z6@~QnS_A@uAP6a}{1WFpd#>ETGcV8c|2;GF|Gj>;@%arxG`vLzSwBgV9zUMm4R;pq z_w&_wTq(lSg^y_XZtDO14j&d@6>E@N>T>Jhr1wNP%sG>$s-0`7@T_K3 z8`VgTiPp|d%**HQS(9G@bh$$}!k09nzVS*>T*hI&?F> zAF$D1%A7&i(x%o|y&#t_On_8PF4I(DmNxe(m4#u_DR?G!e(A&gmziL}ZS z-?7($1zTDNZU8$GxT>+DwYKnZ%^am(3tef;6!ngF>^NfS==4Fhk5-Gg&k;hfW;erW zU!d*qr(dFrFdRHWMW_dBDOfuSpYknqJG>vL^w)Gcy$I*A0?y4UW$5K({1YlMVmjF! z!rTr7Hi2$CyvTRPKju{F*WG`j1c4#5Zui2syc~a@(;c3a|8?;BR`+lccek7*#Cp$6 t{G@jpE20^f)^I{-B^!>;=lZ>ui$AB!VE8f}l1Q+RP=f5gQR-KnpwJ*jk8< zrDEqpSP6n43W`r4SjjqPHL!=daQ^wfxg6$U@S}WlObCS&a?qa7<#IOMT8qG~39G9J zJJxl+WW-Yf3-%gpwJnu;OiElcIHu=&Vcy<=ueP~TAL^Z%-j6zGI_5G^g2$9mKV?eC zo=WPJhY3@0J*mmVeZ7~sWn>E(J7Cz&&@6kNq*6*9s?^ssWZGxKOJnA9&N6fm(XI>~ zY933ujHHMXA!*%=I`EVy0+VW$YLP@4JB)01#*QHC1u0LXfW<N(Emq;u3GeKV8Yvb{>Jmb5&X2*e6OwT_a%RapTsZ3^C}VUlVVTU)reW23 z;ME-^RhV+4%3Gt+csCu_%exj%7z8WS^ueTS!?|0lytFu1vaO913-aeYGtM7(y7JuO w{B8{3ei#IwkIpJ=cTQEFT3ioT_!F8z@S%Sk__BackingField: {fileID: 330585545} ---- !u!114 &647954089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647954086} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8dd28652b58c4d689ab3f2f9354d7589, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Installers: - - {fileID: 647954087} ---- !u!4 &647954090 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647954086} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - 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 &735095186 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 735095188} - - component: {fileID: 735095187} - m_Layer: 0 - m_Name: Runtime Network Stats Monitor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &735095187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 735095186} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17737e0516da2445b9b0077ae2bd9b4f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Visible: 1 - m_MaxRefreshRate: 30 - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - k__BackingField: - k__BackingField: 1 - m_PositionLeftToRight: 0 - m_PositionTopToBottom: 0 - k__BackingField: {fileID: 11400000, guid: 8f1b4e3792d8446399527749cfb591a2, type: 2} ---- !u!4 &735095188 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 735095186} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - 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 &1468139325 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1468139327} - - component: {fileID: 1468139326} - m_Layer: 0 - m_Name: ui_console - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1468139326 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1468139325} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca844a0157054677b2f129fdbf6ddc45, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ConsoleVC: {fileID: 379890222} - m_ToggleAction: {fileID: 11400000, guid: 1c5aabf95d7e5d949af83d0a4c686e95, type: 2} ---- !u!4 &1468139327 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1468139325} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 379890220} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1493735122 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1493735124} - - component: {fileID: 1493735123} - m_Layer: 0 - m_Name: dev_tools - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1493735123 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1493735122} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ea9757c83234daaae0d4227ac495da2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DebugOverlayView: {fileID: 1809244332} ---- !u!4 &1493735124 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1493735122} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1809244330} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1809244329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1809244330} - - component: {fileID: 1809244331} - - component: {fileID: 1809244332} - m_Layer: 0 - m_Name: ui_debug_overlay - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1809244330 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1809244329} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1493735124} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1809244331 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1809244329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PanelSettings: {fileID: 11400000, guid: c4c93f1ef3cc3324696c439305139cbb, type: 2} - m_ParentUI: {fileID: 0} - sourceAsset: {fileID: 9197481963319205126, guid: efa5e4d1b21059c448f8a23fbe41890a, type: 3} - m_SortingOrder: 0 - m_WorldSpaceSizeMode: 1 - m_WorldSpaceWidth: 1920 - m_WorldSpaceHeight: 1080 ---- !u!114 &1809244332 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1809244329} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f18f4d0e8d914fdca81f98faf0e1546f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Document: {fileID: 1809244331} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 647954090} - - {fileID: 330585546} - - {fileID: 1468139327} - - {fileID: 1493735124} - - {fileID: 599568090} - - {fileID: 735095188} diff --git a/Assets/jelycho/Code/ActorSpawner.cs b/Assets/jelycho/Code/ActorSpawner.cs new file mode 100644 index 0000000..72c0f3e --- /dev/null +++ b/Assets/jelycho/Code/ActorSpawner.cs @@ -0,0 +1,52 @@ +using RebootKit.Engine.Main; +using RebootKit.Engine.Simulation; +using UnityEngine; +using UnityEngine.AddressableAssets; +using Logger = RebootKit.Engine.Foundation.Logger; + +namespace RebootReality.jelycho { + public class ActorSpawner : Actor { + static readonly Logger s_Logger = new Logger(nameof(ActorSpawner)); + + [SerializeField] AssetReferenceGameObject m_ActorPrefabReference; + + [TriInspector.InfoBox("If empty will use this object transform as spawn point.")] + [SerializeField] Transform[] m_SpawnPoints; + + protected override IActorData CreateActorData() { + return new NoActorData(); + } + + protected override void OnActorCommandServer(ActorCommand actorCommand) { + base.OnActorCommandServer(actorCommand); + + if (actorCommand.CommandID == (ushort) ActorSpawnerCommands.SpawnActor) { + (Vector3 spawnPoint, Quaternion spawnRotation) = GetSpawnPoint(); + RR.SpawnActor(m_ActorPrefabReference, spawnPoint, spawnRotation); + } + } + + public void SpawnActor() { + if (m_ActorPrefabReference == null) { + s_Logger.Error("ActorPrefabReference is not set. Cannot spawn actor."); + return; + } + + SendActorCommand((ushort) ActorSpawnerCommands.SpawnActor); + } + + (Vector3, Quaternion) GetSpawnPoint() { + if (m_SpawnPoints.Length == 0) { + return (transform.position, transform.rotation); + } + + int index = Random.Range(0, m_SpawnPoints.Length); + return (m_SpawnPoints[index].position, m_SpawnPoints[index].rotation); + } + } + + public enum ActorSpawnerCommands : ushort { + None = 0x0000, + SpawnActor = 0x0001, + } +} \ No newline at end of file diff --git a/Assets/jelycho/Code/ActorSpawner.cs.meta b/Assets/jelycho/Code/ActorSpawner.cs.meta new file mode 100644 index 0000000..df40829 --- /dev/null +++ b/Assets/jelycho/Code/ActorSpawner.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 96676410d3db4402b69bc504218db929 +timeCreated: 1752274642 \ No newline at end of file diff --git a/Assets/jelycho/Code/ButtonActor.cs b/Assets/jelycho/Code/ButtonActor.cs index 494bfe4..0606748 100644 --- a/Assets/jelycho/Code/ButtonActor.cs +++ b/Assets/jelycho/Code/ButtonActor.cs @@ -7,6 +7,9 @@ using UnityEngine.Events; namespace RebootReality.jelycho { public class ButtonActor : Actor, IInteractable { [SerializeField] Transform m_Graphics; + [SerializeField] float m_CooldownDuration = 0.5f; + + DateTime m_LastPressTime; public UnityEvent pressed = new UnityEvent(); @@ -16,6 +19,12 @@ namespace RebootReality.jelycho { protected override void OnActorCommandServer(ActorCommand actorCommand) { if (actorCommand.CommandID == (ushort) ButtonActorCommands.Press) { + if (DateTime.UtcNow - m_LastPressTime < TimeSpan.FromSeconds(m_CooldownDuration)) { + return; + } + + m_LastPressTime = DateTime.UtcNow; + SendActorEvent((ushort) ButtonActorEvents.Pressed); pressed?.Invoke(); } diff --git a/Assets/jelycho/Code/Enemies/ZombieActor.cs b/Assets/jelycho/Code/Enemies/ZombieActor.cs new file mode 100644 index 0000000..6f144fa --- /dev/null +++ b/Assets/jelycho/Code/Enemies/ZombieActor.cs @@ -0,0 +1,21 @@ +using RebootKit.Engine.Simulation; +using Unity.Netcode; +using UnityEngine; + +namespace RebootReality.jelycho.Enemies { + public class ZombieActorData : IActorData { + public void Serialize(FastBufferWriter writer) { + } + + public void Deserialize(FastBufferReader reader) { + } + } + + public class ZombieActor : Actor { + [SerializeField] Animator m_Animator; + + protected override IActorData CreateActorData() { + return new ZombieActorData(); + } + } +} \ No newline at end of file diff --git a/Assets/jelycho/Code/Enemies/ZombieActor.cs.meta b/Assets/jelycho/Code/Enemies/ZombieActor.cs.meta new file mode 100644 index 0000000..3018943 --- /dev/null +++ b/Assets/jelycho/Code/Enemies/ZombieActor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 82c11d5cbdd64c2ab63010901162299e +timeCreated: 1752364002 \ No newline at end of file diff --git a/Assets/jelycho/Code/Items/Inventory.cs b/Assets/jelycho/Code/Items/Inventory.cs index 7ba8ed3..8634f50 100644 --- a/Assets/jelycho/Code/Items/Inventory.cs +++ b/Assets/jelycho/Code/Items/Inventory.cs @@ -60,6 +60,24 @@ namespace RebootReality.jelycho.Items { s_Logger.Error($"Item {actor.name} is not in the inventory."); return false; } + + public ItemActor TryDropOne(int slotIndex) { + if (slotIndex < 0 || slotIndex >= m_Items.Length) { + s_Logger.Error($"Slot index {slotIndex} is out of range."); + return null; + } + + if (m_Items[slotIndex].Actors.Count == 0) { + s_Logger.Error($"No items in slot {slotIndex} to drop."); + return null; + } + + ItemActor actor = m_Items[slotIndex].Actors[0]; + m_Items[slotIndex].Actors.RemoveAt(0); + OnItemDropped?.Invoke(actor); + OnSlotUpdated?.Invoke(slotIndex); + return actor; + } public int GetQuantity(int slotIndex) { if (slotIndex < 0 || slotIndex >= m_Items.Length) { @@ -78,7 +96,6 @@ namespace RebootReality.jelycho.Items { return m_Items[slotIndex].Actors[0]; } - s_Logger.Error($"No items in slot {slotIndex}."); return null; } diff --git a/Assets/jelycho/Code/Items/ItemConfig.cs b/Assets/jelycho/Code/Items/ItemConfig.cs index cde19a6..21836bb 100644 --- a/Assets/jelycho/Code/Items/ItemConfig.cs +++ b/Assets/jelycho/Code/Items/ItemConfig.cs @@ -1,11 +1,24 @@ using System; -using Unity.Collections; +using System.ComponentModel.DataAnnotations; using UnityEngine; namespace RebootReality.jelycho.Items { + public enum ItemType { + Neutral = 0, + Egg = 1, + Sword = 2, + } + [Serializable] - public struct ItemConfig { - public FixedString32Bytes itemID; + public class ItemConfig { + public ItemType itemType = ItemType.Neutral; public Sprite icon; + + [MaxLength(32)] public string characterEquippedMountSlotName = "hand_right"; + + [Header("Chargeable")] + public bool isChargeable = false; + public float chargeDuration = 0.5f; + public float chargeCooldown = 1.0f; } } \ No newline at end of file diff --git a/Assets/jelycho/Code/Main/JelychoGame.cs b/Assets/jelycho/Code/Main/JelychoGame.cs index 3974eb9..bc6466d 100755 --- a/Assets/jelycho/Code/Main/JelychoGame.cs +++ b/Assets/jelycho/Code/Main/JelychoGame.cs @@ -8,6 +8,7 @@ using RebootReality.jelycho.Player.HUD; using Unity.Collections; using Unity.Netcode; using UnityEngine; +using UnityEngine.AddressableAssets; using UnityEngine.Assertions; using Logger = RebootKit.Engine.Foundation.Logger; @@ -23,11 +24,11 @@ namespace RebootReality.jelycho.Main { public class JelychoGame : Game { static readonly Logger s_Logger = new Logger(nameof(JelychoGame)); - + [Header("Player")] [SerializeField] PlayerController m_PlayerControllerPrefab; - [SerializeField] PlayerActor m_PlayerActorPrefab; - + [SerializeField] AssetReferenceGameObject m_PlayerActorPrefab; + readonly List m_PlayerStates = new List(); void Awake() { } @@ -35,18 +36,19 @@ namespace RebootReality.jelycho.Main { public override void OnDestroy() { base.OnDestroy(); } - + protected override void OnPlayerBecameReady(ulong clientID) { s_Logger.Info($"Player {clientID} became ready"); - PlayerActor actor = Instantiate(m_PlayerActorPrefab); - actor.name = $"PlayerActor_{clientID}"; - actor.NetworkObject.SpawnAsPlayerObject(clientID); + if (IsServer) { + PlayerActor actor = + RR.SpawnActor(m_PlayerActorPrefab, Vector3.zero, Quaternion.identity) as PlayerActor; - PlayerState playerState = GetPlayerState(clientID); - Assert.IsNotNull(playerState); - playerState.Actor = actor; - playerState.Controller.SetActorClientRpc(actor.NetworkObjectId); + PlayerState playerState = GetPlayerState(clientID); + Assert.IsNotNull(playerState); + playerState.Actor = actor; + playerState.Controller.PossessActor(actor); + } } public override void OnNetworkSpawn() { @@ -119,7 +121,7 @@ namespace RebootReality.jelycho.Main { RR.WriteToConsole($" {worldConfigAsset.Config.name}"); } } - + [RCCMD("connect_dev", "Connects to a local server for development purposes")] public static void ConnectToLocalServer(string[] args) { RR.WriteToConsole("Connecting to server..."); diff --git a/Assets/jelycho/Code/MainMenu/MainMenuController.cs b/Assets/jelycho/Code/MainMenu/MainMenuController.cs index ad22e05..68d4782 100755 --- a/Assets/jelycho/Code/MainMenu/MainMenuController.cs +++ b/Assets/jelycho/Code/MainMenu/MainMenuController.cs @@ -1,30 +1,35 @@ using RebootKit.Engine.Main; -using RebootReality.jelycho.Main; using UnityEngine; using UnityEngine.UIElements; namespace RebootReality.jelycho.MainMenu { public class MainMenuController : MonoBehaviour { - const string k_ButtonPlay = "btn-play"; - const string k_ButtonSettings = "btn-settings"; - const string k_ButtonQuit = "btn-quit"; + const string k_ButtonHost = "rr-menu__main-btn-host"; + const string k_ButtonJoinLocalHost = "rr-menu__main-btn-join-localhost"; + const string k_ButtonSettings = "rr-menu__main-btn-settings"; + const string k_ButtonQuit = "rr-menu__main-btn-quit"; - const string k_PanelMain = "panel-main"; - const string k_PanelSettings = "panel-settings"; + const string k_PanelMain = "rr-menu__panel-main"; + const string k_PanelSettings = "rr-menu__panel-settings"; [SerializeField] UIDocument m_Document; void OnEnable() { VisualElement root = m_Document.rootVisualElement; - Button playButton = root.Q