diff --git a/Assets/ChatButton.prefab b/Assets/ChatButton.prefab index 7c0c068..ae9715e 100644 --- a/Assets/ChatButton.prefab +++ b/Assets/ChatButton.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 9160917217469581314} - component: {fileID: 9160917217469581315} - component: {fileID: 9160917217469581312} + - component: {fileID: 2200992579668676165} m_Layer: 5 m_Name: ChatButton m_TagString: Untagged @@ -129,7 +130,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9160917217469581326} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: @@ -142,6 +143,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &2200992579668676165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9160917217469581326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3519366cc6f6159448e93458bcd34783, type: 3} + m_Name: + m_EditorClassIdentifier: + nameOfChat: + chatPane: {fileID: 0} + isSelected: 0 --- !u!1 &9160917218642360352 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Plugins/LibreMetaverse/AgentManagerMovement.cs b/Assets/Plugins/LibreMetaverse/AgentManagerMovement.cs index 039b1d8..bfd42e7 100644 --- a/Assets/Plugins/LibreMetaverse/AgentManagerMovement.cs +++ b/Assets/Plugins/LibreMetaverse/AgentManagerMovement.cs @@ -27,6 +27,7 @@ using System; using System.Threading; using OpenMetaverse.Packets; +using UnityEngine; namespace OpenMetaverse { @@ -598,6 +599,8 @@ namespace OpenMetaverse /// Simulator to send the update to public void SendUpdate(bool reliable, Simulator simulator) { + Debug.Log("sending movement packet."); + // Since version 1.40.4 of the Linden simulator, sending this update // causes corruption of the agent position in the simulator if (simulator != null && (!simulator.AgentMovementComplete)) diff --git a/Assets/Raindrop/ChatManager.cs b/Assets/Raindrop/ChatManager.cs index ff36c01..a73c215 100644 --- a/Assets/Raindrop/ChatManager.cs +++ b/Assets/Raindrop/ChatManager.cs @@ -32,6 +32,7 @@ using System; using OpenMetaverse; using System.Collections.Generic; +using Raindrop.Services; namespace Raindrop { @@ -39,30 +40,35 @@ namespace Raindrop // equivalent to a chat window with all the tabs and chats the user is chatting in. public class ChatManager { - public ChatTextManager localChatManager { get; private set; } //TODO: refactor this class to become model. UI can access data in the model as required. - //public List IMManagerList { get; private set; } + public ChatTextManager localChatManager { get; private set; } RaindropInstance instance; GridClient client { get { return instance.Client; } } + //this is the main chat. private string mainChatStringReference; - public ChatManager(RaindropInstance instance) + + public ChatManager(RaindropInstance instance, ITextPrinter textPrinter) { - instance = this.instance; + this.instance = instance; + TextPrinter = textPrinter; UnityEngine.Debug.Log("chatmanager being constructed"); - //setup - //start local chat if connected to localsim instance.Client.Network.SimConnected += Network_SimConnected; instance.Client.Network.Disconnected += Network_Disconnected; + //make the chat manager. (seems like we destroy it on disconnection.) + localChatManager = new ChatTextManager(instance, TextPrinter); + //subscribe to localchat received event // localChatManager.ChatLineAdded += LocalChatManager_ChatLineAdded; } + public ITextPrinter TextPrinter { get; set; } + public void Dispose() { localChatManager = null; @@ -83,23 +89,27 @@ namespace Raindrop Logger.Log("Simulator Connected", Helpers.LogLevel.Info); if (localChatManager == null) - localChatManager = new ChatTextManager(instance, ref mainChatStringReference); + localChatManager = new ChatTextManager(instance, TextPrinter); Logger.Log("creating local chat in memory.", Helpers.LogLevel.Info); + printToMainChat("Simulator Connected"); + } + + public void printToMainChat(string message) + { //print success msg. ChatBufferItem line = new ChatBufferItem( DateTime.Now, string.Empty, UUID.Zero, - "Simulator Connected", + message, ChatBufferTextStyle.Normal ); - localChatManager.ProcessBufferItem(line, true); - + UnityMainThreadDispatcher.Instance().Enqueue(() => + { + //process printing in main thread. + localChatManager.ProcessBufferItem(line, true); + }); } - - - - } } \ No newline at end of file diff --git a/Assets/Raindrop/Core/ChatTextManager.cs b/Assets/Raindrop/Core/ChatTextManager.cs index 06e6030..875f3f1 100644 --- a/Assets/Raindrop/Core/ChatTextManager.cs +++ b/Assets/Raindrop/Core/ChatTextManager.cs @@ -60,9 +60,9 @@ namespace Raindrop //public static Dictionary fontSettings = new Dictionary(); - public ChatTextManager(RaindropInstance instance, ref string localChat) + public ChatTextManager(RaindropInstance instance, ITextPrinter textPrinter) { - //TextPrinter = textPrinter; + TextPrinter = textPrinter; textBuffer = new List(); // a pipe into the string. @@ -187,77 +187,22 @@ namespace Raindrop // put the buffer item into the chat string. public void ProcessBufferItem(ChatBufferItem item, bool addToBuffer) { + // tell the world that a chat line is added. + ChatLineAdded?.Invoke(this, new ChatLineAddedArgs(item)); lock (SyncChat) { - this.localChat += ((string)(item.From + item.Text)); //ok... it seems, the list of chatbufferitem is like each line of the chat. This helps us iterate thru each line of chat in a sane fashion. i see. This can enable scrolling iteratively, like array. instance.LogClientMessage("chat.txt", item.From + item.Text); - - return; //for now... - if (addToBuffer) textBuffer.Add(item); - if (showTimestamps) - { - //if(fontSettings.ContainsKey("Timestamp")) - //{ - // var fontSetting = fontSettings["Timestamp"]; - // TextPrinter.ForeColor = fontSetting.ForeColor; - // TextPrinter.BackColor = fontSetting.BackColor; - // TextPrinter.Font = fontSetting.Font; - // TextPrinter.PrintText(item.Timestamp.ToString("[HH:mm] ")); - //} - //else - //{ - //TextPrinter.ForeColor = SystemColors.GrayText; - //TextPrinter.BackColor = Color.Transparent; - //TextPrinter.Font = Settings.FontSetting.DefaultFont; - //TextPrinter.PrintText(item.Timestamp.ToString("[HH:mm] ")); - //} - } - - //if(fontSettings.ContainsKey("Name")) - //{ - // var fontSetting = fontSettings["Name"]; - // TextPrinter.ForeColor = fontSetting.ForeColor; - // TextPrinter.BackColor = fontSetting.BackColor; - // TextPrinter.Font = fontSetting.Font; - //} - //else - //{ - //TextPrinter.ForeColor = SystemColors.WindowText; - //TextPrinter.BackColor = Color.Transparent; - //TextPrinter.Font = Settings.FontSetting.DefaultFont; - //} - - if (item.Style == ChatBufferTextStyle.Normal && item.ID != UUID.Zero && instance.GlobalSettings["av_name_link"]) - { - //TextPrinter.InsertLink(item.From, $"secondlife:///app/agent/{item.ID}/about"); - } - else - { - //TextPrinter.PrintText(item.From); - } - - //if(fontSettings.ContainsKey(item.Style.ToString())) - //{ - // var fontSetting = fontSettings[item.Style.ToString()]; - // TextPrinter.ForeColor = fontSetting.ForeColor; - // TextPrinter.BackColor = fontSetting.BackColor; - // TextPrinter.Font = fontSetting.Font; - //} - //else - //{ - // TextPrinter.ForeColor = SystemColors.WindowText; - // TextPrinter.BackColor = Color.Transparent; - // TextPrinter.Font = Settings.FontSetting.DefaultFont; - //} - //TextPrinter.PrintTextLine(item.Text); + TextPrinter.PrintText(item.Timestamp.ToString("[HH:mm] ")); + TextPrinter.PrintText(item.From); + TextPrinter.PrintTextLine(item.Text); } - - ChatLineAdded?.Invoke(this, new ChatLineAddedArgs(item)); } + public ITextPrinter TextPrinter { get; set; } + //process sending-out of local chat internal void ProcessChatInput(string input, ChatType type) { diff --git a/Assets/Raindrop/Core/RaindropMovement.cs b/Assets/Raindrop/Core/RaindropMovement.cs index 36074a4..b129e2a 100644 --- a/Assets/Raindrop/Core/RaindropMovement.cs +++ b/Assets/Raindrop/Core/RaindropMovement.cs @@ -49,41 +49,43 @@ namespace Raindrop private Vector3 forward = new Vector3(1, 0, 0); private bool turningLeft = false; private bool turningRight = false; - - public bool TurningLeft + private uint _prev; + + public void TurningRight() { - get => turningLeft; - set { - turningLeft = value; - if (value) { - timer_Elapsed(null, null); - timer.Enabled = true; - } else { - timer.Enabled = false; - client.Self.Movement.TurnLeft = false; - client.Self.Movement.SendUpdate(true); - } - } + turningRight = true; + turningLeft = false; + //start turning + TurnStart(); } - public bool TurningRight + public void TurningLeft() { - get => turningRight; - set - { - turningRight = value; - if (value) { - timer_Elapsed(null, null); - timer.Enabled = true; - } else { - timer.Enabled = false; - client.Self.Movement.TurnRight = false; - client.Self.Movement.SendUpdate(true); - } - } + turningRight = false; + turningLeft = true; + //start turning + TurnStart(); + } + public void TurningStop() + { + turningRight = false; + turningLeft = false; + //start turning + TurnStop(); } - + private void TurnStart() + { + timer_Elapsed(null, null); + timer.Enabled = true; //this timer is only required for turning. + } + private void TurnStop() + { + timer.Enabled = false; + SendMovementPacketIfChanged(); + } + + public RaindropMovement(RaindropInstance instance) { this.instance = instance; @@ -106,11 +108,18 @@ namespace Raindrop if (turningLeft) { client.Self.Movement.TurnLeft = true; client.Self.Movement.BodyRotation = client.Self.Movement.BodyRotation * Quaternion.CreateFromAxisAngle(Vector3.UnitZ, delta); - client.Self.Movement.SendUpdate(true); + + SendMovementPacketIfChanged(); } else if (turningRight) { - client.Self.Movement.TurnRight = true; + // client.Self.Movement.TurnRight = true; client.Self.Movement.BodyRotation = client.Self.Movement.BodyRotation * Quaternion.CreateFromAxisAngle(Vector3.UnitZ, -delta); - client.Self.Movement.SendUpdate(true); + + SendMovementPacketIfChanged(); + } + else + { + + SendMovementPacketIfChanged(); } } @@ -137,15 +146,6 @@ namespace Raindrop client.Self.Movement.LeftNeg = false; } - public void setTurningLeft() - { - TurningLeft = true; - } - - public void setTurningRight() - { - TurningRight = true; - } // stop moving. public void zero2DInput() @@ -154,7 +154,8 @@ namespace Raindrop client.Self.Movement.AtNeg = false; client.Self.Movement.LeftPos = false; client.Self.Movement.LeftNeg = false; - client.Self.Movement.SendUpdate(true); + + SendMovementPacketIfChanged(); } @@ -162,7 +163,7 @@ namespace Raindrop { //note: is impossible to be no movement due to that is being handled by zero2DInput. - uint prev = client.Self.Movement.AgentControls; + bool isUp = arg0.y > 0; bool isDown = arg0.y < 0; @@ -189,9 +190,15 @@ namespace Raindrop setLeftward(); } + SendMovementPacketIfChanged(); + } + + private void SendMovementPacketIfChanged() + { var present = client.Self.Movement.AgentControls; - if (prev != present) + if (_prev != present) { + _prev = client.Self.Movement.AgentControls; client.Self.Movement.SendUpdate(true); } } diff --git a/Assets/Raindrop/Services/Bootstrap/UIBootstrapper.cs b/Assets/Raindrop/Services/Bootstrap/UIBootstrapper.cs index 1c29e8d..4c32e90 100644 --- a/Assets/Raindrop/Services/Bootstrap/UIBootstrapper.cs +++ b/Assets/Raindrop/Services/Bootstrap/UIBootstrapper.cs @@ -9,10 +9,7 @@ namespace Raindrop.Services.Bootstrap //show the first UI panel to the user. class UIBootstrapper : MonoBehaviour { - public bool UI_Is_on = false; - private RaindropInstance instance => ServiceLocator.ServiceLocator.Instance.Get(); - private RaindropNetcom netcom => instance.Netcom; // bootstraps in order to obtain the canvasmanager instance. @@ -45,19 +42,12 @@ namespace Raindrop.Services.Bootstrap //return; } - bool success = false; var cm = GetComponentInChildren(); if (cm == null) Debug.LogError("canvasmanager not present"); var mm = GetComponentInChildren(); if (mm == null) Debug.LogError("modalmanager not present"); ServiceLocator.ServiceLocator.Instance.Register(new UIService(cm, mm)); - - - // in start, lauch the ui. - - // if (UI_Is_on) - // ServiceLocator.ServiceLocator.Instance.Get().init(); } @@ -72,21 +62,6 @@ namespace Raindrop.Services.Bootstrap // statusTimer = null; //} - //if (MediaConsole != null) - //{ - // if (TabConsole.TabExists("media")) - // { - // TabConsole.Tabs["media"].AllowClose = true; - // TabConsole.Tabs["media"].Close(); - // } - // else - // { - // MediaConsole.Dispose(); - // } - // MediaConsole = null; - // if (MessageBox.Show("Are you sure you - //} - if (!netcom.IsLoggedIn) return; Thread saveInvToDisk = new Thread(delegate () @@ -111,16 +86,13 @@ namespace Raindrop.Services.Bootstrap { if (netcom != null) { - //netcom = null; - //netcom.ClientLoginStatus -= new EventHandler(netcom_ClientLoginStatus); - //netcom.ClientLoggedOut -= new EventHandler(netcom_ClientLoggedOut); - //netcom.ClientDisconnected -= new EventHandler(netcom_ClientDisconnected); + netcom.Dispose(); } - - //if (instance.Client != null) - //{ - // UnregisterClientEvents(client); - //} + // + // if (instance.Client != null) + // { + // instance.UnregisterClientEvents(client); + // } //if (instance?.Names != null) //{ @@ -129,5 +101,6 @@ namespace Raindrop.Services.Bootstrap instance.CleanUp(); } + } } diff --git a/Assets/Raindrop/UI/chat/ChatButtonPresenter.cs b/Assets/Raindrop/UI/chat/ChatButtonPresenter.cs index 4d190ae..b940f6a 100644 --- a/Assets/Raindrop/UI/chat/ChatButtonPresenter.cs +++ b/Assets/Raindrop/UI/chat/ChatButtonPresenter.cs @@ -8,11 +8,16 @@ using UnityEngine.UI; namespace Raindrop.Presenters { //controls and handles input from chat buttons. + //this is attached to a chat button + [RequireComponent(typeof(Button))] public class ChatButtonPresenter : MonoBehaviour { + //name to display. public string nameOfChat; - public IMTextManager manager; //it makes sense for a chat tab to hold the chat manager instance. - public ChatPresenter chatPane; //it also makes sense that the chat tab holds the right side panel.. i think + //the chat button holds the printer for the chat window. + public IMTextManager manager; + + public ChatPresenter chatPane; public bool isSelected; // Start is called before the first frame update diff --git a/Assets/Raindrop/UI/chat/ChatPresenter.cs b/Assets/Raindrop/UI/chat/ChatPresenter.cs index 724b5eb..05ba8c3 100644 --- a/Assets/Raindrop/UI/chat/ChatPresenter.cs +++ b/Assets/Raindrop/UI/chat/ChatPresenter.cs @@ -21,7 +21,8 @@ using Vector3 = UnityEngine.Vector3; //view(unitytext) -- presenter(this) -- controller(this?) -- model (raindropinstance singleton) namespace Raindrop.Presenters { - + //this class is attached to the chatview gameobject. + //it launches the manager that takes care of incoming and outgoing chats. public class ChatPresenter : MonoBehaviour { //left pane: scrollable list of chats. @@ -36,11 +37,6 @@ namespace Raindrop.Presenters bool Active => instance.Client.Network.Connected; private ChatManager chatManager; - - - - //private List listOfIMpanels; - //private IMPresenter selectedChatLog; public readonly Dictionary agentSimHandle = new Dictionary(); private static readonly string LOCALCHATTITLE = "Local Chat"; @@ -64,8 +60,8 @@ namespace Raindrop.Presenters [Tooltip("show the current chat the user is viewing")] public TMP_Text ChatBox; - //wtf is this? - public TMPTextFieldPrinter tmp_printer; + //the printer that is printing into the big chat box. + public TMPTextFieldPrinter localChatPrinter; #endregion #region internal representations @@ -87,7 +83,6 @@ namespace Raindrop.Presenters // Use this for initialization void Start() { - 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. @@ -95,26 +90,26 @@ namespace Raindrop.Presenters RegisterClientEvents(client); //check if printer is attached to textbox. else attach it. - tmp_printer = ChatBox.gameObject.GetComponent(); - if (!tmp_printer) + localChatPrinter = ChatBox.gameObject.GetComponent(); + if (!localChatPrinter) { - tmp_printer = ChatBox.gameObject.AddComponent(); + localChatPrinter = ChatBox.gameObject.AddComponent(); //OpenMetaverse.Logger.Log("failed to make the tmp_printer component to the tmp textbox.", Helpers.LogLevel.Error); } + + chatManager = new ChatManager(instance, localChatPrinter); - chatManager = new ChatManager(instance); + // chatManager.localChatManager.ChatLineAdded += LocalChatManager_ChatLineAdded; - chatManager.localChatManager.ChatLineAdded += LocalChatManager_ChatLineAdded; - - startChat(true); + //startChat(true); } - private void LocalChatManager_ChatLineAdded(object sender, ChatLineAddedArgs e) - { - //new message in local chat! print it. - ChatBufferItem item = e.Item; - runPrinterOnItem(tmp_printer, item); - } + // private void LocalChatManager_ChatLineAdded(object sender, ChatLineAddedArgs e) + // { + // //new message in local chat! print it. + // ChatBufferItem item = e.Item; + // runPrinterOnItem(tmp_printer, item); + // } //id relative to the list. -1 means local. 0 means others. public void setShowingChat(int id) @@ -123,83 +118,83 @@ namespace Raindrop.Presenters { //print everything in text buffer list. List x = chatManager.localChatManager.getChatBuffer(); - runPrinterOnList(tmp_printer, x, 0,20); //print the selected range into the UI + // runPrinterOnList(tmp_printer, x, 0,20); //print the selected range into the UI } } - - public void runPrinterOnItem(TMPTextFieldPrinter TextPrinter, ChatBufferItem item) - { - //ChatBufferItem item = x[i]; - - if (/*showTimestamps*/ true) - { - //if(fontSettings.ContainsKey("Timestamp")) - //{ - // var fontSetting = fontSettings["Timestamp"]; - // TextPrinter.ForeColor = fontSetting.ForeColor; - // TextPrinter.BackColor = fontSetting.BackColor; - // TextPrinter.Font = fontSetting.Font; - // TextPrinter.PrintText(item.Timestamp.ToString("[HH:mm] ")); - //} - //else - //{ - //TextPrinter.ForeColor = SystemColors.GrayText; - //TextPrinter.BackColor = Color.Transparent; - //TextPrinter.Font = Settings.FontSetting.DefaultFont; - TextPrinter.PrintText(item.Timestamp.ToString("[HH:mm] ")); - //} - } - - //if(fontSettings.ContainsKey("Name")) - //{ - // var fontSetting = fontSettings["Name"]; - // TextPrinter.ForeColor = fontSetting.ForeColor; - // TextPrinter.BackColor = fontSetting.BackColor; - // TextPrinter.Font = fontSetting.Font; - //} - //else - //{ - //TextPrinter.ForeColor = SystemColors.WindowText; - //TextPrinter.BackColor = Color.Transparent; - //TextPrinter.Font = Settings.FontSetting.DefaultFont; - //} - - if (item.Style == ChatBufferTextStyle.Normal && item.ID != UUID.Zero && instance.GlobalSettings["av_name_link"]) - { - TextPrinter.InsertLink(item.From, $"secondlife:///app/agent/{item.ID}/about"); - } - else - { - TextPrinter.PrintText(item.From); - } - - //if(fontSettings.ContainsKey(item.Style.ToString())) - //{ - // var fontSetting = fontSettings[item.Style.ToString()]; - // TextPrinter.ForeColor = fontSetting.ForeColor; - // TextPrinter.BackColor = fontSetting.BackColor; - // TextPrinter.Font = fontSetting.Font; - //} - //else - //{ - // TextPrinter.ForeColor = SystemColors.WindowText; - // TextPrinter.BackColor = Color.Transparent; - // TextPrinter.Font = Settings.FontSetting.DefaultFont; - //} - - TextPrinter.PrintTextLine(item.Text); - } - - //you can run the printer when a new text comes in. - //or you can run it when the user opens a new chat and you gotta update the chat text. - public void runPrinterOnList(TMPTextFieldPrinter TextPrinter, List x, int rangeNew, int rangeOld) - { - for (int i = rangeNew; i < rangeOld; i++) - { - runPrinterOnItem(TextPrinter, x[i]); - } - } + // + // public void runPrinterOnItem(TMPTextFieldPrinter TextPrinter, ChatBufferItem item) + // { + // //ChatBufferItem item = x[i]; + // + // if (/*showTimestamps*/ true) + // { + // //if(fontSettings.ContainsKey("Timestamp")) + // //{ + // // var fontSetting = fontSettings["Timestamp"]; + // // TextPrinter.ForeColor = fontSetting.ForeColor; + // // TextPrinter.BackColor = fontSetting.BackColor; + // // TextPrinter.Font = fontSetting.Font; + // // TextPrinter.PrintText(item.Timestamp.ToString("[HH:mm] ")); + // //} + // //else + // //{ + // //TextPrinter.ForeColor = SystemColors.GrayText; + // //TextPrinter.BackColor = Color.Transparent; + // //TextPrinter.Font = Settings.FontSetting.DefaultFont; + // TextPrinter.PrintText(item.Timestamp.ToString("[HH:mm] ")); + // //} + // } + // + // //if(fontSettings.ContainsKey("Name")) + // //{ + // // var fontSetting = fontSettings["Name"]; + // // TextPrinter.ForeColor = fontSetting.ForeColor; + // // TextPrinter.BackColor = fontSetting.BackColor; + // // TextPrinter.Font = fontSetting.Font; + // //} + // //else + // //{ + // //TextPrinter.ForeColor = SystemColors.WindowText; + // //TextPrinter.BackColor = Color.Transparent; + // //TextPrinter.Font = Settings.FontSetting.DefaultFont; + // //} + // + // if (item.Style == ChatBufferTextStyle.Normal && item.ID != UUID.Zero && instance.GlobalSettings["av_name_link"]) + // { + // TextPrinter.InsertLink(item.From, $"secondlife:///app/agent/{item.ID}/about"); + // } + // else + // { + // TextPrinter.PrintText(item.From); + // } + // + // //if(fontSettings.ContainsKey(item.Style.ToString())) + // //{ + // // var fontSetting = fontSettings[item.Style.ToString()]; + // // TextPrinter.ForeColor = fontSetting.ForeColor; + // // TextPrinter.BackColor = fontSetting.BackColor; + // // TextPrinter.Font = fontSetting.Font; + // //} + // //else + // //{ + // // TextPrinter.ForeColor = SystemColors.WindowText; + // // TextPrinter.BackColor = Color.Transparent; + // // TextPrinter.Font = Settings.FontSetting.DefaultFont; + // //} + // + // TextPrinter.PrintTextLine(item.Text); + // } + // + // //you can run the printer when a new text comes in. + // //or you can run it when the user opens a new chat and you gotta update the chat text. + // public void runPrinterOnList(TMPTextFieldPrinter TextPrinter, List x, int rangeNew, int rangeOld) + // { + // for (int i = rangeNew; i < rangeOld; i++) + // { + // runPrinterOnItem(TextPrinter, x[i]); + // } + // } //adds another chat to the left side public void startChat(bool isSimChat) @@ -252,8 +247,8 @@ namespace Raindrop.Presenters //public chat ProcessChatInput(msgtext, ChatType.Normal); Debug.Log("Sending chat to local"); - return; - + + chatManager.printToMainChat("sending message (test)"); } diff --git a/Assets/joystickToCameraBackend.cs b/Assets/Raindrop/UI/joystickToCameraBackend.cs similarity index 84% rename from Assets/joystickToCameraBackend.cs rename to Assets/Raindrop/UI/joystickToCameraBackend.cs index cc68ba0..05ad696 100644 --- a/Assets/joystickToCameraBackend.cs +++ b/Assets/Raindrop/UI/joystickToCameraBackend.cs @@ -32,13 +32,18 @@ public class joystickToCameraBackend : MonoBehaviour //process vertical camera movment. if (horz > 0) { - instance.Movement.setTurningLeft(); + instance.Movement.TurningLeft(); } else { - instance.Movement.setTurningRight(); + instance.Movement.TurningRight(); } } + else + { + instance.Movement.TurningStop(); + + } } diff --git a/Assets/joystickToCameraBackend.cs.meta b/Assets/Raindrop/UI/joystickToCameraBackend.cs.meta similarity index 100% rename from Assets/joystickToCameraBackend.cs.meta rename to Assets/Raindrop/UI/joystickToCameraBackend.cs.meta diff --git a/Assets/Raindrop/UI/modals/EulaView.cs b/Assets/Raindrop/UI/modals/EulaView.cs index 856874e..ced843f 100644 --- a/Assets/Raindrop/UI/modals/EulaView.cs +++ b/Assets/Raindrop/UI/modals/EulaView.cs @@ -3,6 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; using Raindrop.ServiceLocator; +using Raindrop.Services; using TMPro; using UniRx; using UnityEngine; @@ -17,8 +18,7 @@ public class EulaView : MonoBehaviour private Toggle EulaToggle; public GameObject EulaToggleGO; - private Button closeBtn; - public GameObject closeBtnGO; + public Button closeBtn; private void Start() { @@ -41,6 +41,18 @@ public class EulaView : MonoBehaviour bool isAcceptedEULA = instance.GlobalSettings["EulaAccepted"]; onToggleChanged(isAcceptedEULA); + + closeBtn.onClick.AddListener(closeEula); + } + + private void closeEula() + { + if (instance.GlobalSettings["EulaAccepted"] == null) + return; + if (instance.GlobalSettings["EulaAccepted"] == false) + return; + + ServiceLocator.Instance.Get().canvasManager.resetToInitialScreen(); } private void onToggleChanged(bool isEulaAccepted) @@ -49,12 +61,12 @@ public class EulaView : MonoBehaviour if (isEulaAccepted) { - closeBtnGO.SetActive(true); + closeBtn.gameObject.SetActive(true); return; } else { - closeBtnGO.SetActive(false); + closeBtn.gameObject.SetActive(false); } } diff --git a/Assets/Raindrop/UI/textBoxTMP.cs b/Assets/Raindrop/UI/textBoxTMP.cs index 2122c5f..c1084e8 100644 --- a/Assets/Raindrop/UI/textBoxTMP.cs +++ b/Assets/Raindrop/UI/textBoxTMP.cs @@ -1,32 +1,32 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using TMPro; - -public class textBoxTMP : MonoBehaviour -{ - private TMP_Text textBox; - private string text; - // Start is called before the first frame update - void Start() - { - textBox = this.gameObject.GetComponent(); - Clear(); - } - - - public void appendtext(string text) - { - this.text += text; - textBox.text = this.text; - - return; - } - public void Clear() - { - this.text = ""; - textBox.text = this.text; - - return; - } -} +// using System.Collections; +// using System.Collections.Generic; +// using UnityEngine; +// using TMPro; +// +// public class textBoxTMP : MonoBehaviour +// { +// private TMP_Text textBox; +// private string text; +// // Start is called before the first frame update +// void Start() +// { +// textBox = this.gameObject.GetComponent(); +// Clear(); +// } +// +// +// public void appendtext(string text) +// { +// this.text += text; +// textBox.text = this.text; +// +// return; +// } +// public void Clear() +// { +// this.text = ""; +// textBox.text = this.text; +// +// return; +// } +// } diff --git a/Assets/Raindrop/UI/unity/TMPTextFieldPrinter.cs b/Assets/Raindrop/UI/unity/TMPTextFieldPrinter.cs index 94831a1..36f0aad 100644 --- a/Assets/Raindrop/UI/unity/TMPTextFieldPrinter.cs +++ b/Assets/Raindrop/UI/unity/TMPTextFieldPrinter.cs @@ -34,14 +34,6 @@ namespace Raindrop Regex urlRegex; private SlUriParser uriParser; - //public TMPTextFieldPrinter(IPrintableTMP_GO textBox) - //{ - // rtb = - // if (rtb == null) - // { - // rtb = this. - // } - private void Awake() { rtb = this.GetComponent(); diff --git a/Assets/Raindrop/Unity3D/AgentPresenter.cs b/Assets/Raindrop/Unity3D/AgentPresenter.cs index e5ee1d7..61d9c4b 100644 --- a/Assets/Raindrop/Unity3D/AgentPresenter.cs +++ b/Assets/Raindrop/Unity3D/AgentPresenter.cs @@ -7,7 +7,6 @@ using System.Threading; using UniRx.Triggers; using UE = UnityEngine ; using UnityEngine ; -using Vector3 = OpenMetaverse.Vector3; namespace Raindrop.Presenters { @@ -61,9 +60,7 @@ namespace Raindrop.Presenters avatarsDict.TryGetValue(e.Prim.ID, out agent); if (agent != null) { - Debug.Log("agent " + e.Prim.ID.ToString() + "has moved"); - UE.Vector3 pos = RHelp.TKVector3(e.Prim.Position); - agent.transform.position = pos; + UpdateAvatarTransforms(e.Prim, agent); } } } @@ -122,12 +119,18 @@ namespace Raindrop.Presenters Debug.Log("updating known-avi position. " + e.Avatar.Name); } - UE.Vector3 pos = RHelp.TKVector3(e.Avatar.Position); - aviGO.transform.position = pos; - + UpdateAvatarTransforms(e.Avatar, aviGO); } } + private static void UpdateAvatarTransforms(Primitive e, GameObject aviGO) + { + UE.Vector3 pos = RHelp.TKVector3(e.Position); + UE.Quaternion rot = RHelp.TKQuaternion4(e.Rotation); + aviGO.transform.position = pos; + aviGO.transform.rotation = rot; + } + //give the object for the main camera to track. private void cameraTrackAgent(GameObject aviGo) { diff --git a/Assets/Raindrop/Unity3D/ObjectPresenter.cs b/Assets/Raindrop/Unity3D/ObjectPresenter.cs index b98e9cf..6a9d460 100644 --- a/Assets/Raindrop/Unity3D/ObjectPresenter.cs +++ b/Assets/Raindrop/Unity3D/ObjectPresenter.cs @@ -39,7 +39,7 @@ namespace Raindrop.Presenters objects.TryGetValue(e.Prim.ID, out res); if (res != null) { - Debug.Log("object " + e.Prim.ID.ToString() + "has moved"); + //Debug.Log("object " + e.Prim.ID.ToString() + "has moved"); Debug.LogWarning("object move to be implemented"); } } diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 3dbc477..9854453 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -2024,7 +2024,7 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7869931064370213008, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} m_PrefabInstance: {fileID: 1679152091} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1984392857} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2706,7 +2706,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5dbfabecbcda5bb47b7800f9d748db3b, type: 3} m_Name: m_EditorClassIdentifier: - UI_Is_on: 1 --- !u!4 &505369348 Transform: m_ObjectHideFlags: 0 @@ -4070,7 +4069,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 746450086213425068, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.x - value: 299.0231 + value: 269.0231 objectReference: {fileID: 0} - target: {fileID: 746450086213425068, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.y @@ -4238,7 +4237,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 746450086938677148, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.x - value: 77.6688 + value: 47.6688 objectReference: {fileID: 0} - target: {fileID: 746450086938677148, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.y @@ -4262,7 +4261,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 746450087493763364, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.x - value: 1017.3916 + value: 1012.3916 objectReference: {fileID: 0} - target: {fileID: 746450087493763364, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.y @@ -4272,10 +4271,34 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 746450087517527253, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 746450087517527254, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_SizeDelta.y value: 92 objectReference: {fileID: 0} + - target: {fileID: 746450087517527255, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 746450087517527255, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_Padding.m_Top + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 746450087517527255, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_Padding.m_Left + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 746450087517527255, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_Padding.m_Right + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 746450087517527255, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_Padding.m_Bottom + value: 20 + objectReference: {fileID: 0} - target: {fileID: 746450087576395542, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4312,6 +4335,30 @@ PrefabInstance: propertyPath: m_Name value: Joystick objectReference: {fileID: 0} + - target: {fileID: 746450087857541889, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchoredPosition.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 746450087857541889, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchoredPosition.y + value: 357 + objectReference: {fileID: 0} + - target: {fileID: 746450087865279773, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 746450087865279773, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 746450087865279773, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000030518 + objectReference: {fileID: 0} + - target: {fileID: 746450087865279773, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchoredPosition.y + value: 68.77 + objectReference: {fileID: 0} - target: {fileID: 746450088104396160, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -4350,7 +4397,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 746450088105794417, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.x - value: 722.5501 + value: 692.5501 objectReference: {fileID: 0} - target: {fileID: 746450088105794417, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchoredPosition.y @@ -4392,6 +4439,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4306703675508275231, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchoredPosition.x + value: -252 + objectReference: {fileID: 0} + - target: {fileID: 4306703675508275231, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} + propertyPath: m_AnchoredPosition.y + value: 350 + objectReference: {fileID: 0} - target: {fileID: 7776404275057971278, guid: b1e7c57bd22531646a076ca6ee9cc6ad, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4690,10 +4745,10 @@ RectTransform: m_Father: {fileID: 2113625385} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 572, y: -69} - m_SizeDelta: {x: 210.3528, y: 84.3811} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 105.18, y: 99.8} + m_SizeDelta: {x: 210.35278, y: 84.3811} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &831097303 MonoBehaviour: @@ -5021,7 +5076,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: 0.0014190674, y: -0.00011444092} + m_AnchoredPosition: {x: 0.0014038086, y: -0.00012207031} m_SizeDelta: {x: -0.0029297, y: -0.00023651} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &941435050 @@ -5835,7 +5890,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: 0.002456665, y: 0.5190048} + m_AnchoredPosition: {x: 0.0024414062, y: 0.51898193} m_SizeDelta: {x: -0.0049972534, y: 1.0400009} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1114870290 @@ -6695,6 +6750,10 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 3775511210413060700, guid: ef712204938f12b4dad86d911456f638, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4000849118352810569, guid: ef712204938f12b4dad86d911456f638, type: 3} propertyPath: m_Name value: LoginPnl @@ -6821,10 +6880,10 @@ RectTransform: m_Father: {fileID: 2113625385} m_RootOrder: 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: -718.23, y: -515.55} - m_SizeDelta: {x: 483.5357, y: 48.8971} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 241.77002, y: 24.448975} + m_SizeDelta: {x: 483.5357, y: 48.897095} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1331173842 GameObject: @@ -7914,19 +7973,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 253337325104419149, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 150.6837 + value: 132.81076 objectReference: {fileID: 0} - target: {fileID: 253337325104419149, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 80.44 + value: 123.98413 objectReference: {fileID: 0} - target: {fileID: 253337325104419149, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 75.34185 + value: 66.40538 objectReference: {fileID: 0} - target: {fileID: 253337325104419149, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -40.22 + value: -61.992065 + objectReference: {fileID: 0} + - target: {fileID: 283476209163817756, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 667610398905264678, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 667610398905264678, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Padding.m_Top + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 667610398905264678, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Padding.m_Left + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 667610398905264678, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Padding.m_Right + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 667610398905264678, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Padding.m_Bottom + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 667610398905264678, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 667610398905264678, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildControlHeight + value: 1 objectReference: {fileID: 0} - target: {fileID: 1355683158831300981, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y @@ -7936,13 +8027,21 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 1355683158831300981, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 132.81076 + objectReference: {fileID: 0} + - target: {fileID: 1355683158831300981, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.y + value: 53.54413 + objectReference: {fileID: 0} - target: {fileID: 1355683158831300981, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 192.3095 + value: 86.40538 objectReference: {fileID: 0} - target: {fileID: 1355683158831300981, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -250.44 + value: -224.30032 objectReference: {fileID: 0} - target: {fileID: 2143019303963152537, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y @@ -7952,17 +8051,33 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 2143019303963152537, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 132.81076 + objectReference: {fileID: 0} - target: {fileID: 2143019303963152537, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 71.20387 objectReference: {fileID: 0} - target: {fileID: 2143019303963152537, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 192.3095 + value: 86.40538 objectReference: {fileID: 0} - target: {fileID: 2143019303963152537, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -250.44 + value: -268.44968 + objectReference: {fileID: 0} + - target: {fileID: 2162135187938738354, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildAlignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2162135187938738354, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2162135187938738354, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 objectReference: {fileID: 0} - target: {fileID: 2272297659527053195, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y @@ -7980,6 +8095,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2556938080555305116, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3334281381125149009, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -7990,19 +8109,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3334281381125149009, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 384.619 + value: 172.8108 objectReference: {fileID: 0} - target: {fileID: 3334281381125149009, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 320.44 + value: 271.0724 objectReference: {fileID: 0} - target: {fileID: 3334281381125149009, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: -27.946976 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3334281381125149009, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -532.0918 + value: -442.3345 objectReference: {fileID: 0} - target: {fileID: 4056373946394946524, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y @@ -8012,29 +8131,73 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 4056373946394946524, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 132.81076 + objectReference: {fileID: 0} + - target: {fileID: 4056373946394946524, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.y + value: 123.98413 + objectReference: {fileID: 0} - target: {fileID: 4056373946394946524, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 95.34185 + value: 86.40538 objectReference: {fileID: 0} - target: {fileID: 4056373946394946524, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -60.22 + value: -81.992065 + objectReference: {fileID: 0} + - target: {fileID: 4487788980468529548, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4487788980468529548, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4487788980468529548, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildForceExpandHeight + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5428335387189172732, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5428335387189172732, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_MinHeight + value: 127.4 + objectReference: {fileID: 0} + - target: {fileID: 5428335387189172732, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_PreferredWidth + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 5428335387189172732, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_PreferredHeight + value: 57.1 objectReference: {fileID: 0} - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 172.3095 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5428335387189172733, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7018709174718091542, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y @@ -8048,21 +8211,37 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 7223682445249600274, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 132.81076 + objectReference: {fileID: 0} + - target: {fileID: 7223682445249600274, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.y + value: 53.54413 + objectReference: {fileID: 0} - target: {fileID: 7223682445249600274, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 192.3095 + value: 86.40538 objectReference: {fileID: 0} - target: {fileID: 7223682445249600274, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -150.44 + value: -170.7562 + objectReference: {fileID: 0} + - target: {fileID: 7601994485748376856, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931063598443280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 1 objectReference: {fileID: 0} - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x @@ -8070,147 +8249,175 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 61.7435 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063598443284, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -61.7435 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 100.36072 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 1199.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063658595572, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -50.18036 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931063738021369, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 435.267 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 124.05142 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 1211.4365 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063738021372, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -72.02571 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063902907936, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 143.55145 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 370.24863 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 934.7706 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 195.12431 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063970133811, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -477.3853 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 390.24863 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 954.7706 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 200.12431 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931063976929356, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -482.3853 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931063976929367, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Horizontal + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931064072225201, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Text + value: objectReference: {fileID: 0} - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 973.803 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 124.05142 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 496.9015 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064072225203, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -72.02571 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931064156114084, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931064156114084, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_MinWidth + value: -1 objectReference: {fileID: 0} - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 148.7932 objectReference: {fileID: 0} - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 279.377 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064156114087, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -61.745 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931064171861448, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064171861450, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y @@ -8222,199 +8429,223 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7869931064171861450, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 384.619 + value: 172.8108 objectReference: {fileID: 0} - target: {fileID: 7869931064171861450, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 320.44 + value: 324.0516 objectReference: {fileID: 0} - target: {fileID: 7869931064171861450, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: -27.946976 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064171861450, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -128.41295 + value: -0.00012868317 + objectReference: {fileID: 0} + - target: {fileID: 7869931064171861451, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7869931064171861453, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064214119123, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064214119123, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064214119123, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 0.13737375 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1459.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 954.7706 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 1129.7836 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064243508739, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -482.3853 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1439.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 100.36072 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 719.535 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064268621182, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -730.5388 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931064370213010, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Name + value: ChatLog (printer) objectReference: {fileID: 0} - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1368.6285 + value: 796.31476 objectReference: {fileID: 0} - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 164.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 694.3143 + value: 408.15738 objectReference: {fileID: 0} - target: {fileID: 7869931064370213011, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -92.205 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064498223490, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064498223490, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064498223490, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: -50.4414 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7869931064620355454, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_text + value: Input + objectReference: {fileID: 0} + - target: {fileID: 7869931064620355454, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7869931064620355454, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_fontStyle + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 100.36072 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 1359.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064653769523, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -50.18036 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1439.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 144.05142 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 729.535 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931064696935669, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -872.7449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065000309267, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065000309267, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065000309267, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: -41.5236 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1864.3186 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 964.7706 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 932.1593 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065012256426, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -636.2058 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065059539331, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 143.55145 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065211819548, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_Pivot.x @@ -8506,7 +8737,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7869931065211819551, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7869931065211819622, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: ChatBox @@ -8516,49 +8747,53 @@ PrefabInstance: propertyPath: ChatInputField value: objectReference: {fileID: 290349283} + - target: {fileID: 7869931065211819622, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: localChatPrinter + value: + objectReference: {fileID: 1984392858} - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1864.3186 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 153.82053 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 932.1593 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065226065626, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -76.91026 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 100.36072 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 1039.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065284462280, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -50.18036 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065285229390, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y @@ -8568,73 +8803,77 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 7869931065285229390, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 132.81076 + objectReference: {fileID: 0} - target: {fileID: 7869931065285229390, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 71.20387 objectReference: {fileID: 0} - target: {fileID: 7869931065285229390, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 192.3095 + value: 86.40538 objectReference: {fileID: 0} - target: {fileID: 7869931065285229390, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -150.44 + value: -197.24582 objectReference: {fileID: 0} - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1439.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 680.35846 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 719.535 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065326940871, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -340.17923 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 1439.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 780.7192 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 729.535 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065343256300, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -400.3596 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065358025499, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065358025499, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 0.63552415 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7869931065358025499, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y @@ -8648,17 +8887,21 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 8052385738520796498, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + propertyPath: m_SizeDelta.x + value: 132.81076 + objectReference: {fileID: 0} - target: {fileID: 8052385738520796498, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 80.44 + value: 141.64388 objectReference: {fileID: 0} - target: {fileID: 8052385738520796498, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 95.34185 + value: 86.40538 objectReference: {fileID: 0} - target: {fileID: 8052385738520796498, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -60.22 + value: -90.82194 objectReference: {fileID: 0} - target: {fileID: 8180106457769803369, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y @@ -8670,45 +8913,47 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8180106457769803369, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 150.6837 + value: 132.81076 objectReference: {fileID: 0} - target: {fileID: 8180106457769803369, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 80.44 + value: 141.64388 objectReference: {fileID: 0} - target: {fileID: 8180106457769803369, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: 75.34185 + value: 66.40538 objectReference: {fileID: 0} - target: {fileID: 8180106457769803369, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -40.22 + value: -70.82194 objectReference: {fileID: 0} - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.x - value: 344.619 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_SizeDelta.y - value: 127.41295 + value: 116.2829 objectReference: {fileID: 0} - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.x - value: -7.9469757 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9199810795218893836, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2556938080555305116, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + - {fileID: 7869931064370213022, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} --- !u!1 &1679896958 GameObject: @@ -10105,6 +10350,23 @@ MonoBehaviour: m_ChildScaleWidth: 1 m_ChildScaleHeight: 1 m_ReverseArrangement: 0 +--- !u!1 &1984392857 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7869931064370213010, guid: 6d2618c0195b58c43b26e914c74c68ea, type: 3} + m_PrefabInstance: {fileID: 1679152091} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1984392858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984392857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc6b3e25d08ab4e49b26feceddf20fed, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2068575057 GameObject: m_ObjectHideFlags: 0 @@ -10281,7 +10543,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: EulaToggleGO: {fileID: 125379937} - closeBtnGO: {fileID: 0} + closeBtn: {fileID: 0} --- !u!114 &2069695858 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11300,7 +11562,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: EulaToggleGO: {fileID: 7780500126978366678} - closeBtnGO: {fileID: 5029334537454114588} + closeBtn: {fileID: 5029334537454114590} --- !u!1 &1710798491092331352 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e080360..d6b917e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,6 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} - - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1