diff --git a/meng_yao/Assets/Resources/preform/gui/Text_pop.prefab b/meng_yao/Assets/Resources/preform/gui/Text_pop.prefab index 7233ebdbc..88afeeffc 100644 --- a/meng_yao/Assets/Resources/preform/gui/Text_pop.prefab +++ b/meng_yao/Assets/Resources/preform/gui/Text_pop.prefab @@ -68,10 +68,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 25 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/meng_yao/Assets/Scenes/loading.unity b/meng_yao/Assets/Scenes/loading.unity index 598faf7bb..98c6a8895 100644 --- a/meng_yao/Assets/Scenes/loading.unity +++ b/meng_yao/Assets/Scenes/loading.unity @@ -754,10 +754,10 @@ RectTransform: m_Father: {fileID: 1125672641} 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: 453.20807, y: -945} - m_SizeDelta: {x: 173.5839, y: 30} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -93, y: 34} + m_SizeDelta: {x: 173.58386, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &748624119 MonoBehaviour: diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity index 83149d1f3..5d4f19ad3 100644 --- a/meng_yao/Assets/Scenes/scene_Main.unity +++ b/meng_yao/Assets/Scenes/scene_Main.unity @@ -9623,6 +9623,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 129710023} m_CullTransparentMesh: 1 +--- !u!1 &130621706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 130621707} + - component: {fileID: 130621709} + - component: {fileID: 130621708} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &130621707 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130621706} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1805201171} + 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: 10} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &130621708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130621706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 80 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!222 &130621709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130621706} + m_CullTransparentMesh: 1 --- !u!1 &133417873 GameObject: m_ObjectHideFlags: 0 @@ -13128,10 +13208,10 @@ RectTransform: m_Father: {fileID: 1563334097} 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.000030518, y: -1050.9} - m_SizeDelta: {x: 1080, y: 1086.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.99993896, y: 74.165405} + m_SizeDelta: {x: -2.0001, y: -152.0148} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &237151460 MonoBehaviour: @@ -22679,9 +22759,9 @@ RectTransform: m_Father: {fileID: 1563334097} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 354, y: -1645} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -186, y: 74} m_SizeDelta: {x: 368, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &429611109 @@ -28050,6 +28130,84 @@ RectTransform: m_AnchoredPosition: {x: 0.5, y: -373.85742} m_SizeDelta: {x: 1081, y: 548.7717} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &551912974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 551912975} + - component: {fileID: 551912977} + - component: {fileID: 551912976} + m_Layer: 5 + m_Name: you + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &551912975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551912974} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 963291860} + - {fileID: 1274129598} + m_Father: {fileID: 1889601926} + 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: 263, y: 0} + m_SizeDelta: {x: 492, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &551912976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551912974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 46551461371429546bda9257b8ea0174, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &551912977 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551912974} + m_CullTransparentMesh: 1 --- !u!1 &554621586 GameObject: m_ObjectHideFlags: 0 @@ -35016,6 +35174,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 740940668} m_CullTransparentMesh: 1 +--- !u!1001 &741143420 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1043246652} + m_Modifications: + - target: {fileID: 364992840698756911, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Name + value: head_photo + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_SizeDelta.x + value: 164 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_SizeDelta.y + value: 166 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchoredPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992842414460532, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} +--- !u!224 &741143421 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + m_PrefabInstance: {fileID: 741143420} + m_PrefabAsset: {fileID: 0} --- !u!1 &745923429 GameObject: m_ObjectHideFlags: 0 @@ -38056,13 +38320,14 @@ RectTransform: - {fileID: 796205090} - {fileID: 439327119} - {fileID: 21458239} + - {fileID: 1889601926} m_Father: {fileID: 388772539} m_RootOrder: 0 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: 0} - m_SizeDelta: {x: 0, y: 1350} + m_SizeDelta: {x: 2.000122, y: 1575} m_Pivot: {x: 0, y: 1} --- !u!114 &820767597 MonoBehaviour: @@ -42285,6 +42550,116 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963251248} m_CullTransparentMesh: 1 +--- !u!1001 &963291859 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 551912975} + m_Modifications: + - target: {fileID: 364992840698756911, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Name + value: head_photo + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_SizeDelta.x + value: 164 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_SizeDelta.y + value: 166 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchoredPosition.x + value: -92 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchoredPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756913, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364992842414460532, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} +--- !u!224 &963291860 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + m_PrefabInstance: {fileID: 963291859} + m_PrefabAsset: {fileID: 0} --- !u!1 &970462198 GameObject: m_ObjectHideFlags: 0 @@ -45738,6 +46113,83 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1043246651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1043246652} + - component: {fileID: 1043246654} + - component: {fileID: 1043246653} + m_Layer: 5 + m_Name: zuo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1043246652 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043246651} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 741143421} + m_Father: {fileID: 1889601926} + 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: -265, y: 0} + m_SizeDelta: {x: 492, y: 206} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1043246653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043246651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c9ef225874bad5943b62dfb9d9f7241c, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1043246654 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043246651} + m_CullTransparentMesh: 1 --- !u!1 &1044695226 GameObject: m_ObjectHideFlags: 0 @@ -47825,6 +48277,86 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1100736960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1100736961} + - component: {fileID: 1100736963} + - component: {fileID: 1100736962} + m_Layer: 5 + m_Name: Text (Legacy) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1100736961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100736960} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1805201171} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 1, y: 24} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1100736962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100736960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7EA7" +--- !u!222 &1100736963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100736960} + m_CullTransparentMesh: 1 --- !u!1001 &1101457900 PrefabInstance: m_ObjectHideFlags: 0 @@ -54207,6 +54739,116 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1272092946} m_CullTransparentMesh: 1 +--- !u!1001 &1274129597 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 551912975} + m_Modifications: + - target: {fileID: 364992840698756911, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Name + value: head_photo (1) + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_SizeDelta.x + value: 164 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_SizeDelta.y + value: 166 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 104 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_AnchoredPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 364992840698756913, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364992842414460532, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} +--- !u!224 &1274129598 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 364992840698756912, guid: 7a2c17f915d7cd447b11eceef63703d3, type: 3} + m_PrefabInstance: {fileID: 1274129597} + m_PrefabAsset: {fileID: 0} --- !u!1 &1277500120 GameObject: m_ObjectHideFlags: 0 @@ -66060,10 +66702,10 @@ RectTransform: m_Father: {fileID: 346722531} m_RootOrder: 1 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: -960} - m_SizeDelta: {x: 1080, y: 1920} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -160.59998} + m_SizeDelta: {x: 0, y: -719.30005} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1563334098 MonoBehaviour: @@ -76351,6 +76993,84 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1805201170 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1805201171} + - component: {fileID: 1805201173} + - component: {fileID: 1805201172} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1805201171 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805201170} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 130621707} + - {fileID: 1100736961} + m_Father: {fileID: 1889601926} + 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: -2, y: -6} + m_SizeDelta: {x: 148, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1805201172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805201170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7f66311e0300bdc4f89293a3f706fcf9, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1805201173 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805201170} + m_CullTransparentMesh: 1 --- !u!1 &1805409416 GameObject: m_ObjectHideFlags: 0 @@ -79709,6 +80429,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1889134673} m_CullTransparentMesh: 1 +--- !u!1 &1889601925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1889601926} + m_Layer: 5 + m_Name: item (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1889601926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1889601925} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1043246652} + - {fileID: 551912975} + - {fileID: 1805201171} + m_Father: {fileID: 820767596} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -1475} + m_SizeDelta: {x: 1080, y: 200} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1890872687 GameObject: m_ObjectHideFlags: 0 @@ -82164,9 +82923,9 @@ RectTransform: m_Father: {fileID: 1563334097} m_RootOrder: 1 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: -1643} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 76} m_SizeDelta: {x: 289, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1940509820 diff --git a/meng_yao/Assets/script/ConnactServer/Logo_in.cs b/meng_yao/Assets/script/ConnactServer/Logo_in.cs index 06e73dc9b..2c934f580 100644 --- a/meng_yao/Assets/script/ConnactServer/Logo_in.cs +++ b/meng_yao/Assets/script/ConnactServer/Logo_in.cs @@ -35,6 +35,7 @@ public class Logo_in : mount } PlayerPrefs.SetInt("SceneStatus", -1); + sceneslider.gameObject.SetActive(false); Privacy_Policy_screen(); } @@ -141,7 +142,7 @@ public class Logo_in : mount gameObject.SetActive(false); Promptmgr.Instance.PromptBubble("µÇ¼³É¹¦"); - + sceneslider.gameObject.SetActive(true); StartCoroutine(jiaLoading()); diff --git a/meng_yao/Assets/script/JumpScene/JinshaBtn.cs b/meng_yao/Assets/script/JumpScene/JinshaBtn.cs index 9843085b3..54b89366f 100644 --- a/meng_yao/Assets/script/JumpScene/JinshaBtn.cs +++ b/meng_yao/Assets/script/JumpScene/JinshaBtn.cs @@ -31,7 +31,6 @@ public class JinshaBtn : MonoBehaviour void JUmpScem() { - Debug.Log("===="); - SceneGuodu.instance.SlideInAndLoadScene(JumpScene.cultivation_Jinsha_mine_slices); + //Debug.Log("===="); } }