diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab index 99a85ce26c..eb26847fb8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab @@ -436,6 +436,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2141582684209815005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8728742581174877922} + - component: {fileID: 1357748015489741972} + - component: {fileID: 8356134081005022932} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8728742581174877922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141582684209815005} + 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: 8117222038710362646} + 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: -4.6, y: 11.7} + m_SizeDelta: {x: 311.9, y: 83.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1357748015489741972 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141582684209815005} + m_CullTransparentMesh: 0 +--- !u!114 &8356134081005022932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141582684209815005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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: 35 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 35 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5C1A\u672A\u83B7\u5F97\u5723\u7269" + LanguageIndex: 0 --- !u!1 &2153926654090079143 GameObject: m_ObjectHideFlags: 0 @@ -601,7 +681,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &3596911974103120750 +--- !u!1 &3122153438160475401 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -609,78 +689,89 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6156450762423982161} - - component: {fileID: 4505027723465724455} - - component: {fileID: 6891723302308481127} + - component: {fileID: 7222557603606093079} + - component: {fileID: 2815702548666880762} + - component: {fileID: 549304731953116223} + - component: {fileID: 8195064787789156494} m_Layer: 5 - m_Name: Text + m_Name: infoRect m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6156450762423982161 +--- !u!224 &7222557603606093079 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3596911974103120750} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 3122153438160475401} + 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: 8117222038710362646} - m_RootOrder: 0 + m_LocalScale: {x: 0.8506667, y: 0.8506667, z: 1} + m_Children: + - {fileID: 6465732091684636504} + m_Father: {fileID: 1000020802548592087} + m_RootOrder: 10 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: -4.6, y: 11.7} - m_SizeDelta: {x: 311.9, y: 83.2} + m_AnchoredPosition: {x: 83.2, y: -23.2} + m_SizeDelta: {x: 578.9, y: 140.3} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4505027723465724455 +--- !u!222 &2815702548666880762 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3596911974103120750} + m_GameObject: {fileID: 3122153438160475401} m_CullTransparentMesh: 0 ---- !u!114 &6891723302308481127 +--- !u!114 &549304731953116223 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3596911974103120750} + m_GameObject: {fileID: 3122153438160475401} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: + m_Content: {fileID: 6465732091684636504} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 7222557603606093079} + 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.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: 35 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 - m_MaxSize: 35 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5C1A\u672A\u83B7\u5F97\u5723\u7269" - LanguageIndex: 0 + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &8195064787789156494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3122153438160475401} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4255691785566229128 GameObject: m_ObjectHideFlags: 0 @@ -785,7 +876,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2338752875457827752} + - {fileID: 875467585844524315} m_Father: {fileID: 1000020802548592087} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -905,80 +996,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4617868602273569523 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1347353653869461646} - - component: {fileID: 2426879734756963739} - - component: {fileID: 665613725807897516} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1347353653869461646 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4617868602273569523} - 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: 1000020802548592087} - 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: -5, y: 0} - m_SizeDelta: {x: 925, y: 245} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2426879734756963739 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4617868602273569523} - m_CullTransparentMesh: 0 ---- !u!114 &665613725807897516 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4617868602273569523} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c013fd5e85530c74da236b54541ccd20, 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 &4973900029368796356 GameObject: m_ObjectHideFlags: 0 @@ -1053,6 +1070,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5590907423102783705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 875467585844524315} + - component: {fileID: 4068411867782246730} + - component: {fileID: 3308096413365396590} + m_Layer: 5 + m_Name: posImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &875467585844524315 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5590907423102783705} + 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: 4242525565220844069} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -3.4} + m_SizeDelta: {x: 66, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4068411867782246730 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5590907423102783705} + m_CullTransparentMesh: 0 +--- !u!114 &3308096413365396590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5590907423102783705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b1a92f783ef44174cadd79d112420c8e, 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 &5813030036485488626 GameObject: m_ObjectHideFlags: 0 @@ -1082,7 +1173,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4110888016398156113} - - {fileID: 1347353653869461646} + - {fileID: 4530728404433053245} - {fileID: 892603925685592230} - {fileID: 4254629525009586640} - {fileID: 5636838467550300114} @@ -1091,12 +1182,13 @@ RectTransform: - {fileID: 4242525565220844069} - {fileID: 1023355362182389012} - {fileID: 2073089078963641451} + - {fileID: 7222557603606093079} m_Father: {fileID: 3099126925472904098} 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: -2208, y: 369} + m_AnchoredPosition: {x: -2409, y: 236} m_SizeDelta: {x: 902.6, y: 245} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7241221209061229747 @@ -1201,7 +1293,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5636838467550300114 RectTransform: m_ObjectHideFlags: 0 @@ -1262,7 +1354,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u804C\u4E1A\u730E\u5996\u804C\u4E1A\u730E\u5996\u804C\u4E1A\u730E\u5996w" + m_Text: "\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240" LanguageIndex: 0 --- !u!1 &6842376930532553360 GameObject: @@ -1492,80 +1584,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7044833598755911274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2338752875457827752} - - component: {fileID: 1452205756594198521} - - component: {fileID: 124440878739915485} - m_Layer: 5 - m_Name: posImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2338752875457827752 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7044833598755911274} - 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: 4242525565220844069} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -3.4} - m_SizeDelta: {x: 66, y: 84} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1452205756594198521 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7044833598755911274} - m_CullTransparentMesh: 0 ---- !u!114 &124440878739915485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7044833598755911274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b1a92f783ef44174cadd79d112420c8e, 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 &7123935009926928724 GameObject: m_ObjectHideFlags: 0 @@ -1674,6 +1692,101 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7716353829263676384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6465732091684636504} + - component: {fileID: 6706607635529974733} + - component: {fileID: 987138142937189376} + - component: {fileID: 8797940289912472881} + m_Layer: 5 + m_Name: infoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6465732091684636504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716353829263676384} + 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: 7222557603606093079} + 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: -2, y: -0.000038146973} + m_SizeDelta: {x: 580.9, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6706607635529974733 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716353829263676384} + m_CullTransparentMesh: 0 +--- !u!114 &987138142937189376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716353829263676384} + 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!114 &8797940289912472881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716353829263676384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9529412, g: 0.6156863, b: 0.5176471, 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: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996" + LanguageIndex: 10911 --- !u!1 &7770118332320716803 GameObject: m_ObjectHideFlags: 0 @@ -1703,7 +1816,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6156450762423982161} + - {fileID: 8728742581174877922} m_Father: {fileID: 8238264444780451486} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1749,6 +1862,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7802298879839697984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4530728404433053245} + - component: {fileID: 1007856589262000936} + - component: {fileID: 2697126559576263967} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4530728404433053245 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7802298879839697984} + 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: 1000020802548592087} + 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: -5, y: 0} + m_SizeDelta: {x: 925, y: 245} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1007856589262000936 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7802298879839697984} + m_CullTransparentMesh: 0 +--- !u!114 &2697126559576263967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7802298879839697984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c013fd5e85530c74da236b54541ccd20, 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 &8934580055360637647 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab index 4d787c5cbe..f5be5534f8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab @@ -516,7 +516,7 @@ RectTransform: m_AnchoredPosition: {x: -0.3, y: 489.3} m_SizeDelta: {x: 902.6, y: 726.3} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &1901947405468742878 +--- !u!1 &2017687745569761094 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -524,78 +524,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9151248666059970529} - - component: {fileID: 1516250363395923351} - - component: {fileID: 190426310843828084} + - component: {fileID: 2597625163890798127} + - component: {fileID: 557923287019330996} + - component: {fileID: 4493217944038417039} m_Layer: 5 - m_Name: Text + m_Name: posImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9151248666059970529 +--- !u!224 &2597625163890798127 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1901947405468742878} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 2017687745569761094} + 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: 8117222038710362646} + m_Father: {fileID: 4242525565220844069} 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: -14, y: 18.1} - m_SizeDelta: {x: 302.5, y: 98} + m_AnchoredPosition: {x: 0, y: -3.4} + m_SizeDelta: {x: 66, y: 84} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1516250363395923351 +--- !u!222 &557923287019330996 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1901947405468742878} + m_GameObject: {fileID: 2017687745569761094} m_CullTransparentMesh: 0 ---- !u!114 &190426310843828084 +--- !u!114 &4493217944038417039 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1901947405468742878} + m_GameObject: {fileID: 2017687745569761094} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 - m_MaxSize: 35 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5C1A\u672A\u83B7\u5F97\u5723\u7269" - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: b1a92f783ef44174cadd79d112420c8e, 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 &2153926654090079143 GameObject: m_ObjectHideFlags: 0 @@ -670,6 +664,144 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2323061010633546564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4702742431594528030} + - component: {fileID: 1304049099460694528} + - component: {fileID: 7462023865129490634} + - component: {fileID: 4462914723436032743} + - component: {fileID: 6865890053998197746} + m_Layer: 5 + m_Name: infoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4702742431594528030 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323061010633546564} + 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: 3425703103692078191} + 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: -2, y: -0.000030517578} + m_SizeDelta: {x: 666.65, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1304049099460694528 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323061010633546564} + m_CullTransparentMesh: 0 +--- !u!114 &7462023865129490634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323061010633546564} + 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!114 &4462914723436032743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323061010633546564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9529412, g: 0.6156863, b: 0.5176471, 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: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996\u6240\u6709\u79D8\u6CD5\u804C\u4E1A\u730E\u5996" + LanguageIndex: 10911 +--- !u!114 &6865890053998197746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323061010633546564} + 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: 4462914723436032743} + 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 &2890044081499600516 GameObject: m_ObjectHideFlags: 0 @@ -792,7 +924,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1000020802548592087} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -865,7 +997,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8225809829863536859} + - {fileID: 2597625163890798127} m_Father: {fileID: 1000020802548592087} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -985,6 +1117,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4445409442795373495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8004708882280126922} + - component: {fileID: 6632308090274720991} + - component: {fileID: 8401482126140715752} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8004708882280126922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4445409442795373495} + 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: 1000020802548592087} + 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: -5, y: 0} + m_SizeDelta: {x: 925, y: 245} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6632308090274720991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4445409442795373495} + m_CullTransparentMesh: 0 +--- !u!114 &8401482126140715752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4445409442795373495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c013fd5e85530c74da236b54541ccd20, 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 &4850152099252776889 GameObject: m_ObjectHideFlags: 0 @@ -1016,7 +1222,7 @@ RectTransform: m_Children: - {fileID: 2544243924442159544} m_Father: {fileID: 1000020802548592087} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1134,7 +1340,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5344409878094229938 +--- !u!1 &5498472044566520362 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1142,72 +1348,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8225809829863536859} - - component: {fileID: 5878684472819944256} - - component: {fileID: 7525640108514423931} + - component: {fileID: 2942161219705405717} + - component: {fileID: 4837325096089045859} + - component: {fileID: 6093347889625502080} m_Layer: 5 - m_Name: posImage + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8225809829863536859 +--- !u!224 &2942161219705405717 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5344409878094229938} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 5498472044566520362} + 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: 4242525565220844069} + m_Father: {fileID: 8117222038710362646} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -3.4} - m_SizeDelta: {x: 66, y: 84} + m_AnchoredPosition: {x: -14, y: 18.1} + m_SizeDelta: {x: 302.5, y: 98} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5878684472819944256 +--- !u!222 &4837325096089045859 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5344409878094229938} + m_GameObject: {fileID: 5498472044566520362} m_CullTransparentMesh: 0 ---- !u!114 &7525640108514423931 +--- !u!114 &6093347889625502080 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5344409878094229938} + m_GameObject: {fileID: 5498472044566520362} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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: b1a92f783ef44174cadd79d112420c8e, 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 35 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5C1A\u672A\u83B7\u5F97\u5723\u7269" + LanguageIndex: 0 --- !u!1 &5813030036485488626 GameObject: m_ObjectHideFlags: 0 @@ -1237,13 +1449,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4110888016398156113} - - {fileID: 4124484130916634430} + - {fileID: 8004708882280126922} - {fileID: 892603925685592230} - {fileID: 4254629525009586640} - {fileID: 5636838467550300114} - {fileID: 4242525565220844069} - {fileID: 3690411455987270658} - {fileID: 4599864883104131042} + - {fileID: 3425703103692078191} - {fileID: 9144379138180442586} - {fileID: 2852514959933465201} - {fileID: 2775512645932585358} @@ -1358,7 +1571,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5636838467550300114 RectTransform: m_ObjectHideFlags: 0 @@ -1649,6 +1862,97 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7003501768636301344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3425703103692078191} + - component: {fileID: 8332169417261888420} + - component: {fileID: 1108866153280342499} + - component: {fileID: 5519476265864744399} + m_Layer: 5 + m_Name: infoRect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3425703103692078191 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7003501768636301344} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8506667, y: 0.8506667, z: 1} + m_Children: + - {fileID: 4702742431594528030} + m_Father: {fileID: 1000020802548592087} + m_RootOrder: 8 + 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: 113, y: -26} + m_SizeDelta: {x: 664.7, y: 140.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8332169417261888420 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7003501768636301344} + m_CullTransparentMesh: 0 +--- !u!114 &1108866153280342499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7003501768636301344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 4702742431594528030} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 3425703103692078191} + 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 &5519476265864744399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7003501768636301344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7123935009926928724 GameObject: m_ObjectHideFlags: 0 @@ -1787,7 +2091,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1000020802548592087} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1831,80 +2135,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7753554180664546627 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4124484130916634430} - - component: {fileID: 730107839455640107} - - component: {fileID: 2500451467875591196} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4124484130916634430 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7753554180664546627} - 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: 1000020802548592087} - 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: -5, y: 0} - m_SizeDelta: {x: 925, y: 245} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &730107839455640107 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7753554180664546627} - m_CullTransparentMesh: 0 ---- !u!114 &2500451467875591196 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7753554180664546627} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c013fd5e85530c74da236b54541ccd20, 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 &7770118332320716803 GameObject: m_ObjectHideFlags: 0 @@ -1934,7 +2164,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9151248666059970529} + - {fileID: 2942161219705405717} m_Father: {fileID: 8238264444780451486} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2014,7 +2244,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: -1.72} + m_AnchoredPosition: {x: 0, y: -1.72} m_SizeDelta: {x: 188, y: 65.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5356368417287253732 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua index 5795600580..6100e79058 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua @@ -83,7 +83,7 @@ function ExpeditionHalidomPanel:OnShowSingleHolyData(go,singleHoly) Util.GetGameObject(go, "quaImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(configData.type)) Util.GetGameObject(go, "iconImage"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(configData.Icon)) Util.GetGameObject(go, "nameText"):GetComponent("Text").text = GetLanguageStrById(configData.Name) - Util.GetGameObject(go, "infoText"):GetComponent("Text").text = GetLanguageStrById(configData.Describe) + Util.GetGameObject(go, "infoRect/infoText"):GetComponent("Text").text = GetLanguageStrById(configData.Describe) local click = Util.GetGameObject(go, "click") click:GetComponent("Button").enabled = false local posImage = Util.GetGameObject(go, "posImage") diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua index a957563c32..622a880b24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionSelectHalidomPanel.lua @@ -98,7 +98,7 @@ function ExpeditionSelectHalidomPanel:OnShowSingleHolyData(go,singleHoly) Util.GetGameObject(go, "quaImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(configData.type)) Util.GetGameObject(go, "iconImage"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(configData.Icon))-- 报错,资源表里找不到:Util.LoadSprite(GetResourcePath(configData.Icon)) Util.GetGameObject(go, "nameText"):GetComponent("Text").text = GetLanguageStrById(configData.Name) - Util.GetGameObject(go, "infoText"):GetComponent("Text").text = GetLanguageStrById(configData.Describe) + Util.GetGameObject(go, "infoRect/infoText"):GetComponent("Text").text = GetLanguageStrById(configData.Describe) local posImage = Util.GetGameObject(go, "posImage") local proImage = Util.GetGameObject(go, "proImage") local heroImage = Util.GetGameObject(go, "Hero") @@ -125,6 +125,11 @@ function ExpeditionSelectHalidomPanel:OnShowSingleHolyData(go,singleHoly) self:SelectImageSetParent(Util.GetGameObject(go, "selectRoot"), configData) curSelectHalidom = singleHoly end) + Util.AddOnceClick(Util.GetGameObject(go, "infoRect/infoText"), function() + self:SelectImageSetParent(Util.GetGameObject(go, "selectRoot"), configData) + curSelectHalidom = singleHoly + end) + end --选择图片设置父级