Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add doors during level generation #41

Merged
merged 13 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@ aplib.net-demo/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
aplib.net-demo/[Aa]ssets/[Ss]treamingAssets/aa.meta
aplib.net-demo/[Aa]ssets/[Ss]treamingAssets/aa/*

# Ignore rider files
# Rider files
**/.idea/
5 changes: 5 additions & 0 deletions aplib.net-demo/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,11 @@ dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case

#### Rules for Resharper ####

resharper_place_attribute_on_same_line = never
resharper_indent_nested_for_stmt = true
LukaBerkers marked this conversation as resolved.
Show resolved Hide resolved

[*.{cs,vb}]
# Use underscores for private fields
dotnet_naming_symbols.private_fields.applicable_kinds = field
Expand Down
73 changes: 56 additions & 17 deletions aplib.net-demo/Assets/Prefabs/Environment/Interactables/Door.prefab
SilasPeters marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 1472966249733116028}
- component: {fileID: 3338573040676617101}
- component: {fileID: 7956993908252065484}
- component: {fileID: 4805177238158399063}
m_Layer: 0
m_Name: Door
m_TagString: Untagged
Expand All @@ -34,6 +33,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 720727558142947255}
- {fileID: 848415037625510833}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1472966249733116028
Expand Down Expand Up @@ -107,20 +107,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4805177238158399063
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3526522355453958696}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab4ebc97e438ddf4f82df525a42daa25, type: 3}
m_Name:
m_EditorClassIdentifier:
doorId: 1
_parent: {fileID: 3526522355453958696}
--- !u!1 &4350768672960882908
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -135,7 +121,7 @@ GameObject:
- component: {fileID: 8973477280568418425}
- component: {fileID: 9013568583056147879}
m_Layer: 0
m_Name: DoorCollider
m_Name: DoorTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -240,4 +226,57 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
doorId: 0
_parent: {fileID: 0}
parent: {fileID: 0}
--- !u!1 &6703117969167787572
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 848415037625510833}
- component: {fileID: 3675384861766110758}
m_Layer: 0
m_Name: DoorCollider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &848415037625510833
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6703117969167787572}
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: 753418903027165643}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &3675384861766110758
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6703117969167787572}
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_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
6 changes: 4 additions & 2 deletions aplib.net-demo/Assets/Scenes/ConnectedComponents.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18029143, g: 0.22572419, b: 0.30693057, a: 1}
m_IndirectSpecularColor: {r: 0.18028328, g: 0.22571328, b: 0.3069218, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -407,7 +407,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf81f8d2562f471f8fe5ad818d5670e6, type: 3}
m_Name:
m_EditorClassIdentifier:
RoomObjects: {fileID: 11400000, guid: 9962865d7cc12a74abe02efdb8b7d072, type: 2}
_roomObjects: {fileID: 11400000, guid: 9962865d7cc12a74abe02efdb8b7d072, type: 2}
_doorPrefab: {fileID: 3526522355453958696, guid: 22b08b26ebf57994bb9b9f1004aa58ca,
type: 3}
--- !u!4 &1455078763
Transform:
m_ObjectHideFlags: 0
Expand Down
Loading