diff --git a/Assets/Prefabs/Abilities/VectorFencePrefab.prefab b/Assets/Prefabs/Abilities/VectorFencePrefab.prefab index bec365e..536d656 100644 --- a/Assets/Prefabs/Abilities/VectorFencePrefab.prefab +++ b/Assets/Prefabs/Abilities/VectorFencePrefab.prefab @@ -104,7 +104,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -136,7 +136,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 1554870052 + GlobalObjectIdHash: 3892629208 InScenePlacedSourceGlobalObjectIdHash: 0 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 1 diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index 199dd9e..d5d75de 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -8896,7 +8896,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.x - value: 0.3943448 + value: 0.39434478 objectReference: {fileID: 0} - target: {fileID: 1676734515771252668, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.y @@ -9161,15 +9161,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalRotation.x - value: 0.39434484 + value: 0.3943448 objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalRotation.y - value: 0.3104465 + value: 0.31044647 objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalRotation.z - value: -0.1435298 + value: -0.14352977 objectReference: {fileID: 0} - target: {fileID: 203267159508449512, guid: 36b3ee75677a1544191c0ddaaadd8140, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9841,7 +9841,7 @@ MonoBehaviour: m_EditorClassIdentifier: timer: {fileID: 1521032483} serverAdditiveSceneLoader: {fileID: 3765979715153886893} - timeInSeconds: 120 + timeInSeconds: 1200 --- !u!1 &1527274045 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/CharSelect.unity b/Assets/Scenes/CharSelect.unity index 0fb00d9..de42c2b 100644 --- a/Assets/Scenes/CharSelect.unity +++ b/Assets/Scenes/CharSelect.unity @@ -123,6 +123,140 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &32199422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32199423} + - component: {fileID: 32199425} + - component: {fileID: 32199424} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &32199423 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32199422} + 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: 735073816} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 210, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &32199424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32199422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: START! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2} + m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 39 + m_fontSizeBase: 39 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &32199425 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32199422} + m_CullTransparentMesh: 1 --- !u!1 &219125660 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5940892340808018829, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} @@ -452,6 +586,140 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 202b55377fea5a54caed392aa936bfe8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &735073815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 735073816} + - component: {fileID: 735073819} + - component: {fileID: 735073818} + - component: {fileID: 735073817} + m_Layer: 5 + m_Name: Start Btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &735073816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735073815} + 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: 32199423} + m_Father: {fileID: 5940892340892531732} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 240, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &735073817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735073815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.4433962, g: 0.43712175, b: 0.43712175, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: ef730a29d365f6941b0fbc2aad9d99b4, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 21300000, guid: ef730a29d365f6941b0fbc2aad9d99b4, type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 735073818} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1624197991} + m_TargetAssemblyTypeName: Unity.BossRoom.Gameplay.GameState.ServerCharSelectState, + Unity.BossRoom.Gameplay + m_MethodName: StartGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &735073818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735073815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.078233, g: 1, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b26936a6b89f4694d814812c2c4f5070, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &735073819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735073815} + m_CullTransparentMesh: 1 --- !u!114 &853305158 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4148434299653504325, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} @@ -895,6 +1163,10 @@ PrefabInstance: propertyPath: m_GameObjectsThatWillBeInjectedAutomatically.Array.data[1] value: objectReference: {fileID: 596224819} + - target: {fileID: 3565665953789623675, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} + propertyPath: startButtonScipt + value: + objectReference: {fileID: 1624197990} - target: {fileID: 3565665953789623676, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} propertyPath: m_RootOrder value: 3 @@ -942,19 +1214,51 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3565665953789623672, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} + insertIndex: -1 + addedObject: {fileID: 1624197990} m_SourcePrefab: {fileID: 100100000, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} --- !u!114 &1624197988 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3565665953789623674, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} m_PrefabInstance: {fileID: 1624197987} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1624197989} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: eca1f4b442326cc4d9be3975746b8cdb, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1624197989 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3565665953789623672, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} + m_PrefabInstance: {fileID: 1624197987} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1624197990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624197989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e6e651c6f217334bb2da5f5a29370fe, type: 3} + m_Name: + m_EditorClassIdentifier: + StartButton: {fileID: 735073817} +--- !u!114 &1624197991 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3565665953789623675, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3} + m_PrefabInstance: {fileID: 1624197987} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624197989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b4ae93287066a264d92939aa957cf227, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1708761310 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1192,108 +1496,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e72290981fe0b14469584445274082b6, type: 3} ---- !u!1001 &4620751774230532315 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5940892340892531732} - m_Modifications: - - target: {fileID: 2512335036501734854, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_Name - value: PlayerName (TMP) (1) - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_SizeDelta.x - value: 130 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_SizeDelta.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_AnchoredPosition.y - value: -100 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} ---- !u!224 &4620751774230532316 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6791306556250902720, guid: c9c256cefc93f3647880ff0178ca92a7, type: 3} - m_PrefabInstance: {fileID: 4620751774230532315} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5940892340892531729 PrefabInstance: m_ObjectHideFlags: 0 @@ -1429,9 +1631,9 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6540888083354289637, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} + - targetCorrespondingSourceObject: {fileID: 5940892342547609501, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} insertIndex: -1 - addedObject: {fileID: 4620751774230532316} + addedObject: {fileID: 735073816} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} --- !u!114 &5940892340892531730 stripped @@ -1452,7 +1654,7 @@ GameObject: m_PrefabAsset: {fileID: 0} --- !u!224 &5940892340892531732 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6540888083354289637, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} + m_CorrespondingSourceObject: {fileID: 5940892342547609501, guid: 463d19e34c787654c8cb7332fc58149b, type: 3} m_PrefabInstance: {fileID: 5940892340892531729} m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 diff --git a/Assets/Scripts/Gameplay/GameState/ClientCharSelectState.cs b/Assets/Scripts/Gameplay/GameState/ClientCharSelectState.cs index fa8d2d5..eae3809 100644 --- a/Assets/Scripts/Gameplay/GameState/ClientCharSelectState.cs +++ b/Assets/Scripts/Gameplay/GameState/ClientCharSelectState.cs @@ -344,6 +344,7 @@ namespace Unity.BossRoom.Gameplay.GameState if (isLobbyClosed) { ConfigureUIForLobbyMode(LobbyMode.LobbyEnding); + } else { diff --git a/Assets/Scripts/Gameplay/GameState/ServerCharSelectState.cs b/Assets/Scripts/Gameplay/GameState/ServerCharSelectState.cs index adfe6a0..875a8fe 100644 --- a/Assets/Scripts/Gameplay/GameState/ServerCharSelectState.cs +++ b/Assets/Scripts/Gameplay/GameState/ServerCharSelectState.cs @@ -69,7 +69,7 @@ namespace Unity.BossRoom.Gameplay.GameState lockedIn ? NetworkCharSelection.SeatState.LockedIn : NetworkCharSelection.SeatState.Active, newSeatIdx, Time.time); - + Debug.Log("CloseLobbyIfReady"); CloseLobbyIfReady(); } @@ -85,21 +85,24 @@ namespace Unity.BossRoom.Gameplay.GameState } return -1; } + public void StartGame() + { + networkCharSelection.IsLobbyClosed.Value = true; + SaveLobbyResults(); + m_WaitToEndLobbyCoroutine = StartCoroutine(WaitToEndLobby()); + } void CloseLobbyIfReady() { + startButtonScipt.InteractableTruer(false); foreach (NetworkCharSelection.LobbyPlayerState playerInfo in networkCharSelection.LobbyPlayers) { if (playerInfo.SeatState != NetworkCharSelection.SeatState.LockedIn) return; // at least one player isn't locked in yet! } - - networkCharSelection.IsLobbyClosed.Value = true; - - SaveLobbyResults(); - m_WaitToEndLobbyCoroutine = StartCoroutine(WaitToEndLobby()); + startButtonScipt.InteractableTruer(true); } - + public StartButtonScipt startButtonScipt; void CancelCloseLobby() { if (m_WaitToEndLobbyCoroutine != null) diff --git a/Assets/Scripts/Gameplay/GameState/StartButtonScipt.cs b/Assets/Scripts/Gameplay/GameState/StartButtonScipt.cs new file mode 100644 index 0000000..8b4e6aa --- /dev/null +++ b/Assets/Scripts/Gameplay/GameState/StartButtonScipt.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.Netcode; +using UnityEngine; +using UnityEngine.UI; + +namespace Unity.Multiplayer.Samples.BossRoom +{ + public class StartButtonScipt : NetworkBehaviour + { + public Button StartButton; + private void Start() + { + StartButtonSetter(); + } + void StartButtonSetter() + { + if(IsServer) + { + StartButton.gameObject.SetActive(true); + StartButton.interactable = false; + } + } + public void InteractableTruer(bool flag) + { + StartButton.interactable=flag; + } + } +} diff --git a/Assets/Scripts/Gameplay/GameState/StartButtonScipt.cs.meta b/Assets/Scripts/Gameplay/GameState/StartButtonScipt.cs.meta new file mode 100644 index 0000000..b69a065 --- /dev/null +++ b/Assets/Scripts/Gameplay/GameState/StartButtonScipt.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0e6e651c6f217334bb2da5f5a29370fe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: