Merge branch 'main' of http://shu.sheziwanglo.cn:3000/hyskai/_TheStrongestSnail

TheStrongestSnail/Assets/Resources/ListItem.prefab

@@ -488,7 +488,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 9
+  m_text: 11+
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2}
   m_sharedMaterial: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2}
@@ -515,12 +515,12 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 63.7
+  m_fontSize: 60
   m_fontSizeBase: 63.7
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 60
   m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -812,3 +812,4 @@ MonoBehaviour:
   nameText: {fileID: 3151892669938186945}
   numText: {fileID: 3151892669932753418}
   Bg: {fileID: 3151892671755038175}
+  headPath: 

TheStrongestSnail/Assets/Scenes/Battle_Royale.unity

@@ -308,9 +308,12 @@ MonoBehaviour:
   Orparent2: {fileID: 326865757}
   ListItemPre: {fileID: 3151892671755038169, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3}
   ItemList: []
+  ItemListLastDay: []
   CreateParentToDay: {fileID: 1282886001}
   CreateParentLastDay: {fileID: 67039494}
-  SelfList: {fileID: 1201875112}
+  SelfListToDay: {fileID: 1201875112}
+  SelfListLastDay: {fileID: 849802445}
+  allHouseContro: {fileID: 142654723}
 --- !u!114 &12243720
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1344,7 +1347,7 @@ MonoBehaviour:
   m_Padding:
     m_Left: 82
     m_Right: 0
-    m_Top: 71
+    m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
   m_Spacing: 21.28
@@ -3127,9 +3130,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_AnchorMax: {x: 1, y: 0.936222}
+  m_AnchoredPosition: {x: 0, y: 1.6398926}
+  m_SizeDelta: {x: 0, y: -15.3601}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &178657456
 MonoBehaviour:
@@ -4179,6 +4182,7 @@ RectTransform:
   - {fileID: 39192268}
   - {fileID: 508508375}
   - {fileID: 1201875109}
+  - {fileID: 849802444}
   - {fileID: 975341007}
   - {fileID: 400236064}
   - {fileID: 326865757}
@@ -5028,6 +5032,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 318208428}
   m_CullTransparentMesh: 1
+--- !u!1 &319300820
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 319300821}
+  - component: {fileID: 319300823}
+  - component: {fileID: 319300822}
+  m_Layer: 5
+  m_Name: headImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &319300821
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 319300820}
+  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: 1379278367}
+  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: 0}
+  m_SizeDelta: {x: 110, y: 110}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &319300822
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 319300820}
+  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: 0}
+  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 &319300823
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 319300820}
+  m_CullTransparentMesh: 1
 --- !u!1 &321996952
 GameObject:
   m_ObjectHideFlags: 0
@@ -5292,7 +5372,7 @@ RectTransform:
   m_Children:
   - {fileID: 769264874}
   m_Father: {fileID: 253455722}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -6432,7 +6512,7 @@ RectTransform:
   - {fileID: 922283406}
   - {fileID: 269204434}
   m_Father: {fileID: 253455722}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -7138,6 +7218,141 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 488757076}
   m_CullTransparentMesh: 1
+--- !u!1 &490482388
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 490482389}
+  - component: {fileID: 490482391}
+  - component: {fileID: 490482390}
+  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 &490482389
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 490482388}
+  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: 1616532113}
+  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: 0}
+  m_SizeDelta: {x: 120, y: 109}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &490482390
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 490482388}
+  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: 9
+  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: 60
+  m_fontSizeBase: 63.7
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 18
+  m_fontSizeMax: 60
+  m_fontStyle: 1
+  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 &490482391
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 490482388}
+  m_CullTransparentMesh: 1
 --- !u!1 &499703315
 GameObject:
   m_ObjectHideFlags: 0
@@ -7273,6 +7488,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 499703315}
   m_CullTransparentMesh: 1
+--- !u!1 &500847591
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 500847592}
+  - component: {fileID: 500847594}
+  - component: {fileID: 500847593}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &500847592
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 500847591}
+  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: 849802444}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -336, y: 0.0000026226}
+  m_SizeDelta: {x: 65.224, y: 75.0075}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &500847593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 500847591}
+  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: 08f5a0582a540a14a9c564a8628a35ac, 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 &500847594
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 500847591}
+  m_CullTransparentMesh: 1
 --- !u!1 &503560739
 GameObject:
   m_ObjectHideFlags: 0
