diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index e21076a83b..811810f876 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3426365} - component: {fileID: 3426367} - component: {fileID: 3426366} + - component: {fileID: 7300234657696729158} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -34,7 +35,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -54} + m_AnchoredPosition: {x: 0, y: -72.5} m_SizeDelta: {x: 160, y: 59.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3426367 @@ -67,11 +68,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -79,6 +80,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u8BB0\u5F55" +--- !u!114 &7300234657696729158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3426364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &269761618 GameObject: m_ObjectHideFlags: 0 @@ -109,7 +125,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1454780772259464311} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -342,7 +358,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 26, y: 0} + m_AnchoredPosition: {x: 70, y: 0} m_SizeDelta: {x: 232.2, y: 86.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1376534453 @@ -380,13 +396,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 48 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7A7A\u5C9B" + m_Text: "\u98DE\u8239" --- !u!114 &1376534451 MonoBehaviour: m_ObjectHideFlags: 0 @@ -452,7 +468,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 4.5} m_SizeDelta: {x: 186, y: 156} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1579963070 @@ -682,6 +698,81 @@ MonoBehaviour: m_EffectColor: {r: 0.45098042, g: 0.21960786, b: 0, a: 1} m_EffectDistance: {x: 4.5, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &15289702885340788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8829683958565292174} + - component: {fileID: 7472618193001154611} + - component: {fileID: 1728200712416599213} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8829683958565292174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 15289702885340788} + 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: 3576641479676290196} + m_Father: {fileID: 1454780772259464311} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7472618193001154611 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 15289702885340788} + m_CullTransparentMesh: 0 +--- !u!114 &1728200712416599213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 15289702885340788} + 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: da769bf29f6ad91419d704aa20062d65, 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 &25192073225386989 GameObject: m_ObjectHideFlags: 0 @@ -803,8 +894,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: 22, y: -219} - m_SizeDelta: {x: 227.63, y: 203.3} + m_AnchoredPosition: {x: 301.6, y: -196.3} + m_SizeDelta: {x: 476.8, y: 451.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6136058743138110916 CanvasRenderer: @@ -821,7 +912,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 166980634780766595} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1030,12 +1121,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1454780772259464311} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 113} - m_SizeDelta: {x: 79, y: 176} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6846808885653280944 CanvasRenderer: @@ -1065,7 +1156,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8561d25febfc8bc428011c49f29d126b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1146,7 +1237,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1454780772259464311} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1226,7 +1317,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -63, y: -0.7} + m_AnchoredPosition: {x: -90, y: -0.7} m_SizeDelta: {x: 60.55, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8411240687234533140 @@ -1555,7 +1646,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -7, y: -98.5} - m_SizeDelta: {x: 185.5, y: 63.2} + m_SizeDelta: {x: 250, y: 63.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7747904588425403164 CanvasRenderer: @@ -1986,7 +2077,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 170.8, y: 80} + m_AnchoredPosition: {x: 115.8, y: 80} m_SizeDelta: {x: 213.57, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3166606211262024359 @@ -2232,7 +2323,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: 108.5, y: -20} + m_AnchoredPosition: {x: 40, y: -20} m_SizeDelta: {x: 137, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5036984892833036200 @@ -2329,8 +2420,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: -5, y: -98.5} - m_SizeDelta: {x: 185.8, y: 63.2} + m_AnchoredPosition: {x: -60, y: -98.5} + m_SizeDelta: {x: 250, y: 63.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8172347158767258390 CanvasRenderer: @@ -2698,8 +2789,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: 130, y: 475} - m_SizeDelta: {x: 227.63, y: 203.3} + m_AnchoredPosition: {x: 121.6, y: 506.9} + m_SizeDelta: {x: 364.9, y: 411.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6585439458256033418 CanvasRenderer: @@ -2716,7 +2807,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1558309260135434847} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -3176,8 +3267,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -15, y: -15} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: -15, y: -18.3} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1100801024866038825 CanvasRenderer: @@ -3407,7 +3498,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 26, y: 0} + m_AnchoredPosition: {x: 70, y: 0} m_SizeDelta: {x: 232.2, y: 86.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4260874657283544321 @@ -3445,13 +3536,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 48 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7A7A\u5C9B" + m_Text: "\u53D1\u5C04\u5854" --- !u!114 &1679830128832092911 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3515,11 +3606,11 @@ RectTransform: m_Children: - {fileID: 3214502620443258166} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -74.9, y: -120.7} + m_AnchoredPosition: {x: -293.2, y: -96} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2004447905712542452 @@ -4117,8 +4208,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: -1, y: -98.5} - m_SizeDelta: {x: 185.8, y: 63.2} + m_AnchoredPosition: {x: -43.09, y: -205.5} + m_SizeDelta: {x: 250, y: 63.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6350459956085405241 CanvasRenderer: @@ -4510,7 +4601,7 @@ RectTransform: - {fileID: 2315317596162847773} - {fileID: 4464128417798635013} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4708,7 +4799,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -61, y: -0.7} + m_AnchoredPosition: {x: -90, y: -0.7} m_SizeDelta: {x: 60.55, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6049504267305349124 @@ -4972,7 +5063,7 @@ RectTransform: 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: 68, y: 68} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3214502620443258164 CanvasRenderer: @@ -5002,7 +5093,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5187,7 +5278,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 170.8, y: 80} + m_AnchoredPosition: {x: 95, y: -27} m_SizeDelta: {x: 213.57, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5868794079429826473 @@ -5656,7 +5747,7 @@ RectTransform: - {fileID: 4392713943104514778} - {fileID: 8208061848372739616} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -5765,8 +5856,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: -385, y: -157} - m_SizeDelta: {x: 227.63, y: 203.3} + m_AnchoredPosition: {x: -312.1, y: -428.8} + m_SizeDelta: {x: 400.6, y: 472.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6605008651395083496 CanvasRenderer: @@ -5783,7 +5874,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3677370552017579102} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -6252,7 +6343,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -63, y: -0.7} + m_AnchoredPosition: {x: -90, y: -0.7} m_SizeDelta: {x: 60.55, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1439703854309874122 @@ -6498,7 +6589,7 @@ RectTransform: - {fileID: 7786880042585330257} - {fileID: 2347942256702468480} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -6613,7 +6704,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -2, y: -98.5} - m_SizeDelta: {x: 185.5, y: 63.2} + m_SizeDelta: {x: 250, y: 63.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7798557018132772787 CanvasRenderer: @@ -6761,7 +6852,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: 108.5, y: -20} + m_AnchoredPosition: {x: 40, y: -20} m_SizeDelta: {x: 137, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5866148740682195067 @@ -6909,14 +7000,15 @@ RectTransform: 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_Children: + - {fileID: 3093880863140612151} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -33.25} - m_SizeDelta: {x: 0, y: 86.5} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8415768821001178698 CanvasRenderer: @@ -6946,7 +7038,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: da769bf29f6ad91419d704aa20062d65, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7046,7 +7138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5260388766404069698 RectTransform: m_ObjectHideFlags: 0 @@ -7056,15 +7148,15 @@ RectTransform: m_GameObject: {fileID: 4734253633205266820} 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_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 1454780772259464311} - m_RootOrder: 1 + 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: -38.25} - m_SizeDelta: {x: 0, y: -76.5} + m_AnchoredPosition: {x: 61, y: 42} + m_SizeDelta: {x: 968, y: -463} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &719078331411497301 CanvasRenderer: @@ -7094,7 +7186,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7d35d45e44b185e4cbf867d7a757fe01, type: 3} + m_Sprite: {fileID: 21300000, guid: 73a06e1c8de911748b428362485b1c96, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7408,7 +7500,7 @@ RectTransform: - {fileID: 434388096181781997} - {fileID: 1044276753} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -7812,7 +7904,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 26, y: 0} + m_AnchoredPosition: {x: 70, y: 0} m_SizeDelta: {x: 232.2, y: 86.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7134051356384161689 @@ -7850,13 +7942,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 48 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7A7A\u5C9B" + m_Text: "\u7814\u7A76\u6240" --- !u!114 &6328508206699092715 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8382,7 +8474,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -67, y: -0.7} + m_AnchoredPosition: {x: -90, y: -0.7} m_SizeDelta: {x: 60.55, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4694236665337237132 @@ -8800,7 +8892,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5C1A\u672A\u5360\u9886\u7075\u8109" + m_Text: "\u5C1A\u672A\u5360\u9886\u5730\u76D8" --- !u!1 &6503453167472706456 GameObject: m_ObjectHideFlags: 0 @@ -8836,7 +8928,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: 108.5, y: -20} + m_AnchoredPosition: {x: 40, y: -20} m_SizeDelta: {x: 137, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3066400076754835733 @@ -8928,7 +9020,7 @@ RectTransform: - {fileID: 6377394198622654848} - {fileID: 8105622087091877764} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -8955,7 +9047,7 @@ MonoBehaviour: m_ChildAlignment: 2 m_StartCorner: 1 m_StartAxis: 1 - m_CellSize: {x: 180, y: 174} + m_CellSize: {x: 150, y: 174} m_Spacing: {x: 0, y: 25} m_Constraint: 1 m_ConstraintCount: 1 @@ -9148,7 +9240,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3} + m_Sprite: {fileID: 21300000, guid: 007ce76cef3dec944b160050bce344a5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9482,7 +9574,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 26, y: 0} + m_AnchoredPosition: {x: 70, y: 0} m_SizeDelta: {x: 232.2, y: 86.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6050672061113071029 @@ -9520,13 +9612,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 48 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7A7A\u5C9B" + m_Text: "\u5546\u4E1A\u8857" --- !u!114 &2121629133131677618 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9678,8 +9770,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: -151, y: 105} - m_SizeDelta: {x: 227.63, y: 203.3} + m_AnchoredPosition: {x: -346, y: 581.9} + m_SizeDelta: {x: 227.6, y: 407.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &664004962842327823 CanvasRenderer: @@ -9696,7 +9788,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7265871147559977972} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -10971,8 +11063,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4519818950234898069} - {fileID: 5260388766404069698} + - {fileID: 1415145097454105703} + - {fileID: 4519818950234898069} + - {fileID: 8829683958565292174} - {fileID: 6373810580157117310} - {fileID: 3414800266310949691} - {fileID: 8713029853791401389} @@ -11153,6 +11247,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &8571332467094499088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3093880863140612151} + - component: {fileID: 3248728766994738948} + - component: {fileID: 3966073556620232068} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3093880863140612151 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8571332467094499088} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4519818950234898069} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3248728766994738948 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8571332467094499088} + m_CullTransparentMesh: 0 +--- !u!114 &3966073556620232068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8571332467094499088} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &8582570399324357897 GameObject: m_ObjectHideFlags: 0 @@ -11187,7 +11355,7 @@ RectTransform: - {fileID: 8863978883389089030} - {fileID: 8994663043081062722} m_Father: {fileID: 1454780772259464311} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -11338,6 +11506,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8920804741915323135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3576641479676290196} + - component: {fileID: 5103438919133460703} + - component: {fileID: 4943991268744520990} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3576641479676290196 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920804741915323135} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8829683958565292174} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5103438919133460703 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920804741915323135} + m_CullTransparentMesh: 0 +--- !u!114 &4943991268744520990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920804741915323135} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &8934004158165950739 GameObject: m_ObjectHideFlags: 0 @@ -11512,7 +11754,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: 108.5, y: -20} + m_AnchoredPosition: {x: 40, y: -20} m_SizeDelta: {x: 137, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8284613078772494453 @@ -13678,6 +13920,151 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4502395989082897117} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4600330490399384016 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1454780772259464311} + m_Modifications: + - target: {fileID: 3203241048046590536, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_Name + value: mainSceneBack + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -850 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -803 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_SizeDelta.x + value: 2048 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_SizeDelta.y + value: 1459 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4666609420006226685, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 4666609420006226685, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 575505194805564705, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4709323859232352411, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4c349ba5e25b3fe4f8f834ce2c967939, type: 3} +--- !u!224 &1415145097454105703 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3203241048046589367, guid: 4c349ba5e25b3fe4f8f834ce2c967939, + type: 3} + m_PrefabInstance: {fileID: 4600330490399384016} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5272541419742847675 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index b9dfcd7e78..f99c83999f 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -3,8 +3,8 @@ local LingMaiMiJingPanel = Inherit(BasePanel) local lodeConfig = ConfigManager.GetConfig(ConfigName.LodeConfig) local TEXTLIST = { [1] = "距抢夺期结束:", - [2] = "距空岛开启:", - [3] = "距空岛关闭:", + [2] = "距开启:", + [3] = "距关闭:", } local veinName = { [3] = "l_lmmj_huangjilingmai", @@ -226,7 +226,7 @@ function LingMaiMiJingPanel:SetVeins() if LingMaiMiJingManager.state == 1 then UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.servername and data.servername or nil,data) else - PopupTipPanel.ShowTip("空岛未开启!") + PopupTipPanel.ShowTip("未开启!") end end)