root
/
BITKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

1

This commit is contained in:
CortexCore 2024-06-07 13:31:34 +08:00
parent ce477ef510
commit ccc9957809
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs
View File

@ -73,6 +73,13 @@ namespace BITKit.UX
protected virtual void Start() protected virtual void Start()
{ {
BITKit.UX.UXUtils.Inject(this); BITKit.UX.UXUtils.Inject(this);
UXService.Register(this);
destroyCancellationToken.Register(() =>
{
UXService.UnRegister(this);
});
if(IsValid && autoEntry) if(IsValid && autoEntry)
UXService.Entry(this); UXService.Entry(this);
@ -92,8 +99,8 @@ namespace BITKit.UX
{ {
UXService.Return(); UXService.Return();
} }
protected virtual void OnEnable()=>UXService.Register(this); protected virtual void OnEnable(){}
protected virtual void OnDisable()=>UXService.UnRegister(this); protected virtual void OnDisable(){}
protected virtual void OnPanelEntry(){} protected virtual void OnPanelEntry(){}
protected virtual void OnPanelExit(){} protected virtual void OnPanelExit(){}
void IEntryElement.Entry() void IEntryElement.Entry()

5
Src/Unity/UX/Common/Common_Mobile.asset
View File

@ -12,15 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
m_Name: Common_Mobile m_Name: Common_Mobile
m_EditorClassIdentifier: m_EditorClassIdentifier:
themeUss: {fileID: -4733365628477956816, guid: ac803f0924e239645ac6b2fc9baebc65, themeUss: {fileID: -4733365628477956816, guid: ac803f0924e239645ac6b2fc9baebc65, type: 3}
type: 3}
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_ScaleMode: 2 m_ScaleMode: 2
m_ReferenceSpritePixelsPerUnit: 100 m_ReferenceSpritePixelsPerUnit: 100
m_Scale: 1 m_Scale: 1
m_ReferenceDpi: 96 m_ReferenceDpi: 96
m_FallbackDpi: 96 m_FallbackDpi: 96
m_ReferenceResolution: {x: 640, y: 480} m_ReferenceResolution: {x: 480, y: 800}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_Match: 1 m_Match: 1
m_SortingOrder: 0 m_SortingOrder: 0

28
Src/Unity/UX/MaterialDesign.uss
View File

@ -23,8 +23,6 @@
.material Label { .material Label {
color: rgb(32, 33, 36); color: rgb(32, 33, 36);
-unity-font-definition: initial;
-unity-font: url('project://database/Assets/BITKit/Unity/Common/Art/Fonts/TTF/SourceHanMono/SourceHanMono-Medium.ttc?fileID=12800000&guid=c8058440fb1ea26488e022a5ee5b3b35&type=3#SourceHanMono-Medium');
} }
.material Label.title { .material Label.title {
@ -48,8 +46,6 @@ Slider.material {
border-bottom-width: 0; border-bottom-width: 0;
color: rgb(26, 115, 232); color: rgb(26, 115, 232);
transition-duration: 0.32s; transition-duration: 0.32s;
-unity-font: url('project://database/Assets/BITKit/Unity/Common/Art/Fonts/TTF/NotoSansSC/NotoSansSC-Bold.otf?fileID=12800000&guid=e530f1efcc7d4194f906fb563685b850&type=3#NotoSansSC-Bold');
-unity-font-definition: initial;
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
@ -101,8 +97,6 @@ Slider.material {
.material .unity-base-field Label { .material .unity-base-field Label {
color: rgb(95, 99, 104); color: rgb(95, 99, 104);
-unity-font-definition: initial;
-unity-font: url('project://database/Assets/BITKit/Unity/Common/Art/Fonts/TTF/SourceHanMono/SourceHanMono-Medium.ttc?fileID=12800000&guid=c8058440fb1ea26488e022a5ee5b3b35&type=3#SourceHanMono-Medium');
-unity-text-align: middle-left; -unity-text-align: middle-left;
} }
@ -144,8 +138,6 @@ Slider.material {
.material DropdownField > VisualElement > PopupTextElement { .material DropdownField > VisualElement > PopupTextElement {
color: rgb(26, 115, 232); color: rgb(26, 115, 232);
-unity-font-definition: initial;
-unity-font: url('project://database/Assets/BITKit/Unity/Common/Art/Fonts/TTF/SourceHanMono/SourceHanMono-Bold.ttc?fileID=12800000&guid=70e08abd745a9214299a520605342101&type=3#SourceHanMono-Bold');
} }
.material DropdownField > VisualElement > VisualElement { .material DropdownField > VisualElement > VisualElement {
@ -160,8 +152,6 @@ Slider.material {
.material .h2 { .material .h2 {
font-size: 30px; font-size: 30px;
-unity-font-definition: initial;
-unity-font: url('project://database/Assets/BITKit/Unity/Common/Art/Fonts/TTF/SourceHanMono/SourceHanMono-Bold.ttc?fileID=12800000&guid=70e08abd745a9214299a520605342101&type=3#SourceHanMono-Bold');
} }
.unity-base-dropdown > VisualElement { .unity-base-dropdown > VisualElement {
@ -173,8 +163,6 @@ Slider.material {
.unity-base-dropdown__label { .unity-base-dropdown__label {
color: rgb(26, 115, 232); color: rgb(26, 115, 232);
-unity-font: url('project://database/Assets/BITKit/Unity/Common/Art/Fonts/TTF/SourceHanMono/SourceHanMono-Bold.ttc?fileID=12800000&guid=70e08abd745a9214299a520605342101&type=3#SourceHanMono-Bold');
-unity-font-definition: initial;
} }
.context-menu { .context-menu {
@ -215,3 +203,19 @@ Slider.material {
.material.light RadioButton { .material.light RadioButton {
} }
.material Button:disabled {
background-color: rgba(32, 32, 32, 0.06);
border-left-width: 0;
border-right-width: 0;
border-top-width: 0;
border-bottom-width: 0;
color: rgb(32, 32, 32);
transition-duration: 0.32s;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
min-width: 128px;
opacity: 0.8;
}