@@ -9370,6 +9661,141 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 650085802}
   m_CullTransparentMesh: 1
+--- !u!1 &651913235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 651913236}
+  - component: {fileID: 651913238}
+  - component: {fileID: 651913237}
+  m_Layer: 5
+  m_Name: nameText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &651913236
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 651913235}
+  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: 849802444}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -55, y: 4.4052}
+  m_SizeDelta: {x: 427.4494, y: 91.1895}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &651913237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 651913235}
+  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: "\u7237\u50B2\u5948\u6211\u4F55"
+  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: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  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 &651913238
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 651913235}
+  m_CullTransparentMesh: 1
 --- !u!1 &654002499
 GameObject:
   m_ObjectHideFlags: 0
@@ -11901,9 +12327,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_AnchorMax: {x: 1, y: 0.93755233}
+  m_AnchoredPosition: {x: 0, y: -0.35986328}
+  m_SizeDelta: {x: 0, y: -17.359901}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &836099515
 MonoBehaviour:
@@ -12178,6 +12604,108 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4075030775632783688, guid: a030fef0719b2504ba325e558ca3651c, type: 3}
   m_PrefabInstance: {fileID: 849249375}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &849802443
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 849802444}
+  - component: {fileID: 849802447}
+  - component: {fileID: 849802446}
+  - component: {fileID: 849802445}
+  m_Layer: 5
+  m_Name: ListItemLastDay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &849802444
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 849802443}
+  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: 1616532113}
+  - {fileID: 1379278367}
+  - {fileID: 651913236}
+  - {fileID: 500847592}
+  - {fileID: 1153480701}
+  m_Father: {fileID: 253455722}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 176.58704}
+  m_SizeDelta: {x: 1205.1096, y: 157}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &849802445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 849802443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca881e1060abd064ab529ea8d7dc18ab, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  list: 0
+  listText: {fileID: 490482390}
+  listImage: {fileID: 1616532114}
+  headImage: {fileID: 319300822}
+  nameText: {fileID: 651913237}
+  numText: {fileID: 1153480702}
+  Bg: {fileID: 849802446}
+  headPath: 
+--- !u!114 &849802446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 849802443}
+  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: e2c22f03791a45146aca4b67398f36c7, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &849802447
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 849802443}
+  m_CullTransparentMesh: 1
 --- !u!1 &859521329
 GameObject:
   m_ObjectHideFlags: 0
@@ -14375,7 +14903,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 253455722}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -17304,6 +17832,141 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1151048159}
   m_CullTransparentMesh: 1
+--- !u!1 &1153480700
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1153480701}
+  - component: {fileID: 1153480703}
+  - component: {fileID: 1153480702}
+  m_Layer: 5
+  m_Name: numText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1153480701
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1153480700}
+  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: 849802444}
+  m_RootOrder: 4
+  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: 436.71497, y: 0.000099658966}
+  m_SizeDelta: {x: 232.8539, y: 75.008}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1153480702
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1153480700}
+  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: 999999
+  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: 62.6
+  m_fontSizeBase: 62.6
+  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 &1153480703
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1153480700}
+  m_CullTransparentMesh: 1
 --- !u!1 &1153582819
 GameObject:
   m_ObjectHideFlags: 0
@@ -17785,7 +18448,7 @@ GameObject:
   - component: {fileID: 1201875110}
   - component: {fileID: 1201875112}
   m_Layer: 5
-  m_Name: ListItem
+  m_Name: ListItemToDay
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -17867,12 +18530,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   list: 0
-  listText: {fileID: 0}
-  listImage: {fileID: 0}
-  headImage: {fileID: 0}
-  nameText: {fileID: 0}
-  numText: {fileID: 0}
-  Bg: {fileID: 0}
+  listText: {fileID: 1857194266}
+  listImage: {fileID: 1711629609}
+  headImage: {fileID: 1465102439}
+  nameText: {fileID: 321996954}
+  numText: {fileID: 1024936516}
+  Bg: {fileID: 1201875110}
   headPath: 
 --- !u!1 &1207811674
 GameObject:
