Skip to content

Commit bc22328

Browse files
committed
Debugging and adjusting fade-in animation as well as moving message feed uxml into post game uxml
1 parent 969aa22 commit bc22328

File tree

4 files changed

+14
-82
lines changed

4 files changed

+14
-82
lines changed

Assets/Prefabs/UI/UIToolkit/PostGameUICanvasUITK.prefab

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ GameObject:
7575
serializedVersion: 6
7676
m_Component:
7777
- component: {fileID: 2100339957089282678}
78-
- component: {fileID: 1286002055205536738}
7978
- component: {fileID: 7623313333782190830}
8079
m_Layer: 5
8180
m_Name: MessageFeed
@@ -96,29 +95,9 @@ Transform:
9695
m_LocalPosition: {x: 0, y: 0, z: 0}
9796
m_LocalScale: {x: 1, y: 1, z: 1}
9897
m_ConstrainProportionsScale: 0
99-
m_Children:
100-
- {fileID: 5886284794912537810}
98+
m_Children: []
10199
m_Father: {fileID: 7855837178462082302}
102100
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
103-
--- !u!114 &1286002055205536738
104-
MonoBehaviour:
105-
m_ObjectHideFlags: 0
106-
m_CorrespondingSourceObject: {fileID: 0}
107-
m_PrefabInstance: {fileID: 0}
108-
m_PrefabAsset: {fileID: 0}
109-
m_GameObject: {fileID: 5550880791410142769}
110-
m_Enabled: 1
111-
m_EditorHideFlags: 0
112-
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
113-
m_Name:
114-
m_EditorClassIdentifier:
115-
m_PanelSettings: {fileID: 11400000, guid: 30704bc49d34869449e8bfdb3ab57841, type: 2}
116-
m_ParentUI: {fileID: 2063287831439623020}
117-
sourceAsset: {fileID: 9197481963319205126, guid: 79e0526232b7b2246a02c77f935c2b2a, type: 3}
118-
m_SortingOrder: 0
119-
m_WorldSpaceSizeMode: 1
120-
m_WorldSpaceWidth: 1920
121-
m_WorldSpaceHeight: 1080
122101
--- !u!114 &7623313333782190830
123102
MonoBehaviour:
124103
m_ObjectHideFlags: 0
@@ -132,54 +111,3 @@ MonoBehaviour:
132111
m_Name:
133112
m_EditorClassIdentifier:
134113
doc: {fileID: 2063287831439623020}
135-
--- !u!1 &8225198564806970540
136-
GameObject:
137-
m_ObjectHideFlags: 0
138-
m_CorrespondingSourceObject: {fileID: 0}
139-
m_PrefabInstance: {fileID: 0}
140-
m_PrefabAsset: {fileID: 0}
141-
serializedVersion: 6
142-
m_Component:
143-
- component: {fileID: 5886284794912537810}
144-
- component: {fileID: 6577115012106585769}
145-
m_Layer: 5
146-
m_Name: MessageItem
147-
m_TagString: Untagged
148-
m_Icon: {fileID: 0}
149-
m_NavMeshLayer: 0
150-
m_StaticEditorFlags: 0
151-
m_IsActive: 1
152-
--- !u!4 &5886284794912537810
153-
Transform:
154-
m_ObjectHideFlags: 0
155-
m_CorrespondingSourceObject: {fileID: 0}
156-
m_PrefabInstance: {fileID: 0}
157-
m_PrefabAsset: {fileID: 0}
158-
m_GameObject: {fileID: 8225198564806970540}
159-
serializedVersion: 2
160-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
161-
m_LocalPosition: {x: 0, y: 0, z: 0}
162-
m_LocalScale: {x: 1, y: 1, z: 1}
163-
m_ConstrainProportionsScale: 0
164-
m_Children: []
165-
m_Father: {fileID: 2100339957089282678}
166-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
167-
--- !u!114 &6577115012106585769
168-
MonoBehaviour:
169-
m_ObjectHideFlags: 0
170-
m_CorrespondingSourceObject: {fileID: 0}
171-
m_PrefabInstance: {fileID: 0}
172-
m_PrefabAsset: {fileID: 0}
173-
m_GameObject: {fileID: 8225198564806970540}
174-
m_Enabled: 1
175-
m_EditorHideFlags: 0
176-
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
177-
m_Name:
178-
m_EditorClassIdentifier:
179-
m_PanelSettings: {fileID: 11400000, guid: 30704bc49d34869449e8bfdb3ab57841, type: 2}
180-
m_ParentUI: {fileID: 1286002055205536738}
181-
sourceAsset: {fileID: 9197481963319205126, guid: 67ec44aea0b0f484c86c6489932cfcad, type: 3}
182-
m_SortingOrder: 0
183-
m_WorldSpaceSizeMode: 1
184-
m_WorldSpaceWidth: 1920
185-
m_WorldSpaceHeight: 1080

