Skip to content

Commit f6db0cc

Browse files
Elfi0KuhndorfElfi0Kuhndorf
committed
fix: add messageFeed UI, cleanup scripts, rename Prefabs
1 parent 47d5840 commit f6db0cc

16 files changed

+246
-72
lines changed

Assets/Prefabs/UI/UIToolkit/PostGameUICanvasToolkit.prefab renamed to Assets/Prefabs/UI/UIToolkit/PostGameUICanvasUITK.prefab

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ GameObject:
1010
m_Component:
1111
- component: {fileID: 7855837178462082302}
1212
- component: {fileID: 2063287831439623020}
13+
- component: {fileID: 6738810595005964937}
1314
m_Layer: 5
14-
m_Name: PostGameUICanvasToolkit
15+
m_Name: PostGameUICanvasUITK
1516
m_TagString: Untagged
1617
m_Icon: {fileID: 0}
1718
m_NavMeshLayer: 0
@@ -51,3 +52,16 @@ MonoBehaviour:
5152
m_WorldSpaceSizeMode: 1
5253
m_WorldSpaceWidth: 1920
5354
m_WorldSpaceHeight: 1080
55+
--- !u!114 &6738810595005964937
56+
MonoBehaviour:
57+
m_ObjectHideFlags: 0
58+
m_CorrespondingSourceObject: {fileID: 0}
59+
m_PrefabInstance: {fileID: 0}
60+
m_PrefabAsset: {fileID: 0}
61+
m_GameObject: {fileID: 1443245446169138580}
62+
m_Enabled: 1
63+
m_EditorHideFlags: 0
64+
m_Script: {fileID: 11500000, guid: c0ae2681246f0ef43b41f215b690d854, type: 3}
65+
m_Name:
66+
m_EditorClassIdentifier:
67+
uiDocument: {fileID: 2063287831439623020}

Assets/Prefabs/UI/UIToolkit/PostGameUICanvasToolkit.prefab.meta renamed to Assets/Prefabs/UI/UIToolkit/PostGameUICanvasUITK.prefab.meta

File renamed without changes.

Assets/Prefabs/UI/UIToolkit/UIDocumentSettingsPanel.prefab renamed to Assets/Prefabs/UI/UIToolkit/SettingsPanelCanvasUITK.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GameObject:
1212
- component: {fileID: 4096003274560183257}
1313
- component: {fileID: 1425188790653231607}
1414
m_Layer: 5
15-
m_Name: UIDocumentSettingsPanel
15+
m_Name: SettingsPanelCanvasUITK
1616
m_TagString: Untagged
1717
m_Icon: {fileID: 0}
1818
m_NavMeshLayer: 0
@@ -49,7 +49,7 @@ MonoBehaviour:
4949
m_PanelSettings: {fileID: 11400000, guid: 30704bc49d34869449e8bfdb3ab57841, type: 2}
5050
m_ParentUI: {fileID: 0}
5151
sourceAsset: {fileID: 9197481963319205126, guid: b3d4e0fc4dc0779409b489ef4872ba77, type: 3}
52-
m_SortingOrder: 2
52+
m_SortingOrder: 0
5353
m_WorldSpaceSizeMode: 1
5454
m_WorldSpaceWidth: 1920
5555
m_WorldSpaceHeight: 1080

Assets/Prefabs/UI/UIToolkit/UIDocumentSettingsPanel.prefab.meta renamed to Assets/Prefabs/UI/UIToolkit/SettingsPanelCanvasUITK.prefab.meta

File renamed without changes.

‎Assets/Prefabs/UI/UIToolkit/USS/GeneralUI.uss‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
.menuButton:hover {
2-
background-image: url("project://database/Assets/Textures/UI/ui_btn_blank.png?fileID=2800000&guid=41948b4cc6087644b983dce55b466d50&type=3#ui_btn_blank");
3-
background-size: 435px 75px;
4-
-unity-font-definition: url("project://database/Assets/TextMesh%20Pro/Fonts/Bungee-Regular.ttf?fileID=12800000&guid=b8a509d3b3ce60847bbafb5a38462ecf&type=3#Bungee-Regular");
5-
color: rgb(247, 213, 32);
6-
width: 320px;
7-
height: 65px;
8-
align-self: center;
9-
font-size: 44px;
10-
margin-top: 10px;
11-
background-color: rgb(208, 232, 255);
12-
-unity-background-image-tint-color: rgba(255, 255, 255, 0.42);
2+
-unity-background-image-tint-color: rgb(255, 245, 235);
133
}
144