@@ -19081,7 +19744,7 @@ MonoBehaviour:
   m_Padding:
     m_Left: 82
     m_Right: 0
-    m_Top: 71
+    m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
   m_Spacing: 21.28
@@ -20263,6 +20926,83 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1377318865}
   m_CullTransparentMesh: 1
+--- !u!1 &1379278366
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1379278367}
+  - component: {fileID: 1379278369}
+  - component: {fileID: 1379278368}
+  m_Layer: 5
+  m_Name: HeadImageBg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1379278367
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1379278366}
+  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: 319300821}
+  m_Father: {fileID: 849802444}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 254, y: 0}
+  m_SizeDelta: {x: 136, y: 136}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1379278368
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1379278366}
+  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: 162542e43ec53e64f8ab0588c5e31b2c, 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 &1379278369
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1379278366}
+  m_CullTransparentMesh: 1
 --- !u!1 &1382013987
 GameObject:
   m_ObjectHideFlags: 0
@@ -23479,6 +24219,83 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1605011913}
   m_CullTransparentMesh: 1
+--- !u!1 &1616532112
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1616532113}
+  - component: {fileID: 1616532115}
+  - component: {fileID: 1616532114}
+  m_Layer: 5
+  m_Name: listImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1616532113
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1616532112}
+  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: 490482389}
+  m_Father: {fileID: 849802444}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 97, y: 0}
+  m_SizeDelta: {x: 120, y: 109}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1616532114
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1616532112}
+  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: f3744568a2a095d4189f9e06dfebeeb5, 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 &1616532115
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1616532112}
+  m_CullTransparentMesh: 1
 --- !u!1 &1623243284
 GameObject:
   m_ObjectHideFlags: 0
@@ -27389,7 +28206,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 9
+  m_text: 11+
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2}
   m_sharedMaterial: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2}
@@ -27416,12 +28233,12 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 63.7
+  m_fontSize: 60
   m_fontSizeBase: 63.7
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 60
   m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512

TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs

@@ -51,7 +51,7 @@ public class AllHouseContro : MonoBehaviour
         battleRoyaleGameDetails();
         GetInfo516();
         GetInfo517();
-        GetInfo518();
+      
         InvokeRepeating("checkOutAllTheEscapeRoomsAsync", 2,2);
     }
     void OnDestroy()
@@ -266,6 +266,10 @@ public class AllHouseContro : MonoBehaviour
             IsHideLoadPanel = false;
             GetInfo516();
             GetInfo517();