Assets/Prefabs/UI/UIToolkit/USS/MessageFeed.uss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@
4545
height: 26px;
4646
translate: -150% 0 0;
4747
transition-property: translate, opacity;
48-
transition-timing-function: ease-out-bounce, ease-in;
49-
transition-duration: 2s, 1s;
48+
transition-timing-function: ease-in-out-back, ease-in;
49+
transition-duration: 0.5s, 1s;
5050
position: relative;
51-
top: -537px;
52-
left: 10px;
5351
overflow: scroll;
5452
flex-direction: column;
5553
}
@@ -69,6 +67,8 @@
6967
#messageList{
7068
flex-direction: column;
7169
position: absolute;
70+
top: -537px;
71+
left: 10px;
7272
}
7373

7474
/* since we are using absolute position with a list view in this case

Assets/Prefabs/UI/UIToolkit/UXML/PostGameUICanvas.uxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
2+
<engine:Template name="MessageFeed" src="project://database/Assets/Prefabs/UI/UIToolkit/UXML/MessageFeed.uxml?fileID=9197481963319205126&amp;guid=79e0526232b7b2246a02c77f935c2b2a&amp;type=3#MessageFeed" />
23
<Style src="project://database/Assets/Prefabs/UI/UIToolkit/USS/GeneralUI.uss?fileID=7433441132597879392&amp;guid=36bef7d47f6ca284f8a33439946d6dfe&amp;type=3#GeneralUI" />
34
<Style src="project://database/Assets/Prefabs/UI/UIToolkit/USS/MessageFeed.uss?fileID=7433441132597879392&amp;guid=daa8504d262853748b8d7c2a377261a3&amp;type=3#MessageFeed" />
45
<engine:VisualElement name="postRoot" style="flex-grow: 1; flex-shrink: 5;">
@@ -9,6 +10,5 @@
910
<engine:Button text="return to menu" name="menuBtn" class="menuButton" style="left: 32%; top: 75%; position: absolute;" />
1011
<engine:Button text="Waiting on host &#10;to play again" name="waitOnHostBtn" class="menuButton" style="position: absolute; top: 60%; left: 32%;" />
1112
</engine:VisualElement>
12-
<!-- should use a custom control here, and this is not even the actual feed you are using in the post game ui -->
13-
<engine:ScrollView name="messageFeed" class="message-feed message-item" />
13+
<engine:Instance template="MessageFeed" />
1414
</engine:UXML>

Assets/Scripts/Gameplay/UI/MessageFeed.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections;
33
using System.Collections.Generic;
4+
using System.Diagnostics;
45
using UnityEngine;
56
using UnityEngine.UIElements;
67
using Unity.BossRoom.ConnectionManagement;
@@ -9,6 +10,7 @@
910
using Unity.BossRoom.Gameplay.Messages;
1011
using Unity.BossRoom.Infrastructure;
1112
using VContainer;
13+
using Debug = UnityEngine.Debug;
1214

1315
public class MessageFeed : MonoBehaviour
1416
{
@@ -123,6 +125,7 @@ void Start()
123125
var newLabel = new Label();
124126
newLabel.AddToClassList("message");
125127
newBox.Add(newLabel);
128+
Debug.Log("Creating new message box" + newLabel);
126129

127130
// the event when the control get's added to the "UI Canvas"
128131
newBox.RegisterCallback<AttachToPanelEvent>((e) =>
@@ -195,6 +198,7 @@ void Update()
195198

196199
foreach (var m in _messagesToRemove)
197200
{
201+
Debug.Log($"Removing message: {m.Message}");;
198202
var fadeOutClassName = "messageBoxFadeOut";
199203

200204
var child = m_MessageContainer.Query<VisualElement>().Class("messageBox")
@@ -229,10 +233,10 @@ IEnumerator ToggleClassWithDelay(VisualElement element, string className, TimeSp
229233

230234

231235
// if you bind the itemsource to the list you don't actually have to manually do this
232-
private class MessageViewModel
236+
class MessageViewModel
233237
{
234-
private readonly TimeSpan _autoDispose;
235-
private DateTime _createdAt;
238+
readonly TimeSpan _autoDispose;
239+
DateTime _createdAt;
236240

237241
public string Message { get; }
238242

0 commit comments

Comments
 (0)