diff --git a/Client/Assets/Resources/UI/Window/UIGameLaunchWindow.prefab b/Client/Assets/Resources/UI/Window/UIGameLaunchWindow.prefab new file mode 100644 index 0000000..90ef942 --- /dev/null +++ b/Client/Assets/Resources/UI/Window/UIGameLaunchWindow.prefab @@ -0,0 +1,194 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3715708025854149725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9110189334927255088} + - component: {fileID: 2127850970257007342} + - component: {fileID: 1186835599737490729} + m_Layer: 5 + m_Name: UIGameLaunchWindow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9110189334927255088 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715708025854149725} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8524444425201975215} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &2127850970257007342 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715708025854149725} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 7 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1186835599737490729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715708025854149725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 55 +--- !u!1 &4119225751788752102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8524444425201975215} + - component: {fileID: 2708675697425251290} + - component: {fileID: 384570620292863603} + m_Layer: 5 + m_Name: Img@Test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8524444425201975215 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4119225751788752102} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9110189334927255088} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2708675697425251290 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4119225751788752102} + m_CullTransparentMesh: 1 +--- !u!114 &384570620292863603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4119225751788752102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 + m_ColorType: 0 + m_GradientColor: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_Direction: 0 + m_OriginFlipMode: 0 + m_FlipMode: 0 + m_FlipWithCopy: 1 + m_FlipEdgeHorizontal: 2 + m_FlipEdgeVertical: 5 + m_FlipFillCenter: 3 + m_FlipDirection: 3 diff --git a/Client/Assets/Resources/UI/Window/UIGameLaunchWindow.prefab.meta b/Client/Assets/Resources/UI/Window/UIGameLaunchWindow.prefab.meta new file mode 100644 index 0000000..fb07fb4 --- /dev/null +++ b/Client/Assets/Resources/UI/Window/UIGameLaunchWindow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3ca8b6773b932d544b018aa4d39d2971 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scenes/Desingn.unity b/Client/Assets/Scenes/Desingn.unity index 63eb03d..444216e 100644 --- a/Client/Assets/Scenes/Desingn.unity +++ b/Client/Assets/Scenes/Desingn.unity @@ -1998,6 +1998,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3110666966229274110, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} insertIndex: -1 addedObject: {fileID: 1149398277} + - targetCorrespondingSourceObject: {fileID: 3110666966229274110, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} + insertIndex: -1 + addedObject: {fileID: 9129206414241663105} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} --- !u!1 &1649588971 @@ -2870,6 +2873,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129144262} m_CullTransparentMesh: 1 +--- !u!1001 &691226240736795265 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1162767588} + m_Modifications: + - target: {fileID: 1186835599737490729, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_BlockingMask.m_Bits + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 3715708025854149725, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_Name + value: UIGameLaunchWindow + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} +--- !u!224 &9129206414241663105 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9110189334927255088, guid: 3ca8b6773b932d544b018aa4d39d2971, type: 3} + m_PrefabInstance: {fileID: 691226240736795265} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scripts/Startup/UI.meta b/Client/Assets/Scripts/Startup/UI.meta new file mode 100644 index 0000000..6b22036 --- /dev/null +++ b/Client/Assets/Scripts/Startup/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70b5eddbe12ba9c4e9a7f66c8592f282 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scripts/Startup/UI/Generate.meta b/Client/Assets/Scripts/Startup/UI/Generate.meta new file mode 100644 index 0000000..045d5f9 --- /dev/null +++ b/Client/Assets/Scripts/Startup/UI/Generate.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4c4d0dddb0d92748ad7c653fd02b022 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs b/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs new file mode 100644 index 0000000..78902be --- /dev/null +++ b/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using UnityEngine.UI; +using AlicizaX.UI.Runtime; +namespace Game.UI +{ + [UIRes(ui_UIGameLaunchWindow.ResTag, EUIResLoadType.Resources)] + public class ui_UIGameLaunchWindow : UIHolderObjectBase + { + public const string ResTag = "Window/UIGameLaunchWindow"; + #region Generated by Script Tool + + [SerializeField] + private UXImage mImgTest; + public UXImage ImgTest => mImgTest; + + + #endregion + } +} diff --git a/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs.meta b/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs.meta new file mode 100644 index 0000000..4411db1 --- /dev/null +++ b/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ab56d86085a680941bcab8ef261c6fe0 \ No newline at end of file diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index def2209..16604e6 100644 Binary files a/Client/Assets/Test/GameLogic.dll.bytes and b/Client/Assets/Test/GameLogic.dll.bytes differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes index c80d2a8..206a4f9 100644 Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and b/Client/Assets/Test/GameLogic.pdb.bytes differ diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index 167b4e4..24c3840 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -67,17 +67,15 @@ MonoBehaviour: componentType: RecyclerView - uiElementRegex: Drag componentType: UXDraggable - - uiElementRegex: - componentType: UIScriptGenerateConfigs: - ProjectName: MainProject NameSpace: Game.UI - GenerateHolderCodePath: Assets/Scripts/UI/Generated - UIPrefabRootPath: Assets/Art/UI/Prefabs + GenerateHolderCodePath: Assets/Scripts/Startup/UI/Generate + UIPrefabRootPath: Assets/Resources/UI/ LoadType: 0 - ProjectName: Hotfix NameSpace: Game.UI GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic - UIPrefabRootPath: Assets/Art/UI/Prefabs + UIPrefabRootPath: Assets/Bundles/UI LoadType: 1 - UIScriptGeneratorHelper: AlicizaX.UI.Editor.DefaultUIGeneratorHelper + UIScriptGeneratorRuleHelper: AlicizaX.UI.Editor.DefaultIuiGeneratorRuleHelper diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset index 58a3642..0206018 100644 --- a/Client/UserSettings/EditorUserSettings.asset +++ b/Client/UserSettings/EditorUserSettings.asset @@ -33,10 +33,10 @@ EditorUserSettings: value: 0505045406565e080c59097440205d4444164f727d7d76367d7d1c63e3b9646d flags: 0 RecentlyUsedSceneGuid-8: - value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 + value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d flags: 0 RecentlyUsedSceneGuid-9: - value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d + value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 flags: 0 vcSharedLogLevel: value: 0d5e400f0650