diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index cee44e8d84..8e8b17121b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -3208,6 +3208,41 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53D6 \u6D88" LanguageIndex: 10407 +--- !u!1 &283835798700323898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2341903986388034191} + m_Layer: 5 + m_Name: Scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2341903986388034191 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 283835798700323898} + 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: 1547577205136846229} + m_RootOrder: 2 + 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: 810.6, y: 341} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &327192869304605687 GameObject: m_ObjectHideFlags: 0 @@ -3258,6 +3293,123 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 327192869304605687} m_CullTransparentMesh: 0 +--- !u!1 &383242469228152373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4437578735356364455} + - component: {fileID: 4503893001416319641} + - component: {fileID: 7014375674573420657} + - component: {fileID: 1366756429319373846} + m_Layer: 5 + m_Name: equiped + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4437578735356364455 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383242469228152373} + 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: 7661209922386680177} + m_RootOrder: 2 + 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: -6.4, y: 15.7} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4503893001416319641 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383242469228152373} + m_CullTransparentMesh: 0 +--- !u!114 &7014375674573420657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383242469228152373} + 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: 369d888ee69e51c44a4880efad895252, 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 &1366756429319373846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 383242469228152373} + 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: 0 + 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: 7014375674573420657} + 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 &413542288185743335 GameObject: m_ObjectHideFlags: 0 @@ -3297,6 +3449,145 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 28.5} m_SizeDelta: {x: 936.8, y: 456} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &455778513371744112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 111750177751179285} + - component: {fileID: 5493274851065670255} + - component: {fileID: 4476015328747187559} + - component: {fileID: 6016664161482259583} + - component: {fileID: 1416628586072142326} + m_Layer: 5 + m_Name: CancelBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &111750177751179285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455778513371744112} + 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: 7763052177072511891} + m_Father: {fileID: 1547577205136846229} + 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: -208.4, y: -265.09998} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5493274851065670255 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455778513371744112} + m_CullTransparentMesh: 0 +--- !u!114 &4476015328747187559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455778513371744112} + 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6016664161482259583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455778513371744112} + 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: 3 + 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: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + 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: 4476015328747187559} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &1416628586072142326 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455778513371744112} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &520511701913639905 GameObject: m_ObjectHideFlags: 0 @@ -13169,6 +13460,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9760\u8FD1\u654C\u4EBA\u540E\u81EA\u52A8\u8FDB\u5165\u6218\u6597" LanguageIndex: 11267 +--- !u!1 &3155030612461887586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7763052177072511891} + - component: {fileID: 8593895857400106245} + - component: {fileID: 5562263889222733311} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7763052177072511891 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3155030612461887586} + 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: 111750177751179285} + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8593895857400106245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3155030612461887586} + m_CullTransparentMesh: 0 +--- !u!114 &5562263889222733311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3155030612461887586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + 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: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u53D6 \u6D88" + LanguageIndex: 10407 --- !u!1 &3165649101010129155 GameObject: m_ObjectHideFlags: 0 @@ -14667,6 +15038,166 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &3496342813000368643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2673319027285708744} + - component: {fileID: 5493057869418475545} + - component: {fileID: 3810336303797880821} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2673319027285708744 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3496342813000368643} + 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: 1547577205136846229} + 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: 305.83} + m_SizeDelta: {x: 384.31, y: 64.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5493057869418475545 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3496342813000368643} + m_CullTransparentMesh: 0 +--- !u!114 &3810336303797880821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3496342813000368643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, a: 1} + m_RaycastTarget: 0 + 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: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8BBE \u7F6E" + LanguageIndex: 11266 +--- !u!1 &3499467737368281006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 62615950390493537} + - component: {fileID: 4373761899318237873} + - component: {fileID: 5082964763976239036} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &62615950390493537 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499467737368281006} + 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: 1547577205136846229} + 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} + m_AnchoredPosition: {x: 0, y: 232} + m_SizeDelta: {x: 384.31, y: 64.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4373761899318237873 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499467737368281006} + m_CullTransparentMesh: 0 +--- !u!114 &5082964763976239036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3499467737368281006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, a: 1} + m_RaycastTarget: 0 + 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: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u8BBE \u7F6E" + LanguageIndex: 11266 --- !u!1 &3534109283811079376 GameObject: m_ObjectHideFlags: 0 @@ -17617,6 +18148,7 @@ RectTransform: - {fileID: 1557565913901413994} - {fileID: 72210568968635668} - {fileID: 7168560341765080648} + - {fileID: 1547577205136846229} m_Father: {fileID: 4982919456788885506} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -22064,6 +22596,115 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &6025013390449448656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1977717236899668951} + - component: {fileID: 79932610000940076} + - component: {fileID: 32245225713228254} + - component: {fileID: 8521293386288842695} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1977717236899668951 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6025013390449448656} + 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: 1527903515681314488} + m_Father: {fileID: 7661209922386680177} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &79932610000940076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6025013390449448656} + 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: 0 + 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: 8521293386288842695} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &32245225713228254 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6025013390449448656} + m_CullTransparentMesh: 0 +--- !u!114 &8521293386288842695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6025013390449448656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &6069926180843602530 GameObject: m_ObjectHideFlags: 0 @@ -25002,6 +25643,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6677033513105694373} m_CullTransparentMesh: 0 +--- !u!1 &6685549578036669367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1618352936791836106} + - component: {fileID: 876776378167477145} + - component: {fileID: 4806661477673231084} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1618352936791836106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6685549578036669367} + 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: 1270142527764263256} + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &876776378167477145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6685549578036669367} + m_CullTransparentMesh: 0 +--- !u!114 &4806661477673231084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6685549578036669367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + 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: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E \u5B9A\r" + LanguageIndex: 11274 --- !u!1 &6691485569744652692 GameObject: m_ObjectHideFlags: 0 @@ -26253,6 +26974,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7014052985923824080} m_CullTransparentMesh: 0 +--- !u!1 &7065799691782861067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5786691464379296659} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5786691464379296659 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7065799691782861067} + 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: 7661209922386680177} + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7093571060650879715 GameObject: m_ObjectHideFlags: 0 @@ -28472,6 +29228,145 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7676021754637663661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1270142527764263256} + - component: {fileID: 1941063156173957134} + - component: {fileID: 1474247594584583175} + - component: {fileID: 4616128745514094644} + - component: {fileID: 4159095122475303390} + m_Layer: 5 + m_Name: ConfirmBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1270142527764263256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676021754637663661} + 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: 1618352936791836106} + m_Father: {fileID: 1547577205136846229} + 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} + m_AnchoredPosition: {x: 168.20007, y: -265.09998} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1941063156173957134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676021754637663661} + m_CullTransparentMesh: 0 +--- !u!114 &1474247594584583175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676021754637663661} + 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4616128745514094644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676021754637663661} + 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: 3 + 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: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + 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: 1474247594584583175} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &4159095122475303390 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676021754637663661} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &7679549269722646008 GameObject: m_ObjectHideFlags: 0 @@ -31091,6 +31986,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8BBE \u7F6E" LanguageIndex: 11266 +--- !u!1 &8084438387889999376 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1527903515681314488} + - component: {fileID: 144763937853999062} + - component: {fileID: 6931757217413849694} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1527903515681314488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8084438387889999376} + 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: 1977717236899668951} + 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: -10.3, y: 22.7} + m_SizeDelta: {x: 140, y: 125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &144763937853999062 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8084438387889999376} + m_CullTransparentMesh: 0 +--- !u!114 &6931757217413849694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8084438387889999376} + 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: 0 + 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: 84b137e960461f44082b1491d6ce5b7b, 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 &8110487719030297707 GameObject: m_ObjectHideFlags: 0 @@ -34328,6 +35297,56 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8439108667743816576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547577205136846229} + - component: {fileID: 6795299148039980688} + m_Layer: 5 + m_Name: GeneralPopup_XiuXingSelectHero + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1547577205136846229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8439108667743816576} + 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: 2673319027285708744} + - {fileID: 62615950390493537} + - {fileID: 2341903986388034191} + - {fileID: 111750177751179285} + - {fileID: 1270142527764263256} + - {fileID: 7661209922386680177} + m_Father: {fileID: 2925180131101153177} + m_RootOrder: 33 + 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 &6795299148039980688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8439108667743816576} + m_CullTransparentMesh: 0 --- !u!1 &8481125695751606892 GameObject: m_ObjectHideFlags: 0 @@ -34807,6 +35826,44 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &8596818855710990536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7661209922386680177} + m_Layer: 5 + m_Name: itemPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7661209922386680177 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8596818855710990536} + 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: 5786691464379296659} + - {fileID: 1977717236899668951} + - {fileID: 4437578735356364455} + m_Father: {fileID: 1547577205136846229} + 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} + m_AnchoredPosition: {x: -616, y: 9} + m_SizeDelta: {x: 150, y: 180} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8603848061001280458 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cf78d495fd..45b6da23f3 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1981,6 +1981,7 @@ GENERAL_POPUP_TYPE={ YiJingBaoKuConfirm = 31,--易经宝库奖励确认 LingShouBaoGe = 33,--灵兽宝阁选择神兽 YunYouMan = 34,--云游商人选择装备 + XiuXingSelectHero = 36,--修行选择英雄弹窗 --大号通用弹窗 YiJingBaoKu = 30,--易经宝库 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 9d666f130c..149f7bb2ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2202,6 +2202,19 @@ function this.GetHeroDataByProperty(_property, _lvLimit) return heros end +--通过职业,阵营筛选英雄 +function this.GetHeroDataByProperty(_property, _profession) + local heros = {} + local index = 1 + for i, v in pairs(heroDatas) do + if (v.profession == _profession or _profession == 0) then --0 全职业 + heros[index] = v + index = index + 1 + end + end + return heros +end + --通过品阶筛选英雄 function this.GetHeroDataByNatural(_natural) local heros = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua index 1f5d54c0de..c7a447b45f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua @@ -65,6 +65,8 @@ local contentScripts = { [31] = {view = require("Modules/Popup/View/GeneralPopup_LingShouBaoGe"), panelName = "GeneralPopup_LingShouBaoGe",type=GENERAL_POPUP_TYPE.LingShouBaoGe}, --云游商人选择装备 [32] = {view = require("Modules/Popup/View/GeneralPopup_YunYouMan"), panelName = "GeneralPopup_YunYouMan",type=GENERAL_POPUP_TYPE.YunYouMan}, + --修行选择附身英雄 + [33] = {view = require("Modules/Popup/View/GeneralPopup_XiuXingSelectHero"), panelName = "GeneralPopup_XiuXingSelectHero",type=GENERAL_POPUP_TYPE.XiuXingSelectHero}, } --子模块预设 local contentPrefabs={} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua new file mode 100644 index 0000000000..e3015e9e8b --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua @@ -0,0 +1,130 @@ +----- 修行选择英雄弹窗 ----- +local this = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 +local func +local data + +function this:InitComponent(gameObject) + self.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") + self.tip=Util.GetGameObject(gameObject,"tip"):GetComponent("Text") + self.scroll = Util.GetGameObject(gameObject, "Scroll") + self.confirm = Util.GetGameObject(gameObject, "ConfirmBtn") + self.cancel = Util.GetGameObject(gameObject, "CancelBtn") + self.itemPre = Util.GetGameObject(gameObject, "itemPre") + self.mask = Util.GetGameObject(gameObject, "itemPre/item") + + -- 设置循环滚动,万一内容不停地加 + local rootHight = self.scroll.transform.rect.height + local width = self.scroll.transform.rect.width + self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scroll.transform, + self.itemPre, nil, Vector2.New(width, rootHight), 1, 5, Vector2.New(0, 35)) + self.scrollView.moveTween.MomentumAmount = 1 + self.scrollView.moveTween.Strength = 2 + self.heroList={} + self.itemList = {} + self.maskList = {} + self.maskImageList = {} +end + +function this:BindEvent() + Util.AddClick(this.confirm,function() + data.otherData.selectId = self.selectId + parent:ClosePanel() + if func then + func() + end + end) + Util.AddClick(this.cancel,function() + parent:ClosePanel() + end) +end + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnShow(_parent,...) + parent=_parent + sortingOrder = _parent.sortingOrder + --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 + local _args = {...} + data = _args[1] + func = _args[2] + -- self.heroList + this:Refresh(true,true) +end +function this:Refresh(isTop,isAni) + this.titleText.text = "神印附身" + + if not self.itemList then + self.itemList = {} + end + for i = 1, #self.itemList do + self.itemList[i].gameObject:SetActive(false) + end + self.scrollView:SetData(self.heroList, function (index, item) + this:ShowSingleData(item, self.heroList[index],index) + end,not isTop,not isAni) + + if #self.heroList ~= 0 then + this.tip.text = "请选择您要附身的神将" + self.tip.gameObject:GetComponent("RectTransform").localPosition = Vector3.New(0,232,0) + else + self.tip.text = "暂无可附身的神将" + self.tip.gameObject:GetComponent("RectTransform").localPosition = Vector3.zero + end +end + +function this:ShowSingleData(item,sdata,index) + local itemtrans = Util.GetGameObject(item,"item") + local itemmask = Util.GetGameObject(item,"mask") + local maskImage = Util.GetGameObject(item,"mask/Image") + local equiped = Util.GetGameObject(item,"equiped") + maskImage:SetActive(false) + equiped:SetActive(sdata.Equiped) + if not self.itemList[index] then + self.itemList[index] = SubUIManager.Open(SubUIConfig.ItemView,itemtrans.transform) + self.itemList[index].gameObject:SetActive(false) + end + LogGreen("index:"..tostring(index)) + self.itemList[index]:OnOpen(false, {sdata.Id,sdata.Num}, 1,true,false,false,sortingOrder) + self.itemList[index].gameObject:SetActive(true) + self.maskList[index] = itemmask + self.maskImageList[index] = maskImage + self.maskImageList[index]:SetActive(self.selectId == sdata.Id) + + + Util.AddOnceClick(self.maskList[index],function () + for i = 1, #self.maskImageList do + self.maskImageList[i]:SetActive(false) + end + if self.selectId == sdata.Id then + self.maskImageList[index]:SetActive(false) + self.selectId = 0 + else + self.maskImageList[index]:SetActive(true) + self.selectId = sdata.Id + end + end) + Util.AddOnceClick(equiped,function () + PopupTipPanel.ShowTip("神印已附身此神将!") + end) +end + +function this:OnClose() + self.selectId = nil + self.heroList={} + self.maskList = {} + self.maskImageList = {} +end + +function this:OnDestroy() + self.itemList = {} +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua.meta b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua.meta new file mode 100644 index 0000000000..5c23e3a4b6 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_XiuXingSelectHero.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b3251df7138e924e916826fffb7feae +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 1237a348dd..bdcc7b93fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -15,6 +15,11 @@ function PracticeImprint:InitComponent() self.rightInfo = Util.GetGameObject(self.ImprintInfo, "Content/Layout/Right") self.tightTitle = Util.GetGameObject(self.rightInfo, "Title/Text"):GetComponent("Text") + self.Add = Util.GetGameObject(self.rightInfo, "AddBtn") + self.Hero = Util.GetGameObject(self.rightInfo, "Hero") + self.itemView = Util.GetGameObject(self.Hero, "itemview") + self.MaskBtn = Util.GetGameObject(self.rightInfo, "mask") + self.doBtn = Util.GetGameObject(self.ImprintInfo, "Content/Btn") self.doBtnText = Util.GetGameObject(self.doBtn, "Text"):GetComponent("Text") @@ -33,9 +38,6 @@ function PracticeImprint:BindEvent() Util.AddClick(self.ImprintInfoBack, function() self.ImprintInfo:SetActive(false) end) - Util.AddClick(self.doBtn, function() - LogGreen("按钮") - end) end function PracticeImprint:AddListener() @@ -82,6 +84,7 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId) stateImg.sprite = Util.LoadSprite("r_Dungeon_lockon") heroImg.gameObject:SetActive(false) else--已解锁 + LogGreen(" _imprintId:"..tostring(_imprintId).." serverData.state:"..tostring(serverData.state)) if serverData.state == 0 then--未使用 stateImg.gameObject:SetActive(false) heroImg.gameObject:SetActive(false) @@ -103,22 +106,33 @@ end --设置下方神印信息界面 function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData) local curHero = "" + --title显示 + if _configData.Type == 0 then + self.leftTitle.text = string.format("通用神印·%s",_configData.Name) + elseif _configData.Type == 1 then + self.leftTitle.text = string.format("附身神印·%s",_configData.Name) + end + --右侧部分状态和按钮显示 if not _serverData then self.rightInfo:SetActive(false) - self.doBtnText.text = string.format("%s期解锁",_configData.Name) + self.doBtnText.text = string.format("%s解锁",_configData.Unlock) else if _configData.Type == 0 then self.rightInfo:SetActive(false) - self.doBtnText.text = "选择神印" elseif _configData.Type == 1 then self.rightInfo:SetActive(true) + end + if _serverData.state == 0 then + self.doBtnText.text = "选择神印" + elseif _serverData.state == 1 then self.doBtnText.text = "取消神印" end end - self.leftTitle.text = string.format("通用神印·%s",_configData.Name) + --详情 self.leftDetail.text = _configData.Desc - if _serverData then - Util.AddOnceClick(self.doBtn,function () + --神印确认/取消按钮 + Util.AddOnceClick(self.doBtn,function () + if _serverData ~= nil then local old,new,sub = 0,0,"" old = PracticeManager.BigLevelImprintList[_configData.UnlockId] new = _configData.Id @@ -126,8 +140,26 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData) NetManager.PracticeImprintRequest(old,new,sub,function () self:OnShow() end) + end + end) + --如果神印已开启且是附身神印 + if _serverData and _configData.Type == 1 then + self.Add:SetActive(true) + self.Hero:SetActive(false) + if _serverData.subId ~= "" then + self.Add:SetActive(false) + self.Hero:SetActive(true) + local view = SubUIManager.Open(SubUIConfig.ItemView, self.itemView.transform) + view:OnOpen(false, {tonumber(_serverData.subId),0}, 1.3,false,false,false,self.sortingOrder) + end + Util.AddOnceClick(self.MaskBtn,function() + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.XiuXingSelectHero,_configData,function () + self:Refresh() + end) + -- LogRed("OpenPanel") end) end + --神将选择 end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index e2ed34c0d1..54ffed64ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -3,6 +3,7 @@ local this = PracticeManager local XiuXianConfig = ConfigManager.GetConfig(ConfigName.XiuXianConfig) local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig) +local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) function this.Initialize() this.PracticeLevel = 1--小境界id @@ -58,7 +59,11 @@ function this.GetCurAllGetAdd() -- LogGreen("#Pros:"..tostring(#Pros)) for i = 1, #Pros do -- LogBlue("ProsId:"..tostring(Pros[i][1]).." ProsNum:"..tostring(Pros[i][2])) - PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2] + if PropertyConfig[Pros[i][1]].Style == 1 then + PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2] + elseif PropertyConfig[Pros[i][1]].Style == 2 then + PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2]/100 + end end end end @@ -73,7 +78,11 @@ function this.GetAddsListWithTemplate() if v.TotalPros then local Pros = v.TotalPros for i = 1, #Pros do - PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2] + if PropertyConfig[Pros[i][1]].Style == 1 then + PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2] + elseif PropertyConfig[Pros[i][1]].Style == 2 then + PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2]/100 + end end end end @@ -93,7 +102,11 @@ function this.GetAddsListWithOutTemplate() if not addsList[v.RealmId][Pros[i][1]] then addsList[v.RealmId][Pros[i][1]] = 0 end - addsList[v.RealmId][Pros[i][1]] = addsList[v.RealmId][Pros[i][1]] + Pros[i][2] + if PropertyConfig[Pros[i][1]].Style == 1 then + addsList[v.RealmId][Pros[i][1]] = addsList[v.RealmId][Pros[i][1]] + Pros[i][2] + elseif PropertyConfig[Pros[i][1]].Style == 2 then + addsList[v.RealmId][Pros[i][1]] = addsList[v.RealmId][Pros[i][1]] + Pros[i][2]/100 + end end end end @@ -118,7 +131,11 @@ end --返回预览界面文字 function this.GetPreviewSingleText(id,value) - return string.format("全体神将%s+%s",PropertyConfig[id].Info,value) + if PropertyConfig[id].Style == 1 then + return string.format("全体神将%s+%s",PropertyConfig[id].Info,value) + elseif PropertyConfig[id].Style == 2 then + return string.format("全体神将%s+%s",PropertyConfig[id].Info,value).."%" + end end --获取所有神印信息 @@ -143,7 +160,6 @@ function this.UpdataImprintDataFromServer(_imprintList) this.ImprintServerData[value.id].type = value.type this.ImprintServerData[value.id].subId = value.subId this.ImprintServerData[value.id].state = value.state - LogPurple("id:"..tostring(value.id).." state:"..tostring(value.state)) if value.state == 1 then this.BigLevelImprintList[XiuXianSkillConfig[value.id].UnlockId] = value.id end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 6faa6d6bd5..502af66940 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -1,6 +1,7 @@ local Practice = quick_class("Practice", BasePanel) local orginLayer local XinXianConfig = ConfigManager.GetConfig(ConfigName.XiuXianConfig) +local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) function Practice:InitComponent() orginLayer = 0 @@ -60,13 +61,31 @@ function Practice:BindEvent() LogGreen("打开山河社稷图") end) Util.AddClick(self.button, function() - -- self:UpgradeCheck() + if self:UpgradeCheck() then return end NetManager.UpPracticeLevelRequest(function () self:OnShow() end) end) end +--Check +function Practice:UpgradeCheck() + if PracticeManager.StarNum < self.curLevelConfig.NeedStarNum then + PopupTipPanel.ShowTip("无法破境,请前往山河社稷图获取更多星星!") + return true + end + if self.curLevelConfig.LevelUpCost then + for i = 1, #self.curLevelConfig.LevelUpCost do + local data = self.curLevelConfig.LevelUpCost[i] + if BagManager.GetTotalItemNum(data[1]) < data[2] then + PopupTipPanel.ShowTip(string.format("%s不足!",ItemConfig[data[1]].Name)) + return true + end + end + end + return false +end + function Practice:AddListener() Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, self.OnShow,self) end diff --git a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua index 3fdc8d1c85..c614d9fd13 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua @@ -108,7 +108,6 @@ function PlayerInfoView:OnShow() end function PlayerInfoView:RefreshPower(force) - LogGreen("force:"..tostring(force)) self.heroTeamPower.text = force -- self.heroTeamPower.text = FormationManager.GetFormationPower(FormationManager.curFormationIndex) end