diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index a41a451cb..e9b6aa64b 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/ResWork/UI/AppIcon/AppIcon.png b/Assets/ResWork/UI/AppIcon/AppIcon.png index 457b3aa9f..64298a421 100644 Binary files a/Assets/ResWork/UI/AppIcon/AppIcon.png and b/Assets/ResWork/UI/AppIcon/AppIcon.png differ diff --git a/Assets/ResWork/UIPrefabs/Title/TitleInfo.prefab b/Assets/ResWork/UIPrefabs/Title/TitleInfo.prefab index 144fe0b30..97e352bf4 100644 --- a/Assets/ResWork/UIPrefabs/Title/TitleInfo.prefab +++ b/Assets/ResWork/UIPrefabs/Title/TitleInfo.prefab @@ -853,7 +853,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3677812646835513629} + - {fileID: 3896081702813529930} - {fileID: 4414461896555038799} - {fileID: 8826935861239906465} - {fileID: 1885993367526989969} @@ -923,8 +923,8 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1280, y: 720} - m_ScreenMatchMode: 0 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -1218,151 +1218,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4770242101066559002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2629850453921519518} - - component: {fileID: 4494604131952131277} - - component: {fileID: 6915744329611205653} - - component: {fileID: 1400444596164257763} - - component: {fileID: 5493500150216883095} - m_Layer: 0 - m_Name: New Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2629850453921519518 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4770242101066559002} - 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: 3677812646835513629} - 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!222 &4494604131952131277 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4770242101066559002} - m_CullTransparentMesh: 1 ---- !u!114 &6915744329611205653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4770242101066559002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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: 21300000, guid: 83a1693136ea2e349a8648241399a636, type: 3} - 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 ---- !u!114 &1400444596164257763 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4770242101066559002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6915744329611205653} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 5069586864675997313} - m_TargetAssemblyTypeName: TitleInfo, Assembly-CSharp - m_MethodName: OnClick_Screen - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &5493500150216883095 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4770242101066559002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4898603066693379478 GameObject: m_ObjectHideFlags: 0 @@ -1508,42 +1363,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &5975072486964857621 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3677812646835513629} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3677812646835513629 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5975072486964857621} - 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: 2629850453921519518} - m_Father: {fileID: 444483819741401241} - 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!1 &7715074818145021755 GameObject: m_ObjectHideFlags: 0 @@ -1689,6 +1508,135 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7776997623942400837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3896081702813529930} + - component: {fileID: 1793974206804255923} + - component: {fileID: 9160402424715858673} + - component: {fileID: 8544548082063542958} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3896081702813529930 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7776997623942400837} + 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: 444483819741401241} + 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!222 &1793974206804255923 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7776997623942400837} + m_CullTransparentMesh: 1 +--- !u!114 &9160402424715858673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7776997623942400837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Texture: {fileID: 2800000, guid: 02fa6b1d9ccf03d4dbad4c5aee8af94a, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &8544548082063542958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7776997623942400837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9160402424715858673} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5069586864675997313} + m_TargetAssemblyTypeName: TitleInfo, Assembly-CSharp + m_MethodName: OnClick_Screen + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &8345083634418220606 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index ae285ec6d..a0e454723 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -4685,10 +4685,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 121, y: -333} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3875964648245462270 CanvasRenderer: @@ -14759,10 +14759,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 121, y: -232} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &987827436419641488 CanvasRenderer: @@ -16494,7 +16494,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2931286266799411332 RectTransform: m_ObjectHideFlags: 0 @@ -22985,9 +22985,9 @@ RectTransform: - {fileID: 1156520485920347372} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 208, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 126, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5502611037725276666 @@ -33931,9 +33931,9 @@ RectTransform: - {fileID: 6185809200227087122} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.175, y: -38.06} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 78.35, y: 76.12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4656096652649122635 @@ -35654,10 +35654,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -30} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1025175467207679131 CanvasRenderer: @@ -48383,9 +48383,9 @@ RectTransform: - {fileID: 8627581003307384079} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -60, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 126, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4326302710291113810 @@ -51358,8 +51358,7 @@ MonoBehaviour: m_text: "\uC989\uC2DC \uC774\uB3D9" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -54928,10 +54927,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -232} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4520777005139245164 CanvasRenderer: @@ -61695,8 +61694,7 @@ MonoBehaviour: m_text: "\uC989\uC2DC \uC774\uB3D9" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -64736,7 +64734,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -68492,7 +68490,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Sprite: {fileID: 21300000, guid: b5b02bcc53245ec4fb4d313b65c17cea, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -70170,10 +70168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -333} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5575149044663304857 CanvasRenderer: @@ -75286,10 +75284,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -131} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7693815851412756338 CanvasRenderer: @@ -79985,9 +79983,9 @@ RectTransform: - {fileID: 2834052695919924752} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384.57498, y: -38.06} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 78.35, y: 76.12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8304982110673110685 @@ -81458,8 +81456,7 @@ MonoBehaviour: m_text: "\uC989\uC2DC \uC774\uB3D9" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -83344,10 +83341,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 121, y: -131} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5672886145270032371 CanvasRenderer: @@ -85631,8 +85628,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 27d815cb916e1544fb3418dab2c89f49, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: d64a0b06ed45c19409ae7aad2a246d4f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -91553,7 +91550,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -101500,8 +101497,7 @@ MonoBehaviour: m_text: "\uC989\uC2DC \uC774\uB3D9" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -101648,7 +101644,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -106223,9 +106219,9 @@ RectTransform: - {fileID: 3353969789094138875} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -194, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 126, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3070673849616192957 @@ -108416,9 +108412,9 @@ RectTransform: - {fileID: 1629699223974361622} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 211.875, y: -38.06} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 78.35, y: 76.12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5056128966559254441 @@ -109364,7 +109360,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3981901099563870773 RectTransform: m_ObjectHideFlags: 0 @@ -116619,7 +116615,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -119697,9 +119693,9 @@ RectTransform: - {fileID: 2114765989467969691} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 126, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &549673083284403424 @@ -121702,7 +121698,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Sprite: {fileID: 21300000, guid: 77e44864c82b7a34e9407d1195f0a75a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -130475,6 +130471,8 @@ MonoBehaviour: gos_noti: - {fileID: 3786295824972111576} - {fileID: 1615394283807579632} + gos_test: + - {fileID: 5133446003200057021} --- !u!223 &7830712477181563274 Canvas: m_ObjectHideFlags: 0 @@ -130624,10 +130622,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 121, y: -30} - m_SizeDelta: {x: 60, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2311960555711157178 CanvasRenderer: @@ -135208,9 +135206,9 @@ RectTransform: - {fileID: 2281335782828250375} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 125.524994, y: -38.06} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 78.35, y: 76.12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5826074212647485071 @@ -136365,8 +136363,7 @@ MonoBehaviour: m_text: "\uC989\uC2DC \uC774\uB3D9" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -137917,9 +137914,9 @@ RectTransform: - {fileID: 269495131661886090} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 298.22498, y: -38.06} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 78.35, y: 76.12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6032891398466555591 @@ -144938,32 +144935,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 1483342110725493344, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_Type - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1483342110725493344, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, - type: 3} - - target: {fileID: 1483342110725493344, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1483342110725493344, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1483342110725493344, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1545164523732294720, guid: 741f139cbc7b708439dd195045c7d8a1, type: 3} propertyPath: m_SizeDelta.x @@ -144984,12 +144955,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1716087587513416662, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 35f842dbf84b12641982033ea323962b, - type: 3} - target: {fileID: 2303762288305807875, guid: 741f139cbc7b708439dd195045c7d8a1, type: 3} propertyPath: m_fontSize @@ -145025,12 +144990,6 @@ PrefabInstance: propertyPath: m_fontColor32.rgba value: 4278248703 objectReference: {fileID: 0} - - target: {fileID: 2614846990714519588, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 35f842dbf84b12641982033ea323962b, - type: 3} - target: {fileID: 4309501721179535655, guid: 741f139cbc7b708439dd195045c7d8a1, type: 3} propertyPath: m_AnchorMax.y @@ -145191,21 +145150,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 7484528784899160352, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_SizeDelta.x - value: 26 - objectReference: {fileID: 0} - - target: {fileID: 7484528784899160352, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 7484528784899160352, guid: 741f139cbc7b708439dd195045c7d8a1, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -70.9 - objectReference: {fileID: 0} - target: {fileID: 8007294508452680228, guid: 741f139cbc7b708439dd195045c7d8a1, type: 3} propertyPath: m_AnchorMax.y @@ -162220,12 +162164,12 @@ PrefabInstance: - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.x - value: -104.9 + value: -104.8999 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_AnchoredPosition.y - value: -42.51 + value: -42.51001 objectReference: {fileID: 0} - target: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, type: 3} diff --git a/Assets/Scenes/Title.unity b/Assets/Scenes/Title.unity index 95879d7a8..ebabe48e5 100644 --- a/Assets/Scenes/Title.unity +++ b/Assets/Scenes/Title.unity @@ -723,7 +723,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 83a1693136ea2e349a8648241399a636, type: 3} + m_Texture: {fileID: 2800000, guid: 02fa6b1d9ccf03d4dbad4c5aee8af94a, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1358,7 +1358,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1668733659 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Info/InGameInfo.cs b/Assets/Script/Info/InGameInfo.cs index cdcb74558..e14d0ba5a 100644 --- a/Assets/Script/Info/InGameInfo.cs +++ b/Assets/Script/Info/InGameInfo.cs @@ -149,7 +149,10 @@ public partial class InGameInfo : MyCoroutine item.Value[i].SetActive(false); foreach (var item in dic_Obj) - item.Value.SetActive(false); + { + if (!DSUtil.CheckNull(item.Value)) + item.Value.SetActive(false); + } list_HUDDMGUI.ForEach(f => f.Off(true)); list_HUDUI.ForEach(f => f.Off(true)); diff --git a/Assets/Script/Table/PC/table_classopencondition.cs b/Assets/Script/Table/PC/table_classopencondition.cs index 0dbf2d412..ff0e6f526 100644 --- a/Assets/Script/Table/PC/table_classopencondition.cs +++ b/Assets/Script/Table/PC/table_classopencondition.cs @@ -2,7 +2,6 @@ using CodeStage.AntiCheat.ObscuredTypes; using Newtonsoft.Json; using System; using System.Collections.Generic; -using UnityEngine.WSA; [Serializable] public class ClassOpenConditionTableData : TableDataBase diff --git a/Assets/Script/UI/NewGameUI.cs b/Assets/Script/UI/NewGameUI.cs index afd7643e8..51e4612bd 100644 --- a/Assets/Script/UI/NewGameUI.cs +++ b/Assets/Script/UI/NewGameUI.cs @@ -30,6 +30,8 @@ public class NewGameUI : MonoBehaviourSingletonTemplate private void Start() { + Set_TestUI(); + m_GuideQuestUI.Set(); InGameInfo.Ins.Load_Map(-1); var cameraData = Camera.main.GetUniversalAdditionalCameraData(); @@ -160,4 +162,14 @@ public class NewGameUI : MonoBehaviourSingletonTemplate for (int i = 0; i < FarmMenu.Length; i++) FarmMenu[i].OnClick_Back(); } + + public GameObject[] gos_test; + void Set_TestUI() + { +#if UNITY_EDITOR + DSUtil.ActivateGameObjects(gos_test); +#else + DSUtil.InActivateGameObjects(gos_test); +#endif + } } \ No newline at end of file diff --git a/Assets/Script/UI/Shop/ShopPackagePopup.cs b/Assets/Script/UI/Shop/ShopPackagePopup.cs index 85177830c..72d8e7215 100644 --- a/Assets/Script/UI/Shop/ShopPackagePopup.cs +++ b/Assets/Script/UI/Shop/ShopPackagePopup.cs @@ -1,7 +1,6 @@ using TMPro; using UnityEngine; using UnityEngine.UI; -using static UnityEditor.PlayerSettings; public class ShopPackagePopup : uScrollViewMgr {