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 d3b90d2..124455d 100644 Binary files a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin and b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin differ diff --git a/Assets/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset index e022c3a..b1bfeb6 100644 --- a/Assets/DefaultNetworkPrefabs.asset +++ b/Assets/DefaultNetworkPrefabs.asset @@ -24,23 +24,8 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} - - Override: 0 - Prefab: {fileID: 3913326941885152303, guid: d8656ef49bb69e647b019ff5e4d68209, type: 3} - SourcePrefabToOverride: {fileID: 0} - SourceHashToOverride: 0 - OverridingTargetPrefab: {fileID: 0} - Override: 0 Prefab: {fileID: 1321683558189709310, guid: 2cc631d24ab41194ebdeffff7faf62a5, type: 3} SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} - - Override: 0 - Prefab: {fileID: 6086846679135428685, guid: be292ae0883a3be4090cdc42a4c7c131, type: 3} - SourcePrefabToOverride: {fileID: 0} - SourceHashToOverride: 0 - OverridingTargetPrefab: {fileID: 0} - - Override: 0 - Prefab: {fileID: 611922230303722876, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3} - SourcePrefabToOverride: {fileID: 0} - SourceHashToOverride: 0 - OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/Plugins/Borodar/RainbowFolders/Editor/Data/RainbowFoldersRuleset.asset b/Assets/Plugins/Borodar/RainbowFolders/Editor/Data/RainbowFoldersRuleset.asset index 83ed844..38ec304 100644 --- a/Assets/Plugins/Borodar/RainbowFolders/Editor/Data/RainbowFoldersRuleset.asset +++ b/Assets/Plugins/Borodar/RainbowFolders/Editor/Data/RainbowFoldersRuleset.asset @@ -409,3 +409,39 @@ MonoBehaviour: BackgroundTexture: {fileID: 0} IsBackgroundRecursive: 0 IsHidden: 0 + - Type: 1 + Key: Assets/jelycho/core/player + Ordinal: 33 + Priority: 0 + IconType: 170 + SmallIcon: {fileID: 0} + LargeIcon: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 170 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 + - Type: 1 + Key: Assets/jelycho/core/Items + Ordinal: 34 + Priority: 0 + IconType: 130 + SmallIcon: {fileID: 0} + LargeIcon: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 130 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 + - Type: 1 + Key: Assets/jelycho/core/enemies + Ordinal: 35 + Priority: 0 + IconType: 10 + SmallIcon: {fileID: 0} + LargeIcon: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 10 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 diff --git a/Assets/RebootKit b/Assets/RebootKit index 0da6f27..4ec3ded 160000 --- a/Assets/RebootKit +++ b/Assets/RebootKit @@ -1 +1 @@ -Subproject commit 0da6f275c02374b267d232e11c12178d72adcd5e +Subproject commit 4ec3dedd42f3fc74892c4482df4427e5ac085fea diff --git a/Assets/Resources/TheGame/RealityRebootKit.asset b/Assets/Resources/TheGame/RealityRebootKit.asset index 3f0b867..ff12804 100755 --- a/Assets/Resources/TheGame/RealityRebootKit.asset +++ b/Assets/Resources/TheGame/RealityRebootKit.asset @@ -21,4 +21,4 @@ MonoBehaviour: m_SubObjectGUID: m_SubObjectType: m_EditorAssetChanged: 0 - steamAppID: 480 + steamAppID: 3881650 diff --git a/Assets/Scenes/scn_main.unity b/Assets/Scenes/scn_main.unity deleted file mode 100755 index 24fe1cd..0000000 --- a/Assets/Scenes/scn_main.unity +++ /dev/null @@ -1,707 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 10 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 13 - m_BakeOnSceneLoad: 0 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &330585543 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 330585546} - - component: {fileID: 330585545} - - component: {fileID: 330585544} - - component: {fileID: 330585547} - - component: {fileID: 330585548} - m_Layer: 0 - m_Name: camera_main - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &330585544 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 ---- !u!20 &330585545 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.12 - far clip plane: 500 - field of view: 70 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &330585546 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - serializedVersion: 2 - m_LocalRotation: {x: 0.51805025, y: -0.000028491486, z: 0.000016934791, w: 0.8553502} - m_LocalPosition: {x: 0.000034647062, y: 1.4547659, z: 0.33647728} - 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!114 &330585547 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 ---- !u!114 &330585548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - ShowDebugText: 0 - ShowCameraFrustum: 1 - IgnoreTimeScale: 0 - WorldUpOverride: {fileID: 0} - ChannelMask: -1 - UpdateMethod: 1 - BlendUpdateMethod: 1 - LensModeOverride: - Enabled: 0 - DefaultMode: 2 - DefaultBlend: - Style: 1 - Time: 2 - CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - CustomBlends: {fileID: 0} ---- !u!1 &379890219 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 379890220} - - component: {fileID: 379890221} - - component: {fileID: 379890222} - m_Layer: 0 - m_Name: ConsoleVC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &379890220 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 379890219} - 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: 1468139327} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &379890221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 379890219} - 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: 15eee085e73feee4eba58c073b1455c5, type: 3} - m_SortingOrder: 0 - m_WorldSpaceSizeMode: 1 - m_WorldSpaceWidth: 1920 - m_WorldSpaceHeight: 1080 ---- !u!114 &379890222 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 379890219} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6131b8af74b4894ba7b95b12286bc66, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Document: {fileID: 379890221} ---- !u!1 &599568088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 599568090} - - component: {fileID: 599568089} - m_Layer: 0 - m_Name: RainbowHierarchyRuleset - m_TagString: EditorOnly - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &599568089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 599568088} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 848a85510b808ee4994e553f35ca73bd, type: 3} - m_Name: - m_EditorClassIdentifier: - Rules: - - Type: 0 - Name: - GameObject: {fileID: 647954086} - Ordinal: 0 - Priority: 0 - IconType: 0 - IconTexture: {fileID: 0} - IsIconRecursive: 0 - BackgroundType: 1000 - BackgroundTexture: {fileID: 0} - IsBackgroundRecursive: 0 - IsHidden: 0 ---- !u!4 &599568090 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 599568088} - 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 &647954086 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 647954090} - - component: {fileID: 647954089} - - component: {fileID: 647954088} - - component: {fileID: 647954087} - m_Layer: 0 - m_Name: scene_context - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &647954087 -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: 4238ea1a17e342e583cdd929103a22c6, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &647954088 -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: 351d6b8577644d599058e76fa02a11c0, type: 3} - m_Name: - m_EditorClassIdentifier: - k__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