diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab index 1c07eb2455..64e8b5e17e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab @@ -36,8 +36,8 @@ RectTransform: 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: 436.4, y: 819.8} - m_SizeDelta: {x: 68, y: 58.5} + m_AnchoredPosition: {x: 436.4, y: 724} + m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &173196099 CanvasRenderer: @@ -174,7 +174,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -100, y: -623.7} - m_SizeDelta: {x: 126, y: 108.3} + m_SizeDelta: {x: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &230670704 CanvasRenderer: @@ -14442,7 +14442,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -87.659, y: -356} - m_SizeDelta: {x: 126, y: 126} + m_SizeDelta: {x: 123, y: 123} m_Pivot: {x: 0.5820729, y: 0.49999988} --- !u!222 &6711504830727681682 CanvasRenderer: @@ -15581,10 +15581,10 @@ RectTransform: m_Father: {fileID: 6475993147429816923} m_RootOrder: 1 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 74} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5552189867614075924 GameObject: @@ -15935,7 +15935,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -100, y: -496.7} - m_SizeDelta: {x: 130, y: 108.3} + m_SizeDelta: {x: 130, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6195001280529825812 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab index 1e16aace00..596628e586 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab @@ -31,11 +31,11 @@ RectTransform: m_Children: - {fileID: 2325247880462125719} m_Father: {fileID: 8396209728857207438} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -10, y: 160.73} + m_AnchoredPosition: {x: -10, y: 160.72998} m_SizeDelta: {x: 604, y: 266} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &909235708 @@ -106,11 +106,11 @@ RectTransform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8396209728857207438} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70.95, y: 385.9} + m_AnchoredPosition: {x: 70.95001, y: 385.89996} m_SizeDelta: {x: 142, y: 129} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &914335610243721213 @@ -266,80 +266,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1933736740413118902 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3183424733959998188} - - component: {fileID: 9081112457250119285} - - component: {fileID: 4752528248478456379} - m_Layer: 5 - m_Name: mask (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3183424733959998188 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1933736740413118902} - 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: 6860202946281388347} - m_RootOrder: 2 - 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 &9081112457250119285 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1933736740413118902} - m_CullTransparentMesh: 0 ---- !u!114 &4752528248478456379 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1933736740413118902} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 148c4783df7580f4cb1fbc039c78b1ac, 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 --- !u!1 &2084043858434005442 GameObject: m_ObjectHideFlags: 0 @@ -375,9 +301,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 160.73} - m_SizeDelta: {x: 0, y: 321.35} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -0.025158692, y: 321.35} + m_Pivot: {x: 0, y: 0} --- !u!114 &4401188943909670150 MonoBehaviour: m_ObjectHideFlags: 0 @@ -672,7 +598,6 @@ RectTransform: m_Children: - {fileID: 6861030463589856289} - {fileID: 3674927358267051267} - - {fileID: 3183424733959998188} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -834,7 +759,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6860962394609556031 RectTransform: m_ObjectHideFlags: 0 @@ -1070,11 +995,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8396209728857207438} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -71, y: 385.9} + m_AnchoredPosition: {x: -71, y: 385.89996} m_SizeDelta: {x: 142, y: 129} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7540209308422541695 @@ -1221,123 +1146,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &7037925982266623994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5463341982538585298} - - component: {fileID: 8594004281609224473} - - component: {fileID: 3860247886038634203} - - component: {fileID: 3427510240086766405} - m_Layer: 0 - m_Name: rightAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5463341982538585298 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7037925982266623994} - 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: 8396209728857207438} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 193.4, y: 87} - m_SizeDelta: {x: 60, y: 84} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8594004281609224473 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7037925982266623994} - m_CullTransparentMesh: 0 ---- !u!114 &3860247886038634203 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7037925982266623994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3a26a653ede19f547aa35b873069fb87, 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 ---- !u!114 &3427510240086766405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7037925982266623994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - 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_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_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 3860247886038634203} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &7038986176317638297 GameObject: m_ObjectHideFlags: 0 @@ -1475,123 +1283,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &7241748459837452185 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1553465921306343843} - - component: {fileID: 4618459282425840770} - - component: {fileID: 527936977387574282} - - component: {fileID: 4639743093656783960} - m_Layer: 0 - m_Name: leftAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1553465921306343843 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7241748459837452185} - 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: 8396209728857207438} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -193, y: 87} - m_SizeDelta: {x: 60, y: 84} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4618459282425840770 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7241748459837452185} - m_CullTransparentMesh: 0 ---- !u!114 &527936977387574282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7241748459837452185} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 87f02bd2a5259244aa2fe3d12563fcf7, 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 ---- !u!114 &4639743093656783960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7241748459837452185} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - 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_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_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 527936977387574282} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &8452005726723476382 GameObject: m_ObjectHideFlags: 0 @@ -1625,8 +1316,6 @@ RectTransform: - {fileID: 8458557718928898840} - {fileID: 9184003918158714330} - {fileID: 9165166719414008181} - - {fileID: 1553465921306343843} - - {fileID: 5463341982538585298} - {fileID: 909235706} - {fileID: 9126201947357063014} - {fileID: 1923779622248223204} @@ -1681,9 +1370,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -1479, y: 0} + m_AnchoredPosition: {x: -5011, y: 382} m_SizeDelta: {x: 560, y: 222} - m_Pivot: {x: 1, y: 0} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &8189676088079493369 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index 0846591905..b177fa86ed 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &376461280 RectTransform: m_ObjectHideFlags: 0 @@ -259,6 +259,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2114040022} + - component: {fileID: 416313893998901577} m_Layer: 5 m_Name: Bg m_TagString: Untagged @@ -287,6 +288,14 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &416313893998901577 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2114040021} + m_CullTransparentMesh: 0 --- !u!1 &1190103957847382 GameObject: m_ObjectHideFlags: 0 @@ -298,7 +307,6 @@ GameObject: - component: {fileID: 224548315728257952} - component: {fileID: 222544982504122848} - component: {fileID: 114694805322612350} - - component: {fileID: 825941654} m_Layer: 5 m_Name: Bg1 m_TagString: Untagged @@ -346,7 +354,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -362,20 +370,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &825941654 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1190103957847382} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} - m_Name: - m_EditorClassIdentifier: - bgList: - - {fileID: 1190103957847382} --- !u!1 &1885828802997460 GameObject: m_ObjectHideFlags: 0 @@ -5636,7 +5630,6 @@ GameObject: - component: {fileID: 3486540690740851400} - component: {fileID: 6554366241998768696} - component: {fileID: 8904715232727990555} - - component: {fileID: 4938339258614227975} m_Layer: 5 m_Name: Bg2 m_TagString: Untagged @@ -5659,9 +5652,9 @@ RectTransform: m_RootOrder: 1 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_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 540, y: 1197} + m_SizeDelta: {x: 833, y: 834} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6554366241998768696 CanvasRenderer: @@ -5684,14 +5677,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3529412} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 4b7e5f2a4e2aa6147b66a6a121b8c802, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5700,20 +5693,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &4938339258614227975 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1215298159973672871} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} - m_Name: - m_EditorClassIdentifier: - bgList: - - {fileID: 1215298159973672871} --- !u!1 &1247610844541312587 GameObject: m_ObjectHideFlags: 0 @@ -11048,7 +11027,7 @@ RectTransform: m_Children: - {fileID: 6042049788699321599} m_Father: {fileID: 3682111438792279610} - 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} @@ -11140,7 +11119,7 @@ RectTransform: 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: -274, y: -463.7} + m_AnchoredPosition: {x: -274, y: -487.29} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3805011073443342724 @@ -21144,7 +21123,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3682111438792279610} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -21179,7 +21158,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 4fe61f15c1358f74a968a3f4767148c6, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21290,11 +21269,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3682111438792279610} - m_RootOrder: 1 + m_RootOrder: 0 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_AnchoredPosition: {x: 0, y: -128} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3749845715119794073 @@ -21324,10 +21303,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4513234844339929278} - {fileID: 3235415892733763480} + - {fileID: 4513234844339929278} - {fileID: 8791069319542950841} - - {fileID: 1955118664907067739} - {fileID: 2376853810968510760} - {fileID: 3542388914378049150} - {fileID: 1965169765554186566} @@ -21694,85 +21672,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &4276116420809780241 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3116076182073646537} - - component: {fileID: 5433188146642644883} - - component: {fileID: 8222333439630432819} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3116076182073646537 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4276116420809780241} - 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: 1955118664907067739} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.38819566} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.3, y: 65.4} - m_SizeDelta: {x: 124.2, y: 443.8} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5433188146642644883 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4276116420809780241} - m_CullTransparentMesh: 0 ---- !u!114 &8222333439630432819 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4276116420809780241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.72156864, b: 0.23137255, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: --- !u!1 &4321463989081460105 GameObject: m_ObjectHideFlags: 0 @@ -21807,9 +21706,9 @@ RectTransform: m_Father: {fileID: 376461280} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 195.31001, y: -134.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 149.09, y: 168.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7633219641597331427 @@ -31368,81 +31267,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &4886758006685762204 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1955118664907067739} - - component: {fileID: 696483827079068493} - - component: {fileID: 4579291807591354655} - m_Layer: 5 - m_Name: tip - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1955118664907067739 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4886758006685762204} - 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: 3116076182073646537} - m_Father: {fileID: 3682111438792279610} - m_RootOrder: 3 - 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: -349, y: 256} - m_SizeDelta: {x: 177.9, y: 741.9} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &696483827079068493 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4886758006685762204} - m_CullTransparentMesh: 0 ---- !u!114 &4579291807591354655 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4886758006685762204} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 160f9d20d35bf3c47937e17cd7060d09, 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 --- !u!1 &4937578044577667316 GameObject: m_ObjectHideFlags: 0 @@ -31477,9 +31301,9 @@ RectTransform: m_Father: {fileID: 376461280} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 673.88995, y: -134.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 149.09, y: 168.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7933808446971314160 @@ -36525,7 +36349,7 @@ RectTransform: - {fileID: 5820149025698902967} - {fileID: 5010798963308701974} m_Father: {fileID: 3682111438792279610} - 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} @@ -36659,7 +36483,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5646660067030727776} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -36828,6 +36652,7 @@ GameObject: - component: {fileID: 1921701397513380323} - component: {fileID: 6680648963269486201} - component: {fileID: 1122276894552381076} + - component: {fileID: 890717963345430202} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -36842,18 +36667,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5811225270708799072} - m_LocalRotation: {x: 0.0026179885, y: 0.9999966, z: -4.902275e-10, w: -0.00000018725288} + 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: 2376853810968510760} + m_Father: {fileID: 3247941152795093838} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180.00002, z: 0.3} + 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: -30, y: 13} - m_SizeDelta: {x: 418.9, y: 94.2} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0015545, y: 41.719936} + m_SizeDelta: {x: 192.63, y: 0} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &6680648963269486201 CanvasRenderer: m_ObjectHideFlags: 0 @@ -36884,19 +36709,33 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 1 + m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 51 - m_Alignment: 5 + m_MaxSize: 61 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 0.7 - m_Text: "\u9996\u6B21\u5341\u8FDE\u5FC5\u5F97\u4E94\u661F\u795E\u5C06" + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: LanguageIndex: 0 +--- !u!114 &890717963345430202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5811225270708799072} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &6442648155440228079 GameObject: m_ObjectHideFlags: 0 @@ -41793,7 +41632,7 @@ RectTransform: 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: 266.85, y: -463.7} + m_AnchoredPosition: {x: 266.85, y: -487.29} m_SizeDelta: {x: 388.5, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1247665718869932496 @@ -42685,6 +42524,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7376455958693746731} m_CullTransparentMesh: 0 +--- !u!1 &7430666727979094663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3247941152795093838} + - component: {fileID: 4105330798162488110} + - component: {fileID: 1215444120870446514} + m_Layer: 5 + m_Name: scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3247941152795093838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7430666727979094663} + 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: 1921701397513380323} + m_Father: {fileID: 2376853810968510760} + m_RootOrder: 0 + 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.22, y: 3.85} + m_SizeDelta: {x: 192.63, y: 83.44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4105330798162488110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7430666727979094663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1921701397513380323} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1215444120870446514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7430666727979094663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7478158915343189054 GameObject: m_ObjectHideFlags: 0 @@ -42787,18 +42708,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7904051090188792349} - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 227.96657} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 173.7} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1921701397513380323} + - {fileID: 3247941152795093838} m_Father: {fileID: 3682111438792279610} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -311, y: 869} - m_SizeDelta: {x: 549, y: 135} + m_AnchoredPosition: {x: -206.9, y: 576} + m_SizeDelta: {x: 214, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5057723128336030626 CanvasRenderer: @@ -42828,7 +42749,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fa958dc660689ca45bbb016673654f5a, type: 3} + m_Sprite: {fileID: 21300000, guid: cc769968502bdcc4abbc1a7f789bfb2e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -57386,9 +57307,9 @@ RectTransform: m_Father: {fileID: 376461280} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 434.59998, y: -134.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 149.09, y: 168.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2043930599046073550 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua index 0b413c3922..ae934e118b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua @@ -20,19 +20,19 @@ function RecruitMainPanel:InitComponent() this.content = Util.GetGameObject(self.gameObject, "bg/pageContent") this.item = Util.GetGameObject(this.tabbox, "tab") this.grid = Util.GetGameObject(this.tabbox, "box") - this.leftBtn = Util.GetGameObject(this.tabbox, "leftAction") - this.rightBtn = Util.GetGameObject(this.tabbox, "rightAction") + -- this.leftBtn = Util.GetGameObject(this.tabbox, "leftAction") + -- this.rightBtn = Util.GetGameObject(this.tabbox, "rightAction") this.jiantouyou = Util.GetGameObject(this.tabbox, "jiantouyou") this.jiantouzuo = Util.GetGameObject(this.tabbox, "jiantouzuo") this.select = Util.GetGameObject(this.tabbox, "select") + this.selectIma = Util.GetGameObject(this.select, "Image"):GetComponent("Image") this.select.gameObject:SetActive(false) this.upView = SubUIManager.Open(SubUIConfig.UpView,self.gameObject.transform) this.itemList = {} this.moveWidth = this.grid:GetComponent("RectTransform").rect.width this.itemWidth = this.item:GetComponent("RectTransform").rect.width - this.count = 3 - this.off = (this.moveWidth - this.count * this.itemWidth)/(this.count - 1) + this.off = 51 -- for i = 1,this.count do -- if not this.itemList[i] then -- this.itemList[i] = {} @@ -49,7 +49,8 @@ function RecruitMainPanel:InitComponent() -- this.itemList[i].redpot = Util.GetGameObject(this.itemList[i].go, "redpot") -- end -- end - this.pos0 = Vector3.New(this.off * (0 - 1) + 0 * this.itemWidth,0,0) + + this.pos0 = Vector3.New(this.off * (0 - 2) + (0 - 1) * this.itemWidth - 30,50,0) --this.pos4 = Vector3.New(this.off * (4 - 1) + 4 * this.itemWidth,0,0) self.lastPage,self.curPage,self.nextPage = 0,0,0 @@ -136,7 +137,7 @@ function this.OnEndDrag(Pointgo, data) end isEnter = 0 end - end,0.3):Start() + end,0.23):Start() end --绑定事件(用于子类重写) @@ -145,24 +146,24 @@ function RecruitMainPanel:BindEvent() Util.AddClick(this.btnBack, function() this:ClosePanel() end) - Util.AddClick(this.leftBtn, function() - this.mask:SetActive(true) - this.MoveTo(3) - Timer.New(function() - this.SortItemList() - this:LeftAction() - this.mask:SetActive(false) - end,0.3):Start() - end) - Util.AddClick(this.rightBtn, function() - this.mask:SetActive(true) - this.MoveTo(2) - Timer.New(function() - this.SortItemList() - this:RightAction() - this.mask:SetActive(false) - end,0.3):Start() - end) + -- Util.AddClick(this.leftBtn, function() + -- this.mask:SetActive(true) + -- this.MoveTo(3) + -- Timer.New(function() + -- this.SortItemList() + -- this:LeftAction() + -- this.mask:SetActive(false) + -- end,0.3):Start() + -- end) + -- Util.AddClick(this.rightBtn, function() + -- this.mask:SetActive(true) + -- this.MoveTo(2) + -- Timer.New(function() + -- this.SortItemList() + -- this:RightAction() + -- this.mask:SetActive(false) + -- end,0.3):Start() + -- end) Util.AddClick(this.jiantouyou , function() this.mask:SetActive(true) @@ -200,7 +201,6 @@ end function RecruitMainPanel:RefreshJianTou() local index = 0 - LogGreen("self.lastPage:"..self.lastPage.." self.nextPage:"..self.nextPage.." self.curPage:"..self.curPage) for i = self.curPage - 2,1,-1 do if self.dicData[i].RpType and self.dicData[i].RpType > 0 then if RecruitManager.GetAllRecruitBtnRedpoint(self.dicData[i].RpType) then @@ -209,7 +209,6 @@ function RecruitMainPanel:RefreshJianTou() end end end - LogGreen("index1:"..index) if index == 0 then this.jiantouyou.gameObject:SetActive(false) else @@ -300,8 +299,8 @@ function this:RefreshTabData() this.itemList[i].go.name = "tab_"..i this.itemList[i].tran = this.itemList[i].go:GetComponent("RectTransform") local vec = this.itemList[i].tran.anchoredPosition - vec.x = this.off * (i - 1) + i * this.itemWidth - vec.y = 0 + vec.x = this.off * (i - 2) + (i - 1) * this.itemWidth - 30 + vec.y = 50 this.itemList[i].tran.anchoredPosition = vec this.itemList[i].pos = this.itemList[i].tran.anchoredPosition this.itemList[i].index = i @@ -315,7 +314,7 @@ function this:RefreshTabData() redPointTypeList[self.dicData[i].RpType] = this.itemList[i].redpot end end - this.pos4 = Vector3.New(this.off * (#this.itemList) + (#this.itemList + 1) * this.itemWidth,0,0) + this.pos4 = Vector3.New(this.off * (#this.itemList - 2) + (#this.itemList - 1) * this.itemWidth - 30,50,0) end function this:SetIndex() @@ -348,6 +347,7 @@ function this:SetIndex() end this.mask:SetActive(false) this.select.gameObject:SetActive(true) + this.selectIma.sprite = this.spLoader:LoadSprite(self.dicData[self.curPage].Icon[2]) this:RefreshJianTou() end) end @@ -386,6 +386,7 @@ function this:LeftAction() self.curPage = self.nextPage self.nextPage = self.curPage + 1 > #self.dicData and 1 or self.curPage + 1 this.select.gameObject:SetActive(true) + this.selectIma.sprite = this.spLoader:LoadSprite(self.dicData[self.curPage].Icon[2]) this:RefreshJianTou() this:PageOnChange() --this:RefreshTabData() @@ -397,6 +398,7 @@ function this:RightAction() self.curPage = self.lastPage self.lastPage = self.curPage - 1 > 0 and self.curPage - 1 or #self.dicData this.select.gameObject:SetActive(true) + this.selectIma.sprite = this.spLoader:LoadSprite(self.dicData[self.curPage].Icon[2]) this:RefreshJianTou() this:PageOnChange() --this:RefreshTabData() diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index c569a87c1b..96366b57a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -18,11 +18,14 @@ local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) function RecruitPanelNew:InitComponent() self.spLoader = SpriteLoader.New() self.panel = Util.GetGameObject(self.gameObject,"Panel") + self.bg1 = Util.GetGameObject(self.gameObject,"Bg/Bg1"):GetComponent("Image") + self.bg2 = Util.GetGameObject(self.gameObject,"Bg/Bg2"):GetComponent("Image") + self.title=Util.GetGameObject(self.panel,"title"):GetComponent("Image") self.root=Util.GetGameObject(self.panel,"root") - self.rewardBox = Util.GetGameObject(self.panel, "rewardBox") - self.boxIcon = Util.GetGameObject(self.panel, "boxIcon") + self.rewardBox = Util.GetGameObject(self.panel, "btngroup/rewardBox") + self.boxIcon = Util.GetGameObject(self.rewardBox, "boxIcon") self.slider = Util.GetGameObject(self.rewardBox,"Bg/Slider"):GetComponent("Image") self.sliderText = Util.GetGameObject(self.rewardBox, "progress/Text"):GetComponent("Text") self.boxBtn=Util.GetGameObject(self.rewardBox,"Btn") @@ -42,14 +45,13 @@ function RecruitPanelNew:InitComponent() self.wishBtn = Util.GetGameObject(self.wishNoOpen,"Img") self.wishTextImg = Util.GetGameObject(self.wishNoOpen,"ImgText") self.wishText = Util.GetGameObject(self.wishTextImg,"Text"):GetComponent("Text") - self.wishTipIma = Util.GetGameObject(self.wishNoOpen,"tip") - self.wishTip = Util.GetGameObject(self.wishNoOpen,"tip/text"):GetComponent("Text") + self.wishTipIma = Util.GetGameObject(self.wishNoOpen,"tip"):GetComponent("Text") self.wishOpen = Util.GetGameObject(self.wish,"upHeroGrid") self.wishPre = Util.GetGameObject(self.wish,"upHeroPre") - self.tip = Util.GetGameObject(self.panel, "tip/text"):GetComponent("Text") + -- self.tip = Util.GetGameObject(self.panel, "tip/text"):GetComponent("Text") self.tenTip = Util.GetGameObject(self.panel, "TenTip") - self.tenTipText = Util.GetGameObject(self.panel, "TenTip/Text"):GetComponent("Text") + self.tenTipText = Util.GetGameObject(self.tenTip, "scroll/Text"):GetComponent("Text") self.upper = Util.GetGameObject(self.panel,"Upper/Num"):GetComponent("Text")--"今日召唤上限:" @@ -132,6 +134,7 @@ function RecruitPanelNew:OnShow(sortingOrder) self.sortingOrder = sortingOrder self:OnSortingOrderChange(sortingOrder) self.gameObject:SetActive(true) + self.singleConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"LotteryType",self.config.ShopData[1][1],"PerCount",1) self.tenConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"LotteryType",self.config.ShopData[1][1],"PerCount",10) self.XianZhaoConfig = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"LotteryType",TableRecruitType.xianyuan) @@ -141,18 +144,28 @@ function RecruitPanelNew:OnShow(sortingOrder) poolManager:UnLoadLive(self.liveNode.name, self.liveNode) end if self.config.ShopData[2][1] == 1 then - local name = GetResourcePath(self.config.ShopData[2][2]) - self.liveNode = poolManager:LoadLive(name, self.root.transform, Vector3.one *0.45, Vector3.New(253,-586,0)) - self.liveNode.name = name + local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,self.config.ShopData[2][2]) + local name = GetResourcePath(heroConfig.Live) + self.liveNode = poolManager:LoadLive(name, self.root.transform, Vector3.one *heroConfig.Scale, Vector3.New(heroConfig.Position[1], heroConfig.Position[2], 0)) + self.liveNode.name = name + local SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic") + local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end + SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle + poolManager:SetLiveClearCall(name, self.liveNode, function () + SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle + end) end end function RecruitPanelNew:UpdataPanel() - self.title.sprite = self.spLoader:LoadSprite(self.config.Icon[2]) - self.tip.text = self.config.TitleText + self.bg1.sprite = self.spLoader:LoadSprite(self.config.Icon[3]) + self.bg2.sprite = self.spLoader:LoadSprite(self.config.Icon[4]) + self.title.sprite = self.spLoader:LoadSprite(self.config.Icon[5]) + self.title:SetNativeSize() + -- self.tip.text = self.config.TitleText self:UpdataWishPanel() self:UpdataBoxReward() - self.upper.text=PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes).."/"..privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]--特权上限 + self.upper.text="今日召唤上限:"..PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes).."/"..privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]--特权上限 self:UpdatePanelData() self:TimeCountDown() end @@ -163,16 +176,6 @@ function RecruitPanelNew:UpdataWishPanel() self.tenTip.gameObject:SetActive(false) return end - - self.wish = Util.GetGameObject(self.panel,"wishBtn") - self.wishNoOpen = Util.GetGameObject(self.wish,"noOpen") - self.wishBtn = Util.GetGameObject(self.wishNoOpen,"Img") - self.wishTextImg = Util.GetGameObject(self.wishNoOpen,"ImgText") - self.wishTipIma = Util.GetGameObject(self.wishNoOpen,"tip") - self.wishTip = Util.GetGameObject(self.wishNoOpen,"tip/text"):GetComponent("Text") - self.wishOpen = Util.GetGameObject(self.wish,"upHeroGrid") - self.wishPre = Util.GetGameObject(self.wish,"upHeroPre") - self.wish.gameObject:SetActive(true) --如果没有达到150抽按钮置灰 local data = tonumber(specialConfig[119].Value) @@ -182,7 +185,7 @@ function RecruitPanelNew:UpdataWishPanel() self.wishOpen.gameObject:SetActive(false) Util.SetGray(self.wishBtn,true) self.wishText.text = string.format("%s/%s",RecruitManager.drawTimes[1],data) - self.wishTip.text = "开启心愿功能,将有更高概率获得心愿神将~" + self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿神将~" else self.wishNoOpen.gameObject:SetActive(false) self.wishOpen.gameObject:SetActive(true) @@ -206,12 +209,12 @@ function RecruitPanelNew:UpdataWishPanel() self.wishOpen.gameObject:SetActive(false) Util.SetGray(self.wishBtn,true) self.wishText.text = string.format("%s/%s",0,data) - self.wishTip.text = "开启心愿功能,将有更高概率获得心愿神将~" + self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿神将~" end self.tenTip:SetActive(true) if RecruitManager.isTenRecruit == 0 then - self.tenTipText.text = Language[11708] + self.tenTipText.text = "首次十连必得五星神将" else self.tenTipText.text = string.format("剩余%s次必得五星神将",RecruitManager.GetRecruit3MustCount()) end