+            ListPanel.instance.ShowPanels();
+            GetInfo518();
+
+            ListPanel.instance.UpdatePanels();
             PlayerInfo.instance.AllBetCoins = 0;//投注归0
         }
         else if (serverResponse.data.carrySeconds < 45){
@@ -446,18 +450,27 @@ public class AllHouseContro : MonoBehaviour
     {
         Body518 body = new Body518();
         body.userId = Global.global.serverResponse.data.userId;
-        body.dayType = 1;
+        body.dayType = flag;
         string response = await web.SendRequest(web.URL + "/snail/gameEscape/queryUserBetRankByDay", "POST", JsonUtility.ToJson(body), Global.global.CreateHeaders());
         Debug.Log("5.1.8: 请求参数："+ JsonUtility.ToJson(body)+"服务端返回"+ response);
         ServerResponse518 serverResponse_518 = JsonConvert.DeserializeObject<ServerResponse518>(response);
-        Debug.Log("列表ss："+ serverResponse_518.data.gameEscapeUserBetResponseVoList[0]);
-        //Debug.Log("列表ss：" + serverResponse_518.data.userBetInfo);
-        listPanel.CreateListItem(serverResponse_518.data.gameEscapeUserBetResponseVoList, listPanel.CreateParentToDay);
-        //listPanel.SetSelfList(serverResponse_518.data.userBetInfo);
+   
+        
+        if (flag==0)
+        {
+            listPanel.CreateListItem(serverResponse_518.data.gameEscapeUserBetResponseVoList, listPanel.CreateParentToDay);
+        }
+        else
+        {
+            listPanel.CreateListItem(serverResponse_518.data.gameEscapeUserBetResponseVoList, listPanel.CreateParentLastDay,flag);
+        }
+
+        listPanel.SetSelfList(serverResponse_518.data.userBetInfo,flag);
 
 
     }
 
+
     public void OtherBack()
     {
         foreach (otherWoniu item in otherWoniusList)

TheStrongestSnail/Assets/Scripts/ListBtn.cs

@@ -17,7 +17,7 @@ public class ListBtn : MonoBehaviour
 
    public void OnClickBtn()
     {
-        AllHouseContro.GetInfo518();
+        //AllHouseContro.GetInfo518();
         ListPanel.instance.ShowPanel();
     }
 

TheStrongestSnail/Assets/Scripts/ListPanel.cs

@@ -22,17 +22,23 @@ public class ListPanel : BasePanel
 
     public GameObject ListItemPre;//排行预制体
     public List<GameObject> ItemList;
+    public List<GameObject> ItemListLastDay;
 
     public Transform CreateParentToDay;
     public Transform CreateParentLastDay;
 
-    public ListItem SelfList;//自己排名
+    public ListItem SelfListToDay;//自己排名
+    public ListItem SelfListLastDay;//自己排名
+
+    public AllHouseContro allHouseContro;
     public override void Start()
     {
         base.Start();
         instance = this;
         returnBtn.onClick.AddListener(OnClickReBtn);
 
+        allHouseContro.GetInfo518();
+        allHouseContro.GetInfo518(1);
         // 初始化 Toggle 的监听事件
         toggle1.onValueChanged.AddListener(OnToggle1Changed);
         toggle2.onValueChanged.AddListener(OnToggle2Changed);
@@ -48,6 +54,8 @@ public class ListPanel : BasePanel
             SetMarsk(2);
             panel1.SetActive(true);
             panel2.SetActive(false);
+            SelfListToDay.gameObject.SetActive(true);
+            SelfListLastDay.gameObject.SetActive(false);
         }
     }
 
@@ -59,16 +67,24 @@ public class ListPanel : BasePanel
             SetMarsk(1);
             panel1.SetActive(false);
             panel2.SetActive(true);
+            SelfListLastDay.gameObject.SetActive(true);
+            SelfListToDay.gameObject.SetActive(false);
+            //allHouseContro.GetInfo518(1);
         }
     }
 
     // 根据当前 Toggle 的状态初始化面板
-    private void UpdatePanels()
+    public void UpdatePanels()
     {
         panel1.SetActive(toggle1.isOn);
         panel2.SetActive(toggle2.isOn);
     }
 
+    public void ShowPanels()//显示所有面板
+    {
+        panel1.SetActive(true);
+        panel2.SetActive(true);
+    }
     void OnDestroy()
     {
         // 取消监听事件，避免内存泄漏
@@ -94,7 +110,7 @@ public class ListPanel : BasePanel
         }
     }
 
-    public void CreateListItem(List<gameEscapeUserBetResponseVoList> gameData,Transform parent) 
+    public void CreateListItem(List<gameEscapeUserBetResponseVoList> gameData,Transform parent,int flag=0) 
     {
         foreach (gameEscapeUserBetResponseVoList item in gameData)
         {
@@ -106,47 +122,90 @@ public class ListPanel : BasePanel
 
             // 设置实例化对象的内容
            panelComponent.list=item.orderNo;
+            panelComponent.listText.text= item.orderNo.ToString();
             panelComponent.nameText.text=item.nickName;
             panelComponent.numText.text = item.bet.ToString();
-            
 
 
 
 
-            // 判断是否已存在
-            bool exists = false;
-            foreach (GameObject panel in ItemList)
+            if (flag==0)
             {
-                if (panel.GetComponent<ListItem>().list == item.orderNo)
+                // 判断是否已存在
+                bool exists = false;
+                foreach (GameObject panel in ItemList)
                 {
-                    exists = true;
-                    break;
+                    if (panel.GetComponent<ListItem>().list == item.orderNo)
+                    {
+                        exists = true;
+                        break;
+                    }
                 }
-            }
 
-            // 如果不存在，则添加到列表
-            if (!exists)
-            {
-                ItemList.Add(newPanel);
+                // 如果不存在，则添加到列表
+                if (!exists)
+                {
+                    ItemList.Add(newPanel);
 
+                }
+                else
+                {
+                    // 如果已存在，可以根据需求决定是否销毁该实例
+                    Destroy(newPanel);
+                }
             }
             else
             {
-                // 如果已存在，可以根据需求决定是否销毁该实例
-                Destroy(newPanel);
+                // 判断是否已存在
+                bool exists = false;
+                foreach (GameObject panel in ItemListLastDay)
+                {
+                    if (panel.GetComponent<ListItem>().list == item.orderNo)
+                    {
+                        exists = true;
+                        break;
+                    }
+                }
+
+                // 如果不存在，则添加到列表
+                if (!exists)
+                {
+                    ItemListLastDay.Add(newPanel);
+
+                }
+                else
+                {
+                    // 如果已存在，可以根据需求决定是否销毁该实例
+                    Destroy(newPanel);
+                }
             }
+           
         }
     }
 
 
