refactored movement abit by setting fixed 10hz update. but its still quite buggy. can't turn.

2026-07-27 22:11:39 +00:00 · 2022-01-05 02:55:59 +08:00
parent f15647fcc8
commit 4ca961b09b
6 changed files with 186 additions and 184 deletions
@@ -47,31 +47,40 @@ namespace Raindrop
        private GridClient client { get { return instance.Client; } }
        private Timer timer;
        private Vector3 forward = new Vector3(1, 0, 0);
-        private bool turningLeft = false; 
-        private bool turningRight = false;
+        private bool isTurning = false; 
+        // private bool turningRight = false;
        private uint _prev;

-        public void TurningRight()
+        public void SetTurningRight()
        {
-            turningRight = true;
-            turningLeft = false;
+            //change mvmtpacket
+            client.Self.Movement.TurnRight = true;
+            client.Self.Movement.TurnLeft = false;
+            
            //start turning
-            TurnStart();
+            isTurning = true;
+            //TurnStart();
        }

-        public void TurningLeft()
+        public void SetTurningLeft()
        {
-            turningRight = false;
-            turningLeft = true;
+            //change mvmtpacket
+            client.Self.Movement.TurnRight = false;
+            client.Self.Movement.TurnLeft = true;
+            
+            isTurning = true;
            //start turning
-            TurnStart();
+            //TurnStart();
        }
-        public void TurningStop()
+        public void SetTurningStop()
        {
-            turningRight = false;
-            turningLeft = false;
-            //start turning
-            TurnStop();
+            //change mvmtpacket
+            client.Self.Movement.TurnRight = false;
+            client.Self.Movement.TurnLeft = false;
+            
+            isTurning = false;
+            //stop turning
+            //TurnStop();
        }

        private void TurnStart()
@@ -89,7 +98,7 @@ namespace Raindrop
        public RaindropMovement(RaindropInstance instance)
        {
            this.instance = instance;
-            timer = new System.Timers.Timer(1000);
+            timer = new System.Timers.Timer(100); //seems like turn left and right will have 100 timer.
            timer.Elapsed += new ElapsedEventHandler(timer_Elapsed);
            timer.Enabled = false;
        }
