From 978689d9a744d49313d2b8ddc4b12db8ed497374 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 28 Dec 2021 17:52:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Carbon/NewCarbon/ExploreMainPanel.prefab | 122 +- .../NewCarbon/ExploreRewardPopup.prefab | 12 +- .../UI/GeneralPanel/GeneralInfoPopup.prefab | 1156 ++++++++--------- .../GeneralSizeFitterPopup.prefab | 84 +- .../Prefabs/UI/Popup/GeneralPopup.prefab | 34 +- .../~Lua/Common/GlobalDefine.lua | 2 + .../~Lua/Modules/Explore/ExploreMainPanel.lua | 10 +- .../~Lua/Modules/Explore/ExplorePanel.lua | 17 +- .../Modules/Explore/ExploreRewardPopup.lua | 2 +- .../Modules/Fight/View/ExploreMapView.lua | 41 +- .../Formation/View/ExploreFormation.lua | 1 + .../~Lua/Modules/Net/IndicationManager.lua | 3 +- .../View/GeneralPopup_SelectExploreTime.lua | 6 +- .../~Lua/View/SingleExplorePlayerView.lua | 8 +- Assets/ManagedResources/~Lua/View/UpView.lua | 2 + 15 files changed, 808 insertions(+), 692 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab index dae7ec6b57..2f35640919 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreMainPanel.prefab @@ -1272,6 +1272,7 @@ RectTransform: - {fileID: 8640258453947894423} - {fileID: 830083511673587919} - {fileID: 5190378739448930435} + - {fileID: 8546165598943355784} m_Father: {fileID: 6278899851612589502} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2838,6 +2839,123 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u65E0\u8FB9\u6389\u843D" +--- !u!1 &7036335890109415029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8546165598943355784} + - component: {fileID: 9072527345079398483} + - component: {fileID: 8387742053752922386} + - component: {fileID: 1217466485992169014} + m_Layer: 5 + m_Name: helpBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8546165598943355784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7036335890109415029} + 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: 1731085366901955660} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -59, y: -78} + m_SizeDelta: {x: 68, y: 68} + m_Pivot: {x: 1, y: 1} +--- !u!222 &9072527345079398483 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7036335890109415029} + m_CullTransparentMesh: 0 +--- !u!114 &8387742053752922386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7036335890109415029} + 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: 47b0d71d3c8ef79468a5fb4d8ec5f365, 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 &1217466485992169014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7036335890109415029} + 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: 8387742053752922386} + 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 &7365034574822972270 GameObject: m_ObjectHideFlags: 0 @@ -3184,7 +3302,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -161.6, y: 24.9} + m_AnchoredPosition: {x: -17.3, y: 24.9} m_SizeDelta: {x: 174, y: 174} m_Pivot: {x: 1, y: 0} --- !u!222 &6526611771904387564 @@ -3366,7 +3484,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -17, y: 40.8} + m_AnchoredPosition: {x: -27.5, y: 228} m_SizeDelta: {x: 127, y: 135} m_Pivot: {x: 1, y: 0} --- !u!222 &5087118223710356840 diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab index 47bf4567fd..7469dc769e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab @@ -37,8 +37,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: 0, y: 0} - m_SizeDelta: {x: 1081.2, y: 0} + m_AnchoredPosition: {x: 0.9, y: 0} + m_SizeDelta: {x: 1190.7, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6558828224914611059 CanvasRenderer: @@ -675,7 +675,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.29803923} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -815,11 +815,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 69 + m_Left: 120 m_Right: 0 m_Top: -17 - m_Bottom: 0 - m_ChildAlignment: 1 + m_Bottom: 27 + m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 99.78, y: 100} diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index ee62eb51ed..dbb1d82987 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -600,85 +600,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &2017919353395604953 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1314924801399964674} - - component: {fileID: 5326025462598275633} - - component: {fileID: 8963223037336613766} - m_Layer: 5 - m_Name: tip1Pre - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1314924801399964674 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2017919353395604953} - 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: 4036975558514028078} - 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: 282.5, y: -17.5} - m_SizeDelta: {x: 565, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5326025462598275633 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2017919353395604953} - m_CullTransparentMesh: 0 ---- !u!114 &8963223037336613766 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2017919353395604953} - 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: 0.9607844, g: 0.94117653, b: 0.6862745, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 33 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 86 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u63A8\u8350\u6218\u529B" --- !u!1 &2143910940354658375 GameObject: m_ObjectHideFlags: 0 @@ -1035,6 +956,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &2778484534702711709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7388053663340900254} + - component: {fileID: 5410480194062702652} + - component: {fileID: 599591652145315903} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7388053663340900254 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2778484534702711709} + 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: 3544585592822168736} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 168, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5410480194062702652 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2778484534702711709} + m_CullTransparentMesh: 0 +--- !u!114 &599591652145315903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2778484534702711709} + 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: ce7b25bccdf92c54abce7f0236c39592, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2846032824382673813 GameObject: m_ObjectHideFlags: 0 @@ -1130,7 +1125,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &2943274540831935498 +--- !u!1 &2865738367896707678 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1138,82 +1133,71 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8660173280103318612} - - component: {fileID: 1815850210258890837} - - component: {fileID: 4255576432205429478} - - component: {fileID: 6053498005763523728} + - component: {fileID: 172797541901168652} + - component: {fileID: 3820960186786208765} + - component: {fileID: 6575795643565104674} m_Layer: 5 - m_Name: GeneralInfoPopup_ExploreMapTip + m_Name: cost m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8660173280103318612 + m_IsActive: 1 +--- !u!224 &172797541901168652 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2943274540831935498} + m_GameObject: {fileID: 2865738367896707678} 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: 5923074775044740466} - - {fileID: 4036975558514028078} - m_Father: {fileID: 1828482313430278523} - m_RootOrder: 7 + m_Children: [] + m_Father: {fileID: 2000375750248771300} + 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: 300, y: -49.5} - m_SizeDelta: {x: 600, y: 99} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1815850210258890837 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2943274540831935498} - m_CullTransparentMesh: 0 ---- !u!114 &4255576432205429478 + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 19, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &3820960186786208765 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2943274540831935498} + m_GameObject: {fileID: 2865738367896707678} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 25 - m_Right: 10 - m_Top: 61 - m_Bottom: 38 - m_ChildAlignment: 4 - m_Spacing: 23.7 - m_ChildForceExpandWidth: 1 + m_Left: 19 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: -27.89 + m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 ---- !u!114 &6053498005763523728 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &6575795643565104674 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2943274540831935498} + m_GameObject: {fileID: 2865738367896707678} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 + m_HorizontalFit: 2 m_VerticalFit: 2 --- !u!1 &2988453590738361744 GameObject: @@ -1662,6 +1646,88 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 1 +--- !u!1 &3141067709439656124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000375750248771300} + - component: {fileID: 3967777805426352256} + - component: {fileID: 125080106955828854} + m_Layer: 5 + m_Name: scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2000375750248771300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3141067709439656124} + 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: 172797541901168652} + m_Father: {fileID: 4431530441731872839} + 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: 0, y: -88.1} + m_SizeDelta: {x: 549.7, y: 106.2} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &3967777805426352256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3141067709439656124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 172797541901168652} + m_Horizontal: 1 + m_Vertical: 0 + 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 &125080106955828854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3141067709439656124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3182634958685981010 GameObject: m_ObjectHideFlags: 0 @@ -2207,80 +2273,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &3960982225591458472 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 817766988506777633} - - component: {fileID: 4400350897252561987} - - component: {fileID: 8395506844244883343} - m_Layer: 5 - m_Name: cost - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &817766988506777633 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3960982225591458472} - 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: 5784146757079409817} - 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: 0, y: 0} - m_SizeDelta: {x: 19, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &4400350897252561987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3960982225591458472} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 19 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: -27.89 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 ---- !u!114 &8395506844244883343 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3960982225591458472} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!1 &3971097791755335435 GameObject: m_ObjectHideFlags: 0 @@ -2376,154 +2368,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &4215289597663232311 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4286803528483365083} - - component: {fileID: 441489888348213564} - - component: {fileID: 796071642480291314} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4286803528483365083 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4215289597663232311} - 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: 5923074775044740466} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 150, y: 0} - m_SizeDelta: {x: 168, y: 16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &441489888348213564 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4215289597663232311} - m_CullTransparentMesh: 0 ---- !u!114 &796071642480291314 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4215289597663232311} - 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: ce7b25bccdf92c54abce7f0236c39592, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!1 &4274074329890411571 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8817810039667756710} - - component: {fileID: 1753310501230696425} - - component: {fileID: 410139344386262433} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8817810039667756710 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4274074329890411571} - 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: 5923074775044740466} - 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: -150, y: 0} - m_SizeDelta: {x: 168, y: 16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1753310501230696425 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4274074329890411571} - m_CullTransparentMesh: 0 ---- !u!114 &410139344386262433 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4274074329890411571} - 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: d2ade6864516a3a4082e096ad584d113, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &4828691113715586599 GameObject: m_ObjectHideFlags: 0 @@ -2873,108 +2717,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &5156809064041455451 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5923074775044740466} - - component: {fileID: 763389165363921449} - - component: {fileID: 9185148237843520752} - - component: {fileID: 1150305777274784159} - m_Layer: 5 - m_Name: titleName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5923074775044740466 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5156809064041455451} - 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: 8817810039667756710} - - {fileID: 4286803528483365083} - m_Father: {fileID: 8660173280103318612} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -34.23} - m_SizeDelta: {x: 100, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &763389165363921449 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5156809064041455451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!222 &9185148237843520752 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5156809064041455451} - m_CullTransparentMesh: 0 ---- !u!114 &1150305777274784159 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5156809064041455451} - 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: 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 72 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u7EFF\u8272\u6C99\u6F20" --- !u!1 &5195674268734739788 GameObject: m_ObjectHideFlags: 0 @@ -3323,6 +3065,85 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &5637528127466037831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1002363391063092661} + - component: {fileID: 8243098114858762436} + - component: {fileID: 5900630884002657104} + m_Layer: 5 + m_Name: tip1Pre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1002363391063092661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5637528127466037831} + 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: 4431530441731872839} + 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: 282.5, y: -17.5} + m_SizeDelta: {x: 565, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8243098114858762436 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5637528127466037831} + m_CullTransparentMesh: 0 +--- !u!114 &5900630884002657104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5637528127466037831} + 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: 0.9607844, g: 0.94117653, b: 0.6862745, 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: 33 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 86 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u63A8\u8350\u6218\u529B" --- !u!1 &5783323858000913986 GameObject: m_ObjectHideFlags: 0 @@ -3849,6 +3670,80 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &6175006804673798810 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7629803100617897483} + - component: {fileID: 5169888386289259805} + - component: {fileID: 4094717404065167469} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7629803100617897483 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6175006804673798810} + 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: 3544585592822168736} + 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: -150, y: 0} + m_SizeDelta: {x: 168, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5169888386289259805 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6175006804673798810} + m_CullTransparentMesh: 0 +--- !u!114 &4094717404065167469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6175006804673798810} + 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: d2ade6864516a3a4082e096ad584d113, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6216249597930494229 GameObject: m_ObjectHideFlags: 0 @@ -4754,7 +4649,7 @@ RectTransform: - {fileID: 4300246722703134448} - {fileID: 7220832771252977148} - {fileID: 4633213687808411125} - - {fileID: 8660173280103318612} + - {fileID: 2452005600192763866} m_Father: {fileID: 6150816739817875349} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4866,91 +4761,6 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 ---- !u!1 &7785802027066929405 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4036975558514028078} - - component: {fileID: 4422895662179993506} - - component: {fileID: 6875408554603038394} - - component: {fileID: 1287170053581291542} - m_Layer: 5 - m_Name: tipPre - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4036975558514028078 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7785802027066929405} - 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: 1314924801399964674} - - {fileID: 5784146757079409817} - m_Father: {fileID: 8660173280103318612} - 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: 307.5, y: -78.5} - m_SizeDelta: {x: 565, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4422895662179993506 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7785802027066929405} - m_CullTransparentMesh: 0 ---- !u!114 &6875408554603038394 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7785802027066929405} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 ---- !u!114 &1287170053581291542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7785802027066929405} - 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 &8039350172597770738 GameObject: m_ObjectHideFlags: 0 @@ -5148,6 +4958,91 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &8392372349724789695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4431530441731872839} + - component: {fileID: 836176971951247267} + - component: {fileID: 604909134507674326} + - component: {fileID: 2422663204221208516} + m_Layer: 5 + m_Name: tipPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4431530441731872839 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8392372349724789695} + 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: 1002363391063092661} + - {fileID: 2000375750248771300} + m_Father: {fileID: 2452005600192763866} + 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: 307.5, y: -78.5} + m_SizeDelta: {x: 565, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &836176971951247267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8392372349724789695} + m_CullTransparentMesh: 0 +--- !u!114 &604909134507674326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8392372349724789695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &2422663204221208516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8392372349724789695} + 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 &8393110287184769600 GameObject: m_ObjectHideFlags: 0 @@ -5323,6 +5218,91 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &8477248093731610197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2452005600192763866} + - component: {fileID: 2498722260659154628} + - component: {fileID: 444452192568902440} + - component: {fileID: 491492918089974590} + m_Layer: 5 + m_Name: GeneralInfoPopup_ExploreMapTip (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2452005600192763866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477248093731610197} + 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: 3544585592822168736} + - {fileID: 4431530441731872839} + m_Father: {fileID: 1828482313430278523} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 300, y: -67.5} + m_SizeDelta: {x: 600, y: 135} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2498722260659154628 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477248093731610197} + m_CullTransparentMesh: 0 +--- !u!114 &444452192568902440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477248093731610197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 25 + m_Right: 10 + m_Top: 97 + m_Bottom: 38 + m_ChildAlignment: 4 + m_Spacing: 23.7 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &491492918089974590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8477248093731610197} + 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 &8624204245787947856 GameObject: m_ObjectHideFlags: 0 @@ -5418,7 +5398,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &8672505444337066592 +--- !u!1 &8847998157147291353 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5426,80 +5406,100 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5784146757079409817} - - component: {fileID: 6875294287358300949} - - component: {fileID: 5164306623385890563} + - component: {fileID: 3544585592822168736} + - component: {fileID: 7281869549175783506} + - component: {fileID: 5297555296393935119} + - component: {fileID: 4129034575554737056} m_Layer: 5 - m_Name: scroll + m_Name: titleName m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5784146757079409817 + m_IsActive: 1 +--- !u!224 &3544585592822168736 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8672505444337066592} + m_GameObject: {fileID: 8847998157147291353} 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: 817766988506777633} - m_Father: {fileID: 4036975558514028078} - m_RootOrder: 1 + - {fileID: 7629803100617897483} + - {fileID: 7388053663340900254} + m_Father: {fileID: 2452005600192763866} + 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: 0, y: -88.1} - m_SizeDelta: {x: 549.7, y: 106.2} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &6875294287358300949 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -49.98} + m_SizeDelta: {x: 100, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7281869549175783506 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8672505444337066592} + m_GameObject: {fileID: 8847998157147291353} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Content: {fileID: 817766988506777633} - m_Horizontal: 1 - m_Vertical: 0 - 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_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!222 &5297555296393935119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8847998157147291353} + m_CullTransparentMesh: 0 +--- !u!114 &4129034575554737056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8847998157147291353} + 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: 0.9607843, g: 0.9411765, b: 0.6862745, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &5164306623385890563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8672505444337066592} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + 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: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 72 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4E1C\u6D77\u9F99\u5BAB" --- !u!1 &8994127326114394993 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab index 5a67266c6d..13a7b8264d 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralSizeFitterPopup.prefab @@ -1721,8 +1721,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -1.46} - m_SizeDelta: {x: 900, y: 3.05} + m_AnchoredPosition: {x: 0, y: -0.000076293945} + m_SizeDelta: {x: 900, y: 5} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3352581906189306360 CanvasRenderer: @@ -1746,7 +1746,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2019,8 +2019,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 27.8, y: -32.2} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 27.8, y: -9.6599} + m_SizeDelta: {x: 160, y: 51.51} m_Pivot: {x: 0, y: 1} --- !u!222 &1124979048482131543 CanvasRenderer: @@ -2261,10 +2261,10 @@ RectTransform: m_Father: {fileID: 5457873113540345585} 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: -3.3, y: 0} - m_SizeDelta: {x: 893.4, y: 250} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -3.3, y: -93.8} + m_SizeDelta: {x: 893.4, y: 189} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1388094534513899425 GameObject: @@ -2678,7 +2678,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 450, y: -104} - m_SizeDelta: {x: 900, y: 250} + m_SizeDelta: {x: 900, y: 197.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &4991609003910263707 MonoBehaviour: @@ -2698,7 +2698,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: -29.8 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -3245,7 +3245,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 63 + m_FontSize: 37 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 @@ -3564,7 +3564,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8609091337126958581 RectTransform: m_ObjectHideFlags: 0 @@ -3581,10 +3581,10 @@ RectTransform: m_Father: {fileID: 5568991561432925223} 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: 316.62, y: -33.71} - m_SizeDelta: {x: 203.85, y: 58.03} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -130.38, y: -140.5} + m_SizeDelta: {x: 203.84998, y: 58.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3222076879814346723 CanvasRenderer: @@ -3699,10 +3699,10 @@ RectTransform: m_Father: {fileID: 5568991561432925223} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 316.62, y: -33.71} - m_SizeDelta: {x: 203.85, y: 58.03} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -130.38, y: -141.5} + m_SizeDelta: {x: 203.84998, y: 58.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7563001748029032217 CanvasRenderer: @@ -4723,10 +4723,10 @@ RectTransform: m_Father: {fileID: 5568991561432925223} 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: 7.14, y: 79.38096} - m_SizeDelta: {x: 901.79, y: 51.51} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 454.14, y: -33.940002} + m_SizeDelta: {x: 901.79, y: 51.509995} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6238209311415372031 CanvasRenderer: @@ -5968,10 +5968,10 @@ RectTransform: m_Father: {fileID: 5568991561432925223} 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: 316.62, y: -33.71} - m_SizeDelta: {x: 203.85, y: 58.03} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -130.38, y: -141.5} + m_SizeDelta: {x: 203.84998, y: 58.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7693763141959272963 CanvasRenderer: @@ -6389,9 +6389,9 @@ RectTransform: m_Father: {fileID: 5568991561432925223} 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: 312.46, y: 74.7} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -134.54001, y: -35.6} m_SizeDelta: {x: 218, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5814188985522218443 @@ -7685,10 +7685,10 @@ RectTransform: m_Father: {fileID: 5568991561432925223} 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: -117, y: -19} - m_SizeDelta: {x: 643.18, y: 135.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 340.11, y: -128.295} + m_SizeDelta: {x: 643.18, y: 135.20001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2860327502804025555 MonoBehaviour: @@ -9448,8 +9448,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 202.8, y: -33.52} - m_SizeDelta: {x: 317.6, y: 52.87} + m_AnchoredPosition: {x: 218.52, y: -33.52} + m_SizeDelta: {x: 286.15, y: 52.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &45783679607002300 CanvasRenderer: @@ -11054,7 +11054,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5457873113540345585 RectTransform: m_ObjectHideFlags: 0 @@ -11074,8 +11074,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -125} - m_SizeDelta: {x: 900, y: 250} + m_AnchoredPosition: {x: 450, y: -98.85} + m_SizeDelta: {x: 900, y: 197.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8107894537552319360 GameObject: @@ -11095,7 +11095,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9159548010215061646 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 24f0324370..2aeafc2069 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -3892,8 +3892,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 412.5, y: -50} - m_SizeDelta: {x: 409, y: 30} + m_AnchoredPosition: {x: 332.5, y: -50} + m_SizeDelta: {x: 305, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2540190257137457087 CanvasRenderer: @@ -3925,10 +3925,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 54 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 0 m_MaxSize: 82 m_Alignment: 3 m_AlignByGeometry: 0 @@ -16873,7 +16873,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 158, y: -50} + m_AnchoredPosition: {x: 130, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &669657226228892406 @@ -16928,8 +16928,8 @@ MonoBehaviour: m_IgnoreLayout: 0 m_MinWidth: -1 m_MinHeight: -1 - m_PreferredWidth: 75 - m_PreferredHeight: 75 + m_PreferredWidth: 50 + m_PreferredHeight: 50 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -27960,8 +27960,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 54, y: -50} - m_SizeDelta: {x: 108, y: 30} + m_AnchoredPosition: {x: 40, y: -50} + m_SizeDelta: {x: 80, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3100220663330659500 CanvasRenderer: @@ -27993,10 +27993,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 54 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 82 m_Alignment: 3 m_AlignByGeometry: 0 @@ -52787,7 +52787,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -84.5} - m_SizeDelta: {x: 617, y: 100} + m_SizeDelta: {x: 485, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4179867446813545189 MonoBehaviour: @@ -53418,8 +53418,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: 337, y: 67} - m_SizeDelta: {x: 67.93, y: 50} + m_AnchoredPosition: {x: 331.48, y: 67} + m_SizeDelta: {x: 78.965, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6834781439805235509 CanvasRenderer: @@ -53450,19 +53450,19 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 999 + m_Text: "999\u5C0F\u65F6" --- !u!1 &8637437793354094815 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 4073b759f2..0740aa6fc8 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -483,6 +483,7 @@ PanelType = { LingMai = {14,16,1273},--御剑行 tiandihonglu = {16,1287,1289}, fagncunxunbao = {16,1288,1290}, + ExploreFun = { 14, 16, 12061 }, -- 体力 2 } @@ -557,6 +558,7 @@ UpViewRechargeType = { LingMaiCoin = 1273,--灵脉币 yonghengzhiyao = 1287, qianmianhuan = 1288, + exploreCost = 12061, } SHOP_PAGE = { diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua index fd15889f97..969aeddc59 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua @@ -83,10 +83,16 @@ function ExploreMainPanel:InitComponent() self.trigger.onPointerUp = self.trigger.onPointerUp + function() self:SetTip(self.tipRoot,self.mapId) end + + self.helpBtn = Util.GetGameObject(self.gameObject, "btns/helpBtn") + self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition end --绑定事件(用于子类重写) function ExploreMainPanel:BindEvent() + Util.AddClick(self.helpBtn,function() + UIManager.OpenPanel(UIName.HelpPopup,125,self.helpPosition.x,self.helpPosition.y) + end) Util.AddClick(self.backBtn,function() self:ClosePanel() end) @@ -139,7 +145,7 @@ function ExploreMainPanel:OnShow() ForceRebuildLayout(self.Bg.transform) self.data = ExploreManager.ExploreMapData self.tip.gameObject:SetActive(false) - self.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) + self.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ExploreFun }) self:SetMapData() self:SetMapState() end @@ -178,7 +184,7 @@ function ExploreMainPanel:SetMapData() SetNumShow(self.mapList[k].minForce,self.mapList[k].force.gameObject,v.force) if PlayerManager.level < v.openLevel then self.mapList[k].condition.gameObject:SetActive(true) - if v.openLevel == 999 then + if v.openLevel ~= 999 then self.mapList[k].conditionTip.text = v.openLevel.."级解锁" else self.mapList[k].conditionTip.text = "地图暂未开放" diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua index 796af7202f..085c85e883 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua @@ -23,33 +23,40 @@ function ExplorePanel:BindEvent() end) end ---添加事件监听(用于子类重 +--添加事件监听(用于子类重写) function ExplorePanel:AddListener() - fightMap:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Explore.UpdateFormation,this.OnShow) end --移除事件监听(用于子类重写) function ExplorePanel:RemoveListener() - fightMap:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Explore.UpdateFormation,this.OnShow) end --界面打开时调用(用于子类重写) function ExplorePanel:OnOpen(data) this.mapData = data + fightMap:Init() end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function ExplorePanel:OnShow() - fightMap:Init() +function ExplorePanel:OnShow() + this.data = ExploreManager.GetFormationDataByMapId(this.mapData.mapId) + if not this.data or #this.data < 1 then + this:ClosePanel() + return + end end --界面关闭时调用(用于子类重写) function ExplorePanel:OnClose() fightMap:OnClose() end + function ExplorePanel:OnSortingOrderChange() fightMap:OnSortingOrderChange(this.sortingOrder) end + --界面销毁时调用(用于子类重写) function ExplorePanel:OnDestroy() SubUIManager.Close(this.upView) diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreRewardPopup.lua index b149f7ede7..337fd05375 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreRewardPopup.lua @@ -101,7 +101,7 @@ function this:Refresh(_item,_data) _item.reward[i] = SubUIManager.Open(SubUIConfig.ItemView,_item.grid.transform) end _item.reward[i].gameObject:SetActive(true) - _item.reward[i]:OnOpen(false, {_data.dropReward[i].key,_data.dropReward[i].value},0.73,false,false,false,orginLayer) + _item.reward[i]:OnOpen(false, {_data.dropReward[i].key,_data.dropReward[i].val},0.73,false,false,false,orginLayer) end end Util.AddOnceClick(_item.exploring,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua index 42000f52ff..9ae241a22b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua @@ -196,21 +196,20 @@ function this.ReleaseIconList() end function this.AsideTriggerJudge(data,isSelf,_userData) - --Log("data:"..tostring(data).." pos:"..tostring(Map_UV2Pos(data.u - 1, data.v).. " isSelf:"..tostring(isSelf).. " Self:"..tostring(_userData).. " Self:".." "..tostring(_userData.userId))) local isGetIconList = false local iconList = this.iconList if not this.threads then this.threads = {} end - if this.threads[_userData.userId] then - coroutine.stop(this.threads[_userData.userId]) - this.threads[_userData.userId] = nil + if this.threads[_userData.data.formationId] then + coroutine.stop(this.threads[_userData.data.formationId]) + this.threads[_userData.data.formationId] = nil end - this.threads[_userData.userId] = coroutine.start(function() + this.threads[_userData.data.formationId] = coroutine.start(function() while(not isGetIconList) do if this.isClose and this.isClose == true then - coroutine.stop(this.threads[_userData.userId]) - this.threads[_userData.userId] = nil + coroutine.stop(this.threads[_userData.data.formationId]) + this.threads[_userData.data.formationId] = nil this.ReleaseIconList() coroutine.yield() end @@ -238,35 +237,21 @@ function this.AsideTriggerJudge(data,isSelf,_userData) posList[4] = Map_UV2Pos(data.u, data.v + 1) for k,pos in pairs(posList) do --Log("posList pos:"..tostring(pos)) - if iconList[pos] and this.HasSelectIconList(pos,_userData.userId) then + if iconList[pos] and this.HasSelectIconList(pos,_userData.data.formationId) then this.RemoveSelectIconList(_userData.eventPointPos) - this.AddSelectIconList(pos,_userData.userId) + this.AddSelectIconList(pos,_userData.data.formationId) --Log("发送了消息") Game.GlobalEvent:DispatchEvent(GameEvent.GuaJi.getEvent,{goData = _userData, event = iconList[pos], pos = pos}) - coroutine.stop(this.threads[_userData.userId]) - this.threads[_userData.userId] = nil + coroutine.stop(this.threads[_userData.data.formationId]) + this.threads[_userData.data.formationId] = nil this.ReleaseIconList() coroutine.yield() - elseif FightPointPassManager.talkingTime == 0 or (GetTimeStamp() - FightPointPassManager.talkingTime >= 60) then - if isSelf and this.playerViews and LengthOfTable(this.playerViews) > 1 then - for k,v in pairs(this.playerViews) do - if not v.isSelf and Map_UV2Pos(v.roleCurPos.u, v.roleCurPos.v) == pos and v.state == 0 then - FightPointPassManager.talkingTime = GetTimeStamp() - --Log("发送了消息") - Game.GlobalEvent:DispatchEvent(GameEvent.GuaJi.getEvent,{goData = _userData,event = v,pos = pos}) - coroutine.stop(this.threads[_userData.userId]) - this.threads[_userData.userId] = nil - this.ReleaseIconList() - coroutine.yield() - end - end - end end end --Log("周围没有事件") - if this.threads[_userData.userId] then - coroutine.stop( this.threads[_userData.userId]) - this.threads[_userData.userId] = nil + if this.threads[_userData.data.formationId] then + coroutine.stop( this.threads[_userData.data.formationId]) + this.threads[_userData.data.formationId] = nil end this.ReleaseIconList() coroutine.yield() diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua index 2615d608ef..e093c1d6dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua @@ -66,6 +66,7 @@ function this.On_Btn2_Click() end end end + this.root:ClosePanel() end function this.SortHeroDatas(_roleDatas) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index bbcb0ef69f..77fe12e9c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -1086,11 +1086,10 @@ function this.LingMaiIndication(buffer) end --刷新探索编队 -function NetManager.ExplorerMapIndicationResponse(buffer) +function this.ExplorerMapIndicationResponse(buffer) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.ExplorerMapIndicationResponse() msg:ParseFromString(data) - LogGreen("收到了刷新探索编队的indication") ExploreManager.UpdateFormationData(msg.exploreInfo) Game.GlobalEvent:DispatchEvent(GameEvent.Explore.UpdateFormation) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua index 8081b64f2b..6dd03439cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SelectExploreTime.lua @@ -36,7 +36,7 @@ function this:BindEvent() end end) Util.AddOnceClick(this.reduce,function() - if this.slider.value - 1 >= 0 then + if this.slider.value - 1 > 0 then this.slider.value = this.slider.value - 1 this:Refresh() end @@ -75,13 +75,13 @@ function this:OnShow(_parent,...) local args = {...} this.mapData = args[1] this.formation = args[2] - this.slider.minValue = 0 + this.slider.minValue = 1 this.slider.maxValue = #this.timeList this.name.text = string.format("探索目标:%s",this.mapData.name) this.icon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(this.mapData.cost[1])) this.haveNum = BagManager.GetItemCountById(this.mapData.cost[1]) local num = math.floor(this.haveNum/(this.mapData.cost[2]*60)) - local sliderValue = 0 + local sliderValue = 1 for i = 1,#this.timeList do if num >= this.timeList[i] then sliderValue = i diff --git a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua index 0ada611eb2..88f3c366bb 100644 --- a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua @@ -23,14 +23,10 @@ function SingleExplorePlayerView:AddListener() end function SingleExplorePlayerView:ReciveData(data) - if data.goData.userId == self.userId then + if data.goData.data.formationId == self.data.formationId then self.eventPointPos = data.event self.state = 1 self:RoleWalkEnd(data) - elseif (data.event and data.event.userId and data.event.userId == self.userId) then - self.eventPointPos = data.goData - self.state = 1 - self:RoleWalkEnd(data) end return end @@ -351,7 +347,7 @@ function SingleExplorePlayerView:SelectTargetPos() local targetPos = 0 --LogGreen("#selectIconList:"..#selectIconList.." self.uid:"..self.userId) if #selectIconList > 1 then - self.parent.AddSelectIconList(selectIconList[1].pos,self.userId) + self.parent.AddSelectIconList(selectIconList[1].pos,self.data.formationId) targetPos = self:GetTargetPos(selectIconList[1].pos) self.parent.RemoveSelectIconList(self.eventPointPos) else diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index c3a7dbf48d..1bc95a5963 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -66,6 +66,7 @@ local _ShowPlusType = { UpViewRechargeType.LingMaiCoin, UpViewRechargeType.yonghengzhiyao, UpViewRechargeType.qianmianhuan, + UpViewRechargeType.exploreCost, } -- 判断是否显示加号 @@ -412,6 +413,7 @@ function UpView:RechargeType(_type) _type == UpViewRechargeType.LingMaiCoin or _type == UpViewRechargeType.godEquipStone or _type == UpViewRechargeType.yonghengzhiyao or + _type == UpViewRechargeType.exploreCost or _type == UpViewRechargeType.qianmianhuan then UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type) end