-    public void SetSelfList(userBetInfo info)
+    public void SetSelfList(userBetInfo info,int flag=0)
     {
-        SelfList.listText.text=info.orderNo;
-        SelfList.nameText.text=info.nickName;
-        SelfList.numText.text=info.bet.ToString();
-        SelfList.headPath = info.headImg;
+        if (flag==0)
+        {
+            SelfListToDay.listText.text = info.orderNo;
+            SelfListToDay.nameText.text = info.nickName;
+            SelfListToDay.numText.text = info.bet.ToString();
+            SelfListToDay.headPath = info.headImg;
 
-        SelfList.SetListImage();
-        SelfList.ListBgImage();
+            SelfListToDay.SetListImage();
+            SelfListToDay.ListBgImage();
+        }
+        else
+        {
+            SelfListLastDay.listText.text = info.orderNo;
+            SelfListLastDay.nameText.text = info.nickName;
+            SelfListLastDay.numText.text = info.bet.ToString();
+            SelfListLastDay.headPath = info.headImg;
+
+            SelfListLastDay.SetListImage();
+            SelfListLastDay.ListBgImage();
+        }
+      
     }
 }

TheStrongestSnail/Assets/font_textmeshpro/gl.txt

@@ -1 +1 @@
-！@#￥%……&*（）——+|}{”：？》《，。、；’【】、=-0987654321奇迹蜗牛逃亡霸主来袭手机号验证码记录排行灵液密码登入录获取没有立刻脱失败没关系拿到了榜单爷傲奈我何今日排行骑士投入秒后比赛开始灭霸雷神超人蝙蝠钢铁毒液蜘蛛美队卡槽豌豆黄毒蘑菇计时器激素去数加速器商店立刻即工会信息申请申请我的背包碎片兑换公告福利通知活动详情参与规则靓号商店取消确认补充打工时长剩余个人中心邀请好友一二三四五六七八九十鹅的主身份证保存认证真实完成收货新增加编辑安全退出修改注销订转赠送壳兑换购买赤橙黄绿青蓝紫鬼王怪物粉色嘻嬉笑舍洞窟趣巢穴破烂豆逗商城昨天册帐室屋乐居近10次杀手房间记录近100期被杀记录我的参与记录功共投入蜗蛋共获得蜗蛋奖励
+！@#￥%……&*（）——+|}{”：？》《，。、；’【】、=-0987654321奇迹蜗牛逃亡霸主来袭手机号验证码记录排行灵液密码登入录获取没有立刻脱失败没关系拿到了榜单爷傲奈我何今日排行骑士投入秒后比赛开始灭霸雷神超人蝙蝠钢铁毒液蜘蛛美队卡槽豌豆黄毒蘑菇计时器激素去数加速器商店立刻即工会信息申请申请我的背包碎片兑换公告福利通知活动详情参与规则靓号商店取消确认补充打工时长剩余个人中心邀请好友一二三四五六七八九十鹅的主身份证保存认证真实完成收货新增加编辑安全退出修改注销订转赠送壳兑换购买赤橙黄绿青蓝紫鬼王怪物粉色嘻嬉笑舍洞窟趣巢穴破烂豆逗商城昨天册帐室屋乐居近10次杀手房间记录近100期被杀记录我的参与记录功共投入蜗蛋共获得蜗蛋奖励阿尔法狗尊贵的最强蜗牛用户敬超级