From b22b7ecde3046d5de5c6d7343cb490e99ca8360b Mon Sep 17 00:00:00 2001 From: EshanJayasundara Date: Sun, 28 Jan 2024 23:57:21 +0530 Subject: [PATCH 1/4] added gun id field to player registration --- AR Demo/Assets/Scenes/LoadMap.unity | 1152 ++---------- AR Demo/Assets/Scenes/Login.unity | 15 +- AR Demo/Assets/Scenes/Register.unity | 1667 ++++++++++++++++- AR Demo/Assets/Scripts/ARCameraDisplay.cs | 14 +- AR Demo/Assets/Scripts/DirectCamera.cs | 39 + AR Demo/Assets/Scripts/DirectCamera.cs.meta | 11 + AR Demo/Assets/Scripts/HealthController.cs | 16 +- AR Demo/Assets/Scripts/RegisterPlayer.cs | 7 +- AR Demo/Assets/Scripts/WebSocketController.cs | 14 +- .../LiberationSans SDF - Fallback.asset | 564 +----- .../XR/XRGeneralSettingsPerBuildTarget.asset | 48 + ...XRGeneralSettingsPerBuildTarget.asset.meta | 8 + AR Demo/Packages/manifest.json | 2 +- AR Demo/Packages/packages-lock.json | 2 +- .../AndroidResolverDependencies.xml | 57 + 15 files changed, 1990 insertions(+), 1626 deletions(-) create mode 100644 AR Demo/Assets/Scripts/DirectCamera.cs create mode 100644 AR Demo/Assets/Scripts/DirectCamera.cs.meta create mode 100644 AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset create mode 100644 AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta create mode 100644 AR Demo/ProjectSettings/AndroidResolverDependencies.xml diff --git a/AR Demo/Assets/Scenes/LoadMap.unity b/AR Demo/Assets/Scenes/LoadMap.unity index f418f578..5556c4a5 100644 --- a/AR Demo/Assets/Scenes/LoadMap.unity +++ b/AR Demo/Assets/Scenes/LoadMap.unity @@ -291,7 +291,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 823, y: 306} + m_AnchoredPosition: {x: 792.0596, y: 305.99997} m_SizeDelta: {x: 720, y: 50} m_Pivot: {x: 1, y: 1} --- !u!114 &7343741 @@ -465,186 +465,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 41545351} m_CullTransparentMesh: 0 ---- !u!1 &88658945 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 88658946} - - component: {fileID: 88658947} - - component: {fileID: 88658948} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &88658946 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88658945} - 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: 557033159} - 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: -491.00003, y: 380.99997} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &88658947 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88658945} - m_CullTransparentMesh: 1 ---- !u!114 &88658948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88658945} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 26 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 63 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: New Text ---- !u!1 &89891843 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 89891844} - - component: {fileID: 89891845} - m_Layer: 5 - m_Name: HealthBar (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &89891844 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89891843} - 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: 1860196421} - - {fileID: 653674074} - m_Father: {fileID: 557033159} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -181, y: 306} - m_SizeDelta: {x: 720, y: 50} - m_Pivot: {x: 1, y: 1} ---- !u!114 &89891845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89891843} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 1 - 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.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 905584882} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 89891845} - m_TargetAssemblyTypeName: UnityEngine.UI.Slider, UnityEngine.UI - m_MethodName: set_value - m_Mode: 0 - 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!1 &96786500 GameObject: m_ObjectHideFlags: 0 @@ -1442,7 +1262,7 @@ RectTransform: m_Father: {fileID: 1229399953} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1646,12 +1466,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b128226ef7bb4a479014d3841883e02, type: 3} m_Name: m_EditorClassIdentifier: - scoreText: {fileID: 0} - scoreText2: {fileID: 0} - healthBar: {fileID: 0} - healthBar2: {fileID: 0} - shootButton: {fileID: 0} - shootButton2: {fileID: 0} + scoreText: {fileID: 1004700075} + healthBar: {fileID: 7343741} + shootButton: {fileID: 1911649515} score: 0 health: 1 --- !u!4 &295199176 @@ -1856,15 +1673,15 @@ RectTransform: m_GameObject: {fileID: 327892878} 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_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1495200938} 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.000061035, y: -0.27189} - m_SizeDelta: {x: 1920, y: 885.61} + m_AnchoredPosition: {x: -479.99997, y: -0.88705} + m_SizeDelta: {x: 1920, y: 1768.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &327892880 MonoBehaviour: @@ -2337,7 +2154,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 456258764} m_CullTransparentMesh: 0 ---- !u!1 &465206407 +--- !u!1 &465413872 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2345,204 +2162,71 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 465206408} - - component: {fileID: 465206411} - - component: {fileID: 465206410} - - component: {fileID: 465206409} + - component: {fileID: 465413873} + - component: {fileID: 465413876} + - component: {fileID: 465413875} + - component: {fileID: 465413874} + - component: {fileID: 465413877} m_Layer: 5 - m_Name: Shoot (1) + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &465206408 +--- !u!224 &465413873 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465206407} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 465413872} + 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_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 853819241} - m_Father: {fileID: 557033159} + - {fileID: 773448184} + - {fileID: 1597518527} + - {fileID: 1592774299} + - {fileID: 1135502108} + - {fileID: 1822497691} + - {fileID: 1820105218} + - {fileID: 557033159} + m_Father: {fileID: 0} 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: -210.99994, y: -304} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &465206409 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &465413874 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465206407} + m_GameObject: {fileID: 465413872} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, 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: 1 - 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.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 465206410} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 481558931} - m_TargetAssemblyTypeName: Screenshot, Assembly-CSharp - m_MethodName: TakeScreenshot - 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 &465206410 + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &465413875 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465206407} + m_GameObject: {fileID: 465413872} 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: 1, g: 0.99286944, b: 0.2320754, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &465206411 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465206407} - m_CullTransparentMesh: 1 ---- !u!1 &465413872 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 465413873} - - component: {fileID: 465413876} - - component: {fileID: 465413875} - - component: {fileID: 465413874} - - component: {fileID: 465413877} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &465413873 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465413872} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 773448184} - - {fileID: 1597518527} - - {fileID: 1592774299} - - {fileID: 1135502108} - - {fileID: 1822497691} - - {fileID: 1820105218} - - {fileID: 557033159} - m_Father: {fileID: 0} - 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: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &465413874 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465413872} - 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 &465413875 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465413872} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -2591,14 +2275,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 713d5a375bdee8448a0ba0dac4c8c0ff, type: 3} m_Name: m_EditorClassIdentifier: - healthSlider: {fileID: 0} - healthSlider2: {fileID: 0} - redSplatter: {fileID: 0} - redSplatter2: {fileID: 0} - whiteGradient: {fileID: 0} + healthSlider: {fileID: 7343741} + redSplatter: {fileID: 817678451} + redSplatter2: {fileID: 1631777267} + whiteGradient: {fileID: 1077349442} whiteGradient2: {fileID: 1320087751} - gameOverText: {fileID: 0} - gameOverText2: {fileID: 0} + gameOverText: {fileID: 1397496993} maxHealth: 1 minHealth: 0 --- !u!1 &465591900 @@ -3573,7 +3255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &557033159 RectTransform: m_ObjectHideFlags: 0 @@ -3591,16 +3273,11 @@ RectTransform: - {fileID: 1631777266} - {fileID: 1077349441} - {fileID: 7343740} - - {fileID: 89891844} - {fileID: 1397496992} - - {fileID: 716231011} - {fileID: 1911649514} - - {fileID: 465206408} - {fileID: 898818466} - - {fileID: 88658946} - {fileID: 1004700073} - {fileID: 1472792109} - - {fileID: 1025985656} m_Father: {fileID: 465413873} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3851,42 +3528,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b49c9ad93ed964dbf9a8f8e4a7404422, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &653674073 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 653674074} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &653674074 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 653674073} - 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: 905584882} - m_Father: {fileID: 89891844} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &701676088 GameObject: m_ObjectHideFlags: 0 @@ -4045,140 +3686,6 @@ MonoBehaviour: m_CaretWidth: 1 m_ReadOnly: 0 m_ShouldActivateOnSelect: 1 ---- !u!1 &716231010 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 716231011} - - component: {fileID: 716231013} - - component: {fileID: 716231012} - m_Layer: 5 - m_Name: GameOver (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &716231011 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 716231010} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4.02, y: 4.02, z: 4.02} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 557033159} - 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: 507, y: 0.000061035} - m_SizeDelta: {x: 107.5648, y: 87.1505} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &716231012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 716231010} - 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: GAME OVER - 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: 36 - m_fontSizeBase: 36 - 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 &716231013 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 716231010} - m_CullTransparentMesh: 1 --- !u!1 &741365218 GameObject: m_ObjectHideFlags: 0 @@ -4351,7 +3858,7 @@ MonoBehaviour: ResolveMenu: {fileID: 1135502107} PrivacyPrompt: {fileID: 1592774298} ARView: {fileID: 773448182} - GameScreen: {fileID: 0} + GameScreen: {fileID: 557033158} Mode: 0 --- !u!4 &768157053 Transform: @@ -4589,7 +4096,7 @@ MonoBehaviour: DebugText: {fileID: 1918516692} SaveButton: {fileID: 2100399337} ShareButton: {fileID: 288205550} - GameScreen: {fileID: 0} + GameScreen: {fileID: 557033158} cloudAnchor: {fileID: 0} --- !u!224 &773448184 RectTransform: @@ -4821,140 +4328,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 821660042} m_CullTransparentMesh: 0 ---- !u!1 &853819240 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 853819241} - - component: {fileID: 853819243} - - component: {fileID: 853819242} - 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 &853819241 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853819240} - 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: 465206408} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &853819242 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853819240} - 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: Shoot - 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: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 - m_fontSizeBase: 24 - 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: 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 &853819243 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853819240} - m_CullTransparentMesh: 1 --- !u!1 &857380705 GameObject: m_ObjectHideFlags: 0 @@ -5191,128 +4564,53 @@ MonoBehaviour: rgba: 4294967295 m_fontSize: 36 m_fontSizeBase: 36 - 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: -3.186371, 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 &898818468 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 898818465} - m_CullTransparentMesh: 1 ---- !u!1 &905584881 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 905584882} - - component: {fileID: 905584884} - - component: {fileID: 905584883} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &905584882 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 905584881} - 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: 653674074} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &905584883 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 905584881} - 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, g: 1, b: 0.21668553, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &905584884 + 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: -3.186371, 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 &898818468 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 905584881} + m_GameObject: {fileID: 898818465} m_CullTransparentMesh: 1 --- !u!1 &949141737 GameObject: @@ -5560,7 +4858,7 @@ RectTransform: 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: 517.7, y: 380.99997} + m_AnchoredPosition: {x: 500, y: 380.99997} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1004700074 @@ -5965,95 +5263,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1021101043} m_CullTransparentMesh: 1 ---- !u!1001 &1025985655 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 557033159} - m_Modifications: - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalScale.x - value: 57.697052 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalScale.y - value: 57.697033 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalScale.z - value: 57.69706 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalPosition.x - value: -532 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalPosition.y - value: -341 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalPosition.z - value: -87 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.702885 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.043662585 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.70864004 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.043307986 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -90.467 - objectReference: {fileID: 0} - - target: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 7.052 - objectReference: {fileID: 0} - - target: {fileID: 7499290253986968200, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - propertyPath: m_Name - value: assault1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0057024d28b626949aa4cf22993d5f69, type: 3} ---- !u!4 &1025985656 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7158757945973499954, guid: 0057024d28b626949aa4cf22993d5f69, - type: 3} - m_PrefabInstance: {fileID: 1025985655} - m_PrefabAsset: {fileID: 0} --- !u!1 &1038033090 GameObject: m_ObjectHideFlags: 0 @@ -6410,7 +5619,7 @@ MonoBehaviour: InvalidInputWarning: {fileID: 1468836959} ResolveButton: {fileID: 144399442} joinGame: {fileID: 1135502110} - Screen: {fileID: 0} + Screen: {fileID: 557033158} --- !u!114 &1135502110 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6591,15 +5800,15 @@ RectTransform: m_GameObject: {fileID: 1185346957} 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_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1495200938} 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: 960, y: -0.27187} - m_SizeDelta: {x: 1920, y: 885.61} + m_AnchoredPosition: {x: 480.00003, y: -2.6871} + m_SizeDelta: {x: 1920, y: 1772.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1185346959 MonoBehaviour: @@ -7340,7 +6549,7 @@ MonoBehaviour: barrier: {fileID: 8832571488534695039, guid: 069d7d99be79f504d935f4b9608ed752, type: 3} vehicle: {fileID: 8832571488534695039, guid: b81ad1185b0ca564381fd18dadcddb0e, type: 3} sandbag: {fileID: 8832571488534695039, guid: 4fa322875b6dcf34c95067bf11c0778e, type: 3} - arCamera: {fileID: 0} + arCamera: {fileID: 525964292} moveButtonText: {fileID: 245694189} deleteButtonText: {fileID: 245694189} --- !u!4 &1376311554 @@ -7392,7 +6601,7 @@ RectTransform: 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: -491, y: 0.000061035} + m_AnchoredPosition: {x: 500, y: -0.00091934} m_SizeDelta: {x: 107.5648, y: 87.1505} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1397496993 @@ -8111,7 +7320,6 @@ RectTransform: m_Children: - {fileID: 327892879} - {fileID: 1185346958} - - {fileID: 1503476280} - {fileID: 1634432967} - {fileID: 556394495} m_Father: {fileID: 557033159} @@ -8159,81 +7367,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495200937} m_CullTransparentMesh: 1 ---- !u!1 &1503476279 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1503476280} - - component: {fileID: 1503476282} - - component: {fileID: 1503476281} - m_Layer: 5 - m_Name: Crosshair1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1503476280 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503476279} - 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: 1495200938} - 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: -498, y: 0.27186} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1503476281 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503476279} - 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: 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_Sprite: {fileID: 21300000, guid: e247824cbf3e1284e85b01e2ec6121c7, 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 &1503476282 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503476279} - m_CullTransparentMesh: 1 --- !u!1 &1503625668 GameObject: m_ObjectHideFlags: 0 @@ -9018,7 +8151,7 @@ RectTransform: 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: 511, y: 0.27189} + m_AnchoredPosition: {x: 500, y: 0.27189} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1634432968 @@ -9900,81 +9033,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1860196420 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1860196421} - - component: {fileID: 1860196423} - - component: {fileID: 1860196422} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1860196421 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1860196420} - 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: 89891844} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1860196422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1860196420} - 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: 1, g: 0, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &1860196423 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1860196420} - m_CullTransparentMesh: 1 --- !u!1 &1878835088 GameObject: m_ObjectHideFlags: 0 @@ -10135,7 +9193,7 @@ RectTransform: 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: 793, y: -304} + m_AnchoredPosition: {x: 802.16797, y: -304} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1911649515 @@ -10399,7 +9457,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -90, y: 0} + m_AnchoredPosition: {x: -89.99988, y: 0} m_SizeDelta: {x: -220, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1918516691 diff --git a/AR Demo/Assets/Scenes/Login.unity b/AR Demo/Assets/Scenes/Login.unity index 9a666ab0..7472a3bd 100644 --- a/AR Demo/Assets/Scenes/Login.unity +++ b/AR Demo/Assets/Scenes/Login.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44612712, g: 0.49549305, b: 0.57307076, a: 1} + m_IndirectSpecularColor: {r: 0.44871938, g: 0.49877524, b: 0.5756833, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1332,15 +1332,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, 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: 219ab0d4a23f58445b4c26422134facd, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2099,15 +2099,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, 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: 219ab0d4a23f58445b4c26422134facd, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2285,7 +2285,6 @@ MonoBehaviour: username: {fileID: 1790214679} password: {fileID: 809858699} textBox: {fileID: 416825313} - displayName: --- !u!114 &1995738619 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/AR Demo/Assets/Scenes/Register.unity b/AR Demo/Assets/Scenes/Register.unity index 6f25dd10..17b9a641 100644 --- a/AR Demo/Assets/Scenes/Register.unity +++ b/AR Demo/Assets/Scenes/Register.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44402185, g: 0.49316472, b: 0.57223153, a: 1} + m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -157,7 +157,7 @@ RectTransform: 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: 172.24443, y: -196.8508} + m_AnchoredPosition: {x: 176.51, y: -237.58} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &40101430 @@ -293,7 +293,7 @@ RectTransform: 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: 172.24443, y: -254.2656} + m_AnchoredPosition: {x: 176.50998, y: -287.78683} m_SizeDelta: {x: 154, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &64725546 @@ -517,6 +517,161 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} +--- !u!1 &141356938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 141356942} + - component: {fileID: 141356941} + - component: {fileID: 141356939} + - component: {fileID: 141356940} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &141356939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141356938} + 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: Enter text... + 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: 2150773298 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + 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: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + 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!114 &141356940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141356938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &141356941 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141356938} + m_CullTransparentMesh: 1 +--- !u!224 &141356942 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141356938} + 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: 1168808749} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &260662769 GameObject: m_ObjectHideFlags: 0 @@ -611,6 +766,140 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &452614550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 452614551} + - component: {fileID: 452614553} + - component: {fileID: 452614552} + m_Layer: 5 + m_Name: RetypepswdText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &452614551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452614550} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1590288274} + 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: -157.103, y: 3.837158} + m_SizeDelta: {x: 354.222, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &452614552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452614550} + 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: Re-Type Password + 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: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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 &452614553 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452614550} + m_CullTransparentMesh: 1 --- !u!1 &577752939 GameObject: m_ObjectHideFlags: 0 @@ -647,7 +936,7 @@ RectTransform: 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: 16.404234, y: 102.52645} + m_AnchoredPosition: {x: 23.022945, y: 203.36937} m_SizeDelta: {x: 572, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &577752941 @@ -761,15 +1050,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, 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: 219ab0d4a23f58445b4c26422134facd, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -822,7 +1111,7 @@ RectTransform: 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: -143.53703, y: -254.2656} + m_AnchoredPosition: {x: -141.97484, y: -287.78683} m_SizeDelta: {x: 154, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &592904262 @@ -919,7 +1208,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 592904260} m_CullTransparentMesh: 1 ---- !u!1 &754059128 +--- !u!1 &595518412 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -927,7 +1216,471 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 754059129} + - component: {fileID: 595518413} + - component: {fileID: 595518416} + - component: {fileID: 595518415} + - component: {fileID: 595518414} + m_Layer: 5 + m_Name: Gunid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &595518413 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595518412} + 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: 1235085615} + m_Father: {fileID: 1590288274} + 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: 23.022947, y: -168.83495} + m_SizeDelta: {x: 572, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &595518414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595518412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, 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: 1 + 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.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 595518415} + m_TextViewport: {fileID: 1235085615} + m_TextComponent: {fileID: 1854206381} + m_Placeholder: {fileID: 645542663} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} +--- !u!114 &595518415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595518412} + 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, g: 0, 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: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &595518416 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595518412} + m_CullTransparentMesh: 1 +--- !u!1 &628706867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 628706868} + - component: {fileID: 628706870} + - component: {fileID: 628706869} + m_Layer: 5 + m_Name: PasswordTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &628706868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628706867} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1590288274} + 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: -203.36937, y: 122.789055} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &628706869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628706867} + 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: Password + 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: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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 &628706870 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628706867} + m_CullTransparentMesh: 1 +--- !u!1 &645542660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 645542661} + - component: {fileID: 645542664} + - component: {fileID: 645542663} + - component: {fileID: 645542662} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &645542661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645542660} + 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: 1235085615} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &645542662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645542660} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &645542663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645542660} + 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: gun id + 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: 2164260863 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.5} + 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + m_HorizontalAlignment: 1 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + 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 &645542664 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645542660} + m_CullTransparentMesh: 1 +--- !u!1 &754059128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 754059129} - component: {fileID: 754059131} - component: {fileID: 754059130} m_Layer: 5 @@ -1121,6 +1874,140 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &882623051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 882623052} + - component: {fileID: 882623054} + - component: {fileID: 882623053} + m_Layer: 5 + m_Name: UsernameTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &882623052 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 882623051} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1590288274} + 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: -203.36937, y: 253.25243} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.6, y: 0.5} +--- !u!114 &882623053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 882623051} + 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: Username + 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: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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 &882623054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 882623051} + m_CullTransparentMesh: 1 --- !u!1 &932113783 GameObject: m_ObjectHideFlags: 0 @@ -1289,8 +2176,8 @@ RectTransform: 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: 134.69603, y: -155.10452} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 145, y: -178} + m_SizeDelta: {x: 1441.8, y: 739.614} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &966901051 GameObject: @@ -1533,8 +2420,8 @@ RectTransform: 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: 18, y: -8} - m_SizeDelta: {x: 745, y: 645} + m_AnchoredPosition: {x: 22.264845, y: 22.613} + m_SizeDelta: {x: 745, y: 791.479} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1006580804 MonoBehaviour: @@ -1840,9 +2727,195 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1088801186} - m_CullTransparentMesh: 1 ---- !u!1 &1115248840 + m_GameObject: {fileID: 1088801186} + m_CullTransparentMesh: 1 +--- !u!1 &1115248840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115248841} + - component: {fileID: 1115248843} + - component: {fileID: 1115248842} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1115248841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115248840} + 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: 966901052} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1115248842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115248840} + 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: "\u200B" + 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + 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 &1115248843 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115248840} + m_CullTransparentMesh: 1 +--- !u!1 &1168808748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1168808749} + - component: {fileID: 1168808750} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1168808749 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168808748} + 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: 141356942} + - {fileID: 1316894805} + m_Father: {fileID: 1413256306} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1168808750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168808748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} +--- !u!1 &1235085614 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1850,42 +2923,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1115248841} - - component: {fileID: 1115248843} - - component: {fileID: 1115248842} + - component: {fileID: 1235085615} + - component: {fileID: 1235085616} m_Layer: 5 - m_Name: Text + m_Name: Text Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1115248841 +--- !u!224 &1235085615 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115248840} + m_GameObject: {fileID: 1235085614} 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: 966901052} + m_Children: + - {fileID: 645542661} + - {fileID: 1854206380} + m_Father: {fileID: 595518413} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1115248842 +--- !u!114 &1235085616 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115248840} + m_GameObject: {fileID: 1235085614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} +--- !u!1 &1316894802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1316894805} + - component: {fileID: 1316894804} + - component: {fileID: 1316894803} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1316894803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1316894802} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1908,8 +3014,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1926,15 +3032,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1968,14 +3074,33 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1115248843 +--- !u!222 &1316894804 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1115248840} + m_GameObject: {fileID: 1316894802} m_CullTransparentMesh: 1 +--- !u!224 &1316894805 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1316894802} + 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: 1168808749} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1382593287 GameObject: m_ObjectHideFlags: 0 @@ -2012,7 +3137,7 @@ RectTransform: 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: 16.404232, y: -131.23386} + m_AnchoredPosition: {x: 20.669006, y: -44} m_SizeDelta: {x: 572, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1382593289 @@ -2126,15 +3251,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, 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: 219ab0d4a23f58445b4c26422134facd, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2149,8 +3274,183 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1382593287} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 1382593287} + m_CullTransparentMesh: 1 +--- !u!1 &1413256302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1413256306} + - component: {fileID: 1413256305} + - component: {fileID: 1413256304} + - component: {fileID: 1413256303} + m_Layer: 5 + m_Name: InputField (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1413256303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413256302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, 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: 1 + 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.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1413256304} + m_TextViewport: {fileID: 1168808749} + m_TextComponent: {fileID: 1316894803} + m_Placeholder: {fileID: 141356939} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} +--- !u!114 &1413256304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413256302} + 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: 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_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1413256305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413256302} + m_CullTransparentMesh: 1 +--- !u!224 &1413256306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1413256302} + 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: 1168808749} + m_Father: {fileID: 0} + 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: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1590288270 GameObject: m_ObjectHideFlags: 0 @@ -2251,9 +3551,14 @@ RectTransform: - {fileID: 577752940} - {fileID: 1803764258} - {fileID: 1382593288} + - {fileID: 595518413} - {fileID: 592904261} - {fileID: 64725545} - {fileID: 959857835} + - {fileID: 882623052} + - {fileID: 628706868} + - {fileID: 452614551} + - {fileID: 1971714068} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2431,7 +3736,7 @@ RectTransform: 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: 16.404236, y: -14.353703} + m_AnchoredPosition: {x: 23.022945, y: 76.74316} m_SizeDelta: {x: 572, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1803764259 @@ -2545,15 +3850,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, 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: 219ab0d4a23f58445b4c26422134facd, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2645,6 +3950,274 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805297323} m_CullTransparentMesh: 1 +--- !u!1 &1854206379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1854206380} + - component: {fileID: 1854206382} + - component: {fileID: 1854206381} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1854206380 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854206379} + 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: 1235085615} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1854206381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854206379} + 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: "\u200B" + 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + 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 &1854206382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854206379} + m_CullTransparentMesh: 1 +--- !u!1 &1971714067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1971714068} + - component: {fileID: 1971714070} + - component: {fileID: 1971714069} + m_Layer: 5 + m_Name: GunidTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1971714068 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971714067} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1590288274} + 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: -157.32346, y: -122.789055} + m_SizeDelta: {x: 354.222, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1971714069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971714067} + 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: Gun id + 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: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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 &1971714070 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971714067} + m_CullTransparentMesh: 1 --- !u!1 &2030305849 GameObject: m_ObjectHideFlags: 0 @@ -3076,6 +4649,7 @@ MonoBehaviour: username: {fileID: 577752941} password: {fileID: 1803764259} re_password: {fileID: 1382593289} + gun_id: {fileID: 595518414} textBox: {fileID: 754059130} --- !u!1 &2086942241 GameObject: @@ -3137,3 +4711,4 @@ SceneRoots: - {fileID: 260662771} - {fileID: 1590288274} - {fileID: 758054890} + - {fileID: 1413256306} diff --git a/AR Demo/Assets/Scripts/ARCameraDisplay.cs b/AR Demo/Assets/Scripts/ARCameraDisplay.cs index f4243267..5cf913de 100644 --- a/AR Demo/Assets/Scripts/ARCameraDisplay.cs +++ b/AR Demo/Assets/Scripts/ARCameraDisplay.cs @@ -11,16 +11,24 @@ public class ARCameraDisplay : MonoBehaviour void Start() { - // Create or access the RenderTexture with the same dimensions as the screen - renderTexture = new RenderTexture(Screen.width, Screen.height, 24); + // Calculate the square dimensions for the RenderTexture + int size = Mathf.Min(Screen.width, Screen.height); + + // Create or access the RenderTexture with square dimensions + renderTexture = new RenderTexture(size, size, 24); // Set the target texture of the AR camera to the RenderTexture arCamera.targetTexture = renderTexture; - // Display the RenderTexture on the RawImage + // Display the RenderTexture on the RawImages rawImage1.texture = renderTexture; rawImage2.texture = renderTexture; + // Calculate the viewport rect for a square ratio + Rect viewportRect = new Rect(0f, 0f, 1f, 1f); + + // Apply the viewport rect to the AR camera + arCamera.rect = viewportRect; } void OnDestroy() diff --git a/AR Demo/Assets/Scripts/DirectCamera.cs b/AR Demo/Assets/Scripts/DirectCamera.cs new file mode 100644 index 00000000..f796175d --- /dev/null +++ b/AR Demo/Assets/Scripts/DirectCamera.cs @@ -0,0 +1,39 @@ +using UnityEngine; +using UnityEngine.UI; + +public class DirectCamera : MonoBehaviour +{ + public RawImage rawImage1; + public RawImage rawImage2; + private WebCamTexture webCamTexture; + + void Start() + { + // Check if the device has a camera + if (WebCamTexture.devices.Length == 0) + { + Debug.LogError("No camera detected on this device."); + return; + } + + // Get the default camera + WebCamDevice defaultCamera = WebCamTexture.devices[0]; + // Create a new WebCamTexture with default camera + webCamTexture = new WebCamTexture(defaultCamera.name, Screen.width, Screen.height, 30); + // Play the WebCamTexture + webCamTexture.Play(); + + // Assign the WebCamTexture to the RawImage + rawImage1.texture = webCamTexture; + rawImage2.texture = webCamTexture; + } + + void OnDestroy() + { + // Stop the WebCamTexture when the script is destroyed + if (webCamTexture != null) + { + webCamTexture.Stop(); + } + } +} diff --git a/AR Demo/Assets/Scripts/DirectCamera.cs.meta b/AR Demo/Assets/Scripts/DirectCamera.cs.meta new file mode 100644 index 00000000..c1b541ae --- /dev/null +++ b/AR Demo/Assets/Scripts/DirectCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 43c6616afc814834fbcc85b9bf1e6905 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AR Demo/Assets/Scripts/HealthController.cs b/AR Demo/Assets/Scripts/HealthController.cs index 8e6ecc01..567c30e5 100644 --- a/AR Demo/Assets/Scripts/HealthController.cs +++ b/AR Demo/Assets/Scripts/HealthController.cs @@ -4,10 +4,10 @@ public class HealthController : MonoBehaviour { - public Slider healthSlider, healthSlider2; + public Slider healthSlider; public Image redSplatter, redSplatter2; public Image whiteGradient, whiteGradient2; - public TMP_Text gameOverText, gameOverText2; + public TMP_Text gameOverText; [SerializeField] private float maxHealth = 1.0f; [SerializeField] private float minHealth = 0.0f; @@ -15,23 +15,23 @@ public class HealthController : MonoBehaviour private void Start() { healthSlider.maxValue = maxHealth; - healthSlider2.maxValue = maxHealth; + //healthSlider2.maxValue = maxHealth; healthSlider.value = maxHealth; - healthSlider2.value = maxHealth; + //healthSlider2.value = maxHealth; gameOverText.enabled = false; - gameOverText2.enabled = false; + //gameOverText2.enabled = false; } private void Update() { UpdateHealth(); - healthSlider.value = healthSlider2.value; + //healthSlider.value = healthSlider2.value; } private void UpdateHealth() { float currentHealth = healthSlider.value; - healthSlider2.value = healthSlider.value; + //healthSlider2.value = healthSlider.value; float normalizedHealth = Mathf.Clamp01((currentHealth - minHealth) / (maxHealth - minHealth)); // Calculate the opacity based on health @@ -51,7 +51,7 @@ private void UpdateHealth() if (currentHealth <= minHealth) { gameOverText.enabled = true; - gameOverText2.enabled = true; + //gameOverText2.enabled = true; } } diff --git a/AR Demo/Assets/Scripts/RegisterPlayer.cs b/AR Demo/Assets/Scripts/RegisterPlayer.cs index 390f0050..a3353255 100644 --- a/AR Demo/Assets/Scripts/RegisterPlayer.cs +++ b/AR Demo/Assets/Scripts/RegisterPlayer.cs @@ -9,6 +9,7 @@ public class RegisterPlayer : MonoBehaviour [SerializeField] private TMP_InputField username; [SerializeField] private TMP_InputField password; [SerializeField] private TMP_InputField re_password; + [SerializeField] private TMP_InputField gun_id; [SerializeField] private TMP_Text textBox; IEnumerator Notification(string text) @@ -31,8 +32,8 @@ IEnumerator PostRequest(string url, string jsonData) if (request.result != UnityWebRequest.Result.Success) { - // Debug.LogError("Error: " + request.error); - // Debug.LogError("Response code: " + request.responseCode); + Debug.LogError("Error: " + request.error); + Debug.LogError("Response code: " + request.responseCode); StartCoroutine(Notification("An error occurred")); } else @@ -50,7 +51,7 @@ public void Register() string jsonData = "{\"email\":\"" + username.text + "\",\"password\":\"" + password.text + - "\",\"gunid\":\"" + "gunid" + + "\",\"gunid\":\"" + gun_id.text + "\",\"gloveid\":\"" + "gloveid" + "\",\"headsetid\":\"" + "headsetid" + "\"}"; diff --git a/AR Demo/Assets/Scripts/WebSocketController.cs b/AR Demo/Assets/Scripts/WebSocketController.cs index 2826b162..0b4496c2 100644 --- a/AR Demo/Assets/Scripts/WebSocketController.cs +++ b/AR Demo/Assets/Scripts/WebSocketController.cs @@ -8,9 +8,9 @@ public class WebSocketController : MonoBehaviour { private WebSocket ws; - public Text scoreText, scoreText2; - public Slider healthBar, healthBar2; - public Button shootButton, shootButton2; + public Text scoreText; + public Slider healthBar; + public Button shootButton; public short score = 0; public float health = 1.0f; @@ -68,13 +68,13 @@ void OnDestroy() private void Update() { - healthBar2.value = health; + //healthBar2.value = health; healthBar.value = health; scoreText.text = "Score: " + (score); - scoreText2.text = "Score: " + (score); + //scoreText2.text = "Score: " + (score); - Debug.Log("Score2 : " + scoreText2.text); - Debug.Log("health2 : " + healthBar2.value); + //Debug.Log("Score2 : " + scoreText2.text); + //Debug.Log("health2 : " + healthBar2.value); } void OnShootButtonClick() { diff --git a/AR Demo/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/AR Demo/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 604f6e30..e907cc73 100644 --- a/AR Demo/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/AR Demo/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -2,24 +2,20 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2180264 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LiberationSans SDF Material m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] + m_ShaderKeywords: m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -71,7 +67,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Ambient: 0.5 - _Bevel: 0.5 @@ -112,9 +107,9 @@ Material: - _Parallax: 0.02 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.9 + - _ScaleRatioA: 0.90909094 - _ScaleRatioB: 0.73125 - - _ScaleRatioC: 0.73125 + - _ScaleRatioC: 0.7386364 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -153,7 +148,6 @@ Material: - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} - m_BuildTextureStacks: [] --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -176,12 +170,10 @@ MonoBehaviour: m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} m_AtlasPopulationMode: 1 m_FaceInfo: - m_FaceIndex: 0 m_FamilyName: Liberation Sans m_StyleName: Regular m_PointSize: 86 m_Scale: 1 - m_UnitsPerEM: 0 m_LineHeight: 98.8916 m_AscentLine: 77.853516 m_CapLine: 59 @@ -197,509 +189,70 @@ MonoBehaviour: m_StrikethroughOffset: 18 m_StrikethroughThickness: 6.298828 m_TabWidth: 24 - - m_GlyphTable: - - m_Index: 2030 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 66 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 49 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 72 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 90 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 3 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 48 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 68 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 83 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 47 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 82 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 71 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 45 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 76 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 81 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 42 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 80 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 93 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 91 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 70 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 89 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 69 - m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 0 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - m_CharacterTable: - - m_ElementType: 1 - m_Unicode: 8230 - m_GlyphIndex: 2030 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 95 - m_GlyphIndex: 66 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 78 - m_GlyphIndex: 49 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 101 - m_GlyphIndex: 72 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 119 - m_GlyphIndex: 90 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 32 - m_GlyphIndex: 3 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 77 - m_GlyphIndex: 48 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 97 - m_GlyphIndex: 68 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 112 - m_GlyphIndex: 83 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 76 - m_GlyphIndex: 47 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 111 - m_GlyphIndex: 82 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 100 - m_GlyphIndex: 71 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 74 - m_GlyphIndex: 45 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 105 - m_GlyphIndex: 76 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 110 - m_GlyphIndex: 81 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 71 - m_GlyphIndex: 42 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 109 - m_GlyphIndex: 80 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 122 - m_GlyphIndex: 93 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 120 - m_GlyphIndex: 91 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 99 - m_GlyphIndex: 70 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 118 - m_GlyphIndex: 89 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 98 - m_GlyphIndex: 69 - m_Scale: 1 - - + m_GlyphTable: [] + m_CharacterTable: [] m_AtlasTextures: - {fileID: 28268798066460806} m_AtlasTextureIndex: 0 m_IsMultiAtlasTexturesEnabled: 0 m_ClearDynamicDataOnBuild: 1 - m_UsedGlyphRects: + m_UsedGlyphRects: [] + m_FreeGlyphRects: - m_X: 0 m_Y: 0 - - - m_Width: 511 m_Height: 511 - m_fontInfo: - Name: - PointSize: 0 - Scale: 0 - CharacterCount: 0 - LineHeight: 0 + Name: Liberation Sans + PointSize: 86 + Scale: 1 + CharacterCount: 250 + LineHeight: 98.90625 Baseline: 0 - Ascender: 0 - CapHeight: 0 - Descender: 0 + Ascender: 77.84375 + CapHeight: 59.1875 + Descender: -18.21875 CenterLine: 0 - SuperscriptOffset: 0 - SubscriptOffset: 0 - SubSize: 0 - Underline: 0 - UnderlineThickness: 0 - strikethrough: 0 + SuperscriptOffset: 77.84375 + SubscriptOffset: -12.261719 + SubSize: 0.5 + Underline: -12.261719 + UnderlineThickness: 6.298828 + strikethrough: 23.675 strikethroughThickness: 0 - TabWidth: 0 - Padding: 0 - AtlasWidth: 0 - AtlasHeight: 0 + TabWidth: 239.0625 + Padding: 9 + AtlasWidth: 1024 + AtlasHeight: 1024 atlas: {fileID: 0} - m_AtlasWidth: 0 - m_AtlasHeight: 0 + m_AtlasWidth: 512 + m_AtlasHeight: 512 m_AtlasPadding: 9 - m_AtlasRenderMode: 0 + m_AtlasRenderMode: 4169 m_glyphInfoList: [] m_KerningTable: kerningPairs: [] m_FontFeatureTable: - m_GlyphPairAdjustmentRecords: - - m_FirstAdjustmentRecord: - m_GlyphIndex: 47 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: -3.1875 - m_YAdvance: 0 - m_SecondAdjustmentRecord: - m_GlyphIndex: 3 - m_GlyphValueRecord: - m_XPlacement: 0 - m_YPlacement: 0 - m_XAdvance: 0 - m_YAdvance: 0 - m_FeatureLookupFlags: 0 + m_GlyphPairAdjustmentRecords: [] fallbackFontAssets: [] m_FallbackFontAssetTable: [] m_CreationSettings: sourceFontFileName: - sourceFontFileGUID: + sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 pointSizeSamplingMode: 0 - pointSize: 0 - padding: 0 - packingMode: 0 - atlasWidth: 0 - atlasHeight: 0 - characterSetSelectionMode: 0 - characterSequence: - referencedFontAssetGUID: + pointSize: 86 + padding: 9 + packingMode: 4 + atlasWidth: 512 + atlasHeight: 512 + characterSetSelectionMode: 1 + characterSequence: 32 - 126, 160 - 255, 8192 - 8303, 8364, 8482, 9633 + referencedFontAssetGUID: 8f586378b4e144a9851e7b34d9b748ee referencedTextAssetGUID: fontStyle: 0 fontStyleModifier: 0 - renderMode: 0 - includeFontFeatures: 0 + renderMode: 4169 + includeFontFeatures: 1 m_FontWeightTable: - regularTypeface: {fileID: 0} italicTypeface: {fileID: 0} @@ -721,7 +274,27 @@ MonoBehaviour: italicTypeface: {fileID: 0} - regularTypeface: {fileID: 0} italicTypeface: {fileID: 0} - fontWeights: [] + fontWeights: + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} normalStyle: 0 normalSpacingOffset: 0 boldStyle: 0.75 @@ -740,24 +313,15 @@ Texture2D: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - m_IsAlphaChannelOptional: 0 serializedVersion: 2 m_Width: 0 m_Height: 0 m_CompleteImageSize: 0 - - m_MipsStripped: 0 - - m_TextureFormat: 1 m_MipCount: 1 m_IsReadable: 1 - m_IsPreProcessed: 0 - m_IgnoreMipmapLimit: 0 - m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 - m_VTOnly: 0 m_AlphaIsTransparency: 0 m_ImageCount: 1 m_TextureDimension: 2 @@ -771,13 +335,9 @@ Texture2D: m_WrapW: 0 m_LightmapFormat: 0 m_ColorSpace: 0 - - m_PlatformBlob: - image data: 0 _typelessdata: m_StreamData: - serializedVersion: 2 offset: 0 size: 0 path: diff --git a/AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset new file mode 100644 index 00000000..3f0e195d --- /dev/null +++ b/AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2111389328003556645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Android Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: + - {fileID: 11400000, guid: 9b09f0106dcd341a980bb4a4d59799d1, type: 2} +--- !u!114 &-436728179457920124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: Android Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: -2111389328003556645} + m_InitManagerOnStart: 1 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} + m_Name: XRGeneralSettingsPerBuildTarget + m_EditorClassIdentifier: + Keys: 07000000 + Values: + - {fileID: -436728179457920124} diff --git a/AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta b/AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta new file mode 100644 index 00000000..f0a6ab23 --- /dev/null +++ b/AR Demo/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30c2f74f2f2e7c645a197859cde4353a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AR Demo/Packages/manifest.json b/AR Demo/Packages/manifest.json index 8f2443a0..fb1de884 100644 --- a/AR Demo/Packages/manifest.json +++ b/AR Demo/Packages/manifest.json @@ -16,7 +16,7 @@ "com.unity.postprocessing": "3.2.2", "com.unity.progrids": "3.0.3-preview.6", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "3.0.7", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.1", diff --git a/AR Demo/Packages/packages-lock.json b/AR Demo/Packages/packages-lock.json index 66ca1baa..7eb5c629 100644 --- a/AR Demo/Packages/packages-lock.json +++ b/AR Demo/Packages/packages-lock.json @@ -332,7 +332,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { diff --git a/AR Demo/ProjectSettings/AndroidResolverDependencies.xml b/AR Demo/ProjectSettings/AndroidResolverDependencies.xml new file mode 100644 index 00000000..9b6d3e31 --- /dev/null +++ b/AR Demo/ProjectSettings/AndroidResolverDependencies.xml @@ -0,0 +1,57 @@ + + + com.google.android.gms:play-services-auth-base:16+ + + + Assets/Plugins/Android/androidx.annotation.annotation-1.0.0.jar + Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar + Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar + Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar + Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar + Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar + Assets/Plugins/Android/androidx.core.core-1.0.0.aar + Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar + Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar + Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar + Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar + Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar + Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar + Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar + Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar + Assets/Plugins/Android/androidx.legacy.legacy-support-v4-1.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar + Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar + Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar + Assets/Plugins/Android/androidx.media.media-1.0.0.aar + Assets/Plugins/Android/androidx.print.print-1.0.0.aar + Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar + Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar + Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.0.0.aar + Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-auth-base-16.0.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-base-16.0.1.aar + Assets/Plugins/Android/com.google.android.gms.play-services-basement-16.0.1.aar + Assets/Plugins/Android/com.google.android.gms.play-services-tasks-16.0.1.aar + + + + + + + + + + + + + + + + + + + \ No newline at end of file From d9954a62a44e37aff23c4abc7cf9330ca058d824 Mon Sep 17 00:00:00 2001 From: Lakshitha Kaveen Date: Mon, 29 Jan 2024 00:14:56 +0530 Subject: [PATCH 2/4] Identify Nearby Guns --- .../ConnectAWS_ESP/ConnectAWS_ESP.ino | 67 +++++ .../Identify_Wifi/Identify_Wifi.ino | 44 ---- .../Identify_Wifi_ESP/Identify_Wifi_ESP.ino | 97 ++++++++ .../PIR_Sensor/PIR_Sensor.ino | 17 -- code/Stationary Objects/PIR_WiFi/PIR_WiFi.ino | 58 ----- .../PIR_WiFi_ESP/PIR_WiFi_ESP.ino | 229 ++++++++++++++++++ 6 files changed, 393 insertions(+), 119 deletions(-) create mode 100644 code/Stationary Objects/ConnectAWS_ESP/ConnectAWS_ESP.ino delete mode 100644 code/Stationary Objects/Identify_Wifi/Identify_Wifi.ino create mode 100644 code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino delete mode 100644 code/Stationary Objects/PIR_Sensor/PIR_Sensor.ino delete mode 100644 code/Stationary Objects/PIR_WiFi/PIR_WiFi.ino create mode 100644 code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino diff --git a/code/Stationary Objects/ConnectAWS_ESP/ConnectAWS_ESP.ino b/code/Stationary Objects/ConnectAWS_ESP/ConnectAWS_ESP.ino new file mode 100644 index 00000000..cc970eae --- /dev/null +++ b/code/Stationary Objects/ConnectAWS_ESP/ConnectAWS_ESP.ino @@ -0,0 +1,67 @@ +#include +#include +#include + +// WiFi credentials +const char* ssid = ""; +const char* password = ""; + +// AWS IoT credentials +const char* aws_endpoint = ""; // Your AWS IoT endpoint +const char* aws_topic = "pir/1/pub"; // Your MQTT topic + +// Certificates and private key +const char* root_ca = R"EOF( + +)EOF"; + +const char* client_cert = R"KEY( + +)KEY"; + +const char* private_key = R"KEY( + +)KEY"; + +WiFiClientSecure wifiClient; // Use WiFiClientSecure instead of WiFiClient +PubSubClient client(aws_endpoint, 8883, wifiClient); + +void setup() { + Serial.begin(115200); + delay(10); + + // Connect to WiFi + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(250); + Serial.print("."); + } + Serial.println("\nConnected to WiFi"); + + // Load certificate and private key + wifiClient.setCACert(root_ca); + wifiClient.setCertificate(client_cert); + wifiClient.setPrivateKey(private_key); + + // Connect to AWS IoT + if (client.connect("pir1")) { + Serial.println("Connected to AWS IoT"); + // Subscribe or publish here + } else { + Serial.print("AWS IoT connection failed, rc="); + Serial.println(client.state()); + } +} + +void loop() { + // Ensure the client remains connected + if (!client.connected()) { + Serial.println("Reconnecting to AWS IoT..."); + // Reconnect code here + } + + client.loop(); // MQTT loop + // Rest of your code +} diff --git a/code/Stationary Objects/Identify_Wifi/Identify_Wifi.ino b/code/Stationary Objects/Identify_Wifi/Identify_Wifi.ino deleted file mode 100644 index 94c1e9b0..00000000 --- a/code/Stationary Objects/Identify_Wifi/Identify_Wifi.ino +++ /dev/null @@ -1,44 +0,0 @@ -#include - -void setup() { - Serial.begin(115200); - delay(10); - - // Connect to Wi-Fi - WiFi.mode(WIFI_STA); - WiFi.begin("sltfiber", "45763259"); - - while (WiFi.status() != WL_CONNECTED) { - delay(250); - Serial.print("."); - } - Serial.println(""); - -} - -void loop() { - // Display Wi-Fi networks and signal strength - displayWiFiNetworks(); - delay(250); -} - -void displayWiFiNetworks() { - // Perform Wi-Fi scan - Serial.println("Scanning nearby Wi-Fi networks..."); - int numNetworks = WiFi.scanNetworks(); - - if (numNetworks == 0) { - Serial.println("No networks found"); - } else { - Serial.print(numNetworks); - Serial.println(" networks found"); - - for (int i = 0; i < numNetworks; i++) { - Serial.print("Network SSID: "); - Serial.println(WiFi.SSID(i)); - Serial.print("Signal strength: "); - Serial.println(WiFi.RSSI(i)); - Serial.println("-----------------------"); - } - } -} diff --git a/code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino b/code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino new file mode 100644 index 00000000..a850d975 --- /dev/null +++ b/code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino @@ -0,0 +1,97 @@ +#include +#include +#include + +// WiFi credentials +const char* ssid = "SLT-4G_166F33"; +const char* password = "F568A2FF"; + +// AWS IoT credentials +const char* aws_endpoint = "a2leuqp8y2i70g-ats.iot.ap-southeast-1.amazonaws.com"; // Your AWS IoT endpoint +const char* aws_topic = "pir/1/pub"; // Your MQTT topic + +// Certificates and private key +const char* root_ca = R"EOF( +// Your root CA certificate +)EOF"; + +const char* client_cert = R"KEY( +// Your client certificate +)KEY"; + +const char* private_key = R"KEY( +// Your private key +)KEY"; + +WiFiClientSecure wifiClient; +PubSubClient client(aws_endpoint, 8883, wifiClient); // Set the MQTT port to 8883 for TLS + +const int pirPin = 33; // GPIO pin for the PIR sensor +const int LEDPin = 32; // GPIO pin for the LED + +void setup() { + Serial.begin(115200); + delay(10); + + pinMode(pirPin, INPUT); + pinMode(LEDPin, OUTPUT); + + // Connect to WiFi + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(250); + Serial.print("."); + } + Serial.println("\nConnected to WiFi"); + + // Load certificate and private key for AWS IoT + wifiClient.setCACert(root_ca); + wifiClient.setCertificate(client_cert); + wifiClient.setPrivateKey(private_key); + + // Connect to AWS IoT + if (client.connect("pir1")) { + Serial.println("Connected to AWS IoT"); + // Subscribe or publish here + } else { + Serial.print("AWS IoT connection failed, rc="); + Serial.println(client.state()); + } +} + +void loop() { + if (!client.connected()) { + // Reconnect to AWS IoT + } + + client.loop(); // MQTT loop + + // PIR sensor logic + if (digitalRead(pirPin) == HIGH) { + digitalWrite(LEDPin, HIGH); + displayWiFiNetworks(); + delay(5000); // Avoid continuous scanning + } else { + digitalWrite(LEDPin, LOW); + } +} + +void displayWiFiNetworks() { + Serial.println("Scanning Wi-Fi networks..."); + int numNetworks = WiFi.scanNetworks(); + if (numNetworks == 0) { + Serial.println("No networks found"); + } else { + Serial.print(numNetworks); + Serial.println(" networks found"); + for (int i = 0; i < numNetworks; i++) { + Serial.print("Network SSID: "); + Serial.println(WiFi.SSID(i)); + Serial.print("Signal strength: "); + Serial.println(WiFi.RSSI(i)); + } + Serial.println("-----------------------"); + } +} diff --git a/code/Stationary Objects/PIR_Sensor/PIR_Sensor.ino b/code/Stationary Objects/PIR_Sensor/PIR_Sensor.ino deleted file mode 100644 index 96547438..00000000 --- a/code/Stationary Objects/PIR_Sensor/PIR_Sensor.ino +++ /dev/null @@ -1,17 +0,0 @@ -void setup() { - pinMode(8, INPUT); - pinMode(13, OUTPUT); - -} - -void loop() { - int val = digitalRead(6); - - if (val == 1) { - digitalWrite(13, HIGH); - } - else{ - digitalWrite(13, LOW); - } - -} diff --git a/code/Stationary Objects/PIR_WiFi/PIR_WiFi.ino b/code/Stationary Objects/PIR_WiFi/PIR_WiFi.ino deleted file mode 100644 index 5cfbc70e..00000000 --- a/code/Stationary Objects/PIR_WiFi/PIR_WiFi.ino +++ /dev/null @@ -1,58 +0,0 @@ -#include - -const int pirPin = D6; // Assuming the PIR sensor is connected to GPIO pin D2 -const int LEDPin = D7; - -void setup() { - Serial.begin(115200); - delay(10); - - pinMode(pirPin, INPUT); - digitalWrite(pirPin, LOW); // Set initial value to LOW - pinMode(LEDPin, OUTPUT); - - // Connect to Wi-Fi - WiFi.mode(WIFI_STA); - WiFi.begin("sltfiber", "45763259"); - - while (WiFi.status() != WL_CONNECTED) { - delay(250); - Serial.print("."); - } - Serial.println(""); -} - -void loop() { - - if (digitalRead(pirPin) == 1) { - // PIR sensor detected motion, display Wi-Fi networks - displayWiFiNetworks(); - digitalWrite(LEDPin, HIGH); - delay(5000); // Wait for 5 seconds to avoid continuous scanning - } - else{ - digitalWrite(LEDPin, LOW); - } - -} - -void displayWiFiNetworks() { - // Perform Wi-Fi scan - Serial.println("Scanning nearby Wi-Fi networks..."); - int numNetworks = WiFi.scanNetworks(); - - if (numNetworks == 0) { - Serial.println("No networks found"); - } else { - Serial.print(numNetworks); - Serial.println(" networks found"); - - for (int i = 0; i < numNetworks; i++) { - Serial.print("Network SSID: "); - Serial.println(WiFi.SSID(i)); - Serial.print("Signal strength: "); - Serial.println(WiFi.RSSI(i)); - Serial.println("-----------------------"); - } - } -} diff --git a/code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino b/code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino new file mode 100644 index 00000000..5afb75ae --- /dev/null +++ b/code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino @@ -0,0 +1,229 @@ +#include +#include +#include +#include + +// WiFi credentials +const char* ssid = "SLT-4G_166F33"; +const char* password = "F568A2FF"; + +// AWS IoT credentials +const char* aws_endpoint = "a2leuqp8y2i70g-ats.iot.ap-southeast-1.amazonaws.com"; // Your AWS IoT endpoint +const char* aws_topic = "pir/1/pub"; // Your MQTT topic + +// Certificates and private key +const char* root_ca = R"EOF( +-----BEGIN CERTIFICATE----- +MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF +ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6 +b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL +MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv +b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj +ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM +9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw +IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6 +VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L +93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm +jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA +A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI +U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs +N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv +o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU +5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy +rqXRfboQnoZsG4q5WTP468SQvvG5 +-----END CERTIFICATE----- +)EOF"; + +const char* client_cert = R"KEY( +-----BEGIN CERTIFICATE----- +MIIDFDCCAfwCFAnmYnjlR7sM0VI3c5vlVv4yBLmcMA0GCSqGSIb3DQEBCwUAMEgx +CzAJBgNVBAYTAlNMMRMwEQYDVQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhhcmNv +bWJhdDERMA8GA1UEAwwIYXJjb21iYXQwHhcNMjQwMTI2MTMzNzIyWhcNMjUwMTI1 +MTMzNzIyWjBFMQswCQYDVQQGEwJTTDETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8G +A1UECgwIYXJjb21iYXQxDjAMBgNVBAMMBXBpci8xMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEApAjTaaTTjzIj+6zpRm++hKO/IxJEreS5jwzE3MG7UEOp +Di5GGm4ZxUHtxG8vYOLjxG/9URkvx2XRf9BZSoXnEt254hUBfncJUazg+GoLz1Jj +ELF25On8UP4u8zaWk0jFXEPElWBEjjvH7IyXcWthmo7Atngd+Vll4efqj2upTc6o +wjB9IKoq/KeJm7gL4j4x04nyy8rGh9PRTRTTEfHwqeCj9qjW0B6XAizp6jkbJe/e +PQgFPqufcheKhY65KfvO7GWk5ox3iNImvNtG3BXBYf9r47b7ZIUjdiuY8JgrHxhE +lyRVSK3NL8UyCfvo7YvTPlSd5nqxgBMi2HkymjOHdQIDAQABMA0GCSqGSIb3DQEB +CwUAA4IBAQAw/0WV0Ucrtw/yuxqowZLpgCGBYInsGMmu+siOxnAGPq/kRumha6Vc +OTVw9HMtvMTuS9/QMqANeLxgc0ALHq6bV/N/pu4PmuoiDLcOaL8OP19eYuENfJNv +fjIBc7W8ouM5CmrIVusDBoNYLpGyvAfxBBXdW1xewiuTYjs1VX4JdUntlh5oKrGH +Q4cCi9SHTJ0vdMDWZY/WAsWzI6N5x8ZpNXsuz24xmAwmMTVxGlRlI7XlMsO9TPsd +2kEnUo6vrDxUq5zoYvnuCDYBciDHaaz+HcJFz1dpG0WiaIedFYuJiqkh9P7ALTc4 +Mxwlh0U4eL+s4cLVVIqqdvEGHFRaQgPF +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDcTCCAlmgAwIBAgIUXJjdI/YD28+QJagw9JNUSYzlvzIwDQYJKoZIhvcNAQEL +BQAwSDELMAkGA1UEBhMCU0wxEzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAoM +CGFyY29tYmF0MREwDwYDVQQDDAhhcmNvbWJhdDAeFw0yNDAxMTMwNjU4MjlaFw0z +NDAxMTAwNjU4MjlaMEgxCzAJBgNVBAYTAlNMMRMwEQYDVQQIDApTb21lLVN0YXRl +MREwDwYDVQQKDAhhcmNvbWJhdDERMA8GA1UEAwwIYXJjb21iYXQwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCazSiNESFFAhFTcLL0GuYhqugjU1IZmP95 +RaB6QuNAMK8OQ754yF6tDlWxc6ZN7l49nSJuHuKPs4PoAGJr+ydokQQh+1zX4Q4s +PbW44rsfc3gE5b4jZda5b7E/J5cy2hQjNnzfQwiwpAemL+ye3HcESwY9VXMEEXCB +oqKeFqSAsghKMYdKlB71qsL8koAXbETEwbutVYnXBa02FGUhVd6m/0QAuMdY8dK3 +2oIshSBVVzIbwN/u/Ofj+FCoT+HN72k0QFXLUlHr03/eKyKeIBcVJxOLgy7AgzCD +oa/I1ERPxfcBK1l2MYSHirIidboizaR7tw6ZBCx3PYEyeSD7BQPbAgMBAAGjUzBR +MB0GA1UdDgQWBBTK/LIGqAK29+fp6WmHreTCEnVaOzAfBgNVHSMEGDAWgBTK/LIG +qAK29+fp6WmHreTCEnVaOzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA +A4IBAQBr/LXSOWrocuEyDuwP4VzrDaYmsDpRZ0AGc71so889F2jUsof3MJSn0iap +Dpw3t/YaREAr3ytuXM188tQYHMMrFzdZRTg7C8SWbmvsGqYCq4nkbwDOPVuL4iPS +3+5Tex6MKPdROQLvmUiMc5O6NmE6tJU4nh965H8q0jwZQfGSXOwDo0tQ0DSN2OzB +6DSvlKA38raArCvMqfQiK+D2N79kk5We+pLh1f92yPV2vbEEN+QWUTyvsu4l5MOn +GMRjV4n9HgZEXQjjcHm64mHGkZZHXZ87xZ7vTzLOrN+xoBhaOaM7iblxSAL9nQ0O +UhhnT477jo51rwYv4uvzfLvrQvX6 +-----END CERTIFICATE----- + +)KEY"; + +const char* private_key = R"KEY( +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkCNNppNOPMiP7 +rOlGb76Eo78jEkSt5LmPDMTcwbtQQ6kOLkYabhnFQe3Eby9g4uPEb/1RGS/HZdF/ +0FlKhecS3bniFQF+dwlRrOD4agvPUmMQsXbk6fxQ/i7zNpaTSMVcQ8SVYESOO8fs +jJdxa2GajsC2eB35WWXh5+qPa6lNzqjCMH0gqir8p4mbuAviPjHTifLLysaH09FN +FNMR8fCp4KP2qNbQHpcCLOnqORsl7949CAU+q59yF4qFjrkp+87sZaTmjHeI0ia8 +20bcFcFh/2vjtvtkhSN2K5jwmCsfGESXJFVIrc0vxTIJ++jti9M+VJ3merGAEyLY +eTKaM4d1AgMBAAECggEAGMy1y9PN4Wki/A6jERFdZDfOcrq1E/ZP4JL9Y2PN0j98 +fGaeFipdro8+Z5OovdTnux/0VDHC4bpgz1pcWZI/goBvtUDYQjq0d7rzo1MDGJPb +4t71uvuuOD+JsR8oajmXDxE21B+jFb7vhbGmxtDFh6S7+YpU+8kaiGoz8f2EsfzF +tY7yVsslMxRsL5EBDxmS0lgLSAqozr1ENYpuK2ubT487K/knKEjomi40yeu3Barr +txB1l7ZWJSPgzxtQYp7N8CK4cSsTHLLZN75wh4QBN4euTLMsB7Rw8LhBOsJl+ReF +zSOLQHvtrO5yKYllheKXXnKiRjhw/JB8LEiU2uZEuQKBgQC/LtI8mVwl1luAOIYU +lO4L+aVcGMmOmHXKfW/30HOtObdxNVkvGHvUVWNIDKSl9VxLzi2V9MatfYMPOjDp +J5SNNi8p7yqrdDHY4V3w7rzUtq4gRWIMDyauadD87ol4/bs7dYQNUNeLd61X/xow +t2IvEFM7Rb6lAlSaD2hyd0/LbQKBgQDbpbv6h51+vUrFLzTEH2C5bz20MkyLOteF +Lb0p6F4cFYELc6FPTfXk4yqqBTNw7FeewfdwcL+lhgXMPF8PM7pT6Lhcd/QHFdkW +9SyMjeXfXmJH/CjnEZyumJyf2C9mR4msBFMM76lLzj7MdYkaeBU8hTsyRw++GfZZ +YWGXUhjfKQKBgH08u6XMxItYvzngTRzgbovTrpoE9sv9XXQW9aj9mTlJjLyROOnb +/QocIVxKQ/UfJKXX2w7XeOqfRKJN+UpSjkJu0ziCHo6QIDM1dqdkjLg/LxOev9qs +didc0/VMgSuL8wHBOo7KfVg0Po5dYxe0mZHA/PTf/EH1o9wD6eTJ+bCFAoGBAK1+ +bcroD/kqH8M9FFrNxiLywTRyfo+DPPVPOZm+l4drXPDktsfjdpUC8pI1ZXqO1G7s +GzzPcjGWeUHnddaWL1lT+zve6/wkv8MoibXD54zWCp99h/lsqewnU5/WrSoG27Hq +AIe5Tmo4UNZDCLbFn1CclDOUedTYwQO8rc9O46JxAoGAfM5eRhFXrNa3lhEbmUwx +z5RyL3oSYCbz0KtLBQsqlv0sSs86VpsKvHa4Me+J59eToHcg7GuND8oWiZVguN1R +iW9kxyAEkV7mzP4qBQavHVs+NfZNFJm075m3sw+Iy6pqhEiclqAQjsazdRWpDVBF +SRiCztwU/bjhzySR+2I/f2c= +-----END PRIVATE KEY----- +)KEY"; + +WiFiClientSecure wifiClient; +PubSubClient client(aws_endpoint, 8883, wifiClient); // Set the MQTT port to 8883 for TLS + +const int pirPin = 33; // GPIO pin for the PIR sensor +const int LEDPin = 32; // GPIO pin for the LED + +String displayWiFiNetworks(); + +void setup() { + Serial.begin(115200); + delay(10); + + pinMode(pirPin, INPUT); + pinMode(LEDPin, OUTPUT); + + // Connect to WiFi + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(250); + Serial.print("."); + } + Serial.println("\nConnected to WiFi"); + + // Load certificate and private key for AWS IoT + wifiClient.setCACert(root_ca); + wifiClient.setCertificate(client_cert); + wifiClient.setPrivateKey(private_key); + + // Connect to AWS IoT + if (client.connect("pir1")) { + Serial.println("Connected to AWS IoT"); + // Subscribe or publish here + } else { + Serial.print("AWS IoT connection failed, rc="); + Serial.println(client.state()); + } +} + +void loop() { + if (!client.connected()) { + // Reconnect to AWS IoT + } + + client.loop(); // MQTT loop + + // PIR sensor logic + if (digitalRead(pirPin) == HIGH) { + digitalWrite(LEDPin, HIGH); + + // Get first Wi-Fi network's details and send to AWS + String wifiDetails = displayWiFiNetworks(); + if(wifiDetails != "") { + client.publish(aws_topic, wifiDetails.c_str()); + } + + delay(5000); // Avoid continuous scanning + } else { + digitalWrite(LEDPin, LOW); + } +} + +String displayWiFiNetworks() { + Serial.println("Scanning Wi-Fi networks..."); + int numNetworks = WiFi.scanNetworks(); + if (numNetworks == 0) { + Serial.println("No networks found"); + return ""; + } else { + Serial.print(numNetworks); + Serial.println(" networks found"); + + for (int i = 0; i < numNetworks; i++) { + Serial.print("Network SSID: "); + Serial.println(WiFi.SSID(i)); + Serial.print("Signal strength: "); + Serial.println(WiFi.RSSI(i)); + } + Serial.println("-----------------------"); + + // Create a JSON array to hold network details + StaticJsonDocument<1024> jsonDoc; // Adjust size as needed + JsonArray networksArray = jsonDoc.createNestedArray("Networks"); + + for (int i = 0; i < numNetworks; ++i) { + String ssid = WiFi.SSID(i); + // Check if the first three letters of the SSID are "gun" + if (ssid.substring(0, 3).equalsIgnoreCase("gun")) { + // Add network details to the JSON array + JsonObject network = networksArray.createNestedObject(); + network["SSID"] = ssid; + } + } + + if (networksArray.size() == 0) { + Serial.println("No 'gun' networks found"); + return ""; + } + + // Convert JSON object to string + String jsonStr; + serializeJson(jsonDoc, jsonStr); + + Serial.println("JSON String:"); + Serial.println(jsonStr); + return jsonStr; + } +} + + + + + + + + From d9018c0e816564e7e204329eca9947f289933e2d Mon Sep 17 00:00:00 2001 From: Lakshitha Kaveen Date: Mon, 29 Jan 2024 00:22:26 +0530 Subject: [PATCH 3/4] Update PIR_WiFi_ESP.ino --- .../PIR_WiFi_ESP/PIR_WiFi_ESP.ino | 106 +----------------- 1 file changed, 6 insertions(+), 100 deletions(-) diff --git a/code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino b/code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino index 5afb75ae..63af077b 100644 --- a/code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino +++ b/code/Stationary Objects/PIR_WiFi_ESP/PIR_WiFi_ESP.ino @@ -4,110 +4,24 @@ #include // WiFi credentials -const char* ssid = "SLT-4G_166F33"; -const char* password = "F568A2FF"; +const char* ssid = ""; +const char* password = ""; // AWS IoT credentials -const char* aws_endpoint = "a2leuqp8y2i70g-ats.iot.ap-southeast-1.amazonaws.com"; // Your AWS IoT endpoint -const char* aws_topic = "pir/1/pub"; // Your MQTT topic +const char* aws_endpoint = ""; // Your AWS IoT endpoint +const char* aws_topic = ""; // Your MQTT topic // Certificates and private key const char* root_ca = R"EOF( ------BEGIN CERTIFICATE----- -MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF -ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6 -b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL -MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv -b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj -ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM -9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw -IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6 -VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L -93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm -jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC -AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA -A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI -U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs -N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv -o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU -5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy -rqXRfboQnoZsG4q5WTP468SQvvG5 ------END CERTIFICATE----- + )EOF"; const char* client_cert = R"KEY( ------BEGIN CERTIFICATE----- -MIIDFDCCAfwCFAnmYnjlR7sM0VI3c5vlVv4yBLmcMA0GCSqGSIb3DQEBCwUAMEgx -CzAJBgNVBAYTAlNMMRMwEQYDVQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhhcmNv -bWJhdDERMA8GA1UEAwwIYXJjb21iYXQwHhcNMjQwMTI2MTMzNzIyWhcNMjUwMTI1 -MTMzNzIyWjBFMQswCQYDVQQGEwJTTDETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8G -A1UECgwIYXJjb21iYXQxDjAMBgNVBAMMBXBpci8xMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEApAjTaaTTjzIj+6zpRm++hKO/IxJEreS5jwzE3MG7UEOp -Di5GGm4ZxUHtxG8vYOLjxG/9URkvx2XRf9BZSoXnEt254hUBfncJUazg+GoLz1Jj -ELF25On8UP4u8zaWk0jFXEPElWBEjjvH7IyXcWthmo7Atngd+Vll4efqj2upTc6o -wjB9IKoq/KeJm7gL4j4x04nyy8rGh9PRTRTTEfHwqeCj9qjW0B6XAizp6jkbJe/e -PQgFPqufcheKhY65KfvO7GWk5ox3iNImvNtG3BXBYf9r47b7ZIUjdiuY8JgrHxhE -lyRVSK3NL8UyCfvo7YvTPlSd5nqxgBMi2HkymjOHdQIDAQABMA0GCSqGSIb3DQEB -CwUAA4IBAQAw/0WV0Ucrtw/yuxqowZLpgCGBYInsGMmu+siOxnAGPq/kRumha6Vc -OTVw9HMtvMTuS9/QMqANeLxgc0ALHq6bV/N/pu4PmuoiDLcOaL8OP19eYuENfJNv -fjIBc7W8ouM5CmrIVusDBoNYLpGyvAfxBBXdW1xewiuTYjs1VX4JdUntlh5oKrGH -Q4cCi9SHTJ0vdMDWZY/WAsWzI6N5x8ZpNXsuz24xmAwmMTVxGlRlI7XlMsO9TPsd -2kEnUo6vrDxUq5zoYvnuCDYBciDHaaz+HcJFz1dpG0WiaIedFYuJiqkh9P7ALTc4 -Mxwlh0U4eL+s4cLVVIqqdvEGHFRaQgPF ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDcTCCAlmgAwIBAgIUXJjdI/YD28+QJagw9JNUSYzlvzIwDQYJKoZIhvcNAQEL -BQAwSDELMAkGA1UEBhMCU0wxEzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAoM -CGFyY29tYmF0MREwDwYDVQQDDAhhcmNvbWJhdDAeFw0yNDAxMTMwNjU4MjlaFw0z -NDAxMTAwNjU4MjlaMEgxCzAJBgNVBAYTAlNMMRMwEQYDVQQIDApTb21lLVN0YXRl -MREwDwYDVQQKDAhhcmNvbWJhdDERMA8GA1UEAwwIYXJjb21iYXQwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCazSiNESFFAhFTcLL0GuYhqugjU1IZmP95 -RaB6QuNAMK8OQ754yF6tDlWxc6ZN7l49nSJuHuKPs4PoAGJr+ydokQQh+1zX4Q4s -PbW44rsfc3gE5b4jZda5b7E/J5cy2hQjNnzfQwiwpAemL+ye3HcESwY9VXMEEXCB -oqKeFqSAsghKMYdKlB71qsL8koAXbETEwbutVYnXBa02FGUhVd6m/0QAuMdY8dK3 -2oIshSBVVzIbwN/u/Ofj+FCoT+HN72k0QFXLUlHr03/eKyKeIBcVJxOLgy7AgzCD -oa/I1ERPxfcBK1l2MYSHirIidboizaR7tw6ZBCx3PYEyeSD7BQPbAgMBAAGjUzBR -MB0GA1UdDgQWBBTK/LIGqAK29+fp6WmHreTCEnVaOzAfBgNVHSMEGDAWgBTK/LIG -qAK29+fp6WmHreTCEnVaOzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA -A4IBAQBr/LXSOWrocuEyDuwP4VzrDaYmsDpRZ0AGc71so889F2jUsof3MJSn0iap -Dpw3t/YaREAr3ytuXM188tQYHMMrFzdZRTg7C8SWbmvsGqYCq4nkbwDOPVuL4iPS -3+5Tex6MKPdROQLvmUiMc5O6NmE6tJU4nh965H8q0jwZQfGSXOwDo0tQ0DSN2OzB -6DSvlKA38raArCvMqfQiK+D2N79kk5We+pLh1f92yPV2vbEEN+QWUTyvsu4l5MOn -GMRjV4n9HgZEXQjjcHm64mHGkZZHXZ87xZ7vTzLOrN+xoBhaOaM7iblxSAL9nQ0O -UhhnT477jo51rwYv4uvzfLvrQvX6 ------END CERTIFICATE----- )KEY"; const char* private_key = R"KEY( ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkCNNppNOPMiP7 -rOlGb76Eo78jEkSt5LmPDMTcwbtQQ6kOLkYabhnFQe3Eby9g4uPEb/1RGS/HZdF/ -0FlKhecS3bniFQF+dwlRrOD4agvPUmMQsXbk6fxQ/i7zNpaTSMVcQ8SVYESOO8fs -jJdxa2GajsC2eB35WWXh5+qPa6lNzqjCMH0gqir8p4mbuAviPjHTifLLysaH09FN -FNMR8fCp4KP2qNbQHpcCLOnqORsl7949CAU+q59yF4qFjrkp+87sZaTmjHeI0ia8 -20bcFcFh/2vjtvtkhSN2K5jwmCsfGESXJFVIrc0vxTIJ++jti9M+VJ3merGAEyLY -eTKaM4d1AgMBAAECggEAGMy1y9PN4Wki/A6jERFdZDfOcrq1E/ZP4JL9Y2PN0j98 -fGaeFipdro8+Z5OovdTnux/0VDHC4bpgz1pcWZI/goBvtUDYQjq0d7rzo1MDGJPb -4t71uvuuOD+JsR8oajmXDxE21B+jFb7vhbGmxtDFh6S7+YpU+8kaiGoz8f2EsfzF -tY7yVsslMxRsL5EBDxmS0lgLSAqozr1ENYpuK2ubT487K/knKEjomi40yeu3Barr -txB1l7ZWJSPgzxtQYp7N8CK4cSsTHLLZN75wh4QBN4euTLMsB7Rw8LhBOsJl+ReF -zSOLQHvtrO5yKYllheKXXnKiRjhw/JB8LEiU2uZEuQKBgQC/LtI8mVwl1luAOIYU -lO4L+aVcGMmOmHXKfW/30HOtObdxNVkvGHvUVWNIDKSl9VxLzi2V9MatfYMPOjDp -J5SNNi8p7yqrdDHY4V3w7rzUtq4gRWIMDyauadD87ol4/bs7dYQNUNeLd61X/xow -t2IvEFM7Rb6lAlSaD2hyd0/LbQKBgQDbpbv6h51+vUrFLzTEH2C5bz20MkyLOteF -Lb0p6F4cFYELc6FPTfXk4yqqBTNw7FeewfdwcL+lhgXMPF8PM7pT6Lhcd/QHFdkW -9SyMjeXfXmJH/CjnEZyumJyf2C9mR4msBFMM76lLzj7MdYkaeBU8hTsyRw++GfZZ -YWGXUhjfKQKBgH08u6XMxItYvzngTRzgbovTrpoE9sv9XXQW9aj9mTlJjLyROOnb -/QocIVxKQ/UfJKXX2w7XeOqfRKJN+UpSjkJu0ziCHo6QIDM1dqdkjLg/LxOev9qs -didc0/VMgSuL8wHBOo7KfVg0Po5dYxe0mZHA/PTf/EH1o9wD6eTJ+bCFAoGBAK1+ -bcroD/kqH8M9FFrNxiLywTRyfo+DPPVPOZm+l4drXPDktsfjdpUC8pI1ZXqO1G7s -GzzPcjGWeUHnddaWL1lT+zve6/wkv8MoibXD54zWCp99h/lsqewnU5/WrSoG27Hq -AIe5Tmo4UNZDCLbFn1CclDOUedTYwQO8rc9O46JxAoGAfM5eRhFXrNa3lhEbmUwx -z5RyL3oSYCbz0KtLBQsqlv0sSs86VpsKvHa4Me+J59eToHcg7GuND8oWiZVguN1R -iW9kxyAEkV7mzP4qBQavHVs+NfZNFJm075m3sw+Iy6pqhEiclqAQjsazdRWpDVBF -SRiCztwU/bjhzySR+2I/f2c= ------END PRIVATE KEY----- + )KEY"; WiFiClientSecure wifiClient; @@ -219,11 +133,3 @@ String displayWiFiNetworks() { return jsonStr; } } - - - - - - - - From fa2f878fc1e5d402281d2afd153d8f283c08b6e2 Mon Sep 17 00:00:00 2001 From: Lakshitha Kaveen Date: Mon, 29 Jan 2024 00:27:40 +0530 Subject: [PATCH 4/4] Update Identify_Wifi_ESP.ino --- .../Identify_Wifi_ESP/Identify_Wifi_ESP.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino b/code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino index a850d975..3877ec29 100644 --- a/code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino +++ b/code/Stationary Objects/Identify_Wifi_ESP/Identify_Wifi_ESP.ino @@ -3,12 +3,12 @@ #include // WiFi credentials -const char* ssid = "SLT-4G_166F33"; -const char* password = "F568A2FF"; +const char* ssid = ""; +const char* password = ""; // AWS IoT credentials -const char* aws_endpoint = "a2leuqp8y2i70g-ats.iot.ap-southeast-1.amazonaws.com"; // Your AWS IoT endpoint -const char* aws_topic = "pir/1/pub"; // Your MQTT topic +const char* aws_endpoint = ""; // Your AWS IoT endpoint +const char* aws_topic = ""; // Your MQTT topic // Certificates and private key const char* root_ca = R"EOF(