diff --git a/TheStrongestSnail/Assets/Resources/History_item.prefab b/TheStrongestSnail/Assets/Resources/History_item.prefab index fd1e118..4699f4d 100644 --- a/TheStrongestSnail/Assets/Resources/History_item.prefab +++ b/TheStrongestSnail/Assets/Resources/History_item.prefab @@ -95,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: 170.4811, y: 117.94} + m_SizeDelta: {x: 125.1062, y: 78.1982} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7344497915139051867 CanvasRenderer: @@ -125,7 +125,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u7C89\u4E50\u5C45" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} m_sharedMaterial: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} @@ -152,8 +152,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 56.5 - m_fontSizeBase: 56.5 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -229,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: -241} + m_AnchoredPosition: {x: 0, y: -185} m_SizeDelta: {x: 254.86, y: 80.4148} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7344497915180045411 @@ -287,8 +287,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -365,8 +365,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.00090503, y: 24.311} - m_SizeDelta: {x: 336, y: 436} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 223.5044, y: 290.0236} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7344497915218376960 CanvasRenderer: @@ -441,8 +441,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 158} - m_SizeDelta: {x: 95, y: 89} + m_AnchoredPosition: {x: 0, y: -51} + m_SizeDelta: {x: 70.7391, y: 66.2714} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7329271679993189476 CanvasRenderer: diff --git a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity index f172df6..231fcf0 100644 --- a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity +++ b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity @@ -1389,15 +1389,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 632470668} + m_Children: [] 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: -13} - m_SizeDelta: {x: 1306.3, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 643.24084, y: -365.5} + m_SizeDelta: {x: 1286.4817, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &67134104 MonoBehaviour: @@ -1412,15 +1411,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 40 m_Right: 0 m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 + m_Bottom: 153 + m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 345, y: 575} - m_Spacing: {x: 0, y: 0} + m_CellSize: {x: 230, y: 385} + m_Spacing: {x: 15, y: 45} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &67134105 @@ -1444,14 +1443,14 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 67134102} - m_Enabled: 1 + m_Enabled: 0 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_MinHeight: 400 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 @@ -8683,124 +8682,6 @@ 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 @@ -15933,6 +15814,83 @@ MonoBehaviour: numText: {fileID: 0} ParentHouse: {fileID: 708679836} Parent: {fileID: 1153582820} +--- !u!1 &1069572948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1069572949} + - component: {fileID: 1069572951} + - component: {fileID: 1069572950} + m_Layer: 5 + m_Name: titelImage (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1069572949 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1069572948} + 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: 1223280855} + m_Father: {fileID: 1774161588} + 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: 337, y: -51} + m_SizeDelta: {x: 716, y: 131} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1069572950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1069572948} + 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: 8f85695912f05a545b44ad00c8e36f9c, 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 &1069572951 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1069572948} + m_CullTransparentMesh: 1 --- !u!1 &1088858447 GameObject: m_ObjectHideFlags: 0 @@ -17714,6 +17672,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1220212786} m_CullTransparentMesh: 1 +--- !u!1 &1223280854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1223280855} + - component: {fileID: 1223280857} + - component: {fileID: 1223280856} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1223280855 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223280854} + 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: 1069572949} + 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: -1.8213, y: 12.6866} + m_SizeDelta: {x: 523.0417, y: 105.6279} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1223280856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223280854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u8FD110\u6B21\u6740\u624B\u623F\u95F4\u8BB0\u5F55" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} + m_sharedMaterial: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1223280857 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223280854} + m_CullTransparentMesh: 1 --- !u!1 &1225833472 GameObject: m_ObjectHideFlags: 0 @@ -18840,141 +18933,6 @@ MonoBehaviour: numText: {fileID: 0} ParentHouse: {fileID: 2143530046} Parent: {fileID: 1153582820} ---- !u!1 &1317928036 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1317928037} - - component: {fileID: 1317928039} - - component: {fileID: 1317928038} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1317928037 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1317928036} - 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: 1774161588} - 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: -1.8213, y: 12.6866} - m_SizeDelta: {x: 523.0417, y: 105.6279} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1317928038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1317928036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u8FD110\u6B21\u6740\u624B\u623F\u95F4\u8BB0\u5F55" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} - m_sharedMaterial: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1317928039 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1317928036} - m_CullTransparentMesh: 1 --- !u!1 &1331503430 GameObject: m_ObjectHideFlags: 0 @@ -24868,7 +24826,6 @@ GameObject: m_Component: - component: {fileID: 1774161588} - component: {fileID: 1774161590} - - component: {fileID: 1774161589} m_Layer: 5 m_Name: titelImage m_TagString: Untagged @@ -24888,45 +24845,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1317928037} + - {fileID: 1069572949} m_Father: {fileID: 1845562839} 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: 337.1, y: -47.9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 716, y: 131} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1774161589 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1774161587} - 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: 8f85695912f05a545b44ad00c8e36f9c, 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 &1774161590 CanvasRenderer: m_ObjectHideFlags: 0 @@ -26228,6 +26155,7 @@ GameObject: - component: {fileID: 1845562840} - component: {fileID: 1845562843} - component: {fileID: 1845562842} + - component: {fileID: 1845562844} m_Layer: 5 m_Name: BoosKiilPanel m_TagString: Untagged @@ -26254,7 +26182,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 691.1493, y: -1282.092} + m_AnchoredPosition: {x: 691.1493, y: -1182.092} m_SizeDelta: {x: 1306.2986, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1845562840 @@ -26309,7 +26237,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 800 + m_MinHeight: 600 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 @@ -26329,6 +26257,32 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &1845562844 +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: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1845977110 GameObject: m_ObjectHideFlags: 0 diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs index 308ac0a..a214919 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs @@ -429,14 +429,9 @@ public class AllHouseContro : MonoBehaviour historyPanel.SetKilledText(item); } //historyPanel.SetKilledText(serverResponse_516.data.gameEscapeRoomKillCountResponseVoList); - foreach (gameEscapeModel item in serverResponse_516.data.gameEscapeModelList) - { - - if (item.gameNo == gameNo) - { - historyPanel.SetKillHouse(item); - } - } + + historyPanel.SetKillHouse(serverResponse_516.data.gameEscapeModelList); + } public async void GetInfo517() diff --git a/TheStrongestSnail/Assets/Scripts/HistoryBtn.cs b/TheStrongestSnail/Assets/Scripts/HistoryBtn.cs index d7bf18f..f3661db 100644 --- a/TheStrongestSnail/Assets/Scripts/HistoryBtn.cs +++ b/TheStrongestSnail/Assets/Scripts/HistoryBtn.cs @@ -17,7 +17,7 @@ public class HistoryBtn : MonoBehaviour public void OnClickBtn() { - AllHouseContro.GetInfo516(); + //AllHouseContro.GetInfo516(); AllHouseContro.GetInfo517(); historyPanel.ShowPanel(); diff --git a/TheStrongestSnail/Assets/Scripts/HistoryItem.cs b/TheStrongestSnail/Assets/Scripts/HistoryItem.cs index 0410f1b..a6a61ec 100644 --- a/TheStrongestSnail/Assets/Scripts/HistoryItem.cs +++ b/TheStrongestSnail/Assets/Scripts/HistoryItem.cs @@ -5,6 +5,7 @@ using UnityEngine.UI; using TMPro; public class HistoryItem : MonoBehaviour { + public int roomNo;//对应房间编号 public int KillTimes;//被杀次数 public string gameNo;//游戏期号 diff --git a/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs b/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs index bacc736..0a1326e 100644 --- a/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs @@ -112,38 +112,76 @@ public class HistoryPanel : BasePanel - public void SetKillHouse(gameEscapeModel gameEscapeModelList) // 记录近 10 次被击杀的房间 + public void SetKillHouse(List gameEscapeModelList) // 记录近 10 次被击杀的房间 { - string[] parts = gameEscapeModelList.roomNoKill.Split(","); // 根据 ',' 分割字符串 - Debug.Log("被击杀的房间号: " + gameEscapeModelList.roomNoKill + "---------------"); - - foreach (string part in parts) + foreach (gameEscapeModel gameEscape in gameEscapeModelList) { - foreach (HistoryItem item in KillTimesList) - { - if (item.roomNo == int.Parse(part)) + string[] parts = gameEscape.roomNoKill.Split(","); // 根据 ',' 分割字符串 + Debug.Log("被击杀的房间号: " + gameEscape.roomNoKill + "---------------"); + + + + + // 实例化新的对象 + GameObject newHistoryItem = Instantiate(historyItemPre, ItemPreGrid); + + // 设置实例的内容 + HistoryItem historyItemComponent = newHistoryItem.GetComponent(); + foreach (string killNo in parts) { - // 实例化新的对象 - GameObject newHistoryItem = Instantiate(historyItemPre, ItemPreGrid); - - // 设置实例的内容 - HistoryItem historyItemComponent = newHistoryItem.GetComponent(); - historyItemComponent.nameTextPro.text = item.nameTextPro.text; // 房间名字 - historyItemComponent.TextPro.text = gameEscapeModelList.gameNo + "期"; // 期号 - //historyItemComponent.image.sprite = item.sprite; // 背景图片 - - // 限制列表最多保存 10 个实例 - if (ItemList.Count >= 10) - { - Destroy(ItemList[0]); // 销毁最早的对象 - ItemList.RemoveAt(0); // 从列表移除最早的对象 - } - - // 将新实例添加到列表 - ItemList.Add(newHistoryItem); + historyItemComponent.nameTextPro.text += AddName(int.Parse(killNo)); // 房间名字 } - } + + historyItemComponent.TextPro.text = gameEscape.gameNo + "期"; // 期号 + //historyItemComponent.image.sprite = item.sprite; // 背景图片 + + // 限制列表最多保存 10 个实例 + if (ItemList.Count >= 10) + { + Destroy(ItemList[0]); // 销毁最早的对象 + ItemList.RemoveAt(0); // 从列表移除最早的对象 + } + + // 将新实例添加到列表 + ItemList.Add(newHistoryItem); + + } + + } + public string AddName(int roomId) + { + string text=""; + switch (roomId) + { + case 1: + text = "紫怪屋"; + break; + case 2: + text = "青嬉舍"; + break; + case 3: + text = "粉乐居"; + break; + case 4: + text = "黄逗室"; + break; + case 5: + text = "蓝笑窟"; + break; + case 6: + text = "绿趣巢"; + break; + + + + + } + return text; + + } + + }