This commit is contained in:
陈思海 2025-11-19 13:05:11 +08:00
parent fb36666c29
commit 88159964d4
13 changed files with 109 additions and 63 deletions

View File

@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 4801502739230327379}
- component: {fileID: 1839643559262572090}
- component: {fileID: 1590262444720639052}
- component: {fileID: 2636909633397487000}
- component: {fileID: 8270483239104722155}
m_Layer: 5
m_Name: UILoadUpdateWindow
m_TagString: Untagged
@ -40,6 +40,7 @@ RectTransform:
- {fileID: 6056289203651508232}
- {fileID: 8277505350050533328}
- {fileID: 434786077437263718}
- {fileID: 8914933720877746316}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -100,7 +101,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
hotButtons: []
--- !u!114 &2636909633397487000
--- !u!114 &8270483239104722155
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -116,6 +117,12 @@ MonoBehaviour:
mBtnTest: {fileID: 8242433937099588481}
mTextTitl: {fileID: 7423448528652229462}
mTextGameTitle: {fileID: 4229038960500937347}
mObjTestList:
- {fileID: 2580813499182288580}
- {fileID: 5217023009503673661}
- {fileID: 2070341851612434847}
- {fileID: 3075848250350631692}
- {fileID: 6906437026743455523}
mImgTestList:
- {fileID: 4753672883913794088}
- {fileID: 19703495912376014}
@ -128,6 +135,7 @@ MonoBehaviour:
- {fileID: 4563810544014715074}
- {fileID: 2060993977344163427}
- {fileID: 2080853874740608963}
mObjLobb: {fileID: 5770000422433218588}
--- !u!1 &2070341851612434847
GameObject:
m_ObjectHideFlags: 0
@ -141,7 +149,7 @@ GameObject:
- component: {fileID: 4185039174538723206}
- component: {fileID: 4563810544014715074}
m_Layer: 5
m_Name: '*Img#CanvasGroup@Test*2'
m_Name: '*Obj#Img#CanvasGroup@Test*2'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -404,7 +412,7 @@ GameObject:
- component: {fileID: 4753672883913794088}
- component: {fileID: 8659972988376294145}
m_Layer: 5
m_Name: '*Img#CanvasGroup@Test*0'
m_Name: '*Obj#Img#CanvasGroup@Test*0'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -655,7 +663,7 @@ GameObject:
- component: {fileID: 1057851142068418248}
- component: {fileID: 2060993977344163427}
m_Layer: 5
m_Name: '*Img#CanvasGroup@Test*3'
m_Name: '*Obj#Img#CanvasGroup@Test*3'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -782,7 +790,7 @@ GameObject:
- component: {fileID: 19703495912376014}
- component: {fileID: 188176691515685520}
m_Layer: 5
m_Name: '*Img#CanvasGroup@Test*1'
m_Name: '*Obj#Img#CanvasGroup@Test*1'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -896,6 +904,37 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &5770000422433218588
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8914933720877746316}
m_Layer: 0
m_Name: Obj@Lobb
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8914933720877746316
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5770000422433218588}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.1347046, y: -12.957336, z: -1.5050803}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2553447206821208227}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5796037856908370449
GameObject:
m_ObjectHideFlags: 0
@ -984,7 +1023,7 @@ GameObject:
- component: {fileID: 6926886040523368586}
- component: {fileID: 2080853874740608963}
m_Layer: 5
m_Name: '*Img#CanvasGroup@Test*4'
m_Name: '*Obj#Img#CanvasGroup@Test*4'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

View File

@ -27,6 +27,10 @@ namespace Game.UI
private UXTextMeshPro mTextGameTitle;
public UXTextMeshPro TextGameTitle => mTextGameTitle;
[SerializeField]
private GameObject[] mObjTestList = new GameObject[5];
public GameObject[] ObjTestList => mObjTestList;
[SerializeField]
private UXImage[] mImgTestList = new UXImage[5];
public UXImage[] ImgTestList => mImgTestList;
@ -35,6 +39,10 @@ namespace Game.UI
private CanvasGroup[] mCanvasGroupTestList = new CanvasGroup[5];
public CanvasGroup[] CanvasGroupTestList => mCanvasGroupTestList;
[SerializeField]
private GameObject mObjLobb;
public GameObject ObjLobb => mObjLobb;
#endregion
}
}

