From 6fadd9bf71dc4e6001fbc3fd5c32d400052f7098 Mon Sep 17 00:00:00 2001 From: Thomlam Date: Mon, 28 Oct 2024 02:18:38 +0100 Subject: [PATCH 1/2] feat: add Interact mode for RPS, add "Totem" for launch that, add emit --- Assets/Prefabs/RockPaperCissorGame.prefab | 6 +- .../Prefabs/RoomSystem/CorridorEvent/RPS.meta | 8 + .../RPS/RockPaperCissor_prefab.prefab | 462 ++++++++++++++++++ .../RPS/RockPaperCissor_prefab.prefab.meta | 7 + Assets/Scenes/DevRoom.unity | 412 +++------------- Assets/Scenes/EmptyRoom_2.unity | 98 ++-- .../Scripts/Map Control/RoomSystem/EmitRPS.cs | 67 +++ .../Map Control/RoomSystem/EmitRPS.cs.meta | 11 + 8 files changed, 682 insertions(+), 389 deletions(-) create mode 100644 Assets/Prefabs/RoomSystem/CorridorEvent/RPS.meta create mode 100644 Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab create mode 100644 Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab.meta create mode 100644 Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs create mode 100644 Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs.meta diff --git a/Assets/Prefabs/RockPaperCissorGame.prefab b/Assets/Prefabs/RockPaperCissorGame.prefab index 779e4bba..14584bc8 100644 --- a/Assets/Prefabs/RockPaperCissorGame.prefab +++ b/Assets/Prefabs/RockPaperCissorGame.prefab @@ -802,7 +802,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: CISSOR + m_text: SCISSORS m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4b5fe7c2e4bb84551bcc3db2416b48af, type: 2} m_sharedMaterial: {fileID: -1397903820206187217, guid: 4b5fe7c2e4bb84551bcc3db2416b48af, type: 2} @@ -1247,5 +1247,5 @@ MonoBehaviour: rockButton: {fileID: 8465811365922358873} paperButton: {fileID: 8144605884610747780} scissorsButton: {fileID: 4661900220339400221} - canvas: {fileID: 0} - resultsText: {fileID: 0} + canvas: {fileID: 1151693853599494121} + resultsText: {fileID: 5551857545691184436} diff --git a/Assets/Prefabs/RoomSystem/CorridorEvent/RPS.meta b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS.meta new file mode 100644 index 00000000..442b8ce0 --- /dev/null +++ b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 576f7a8ef7cf0c7498b086476d135482 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab new file mode 100644 index 00000000..07e37105 --- /dev/null +++ b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab @@ -0,0 +1,462 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &506680085759098337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6421739320919027698} + - component: {fileID: 3526346132210186901} + - component: {fileID: 1768151421913638469} + 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 &6421739320919027698 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506680085759098337} + 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: 4407629772663555564} + 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: -1.52} + m_SizeDelta: {x: 2.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3526346132210186901 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506680085759098337} + m_CullTransparentMesh: 1 +--- !u!114 &1768151421913638469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506680085759098337} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Defie les dieux en appuyant sur E + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 0.2 + m_fontSizeBase: 0.2 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 0 + 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!1 &1508629469759733934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4844190162371704201} + - component: {fileID: 7315204677023068088} + m_Layer: 0 + m_Name: RockPaperCissor_prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4844190162371704201 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508629469759733934} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -292.80634, y: -70.754005, z: -0.04124558} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4952390202131381893} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &7315204677023068088 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508629469759733934} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.8, y: -0.5} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 2.2} + m_EdgeRadius: 0 +--- !u!1 &1570044548715457365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4952390202131381893} + - component: {fileID: 4170502206729879107} + - component: {fileID: 4201216376406396540} + - component: {fileID: 5699639488801851422} + m_Layer: 0 + m_Name: RockPaperCissorTotem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4952390202131381893 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570044548715457365} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.8152466, y: -0.5319443, z: 0.04124558} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4407629772663555564} + m_Father: {fileID: 4844190162371704201} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4170502206729879107 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570044548715457365} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2144107104, guid: 6b5121ab5b1f0fb409a4b44ff0047fc0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.875, y: 2.0625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &4201216376406396540 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570044548715457365} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.875, y: 2.0625} + newSize: {x: 0.875, y: 2.0625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 3} + m_EdgeRadius: 0 +--- !u!114 &5699639488801851422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570044548715457365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e245bc39857c9241ab777f9ef7d40df, type: 3} + m_Name: + m_EditorClassIdentifier: + interactionCanvas: {fileID: 3518852111317858195} + RPSCanvas: {fileID: 0} +--- !u!1 &3518852111317858195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4407629772663555564} + - component: {fileID: 7964806975543330963} + - component: {fileID: 6107234236613729599} + - component: {fileID: 7690369095100720358} + m_Layer: 0 + m_Name: InteractionCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4407629772663555564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3518852111317858195} + 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: 6421739320919027698} + m_Father: {fileID: 4952390202131381893} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 3, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &7964806975543330963 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3518852111317858195} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6107234236613729599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3518852111317858195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &7690369095100720358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3518852111317858195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 diff --git a/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab.meta b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab.meta new file mode 100644 index 00000000..f04d7f10 --- /dev/null +++ b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57cadef557163984ab89359d6a5c54af +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/DevRoom.unity b/Assets/Scenes/DevRoom.unity index 8448f0ee..26b0c951 100644 --- a/Assets/Scenes/DevRoom.unity +++ b/Assets/Scenes/DevRoom.unity @@ -214,140 +214,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &84550111 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 84550112} - - component: {fileID: 84550114} - - component: {fileID: 84550113} - 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 &84550112 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 84550111} - 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: 1748560780} - 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: -1.52} - m_SizeDelta: {x: 2.5, y: 1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &84550113 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 84550111} - 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Defie les dieux en appuyant sur E - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 0.2 - m_fontSizeBase: 0.2 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - 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: 0 - 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 &84550114 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 84550111} - m_CullTransparentMesh: 1 --- !u!1 &183371195 GameObject: m_ObjectHideFlags: 0 @@ -771,140 +637,6 @@ Transform: - {fileID: 2019622585} m_Father: {fileID: 766254909} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1748560779 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1748560780} - - component: {fileID: 1748560783} - - component: {fileID: 1748560782} - - component: {fileID: 1748560781} - m_Layer: 0 - m_Name: InteractionCanvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1748560780 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748560779} - 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: 84550112} - m_Father: {fileID: 2078549730} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 3, y: 3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1748560781 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748560779} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1748560782 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748560779} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &1748560783 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748560779} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!1 &1969499950 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1969499951} - m_Layer: 0 - m_Name: RockPaperCissorItems - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1969499951 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969499950} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -292.80634, y: -70.754005, z: -0.04124558} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2078549730} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2019622584 GameObject: m_ObjectHideFlags: 0 @@ -2831,91 +2563,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &2078549729 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2078549730} - - component: {fileID: 2078549731} - m_Layer: 0 - m_Name: RockPaperCissorTotem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2078549730 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2078549729} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.8152466, y: -0.5319443, z: 0.04124558} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1748560780} - m_Father: {fileID: 1969499951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2078549731 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2078549729} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -2144107104, guid: 6b5121ab5b1f0fb409a4b44ff0047fc0, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.875, y: 2.0625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1001 &2794364920011803750 PrefabInstance: m_ObjectHideFlags: 0 @@ -3100,6 +2747,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 2234560506680264469, guid: e4326c266f4d3fc4482daabdf57ea4f3, type: 3} m_PrefabInstance: {fileID: 3307090927746267338} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4251475632408035025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1508629469759733934, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_Name + value: RockPaperCissor_prefab + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalPosition.x + value: -292.80634 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalPosition.y + value: -70.754005 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalPosition.z + value: -0.04124558 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 57cadef557163984ab89359d6a5c54af, type: 3} --- !u!1001 &4575848034203898725 PrefabInstance: m_ObjectHideFlags: 0 @@ -3281,7 +2985,7 @@ SceneRoots: - {fileID: 183371198} - {fileID: 3307090927746267338} - {fileID: 859053922} - - {fileID: 1969499951} + - {fileID: 4251475632408035025} - {fileID: 6821699788681146242} - {fileID: 7284937959160339071} - {fileID: 4575848034203898725} diff --git a/Assets/Scenes/EmptyRoom_2.unity b/Assets/Scenes/EmptyRoom_2.unity index 273857a5..e5f6abc2 100644 --- a/Assets/Scenes/EmptyRoom_2.unity +++ b/Assets/Scenes/EmptyRoom_2.unity @@ -227,22 +227,6 @@ PrefabInstance: propertyPath: m_Name value: RockPaperCissorGame objectReference: {fileID: 0} - - target: {fileID: 7792937700425213044, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8054260996891625916, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - propertyPath: canvas - value: - objectReference: {fileID: 1122242797} - - target: {fileID: 8054260996891625916, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - propertyPath: resultsText - value: - objectReference: {fileID: 1122242798} - - target: {fileID: 8054260996891625916, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - propertyPath: resultsCanvas - value: - objectReference: {fileID: 2133814281} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -253,17 +237,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1151693853599494121, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} m_PrefabInstance: {fileID: 1122242796} m_PrefabAsset: {fileID: 0} ---- !u!114 &1122242798 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5551857545691184436, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - m_PrefabInstance: {fileID: 1122242796} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1219144881 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5281155380993205454, guid: b95a2840877394746b9c857ec618031d, type: 3} @@ -751,6 +724,71 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3} +--- !u!1001 &1996324785 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1508629469759733934, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_Name + value: RockPaperCissor_prefab + objectReference: {fileID: 0} + - target: {fileID: 4170502206729879107, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalPosition.x + value: 4.4 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalPosition.y + value: 3.4106054 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalPosition.z + value: -0.04124558 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5699639488801851422, guid: 57cadef557163984ab89359d6a5c54af, type: 3} + propertyPath: RPSCanvas + value: + objectReference: {fileID: 1122242797} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 57cadef557163984ab89359d6a5c54af, type: 3} --- !u!1 &2035874648 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1463738777561398421, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} @@ -828,11 +866,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 983807671} m_SourcePrefab: {fileID: 100100000, guid: 9e9537c65eb0dd649899a676ec5b08c5, type: 3} ---- !u!1 &2133814281 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7338181117485925036, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - m_PrefabInstance: {fileID: 1122242796} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3639548686512757813 PrefabInstance: m_ObjectHideFlags: 0 @@ -1178,3 +1211,4 @@ SceneRoots: - {fileID: 1122242796} - {fileID: 5614575254252139880} - {fileID: 8578007543275711687} + - {fileID: 1996324785} diff --git a/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs b/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs new file mode 100644 index 00000000..f4370a9a --- /dev/null +++ b/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs @@ -0,0 +1,67 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using SocketIOClient; + +public class EmitRPS : InteractableObject +{ + public GameObject interactionCanvas; + public GameObject RPSCanvas; + private bool isPlayerNearby = false; + private SocketIOUnity clientSocket; + + // Start is called before the first frame update + void Start() + { + clientSocket = SocketManager.Instance.ClientSocket; + interactionCanvas.SetActive(false); + } + + // Update is called once per frame + void Update() + { + if (isPlayerNearby && Input.GetKeyDown(KeyCode.E)) + { + Interact(FindObjectOfType()); + } + } + + public override void Interact(Player player) + { + Debug.Log("TAMEREss"); + RPSCanvas.SetActive(true); + clientSocket.Emit("rps:start"); + } + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.CompareTag("Player")) + { + interactionCanvas.SetActive(true); + isPlayerNearby = true; + } + } + + private void OnTriggerExit2D(Collider2D collision) + { + if (collision.CompareTag("Player")) + { + interactionCanvas.SetActive(false); + isPlayerNearby = false; + + } + } + + + public override void SaveState(GameData gameData) + { + + } + + + public override void RestoreState(GameData gameData) + { + + } + +} diff --git a/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs.meta b/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs.meta new file mode 100644 index 00000000..39bb7411 --- /dev/null +++ b/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2e245bc39857c9241ab777f9ef7d40df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From fd92944b79b50e12e70b1554c1fd7cd39752c4de Mon Sep 17 00:00:00 2001 From: Thomas Lamiable Date: Mon, 28 Oct 2024 15:54:38 +0100 Subject: [PATCH 2/2] feat: add RockPaperCissor System --- .../RoomSystem/Corridor/CorridorX7.prefab | 32 ++++++++ .../RPS/RockPaperCissor_prefab.prefab | 10 +-- Assets/Scenes/EmptyRoom_2.unity | 76 ++----------------- .../Camera Control/RenderCameraCapture.cs | 4 +- Assets/Scripts/GameTracker.cs | 24 +++++- .../Scripts/Map Control/RoomSystem/EmitRPS.cs | 7 +- ProjectSettings/TagManager.asset | 1 + 7 files changed, 71 insertions(+), 83 deletions(-) diff --git a/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab b/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab index df28d09f..17fd7992 100644 --- a/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab +++ b/Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab @@ -631,6 +631,37 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 +--- !u!1 &4876044137556993897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3547825846127298904} + m_Layer: 0 + m_Name: RPSSpawnPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &3547825846127298904 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4876044137556993897} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.63, y: -0.83, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3022020511561805294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6168419598805709018 GameObject: m_ObjectHideFlags: 0 @@ -1538,6 +1569,7 @@ Transform: - {fileID: 6485059341568045904} - {fileID: 1238582843666978988} - {fileID: 4510731604005238534} + - {fileID: 3547825846127298904} - {fileID: 8320606197561170021} - {fileID: 417082257302647601} m_Father: {fileID: 0} diff --git a/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab index 07e37105..4b7ebab3 100644 --- a/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab +++ b/Assets/Prefabs/RoomSystem/CorridorEvent/RPS/RockPaperCissor_prefab.prefab @@ -161,7 +161,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -292.80634, y: -70.754005, z: -0.04124558} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4952390202131381893} @@ -267,7 +267,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -285,9 +285,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: -1791178601 + m_SortingLayer: 4 + m_SortingOrder: 2 m_Sprite: {fileID: -2144107104, guid: 6b5121ab5b1f0fb409a4b44ff0047fc0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Scenes/EmptyRoom_2.unity b/Assets/Scenes/EmptyRoom_2.unity index e5f6abc2..f7d51629 100644 --- a/Assets/Scenes/EmptyRoom_2.unity +++ b/Assets/Scenes/EmptyRoom_2.unity @@ -170,6 +170,7 @@ MonoBehaviour: stageText: {fileID: 1219144881} blacksmithPrefab: {fileID: 181369798890271941, guid: e4326c266f4d3fc4482daabdf57ea4f3, type: 3} altarPrefab: {fileID: 4671168421616932687, guid: 52d0b7df8b3db394988157e997abbc1f, type: 3} + RPSPrefab: {fileID: 1508629469759733934, guid: 57cadef557163984ab89359d6a5c54af, type: 3} waitingRoomPrefab: {fileID: 6577988205983815687, guid: 56b8e144977b94114b4eb95ac32bfe84, type: 3} --- !u!1001 &1122242796 PrefabInstance: @@ -183,6 +184,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1151693853599494121, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} + propertyPath: m_TagString + value: RPSTag + objectReference: {fileID: 0} - target: {fileID: 4239213568335062079, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} propertyPath: m_LocalPosition.x value: 503.8351 @@ -232,11 +237,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} ---- !u!1 &1122242797 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1151693853599494121, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - m_PrefabInstance: {fileID: 1122242796} - m_PrefabAsset: {fileID: 0} --- !u!114 &1219144881 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5281155380993205454, guid: b95a2840877394746b9c857ec618031d, type: 3} @@ -724,71 +724,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3} ---- !u!1001 &1996324785 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1508629469759733934, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_Name - value: RockPaperCissor_prefab - objectReference: {fileID: 0} - - target: {fileID: 4170502206729879107, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalPosition.x - value: 4.4 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalPosition.y - value: 3.4106054 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalPosition.z - value: -0.04124558 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4844190162371704201, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5699639488801851422, guid: 57cadef557163984ab89359d6a5c54af, type: 3} - propertyPath: RPSCanvas - value: - objectReference: {fileID: 1122242797} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 57cadef557163984ab89359d6a5c54af, type: 3} --- !u!1 &2035874648 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1463738777561398421, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} @@ -1211,4 +1146,3 @@ SceneRoots: - {fileID: 1122242796} - {fileID: 5614575254252139880} - {fileID: 8578007543275711687} - - {fileID: 1996324785} diff --git a/Assets/Scripts/Camera Control/RenderCameraCapture.cs b/Assets/Scripts/Camera Control/RenderCameraCapture.cs index d52afde6..75bf4156 100644 --- a/Assets/Scripts/Camera Control/RenderCameraCapture.cs +++ b/Assets/Scripts/Camera Control/RenderCameraCapture.cs @@ -9,7 +9,7 @@ public class RenderCameraCapture : MonoBehaviour private RenderTexture renderTexture; private Texture2D texture; private float timeSinceLastCapture = 0f; - private float captureInterval = 0.0166f; + private float captureInterval = 0.0416f; static ulong frameIndex = 0; private SocketIO socket; @@ -54,7 +54,7 @@ async void SendFrameToSocketIO() { if (socket != null && socket.Connected) { - byte[] imageBytes = texture.EncodeToJPG(); + byte[] imageBytes = texture.EncodeToJPG(25); string base64Image = System.Convert.ToBase64String(imageBytes); await socket.EmitAsync("camera:request", base64Image); } diff --git a/Assets/Scripts/GameTracker.cs b/Assets/Scripts/GameTracker.cs index c6312155..ad2e8cf3 100644 --- a/Assets/Scripts/GameTracker.cs +++ b/Assets/Scripts/GameTracker.cs @@ -18,6 +18,7 @@ public class GameTracker : MonoBehaviour // Prefabs des événements (forgeron et autel) public GameObject blacksmithPrefab; public GameObject altarPrefab; + public GameObject RPSPrefab; public GameObject waitingRoomPrefab; @@ -25,9 +26,12 @@ public class GameTracker : MonoBehaviour private Transform blacksmithSpawnPoint; private Transform altarSpawnPoint; + private Transform RPSSpawnPoint; + // Références vers les instances actuelles du forgeron et de l'autel private GameObject currentBlacksmith; private GameObject currentAltar; + private GameObject currentRPS; private GameObject waitingRoom; @@ -70,15 +74,15 @@ public void SpawnCorridorEvents() { altarSpawnPoint = GameObject.Find("AltarSpawnPoint")?.transform; blacksmithSpawnPoint = GameObject.Find("BlacksmithSpawnPoint")?.transform; + RPSSpawnPoint = GameObject.Find("RPSSpawnPoint")?.transform; + - if (blacksmithSpawnPoint == null || altarSpawnPoint == null) + if (blacksmithSpawnPoint == null || altarSpawnPoint == null || RPSSpawnPoint == null) { - return; } - // Apparition du forgeron au stage 5 if (stageCounter >= 5 && blacksmithPrefab != null) { @@ -86,8 +90,14 @@ public void SpawnCorridorEvents() UnityEngine.Debug.Log("Forgeron spawné au stage 5."); } + if (stageCounter >= 3 && RPSPrefab != null) + { + currentRPS = Instantiate(RPSPrefab, RPSSpawnPoint.position, Quaternion.identity); + UnityEngine.Debug.Log("COUCOU PAPA"); + } + // Apparition de l'autel au stage 10, et réinitialisation de ses objets - if (stageCounter >= 10 && altarPrefab != null) + if (stageCounter >= 15 && altarPrefab != null) { currentAltar = Instantiate(altarPrefab, altarSpawnPoint.position, Quaternion.identity); UnityEngine.Debug.Log("Autel spawné au stage 10."); @@ -112,5 +122,11 @@ public void ClearCorridorEvents() Destroy(currentAltar); currentAltar = null; } + + if (currentRPS != null) + { + Destroy(currentRPS); + currentRPS = null; + } } } diff --git a/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs b/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs index f4370a9a..eafb8bbf 100644 --- a/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs +++ b/Assets/Scripts/Map Control/RoomSystem/EmitRPS.cs @@ -13,6 +13,12 @@ public class EmitRPS : InteractableObject // Start is called before the first frame update void Start() { + GameObject parent = GameObject.Find("RockPaperCissorGame"); + if (parent != null) + { + // Recherche l'enfant RockPaperCissor à partir du parent + RPSCanvas = parent.transform.Find("RockPaperCissor")?.gameObject; + } clientSocket = SocketManager.Instance.ClientSocket; interactionCanvas.SetActive(false); } @@ -28,7 +34,6 @@ void Update() public override void Interact(Player player) { - Debug.Log("TAMEREss"); RPSCanvas.SetActive(true); clientSocket.Emit("rps:start"); } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6c9ff4ac..403b2007 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,6 +13,7 @@ TagManager: - Temporary - SpawnPoint - Door + - RPSTag layers: - Default - TransparentFX