diff --git a/Assets/lua/app/ui/dungeon_weapon/dungeon_weapon_introduction_ui.lua.bytes b/Assets/lua/app/ui/dungeon_weapon/dungeon_weapon_introduction_ui.lua.bytes index d7487581f..4e8b3509c 100644 Binary files a/Assets/lua/app/ui/dungeon_weapon/dungeon_weapon_introduction_ui.lua.bytes and b/Assets/lua/app/ui/dungeon_weapon/dungeon_weapon_introduction_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/dungeon_weapon/dungeon_weapon_introduction_ui.prefab b/Assets/prefabs/ui/dungeon_weapon/dungeon_weapon_introduction_ui.prefab index b50e8707a..83da36c72 100644 --- a/Assets/prefabs/ui/dungeon_weapon/dungeon_weapon_introduction_ui.prefab +++ b/Assets/prefabs/ui/dungeon_weapon/dungeon_weapon_introduction_ui.prefab @@ -25,17 +25,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 686577806708465101} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: - {fileID: 1905188437003160460} - m_Father: {fileID: 4632207508707230678} - m_RootOrder: 3 + m_Father: {fileID: 5799746173149248446} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 30} + m_AnchoredPosition: {x: 0, y: 67} m_SizeDelta: {x: 648, y: 96} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6214470338001202407 @@ -107,6 +107,7 @@ RectTransform: m_Children: - {fileID: 7965441918736827698} - {fileID: 1834150648672195171} + - {fileID: 9180970409887932889} - {fileID: 5382004642039516} - {fileID: 1700245095269972984} m_Father: {fileID: 4632207508707230678} @@ -184,7 +185,7 @@ RectTransform: m_Children: - {fileID: 6150211863408127045} m_Father: {fileID: 5799746173149248446} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -376,7 +377,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4632207508707230678} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -466,7 +467,6 @@ RectTransform: - {fileID: 8574265388017891140} - {fileID: 4932298021063795023} - {fileID: 5799746173149248446} - - {fileID: 9180970409887932889} - {fileID: 2908740623035608267} - {fileID: 3327941588890041811} - {fileID: 4982003585249093864} @@ -1591,7 +1591,7 @@ RectTransform: - {fileID: 7392787480440612174} - {fileID: 2813127335823375041} m_Father: {fileID: 4632207508707230678} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1663,6 +1663,82 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 +--- !u!1 &6786461039700052866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4658314493355596723} + - component: {fileID: 8670493357440190166} + - component: {fileID: 6382101345180549630} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4658314493355596723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6786461039700052866} + 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_Children: + - {fileID: 5743157596887952158} + m_Father: {fileID: 4932298021063795023} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 95} + m_SizeDelta: {x: 648, y: 96} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8670493357440190166 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6786461039700052866} + m_CullTransparentMesh: 1 +--- !u!114 &6382101345180549630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6786461039700052866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} + m_Type: 1 + 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!1 &7063485360497148426 GameObject: m_ObjectHideFlags: 0 @@ -2051,7 +2127,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4932298021063795023} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2155,6 +2231,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8506175808812766261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5743157596887952158} + - component: {fileID: 8467633822505572704} + - component: {fileID: 5710002631979539590} + m_Layer: 5 + m_Name: tx_title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5743157596887952158 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8506175808812766261} + 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_Children: [] + m_Father: {fileID: 4658314493355596723} + m_RootOrder: 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: -10} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8467633822505572704 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8506175808812766261} + m_CullTransparentMesh: 1 +--- !u!114 &5710002631979539590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8506175808812766261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8532389522413701147 GameObject: m_ObjectHideFlags: 0 @@ -2190,7 +2400,7 @@ RectTransform: - {fileID: 2928387628623095463} - {fileID: 7158075403852307004} m_Father: {fileID: 4632207508707230678} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2426,6 +2636,10 @@ MonoBehaviour: hashName: 3285171000 objectType: 6 gameObject: {fileID: 3693204972518686778} + - name: dungeon_weapon_introduction_ui.bg.records.title.tx_title + hashName: 1806246997 + objectType: 0 + gameObject: {fileID: 8506175808812766261} --- !u!222 &1067129198068976568 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2495,6 +2709,7 @@ RectTransform: m_Children: - {fileID: 8236243965028806930} - {fileID: 5740101469960457664} + - {fileID: 4658314493355596723} - {fileID: 1096127962611753283} - {fileID: 4858653871622406230} - {fileID: 3962486350410823690} @@ -2566,7 +2781,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} propertyPath: m_AnchorMax.x @@ -2677,7 +2892,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x @@ -2796,7 +3011,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} propertyPath: m_AnchorMax.x @@ -2872,16 +3087,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 767a66e669430b34b86bb9960017f477, type: 3} ---- !u!1 &7520979452224891686 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3228354919635980641, guid: 767a66e669430b34b86bb9960017f477, type: 3} - m_PrefabInstance: {fileID: 4941162679838046791} - m_PrefabAsset: {fileID: 0} --- !u!224 &1096127962611753283 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} m_PrefabInstance: {fileID: 4941162679838046791} m_PrefabAsset: {fileID: 0} +--- !u!1 &7520979452224891686 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3228354919635980641, guid: 767a66e669430b34b86bb9960017f477, type: 3} + m_PrefabInstance: {fileID: 4941162679838046791} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9032293972426580750 PrefabInstance: m_ObjectHideFlags: 0 @@ -2903,7 +3118,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} propertyPath: m_AnchorMax.x @@ -2979,13 +3194,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 767a66e669430b34b86bb9960017f477, type: 3} ---- !u!1 &5878407194020082287 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3228354919635980641, guid: 767a66e669430b34b86bb9960017f477, type: 3} - m_PrefabInstance: {fileID: 9032293972426580750} - m_PrefabAsset: {fileID: 0} --- !u!224 &3962486350410823690 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5450679172860041988, guid: 767a66e669430b34b86bb9960017f477, type: 3} m_PrefabInstance: {fileID: 9032293972426580750} m_PrefabAsset: {fileID: 0} +--- !u!1 &5878407194020082287 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3228354919635980641, guid: 767a66e669430b34b86bb9960017f477, type: 3} + m_PrefabInstance: {fileID: 9032293972426580750} + m_PrefabAsset: {fileID: 0}