Add DevConsole (in-progress) & minor updates

DevConsole: - UI and Controls (PlayerInput) - Still need access to scripting & other Unity Staff Test Robot: - Deleted unusual prefab - minor updates to TestRobot with Ak
2024-11-21 11:26:06 +03:00 · 2024-11-21 11:26:06 +03:00 · 5720408bbf
commit 5720408bbf
parent ed1ce949f7
9 changed files with 3985 additions and 1448 deletions
--- a/Terrain.asset
+++ b/Terrain.asset
--- a/Assets/PlayerControls.inputactions
+++ b/Assets/PlayerControls.inputactions
@ -85,6 +85,15 @@
                    "processors": "",
                    "interactions": "",
                    "initialStateCheck": false
+                },
+                {
+                    "name": "DevConsole",
+                    "type": "Button",
+                    "id": "1689b981-7d80-4535-a45a-1d81850f6306",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                }
            ],
            "bindings": [
@ -472,6 +481,17 @@
                    "action": "Crouch",
                    "isComposite": false,
                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "bea3b97a-84a1-4c8d-ba51-eaf34f0a3632",
+                    "path": "<Keyboard>/t",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": ";Keyboard&Mouse",
+                    "action": "DevConsole",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                }
            ]
        },
--- a/Assets/Prefabs/TestRobot
+++ b/Assets/Prefabs/TestRobot
--- a/Assets/Prefabs/TestRobot.prefab
+++ b/Assets/Prefabs/TestRobot.prefab
@ -1,389 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1577832178701366399
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 1847699201297315863, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1728741696255441903}
-  - component: {fileID: 6979149259401393198}
-  - component: {fileID: 4845931022921045587}
-  - component: {fileID: 2086935356242223762}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1728741696255441903
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 8600085110714036505, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1577832178701366399}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.78, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6464286775858458474}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &6979149259401393198
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 8459520643520874063, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1577832178701366399}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 100
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
--- !u!81 &4845931022921045587
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 6185719823507456124, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1577832178701366399}
-  m_Enabled: 1
--- !u!114 &2086935356242223762
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4605372216697929517, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1577832178701366399}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
-  m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
--- !u!1 &8052615274211522968
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 2654425603306600481, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6464286775858458474}
-  - component: {fileID: 2553940542522333547}
-  - component: {fileID: 2978534649183661060}
-  - component: {fileID: 3119478669253579025}
-  - component: {fileID: 7754349714684805696}
-  - component: {fileID: 5777883993226278380}
-  m_Layer: 0
-  m_Name: ContollerWithOwnCam
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &6464286775858458474
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8052615274211522968}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1728741696255441903}
-  m_Father: {fileID: 8010298719596828561}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2553940542522333547
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 6522164418986561850, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8052615274211522968}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2978534649183661060
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 1021775631010249730, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8052615274211522968}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!136 &3119478669253579025
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 1677893846190844738, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8052615274211522968}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &7754349714684805696
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 5748955823487001867, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8052615274211522968}
-  serializedVersion: 4
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 112
-  m_CollisionDetection: 0
--- !u!114 &5777883993226278380
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 7444859217151384912, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-  m_PrefabInstance: {fileID: 45883484110290688}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8052615274211522968}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fa555b9291455634ca0f4c9de3c0aacc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Camera: {fileID: 6979149259401393198}
--- !u!1 &8139172278064158211
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8010298719596828561}
-  m_Layer: 0
-  m_Name: TestRobot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &8010298719596828561
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8139172278064158211}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6464286775858458474}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &45883484110290688
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 8010298719596828561}
-    m_Modifications:
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 758450359152847902, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2654425603306600481, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_Name
-      value: ContollerWithOwnCam
-      objectReference: {fileID: 0}
-    - target: {fileID: 5748955823487001867, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_Constraints
-      value: 112
-      objectReference: {fileID: 0}
-    - target: {fileID: 7444859217151384912, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
-      propertyPath: m_Camera
-      value: 
-      objectReference: {fileID: 6979149259401393198}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2a75c106e35db224f8f68dcd9c2118ad, type: 3}
--- a/Assets/Prefabs/TestRobot.prefab.meta
+++ b/Assets/Prefabs/TestRobot.prefab.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: dbe7ac81c6bad324696df97006c7af41
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/MultiplayerScene.unity
+++ b/Assets/Scenes/MultiplayerScene.unity
--- a/Assets/Scripts/Runtime/Core/Classes/RobotController.cs
+++ b/Assets/Scripts/Runtime/Core/Classes/RobotController.cs
@ -35,6 +35,10 @@ public class RobotController : NetworkBehaviour
    private bool isMoving;
    private Vector3 currentMovement = Vector3.zero;
    
+    [Header("Developer Console")]
+    [SerializeField] private DeveloperConsoleUI devConsole;
+    private bool LocalDeveloperConsoleOpened = false;
+

    // Network Variables
    [Header("Network Variables")]
@ -49,6 +53,22 @@ public class RobotController : NetworkBehaviour

    // PlayerInput Events

+    public void OnConsoleButtonPressed(InputAction.CallbackContext context)
+    {
+        if (context.performed)
+        {
+            Debug.Log("Console");
+            if (LocalDeveloperConsoleOpened) {
+                LocalDeveloperConsoleOpened = false;
+                devConsole.CloseConsole();
+            }
+            else {
+                LocalDeveloperConsoleOpened = true;
+                devConsole.OpenConsole();
+            }
+        }
+    }
+
    public void OnMove(InputAction.CallbackContext context)
    {
        moveInput = context.ReadValue<Vector2>();
@ -113,7 +133,7 @@ public class RobotController : NetworkBehaviour
            return;
        }

-        Debug.Log("Update(currentMovement.y): " + currentMovement.y);
+        // Debug.Log("Update(currentMovement.y): " + currentMovement.y);
        HandleMovement();
        HandleRotation();
        InternalLockUpdate();
--- a/Assets/Scripts/Runtime/DeveloperConsoleUI.cs
+++ b/Assets/Scripts/Runtime/DeveloperConsoleUI.cs
@ -0,0 +1,23 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+public class DeveloperConsoleUI : MonoBehaviour
+{
+    [SerializeField] private Button closeBtn;
+    [SerializeField] private GameObject console;
+    
+    private void Awake(){
+        closeBtn.onClick.AddListener(() =>{
+            console.SetActive(false);
+        });
+    }
+
+    
+    
+    public void OpenConsole() {
+        console.SetActive(true);
+    }
+    public void CloseConsole() {
+        console.SetActive(false);
+    }
+}
--- a/Assets/Scripts/Runtime/DeveloperConsoleUI.cs.meta
+++ b/Assets/Scripts/Runtime/DeveloperConsoleUI.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 06009521da983e44d9c4eee869d54fd0