View File

@ -12,7 +12,6 @@ namespace Unity.Startup.Procedure
private async UniTaskVoid Start()
{
await UniTask.WaitUntil(() => YooAsset.YooAssets.Initialized);
GameApp.Procedure.InitializeProcedure(
new List<IProcedure>
{

Binary file not shown.

Binary file not shown.

@ -1 +1 @@
Subproject commit 958364080f889abb03729db844a2b0d0d1052e5e
Subproject commit 33922c9521ea1cc3552a50750cc7ce3762d11383

View File

@ -14,8 +14,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43
x: -455
y: 546
width: 1920
height: 997
m_ShowMode: 4
@ -23,7 +23,7 @@ MonoBehaviour:
m_RootView: {fileID: 4}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
m_Maximized: 0
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@ -41,7 +41,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 349
width: 297
width: 248
height: 598
m_MinSize: {x: 50, y: 50}
m_MaxSize: {x: 4000, y: 4000}
@ -69,12 +69,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 297
width: 248
height: 947
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 26
controlID: 25
draggingID: 0
--- !u!114 &4
MonoBehaviour:
@ -173,7 +173,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 100}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 142
controlID: 101
draggingID: 0
--- !u!114 &8
MonoBehaviour:
@ -192,10 +192,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 297
width: 248
height: 349
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 15}
@ -219,14 +219,14 @@ MonoBehaviour:
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 297
x: 248
y: 0
width: 357
width: 413
height: 947
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 71
controlID: 70
draggingID: 0
--- !u!114 &10
MonoBehaviour:
@ -245,7 +245,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 357
width: 413
height: 454
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@ -271,10 +271,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 454
width: 357
width: 413
height: 493
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 18}
@ -295,9 +295,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 654
x: 661
y: 0
width: 420
width: 692
height: 947
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
@ -321,9 +321,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1074
x: 1353
y: 0
width: 846
width: 567
height: 947
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
@ -353,8 +353,8 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 422
width: 296
y: 368
width: 247
height: 577
m_SerializedDataModeController:
m_DataMode: 0
@ -408,10 +408,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 296
width: 247
height: 556
m_Scale: {x: 0.15416667, y: 0.15416667}
m_Translation: {x: 148, y: 278}
m_Scale: {x: 0.12864584, y: 0.12864584}
m_Translation: {x: 123.5, y: 278}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
@ -419,12 +419,12 @@ MonoBehaviour:
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -960
y: -1803.2432
y: -2160.9717
width: 1920
height: 3606.4863
height: 4321.9434
m_MinimalGUI: 1
m_defaultScale: 0.15416667
m_LastWindowPixelSize: {x: 296, y: 577}
m_defaultScale: 0.12864584
m_LastWindowPixelSize: {x: 247, y: 577}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@ -521,8 +521,8 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 73
width: 296
y: 19
width: 247
height: 328
m_SerializedDataModeController:
m_DataMode: 0
@ -1137,9 +1137,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 297
y: 73
width: 355
x: 1
y: 19
width: 411
height: 433
m_SerializedDataModeController:
m_DataMode: 0
@ -1154,9 +1154,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 46760000
m_SelectedIDs: 02120000
m_LastClickedID: 0
m_ExpandedIDs: 00acffff02acffffa2e0ffffaae0fffface0ffffc6f9ffffc8f9ffff
m_ExpandedIDs: 04fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1172,7 +1172,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 10}
m_ClientGUIView: {fileID: 8}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@ -1200,9 +1200,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 297
y: 527
width: 355
x: 1
y: 473
width: 411
height: 472
m_SerializedDataModeController:
m_DataMode: 0
@ -1234,9 +1234,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 654
y: 73
width: 418
x: -31339
y: -31970
width: 690
height: 926
m_SerializedDataModeController:
m_DataMode: 0
@ -1259,7 +1259,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Plugins/Sirenix
- Assets/Scripts/Hotfix/GameProto/Config/Extension
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@ -1275,7 +1275,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: e48c0000
m_LastClickedID: 36068
m_ExpandedIDs: 00000000fe72000000730000027300000473000006730000087300000a7300000c7300000e73000010730000127300001473000016730000187300001a7300001c7300001e73000020730000227300002473000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a7300003c7300003e73000040730000427300004473000046730000487300004a7300004c7300004e73000050730000527300005473000056730000587300005a7300005c7300005e73000060730000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000787300007a7300007c7300007e73000080730000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000987300009a7300009c7300009e730000a0730000a2730000a4730000a6730000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000be730000c0730000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d6730000d8730000da730000dc730000de730000e0730000e2730000e4730000e6730000e8730000ea730000ec730000ee730000f0730000f2730000f4730000f6730000f8730000fa730000fc730000fe73000000740000027400000474000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e7400009074000092740000
m_ExpandedIDs: 00000000ce0d00009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000aa6e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000366f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000786f00007a6f00007c6f00007e6f0000806f0000826f0000846f0000866f0000886f00008a6f00008c6f00008e6f0000906f0000926f0000946f0000966f0000986f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000a66f0000a86f0000aa6f0000ac6f0000ae6f0000b06f0000b26f0000b46f0000b66f0000b86f0000ba6f0000bc6f0000be6f0000c06f0000c26f0000c46f0000c66f0000c86f0000ca6f0000cc6f0000ce6f0000d06f0000d26f0000d46f0000d66f0000d86f0000da6f0000dc6f0000de6f0000e06f0000e26f0000e46f0000e66f0000e86f0000ea6f0000ec6f0000ee6f0000f06f0000f26f0000f46f0000f66f0000f86f0000fa6f0000fc6f0000fe6f000000700000027000000470000006700000087000000a7000000c7000000e70000010700000127000001470000016700000187000001a7000001c7000001e70000020700000227000002470000026700000287000002a7000002c7000002e70000030700000327000003470000036700000387000003a7000003c7000003e700000407000004270000044700000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1303,18 +1303,18 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000920e0000fe72000000730000027300000473000006730000087300000a7300000e73000010730000127300001473000016730000187300001a7300001c7300001e73000020730000227300002473000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a7300003c7300003e73000040730000427300004473000046730000487300004c7300004e73000050730000527300005473000056730000587300005a7300005c7300005e73000060730000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000787300007a7300007e73000080730000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000987300009a7300009c730000a0730000a2730000a4730000a6730000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000be730000c0730000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d6730000d8730000da730000dc730000de730000e0730000e2730000e4730000e6730000e8730000ea730000ec730000ee730000f0730000f2730000f4730000f6730000f8730000fa730000fc730000fe73000000740000027400000474000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e740000607400006274000064740000667400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009c740000de7400009075000092750000b4750000ea75000046760000187700001e7700002277000098770000ac770000b8770000c6770000c8770000de770000
m_ExpandedIDs: ffffffff000000009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000786f00007a6f00007c6f00007e6f0000806f0000826f0000846f0000866f0000886f00008a6f00008c6f00008e6f0000906f0000926f0000946f0000966f0000986f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000a66f0000a86f0000aa6f0000ac6f0000ae6f0000b06f0000b26f0000b46f0000b66f0000b86f0000ba6f0000bc6f0000be6f0000c06f0000c26f0000c46f0000c66f0000c86f0000ca6f0000cc6f0000ce6f0000d06f0000d26f0000d46f0000d66f0000d86f0000da6f0000dc6f0000de6f0000e06f0000e26f0000e46f0000e66f0000e86f0000ea6f0000ec6f0000ee6f0000f26f0000f46f0000f66f0000f86f0000fa6f0000fc6f0000fe6f000000700000027000000470000006700000087000000a7000000c7000000e70000010700000127000001470000016700000187000001a7000001c7000001e7000002070000022700000247000002c700000307000003270000034700000387000003a7000003c7000003e7000004070000042700000447000000e720000287200002a7200003a720000507200005a7200005c7200005e7200006272000070720000ec7300003e75000028760000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: Sirenix
m_OriginalName: Sirenix
m_Name: Entry
m_OriginalName: Entry
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 30278
m_UserData: 28102
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
@ -1379,9 +1379,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1074
y: 73
width: 845
x: 1354
y: 19
width: 566
height: 926
m_SerializedDataModeController:
m_DataMode: 0
@ -1396,7 +1396,7 @@ MonoBehaviour:
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 469
m_CachedPref: 254
m_ControlHash: 1412526313
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1