@@ -105,20 +114,13 @@ namespace Raindrop
        void timer_Elapsed(object sender, ElapsedEventArgs e)
        {
            float delta = (float)timer.Interval / 1000f;
-            if (turningLeft) {
-                client.Self.Movement.TurnLeft = true;
+            if (isTurning) {
                client.Self.Movement.BodyRotation = client.Self.Movement.BodyRotation * Quaternion.CreateFromAxisAngle(Vector3.UnitZ, delta);
                
                SendMovementPacketIfChanged();
-            } else if (turningRight) {
-                // client.Self.Movement.TurnRight = true;
-                client.Self.Movement.BodyRotation = client.Self.Movement.BodyRotation * Quaternion.CreateFromAxisAngle(Vector3.UnitZ, -delta);
-                
-                SendMovementPacketIfChanged();
-            }
+            } 
            else
-            {
-                
+            { //not turning
                SendMovementPacketIfChanged();
            }
        }
@@ -163,8 +165,6 @@ namespace Raindrop
        {
            //note: is impossible to be no movement due to that is being handled by zero2DInput.

-            
-            
            bool isUp = arg0.y > 0;
            bool isDown = arg0.y < 0;
            bool isNoVert = !isUp && !isDown;
@@ -193,8 +193,16 @@ namespace Raindrop
            SendMovementPacketIfChanged();
        }

+        // this is a safer method to send packets, as it makes sure we don't send non-helpful information.
        private void SendMovementPacketIfChanged()
        {
+            //hacky: moving means send. not moving, then have to check if changes has occured.
+            if (isTurning)
+            {
+                client.Self.Movement.SendUpdate(true);
+                return;
+            }
+            
            var present = client.Self.Movement.AgentControls;
            if (_prev != present)
            {
@@ -77,13 +77,13 @@ namespace Raindrop.Presenters

        #endregion

-        void Start()
+        void Awake()
        {
            CloseButton.onClick.AsObservable().Subscribe(_ => OnCloseBtnClick()); //when clicked, runs this method.
            SendButton.onClick.AsObservable().Subscribe(_ => OnSendBtnClick()); //change username property.
            ChatInputField.onValueChanged.AsObservable().Subscribe(_ => OnInputChanged(_)); //change username property.

-            RegisterClientEvents(client);
+            // RegisterClientEvents(client);
            
            _chatPresenterManager = new ChatPresenterManager(instance, localChatPrinter);
            
@@ -101,7 +101,7 @@ namespace Raindrop.Presenters

        private void OnDestroy()
        {
-            UnregisterClientEvents(client);
+            // UnregisterClientEvents(client);

            _chatPresenterManager.Dispose();
            _chatPresenterManager = null;
@@ -125,19 +125,7 @@ namespace Raindrop.Presenters
            var uimanager = ServiceLocator.ServiceLocator.Instance.Get<UIService>();
            uimanager.canvasManager.PopCanvas();
        }
-
-        private void RegisterClientEvents(GridClient client)
-        {
-            //client.Grid.CoarseLocationUpdate += new EventHandler<CoarseLocationUpdateEventArgs>(Grid_CoarseLocationUpdate);
-            
-        }
-
-        private void UnregisterClientEvents(GridClient client)
-        {
-            //client.Grid.CoarseLocationUpdate -= new EventHandler<CoarseLocationUpdateEventArgs>(Grid_CoarseLocationUpdate);
-            
-        }
-
+        
        //adds a tab for this particular IM session
        public void AddIMTab(UUID target, UUID session, string targetName)
        {
@@ -24,28 +24,23 @@ public class joystickToCameraBackend : MonoBehaviour

    private void OnJoySet(Vector2 arg0)
    {
+        
        float vert = arg0.y;
        float horz = arg0.x;

-        if (Mathf.Abs(horz) > thresh)
-        {
-            //process vertical camera movment.
-            if (horz > 0)
-            {
-                instance.Movement.TurningLeft();
-            }
-            else
-            {
-                instance.Movement.TurningRight();
-            }
+        int horz_clamp = (Mathf.Abs(horz) > thresh) ? 1 :
+                (Mathf.Abs(horz) < thresh) ? -1 :0;
+
+        if (horz_clamp == 0){
+            instance.Movement.SetTurningStop();
+        } else if(horz_clamp == 1){
+            instance.Movement.SetTurningRight();
        }
        else
        {
-            instance.Movement.TurningStop();
-
+            instance.Movement.SetTurningLeft();
        }
-        
-        
+
    }
    
 }
@@ -35,15 +35,24 @@ namespace Raindrop.Presenters

        private void ObjectsOnTerseObjectUpdate(object sender, TerseObjectUpdateEventArgs e)
        {
-            GameObject res;
-            objects.TryGetValue(e.Prim.ID, out res);
-            if (res != null)
+            GameObject obj;
+            objects.TryGetValue(e.Prim.ID, out obj);
+            if (obj != null)
            {
                //Debug.Log("object " + e.Prim.ID.ToString() + "has moved");
-                Debug.LogWarning("object move to be implemented");
+                // Debug.LogWarning("object move to be implemented");
+                UpdateObjTransforms(e.Prim, obj);
            }
        }
        
+        private static void UpdateObjTransforms(Primitive e, GameObject obj)
+        {
+            UE.Vector3 pos = RHelp.TKVector3(e.Position);
+            UE.Quaternion rot = RHelp.TKQuaternion4(e.Rotation);
+            obj.transform.position = pos;
+            obj.transform.rotation = rot;
+        }
+        
        private void ObjectsOnObjectUpdate(object sender, PrimEventArgs e)
        {
            if (e.Simulator != instance.Client.Network.CurrentSim)
@@ -73,7 +82,8 @@ namespace Raindrop.Presenters

 

-        //the routine that updates the position of the avatar or creates newly seen avatar
+        //  1. create prim if not exists yet.
+        //  2. move prim if already exist
        private void updatePrim(PrimEventArgs e)
        {
            lock (objectsLock)
@@ -97,7 +107,7 @@ namespace Raindrop.Presenters
                }
                else
                {
-                    Debug.Log("updating obj position. " + e.Prim.ID);
+                    //Debug.Log("updating obj position. " + e.Prim.ID);
                }

                SetPrimTransforms(e, primGO);
@@ -24,5 +24,6 @@ public class simpleFollow : MonoBehaviour
 
        // Smoothly move the camera towards that target position
        transform.position = Vector3.SmoothDamp(transform.position, targetPosition, ref velocity, smoothTime);
+        transform.LookAt(targetPosition);
    }
 }
@@ -693,7 +693,7 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 361051093761253963, guid: b48e30ed103c4324a9e537dd82576993, type: 3}
  m_PrefabInstance: {fileID: 1369961384}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &89864946
+--- !u!114 &89864948
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -787,7 +787,7 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 361051094640251306, guid: b48e30ed103c4324a9e537dd82576993, type: 3}
  m_PrefabInstance: {fileID: 1369961384}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &100122706
+--- !u!114 &100122708
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -8268,27 +8268,27 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 320.64648
      objectReference: {fileID: 0}
    - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 96.2829
      objectReference: {fileID: 0}
    - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 170.32324
      objectReference: {fileID: 0}
    - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -58.14145
      objectReference: {fileID: 0}
    - target: {fileID: 7018709174718091542, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
@@ -8328,11 +8328,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
@@ -8340,31 +8340,31 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 61.7435
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -61.7435
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100.28428
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1242.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -50.14214
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063738021369, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_Enabled
@@ -8372,79 +8372,79 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 272.2802
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 123.97484
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1336.69
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -71.98742
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063902907936, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 143.55145
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 382.17007
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 896.39996
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 201.08504
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -458.19998
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 402.17007
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 916.39996
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 206.08504
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -463.19998
      objectReference: {fileID: 0}
    - target: {fileID: 7869931063976929367, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_Horizontal
@@ -8456,27 +8456,27 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1180.5498
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 123.97484
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 600.2749
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -71.98742
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064156114084, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_Enabled
@@ -8488,11 +8488,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
@@ -8500,11 +8500,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 197.8836
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -61.745
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064171861448, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_Enabled
@@ -8532,7 +8532,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064171861450, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -0.000041463845
+      value: -0.000037224054
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064171861451, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_ChildControlWidth
@@ -8544,63 +8544,63 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064214119123, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064214119123, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064214119123, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 0.00094008446
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1502.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 916.39996
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1163.5851
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -463.19998
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1482.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100.28428
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 741.415
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -692.28296
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064370213010, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_Name
@@ -8608,11 +8608,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
@@ -8620,7 +8620,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 164.41
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
@@ -8628,19 +8628,19 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -92.205
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064498223490, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064498223490, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064498223490, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: -50.4414
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064620355454, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_text
@@ -8656,87 +8656,87 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100.28428
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1402.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -50.14214
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1482.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 143.97484
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 751.415
      objectReference: {fileID: 0}
    - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -834.41254
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065000309267, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065000309267, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065000309267, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: -41.5236
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1920
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 926.39996
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 960
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -616.8
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065059539331, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 143.55145
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065211819548, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_Pivot.x
@@ -8828,7 +8828,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065211819551, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_IsActive
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065211819622, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: ChatBox
@@ -8844,47 +8844,47 @@ PrefabInstance:
      objectReference: {fileID: 1984392860}
    - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1920
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 153.6
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 960
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -76.8
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100.28428
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1082.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -50.14214
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065285229390, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
@@ -8912,59 +8912,59 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1482.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 642.1408
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 741.415
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -321.0704
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 1482.83
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 742.4251
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 751.415
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -381.21255
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065358025499, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.x
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065358025499, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 0.64359003
      objectReference: {fileID: 0}
    - target: {fileID: 7869931065358025499, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
@@ -9020,15 +9020,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 340.64648
      objectReference: {fileID: 0}
    - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3}
      propertyPath: m_SizeDelta.y