155
.exitButton {
@@ -59,3 +49,9 @@
5949
width: 408px;
6050
height: 90px;
6151
}
52+
53+
.menuButton:active {
54+
-unity-font-definition: url("project://database/Assets/TextMesh%20Pro/Fonts/Bungee-Regular.ttf?fileID=12800000&guid=b8a509d3b3ce60847bbafb5a38462ecf&type=3#Bungee-Regular");
55+
color: rgb(247, 213, 32);
56+
-unity-background-image-tint-color: rgb(128, 128, 128);
57+
}

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,30 @@
2222
top: 500px;
2323
left: 64px;
2424
}
25+
26+
.message {
27+
color: rgb(255, 193, 21);
28+
font-size: 32px;
29+
-unity-font-definition: url("project://database/Assets/TextMesh%20Pro/Fonts/Roboto-Bold.ttf?fileID=12800000&guid=55ec8ee3b059fbf4d98bc372920c05e2&type=3#Roboto-Bold");
30+
-unity-text-outline-width: 1px;
31+
-unity-text-outline-color: rgb(0, 0, 0);
32+
}
33+
34+
.messageBox {
35+
flex-grow: 1;
36+
background-image: url("project://database/Assets/Textures/UI/ui_healthbar_bg.png?fileID=2800000&guid=ac1ab0ffbf410094088db89d509a3a4a&type=3#ui_healthbar_bg");
37+
flex-direction: column;
38+
margin-top: 8px;
39+
margin-bottom: 8px;
40+
width: 420px;
41+
height: 60px;
42+
transition-property: position;
43+
transition-duration: 2s;
44+
}
45+
46+
.messageList {
47+
}
48+
49+
.messageBoxMove {
50+
left: 10%;
51+
}

‎Assets/Prefabs/UI/UIToolkit/UXML/MessageFeed.uxml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<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+
<Style src="project://database/Assets/Prefabs/UI/UIToolkit/USS/MessageFeed.uss?fileID=7433441132597879392&amp;guid=daa8504d262853748b8d7c2a377261a3&amp;type=3#MessageFeed" />
3+
<engine:VisualElement name="messageFeed" style="flex-grow: 1;">
4+
<engine:ListView item-template="project://database/Assets/Prefabs/UI/UIToolkit/UXML/MessageItem.uxml?fileID=9197481963319205126&amp;guid=67ec44aea0b0f484c86c6489932cfcad&amp;type=3#MessageItem" name="messageList" virtualization-method="DynamicHeight" binding-source-selection-mode="AutoAssign" class="messageList" />
5+
</engine:VisualElement>
6+
</engine:UXML>

‎Assets/Prefabs/UI/UIToolkit/UXML/MessageFeed.uxml.meta‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Prefabs/UI/UIToolkit/UXML/MessageItem.uxml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<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+
<Style src="project://database/Assets/Prefabs/UI/UIToolkit/USS/MessageFeed.uss?fileID=7433441132597879392&amp;guid=daa8504d262853748b8d7c2a377261a3&amp;type=3#MessageFeed" />
3+
<engine:VisualElement name="messageItem">
4+
<engine:VisualElement name="animatedMessageBox" class="messageBox" style="transition-property: all; transition-duration: 0.7s; transition-timing-function: ease;">
5+
<engine:Label text="Lorem ipsum dolor sit amet" name="message" class="message" />
6+
</engine:VisualElement>
7+
</engine:VisualElement>
8+
</engine:UXML>

‎Assets/Prefabs/UI/UIToolkit/UXML/MessageItem.uxml.meta‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)