diff --git a/TheStrongestSnail/Assets/Resources/History_item.prefab b/TheStrongestSnail/Assets/Resources/History_item.prefab index c7deac2..fd1e118 100644 --- a/TheStrongestSnail/Assets/Resources/History_item.prefab +++ b/TheStrongestSnail/Assets/Resources/History_item.prefab @@ -31,6 +31,7 @@ RectTransform: m_Children: - {fileID: 7344497915218376962} - {fileID: 7344497915180045413} + - {fileID: 8558168417356603295} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -94,7 +95,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: 254.86, y: 117.94} + m_SizeDelta: {x: 170.4811, y: 117.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7344497915139051867 CanvasRenderer: @@ -228,7 +229,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: -74.86634} + m_AnchoredPosition: {x: 0, y: -241} m_SizeDelta: {x: 254.86, y: 80.4148} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7344497915180045411 @@ -365,7 +366,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.00090503, y: 24.311} - m_SizeDelta: {x: 254.86, y: 117.94} + m_SizeDelta: {x: 336, y: 436} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7344497915218376960 CanvasRenderer: @@ -395,8 +396,84 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: db7e50a17b6297143845ed964d96ccd9, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5d363b070972fa54a87e52768f657a8d, 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!1 &8012694916868643201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8558168417356603295} + - component: {fileID: 7329271679993189476} + - component: {fileID: 1693949579976590947} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8558168417356603295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8012694916868643201} + 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: 7344497914347189247} + 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: 0, y: 158} + m_SizeDelta: {x: 95, y: 89} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7329271679993189476 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8012694916868643201} + m_CullTransparentMesh: 1 +--- !u!114 &1693949579976590947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8012694916868643201} + 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: 245d480224e459b42a5f6d1ee371a365, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity index 203537d..f172df6 100644 --- a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity +++ b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity @@ -1369,6 +1369,8 @@ GameObject: m_Component: - component: {fileID: 67134103} - component: {fileID: 67134104} + - component: {fileID: 67134105} + - component: {fileID: 67134106} m_Layer: 5 m_Name: GridHouse m_TagString: Untagged @@ -1387,14 +1389,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 632470668} m_Father: {fileID: 1845562839} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -59.664} - m_SizeDelta: {x: 1306.3, y: 881.91} + m_AnchoredPosition: {x: 0, y: -13} + m_SizeDelta: {x: 1306.3, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &67134104 MonoBehaviour: @@ -1409,17 +1412,51 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 125 + m_Left: 0 m_Right: 0 - m_Top: 7 + m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 255, y: 165} - m_Spacing: {x: 140.45, y: 58.34} + m_CellSize: {x: 345, y: 575} + m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &67134105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67134102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &67134106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67134102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 600 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &74076849 GameObject: m_ObjectHideFlags: 0 @@ -5432,9 +5469,9 @@ RectTransform: m_Father: {fileID: 582056263} 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: 691.1493, y: -530.9911} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1306.2986, y: 609.9821} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &384095152 @@ -8120,7 +8157,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 0.00012605978} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &582056264 @@ -8646,6 +8683,124 @@ RectTransform: m_AnchoredPosition: {x: -133.99988, y: 129.3252} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &632470667 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 67134103} + m_Modifications: + - target: {fileID: 7344497914347189246, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_Name + value: History_item + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497915180045413, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchoredPosition.y + value: -262 + objectReference: {fileID: 0} + - target: {fileID: 7344497915218376962, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7344497915218376962, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8558168417356603295, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + propertyPath: m_AnchoredPosition.y + value: -68 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} +--- !u!224 &632470668 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7344497914347189247, guid: 722a3a0c4d854404bb03dcb657397028, type: 3} + m_PrefabInstance: {fileID: 632470667} + m_PrefabAsset: {fileID: 0} --- !u!1 &642303375 GameObject: m_ObjectHideFlags: 0 @@ -10823,9 +10978,9 @@ RectTransform: m_Father: {fileID: 582056263} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 691.15, y: -2325.055} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1306.3, y: 353.7809} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &760515340 @@ -11921,9 +12076,9 @@ RectTransform: m_Father: {fileID: 582056263} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 691.15, y: -2015.7462} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1306.3, y: 172.6165} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &875993942 @@ -13088,6 +13243,7 @@ MonoBehaviour: JournalPanelPre: {fileID: 1063645489154276222, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} JournParent: {fileID: 582056263} journalPanels: [] + scrollRect: {fileID: 2053983586} --- !u!1 &913069760 GameObject: m_ObjectHideFlags: 0 @@ -26070,6 +26226,8 @@ GameObject: - component: {fileID: 1845562839} - component: {fileID: 1845562841} - component: {fileID: 1845562840} + - component: {fileID: 1845562843} + - component: {fileID: 1845562842} m_Layer: 5 m_Name: BoosKiilPanel m_TagString: Untagged @@ -26096,8 +26254,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 691.1493, y: -1382.7101} - m_SizeDelta: {x: 1306.2986, y: 1001.2359} + m_AnchoredPosition: {x: 691.1493, y: -1282.092} + m_SizeDelta: {x: 1306.2986, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1845562840 MonoBehaviour: @@ -26137,6 +26295,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1845562838} m_CullTransparentMesh: 1 +--- !u!114 &1845562842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845562838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 800 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1845562843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845562838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &1845977110 GameObject: m_ObjectHideFlags: 0 diff --git a/TheStrongestSnail/Assets/Scenes/yhjtext.unity b/TheStrongestSnail/Assets/Scenes/yhjtext.unity index 767a2cd..6861888 100644 --- a/TheStrongestSnail/Assets/Scenes/yhjtext.unity +++ b/TheStrongestSnail/Assets/Scenes/yhjtext.unity @@ -182,7 +182,6 @@ MonoBehaviour: NoContractItem: {fileID: 2792273503885494388, guid: a131fcde57a6cc6478f6fa36b6538a7f, type: 3} NoItem: {fileID: 7051989434364263652, guid: d40f5ad9b27c7fe47aa4e9e3cfa5c242, type: 3} content: {fileID: 420036134} - CH: [] --- !u!1 &76038748 GameObject: m_ObjectHideFlags: 0 @@ -1483,8 +1482,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -198.25192, y: 150} - m_SizeDelta: {x: 168.40894, y: 122.5568} + m_AnchoredPosition: {x: -184.88547, y: 150} + m_SizeDelta: {x: 160.7329, y: 177.5259} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1026835208 MonoBehaviour: @@ -1550,7 +1549,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 114f00c17b7f3694086199ba89d97649, type: 3} + m_Sprite: {fileID: 21300000, guid: 7c533bc20ee3c7d44b7fd980bb3c2897, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2111,7 +2110,6 @@ MonoBehaviour: m_EditorClassIdentifier: ItemParent: {fileID: 229120760} kuanghcangItem: {fileID: 3917486069387947416, guid: ea08932284e84ac43b7828bcb637bbf5, type: 3} - ReturnButton: {fileID: 860805141} --- !u!1 &1388295096 GameObject: m_ObjectHideFlags: 0 @@ -2854,7 +2852,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: 8} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1970592275 @@ -2871,7 +2869,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs b/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs index 84a1c53..bacc736 100644 --- a/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs @@ -20,17 +20,31 @@ public class HistoryPanel : BasePanel public Transform JournParent;//用户参与面板父物体 public List journalPanels=new List(); + + public ScrollRect scrollRect; // 将ScrollRect拖拽到此字段 public override void Start() { + scrollRect.vertical = false; // 禁用垂直滚动 base.Start(); returnBtn.onClick.AddListener(OnClickReBtn); + // 设置ScrollView默认显示在最上面 + } public void OnClickReBtn() { HidePanel(); } - + public override void HidePanel() + { + scrollRect.vertical = false; // 禁用垂直滚动 + base.HidePanel(); + } + public override void ShowPanel() + { + scrollRect.vertical = true; // 启用垂直滚动 + base.ShowPanel(); + } public void SetKilledText(gameEscapeRoomKillCountResponseVo gameKill)//近100次被杀记录的文本修改方法 { for (int i=0;i(); @@ -91,6 +106,7 @@ public class HistoryPanel : BasePanel Destroy(newPanel); } } + } @@ -114,7 +130,7 @@ public class HistoryPanel : BasePanel HistoryItem historyItemComponent = newHistoryItem.GetComponent(); historyItemComponent.nameTextPro.text = item.nameTextPro.text; // 房间名字 historyItemComponent.TextPro.text = gameEscapeModelList.gameNo + "期"; // 期号 - historyItemComponent.image.sprite = item.sprite; // 背景图片 + //historyItemComponent.image.sprite = item.sprite; // 背景图片 // 限制列表最多保存 10 个实例 if (ItemList.Count >= 10)