From 3182f7e5e5ec9e54a3004f4a4a5e1a09c1f6f44c Mon Sep 17 00:00:00 2001 From: GL <2365963573@qq.com> Date: Mon, 25 Nov 2024 15:57:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=9C=97=E7=89=9B=E5=8F=82=E4=B8=8E=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=98=BE=E7=A4=BA=E6=96=87=E6=9C=AC=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Resources/JournalPanel.prefab | 26 ++- .../Assets/Scenes/Battle_Royale.unity | 221 +++++------------- .../Scripts/Battle_Royale/AllHouseContro.cs | 2 + .../Scripts/Battle_Royale/JournalPanel.cs | 59 ++++- .../Assets/Scripts/HistoryPanel.cs | 20 +- .../Assets/Scripts/Login/Global.cs | 4 +- 6 files changed, 158 insertions(+), 174 deletions(-) diff --git a/TheStrongestSnail/Assets/Resources/JournalPanel.prefab b/TheStrongestSnail/Assets/Resources/JournalPanel.prefab index 5b19359..c928e08 100644 --- a/TheStrongestSnail/Assets/Resources/JournalPanel.prefab +++ b/TheStrongestSnail/Assets/Resources/JournalPanel.prefab @@ -757,8 +757,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: -416.52856, y: 4.5911} - m_SizeDelta: {x: 213.8013, y: 103.7815} + m_AnchoredPosition: {x: -459.84152, y: 4.5911} + m_SizeDelta: {x: 300.4272, y: 103.7815} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1063645488954162265 CanvasRenderer: @@ -788,7 +788,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "1356\u671F" + m_text: "20202020202\u671F" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} m_sharedMaterial: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2} @@ -815,12 +815,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 59.9 + m_fontSize: 40 m_fontSizeBase: 59.9 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 40 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1163,6 +1163,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12bf05dc4deb0c84c862ded70d9a58e9, type: 3} m_Name: m_EditorClassIdentifier: + gameNo: + bet: 0 + roomN: 0 + roomNoKill: + outcome: 0 + beansCoin: 0 + createTime: + gameNoText: {fileID: 1063645488954162264} + betText: {fileID: 1063645488093167168} + roomNoText: {fileID: 1063645489649499133} + roomNameKillText: {fileID: 1063645489382352004} + outcomeText: {fileID: 1063645488632767541} + beansCoinText: {fileID: 1063645489086094494} + createTimeText: {fileID: 1063645488948917897} --- !u!1 &1063645489193549617 GameObject: m_ObjectHideFlags: 0 diff --git a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity index a1de90b..9588730 100644 --- a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity +++ b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity @@ -2609,7 +2609,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -2617,7 +2617,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -2657,11 +2657,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1575.7401 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3620,11 +3620,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 214046551} m_CullTransparentMesh: 1 ---- !u!224 &219710331 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - m_PrefabInstance: {fileID: 1063645489068783620} - m_PrefabAsset: {fileID: 0} --- !u!1001 &226521322 PrefabInstance: m_ObjectHideFlags: 0 @@ -5806,7 +5801,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &384095151 RectTransform: m_ObjectHideFlags: 0 @@ -8322,7 +8317,6 @@ RectTransform: - {fileID: 1845562839} - {fileID: 859521330} - {fileID: 752601892} - - {fileID: 219710331} m_Father: {fileID: 199302496} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9684,7 +9678,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -9692,7 +9686,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -9732,11 +9726,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -862.62006 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10525,7 +10519,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -10533,7 +10527,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -10573,11 +10567,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1397.4601 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10842,7 +10836,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -10850,7 +10844,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -10890,11 +10884,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -327.78 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11296,9 +11290,9 @@ RectTransform: m_Father: {fileID: 582056263} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 691.15, y: -2325.055} m_SizeDelta: {x: 1306.3, y: 353.7809} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &760515340 @@ -11631,7 +11625,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -11639,7 +11633,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -11679,11 +11673,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1219.18 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12393,9 +12387,9 @@ RectTransform: m_Father: {fileID: 582056263} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 691.15, y: -2015.7462} m_SizeDelta: {x: 1306.3, y: 172.6165} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &875993942 @@ -13421,6 +13415,8 @@ MonoBehaviour: ItemList: [] throwEggText: {fileID: 1583652096} getEggText: {fileID: 1942300468} + JournalPanelPre: {fileID: 1063645489154276222, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} + JournParent: {fileID: 582056263} --- !u!1 &913069760 GameObject: m_ObjectHideFlags: 0 @@ -14668,7 +14664,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -14676,7 +14672,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -14716,11 +14712,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -506.06 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18675,7 +18671,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -18683,7 +18679,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -18723,11 +18719,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -684.34 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -19444,7 +19440,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -19452,7 +19448,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -19492,11 +19488,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -506.06 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -22784,7 +22780,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -22792,7 +22788,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -22832,11 +22828,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1040.9001 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -24951,7 +24947,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -24959,7 +24955,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -24999,11 +24995,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -327.78 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -27144,9 +27140,9 @@ RectTransform: m_Father: {fileID: 582056263} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 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_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1845562840 @@ -28040,7 +28036,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -28048,7 +28044,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -28088,11 +28084,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -149.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -30893,103 +30889,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143809076} m_CullTransparentMesh: 1 ---- !u!1001 &1063645489068783620 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 582056263} - m_Modifications: - - target: {fileID: 1063645489154276222, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_Name - value: JournalPanel - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_SizeDelta.x - value: 1306.2986 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_SizeDelta.y - value: 537.7136 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063645489154276223, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7d88e5b3da2d84eab98f9d8685014f, type: 3} --- !u!1001 &3151892671412227586 PrefabInstance: m_ObjectHideFlags: 0 @@ -31019,7 +30918,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.x @@ -31027,7 +30926,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_SizeDelta.x @@ -31067,11 +30966,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 684.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -149.5 objectReference: {fileID: 0} - target: {fileID: 3151892671755038174, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs index 927b71d..280f649 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs @@ -433,6 +433,8 @@ public class AllHouseContro : MonoBehaviour ServerResponse517 serverResponse_517 = JsonConvert.DeserializeObject(response); historyPanel.throwEggText.text = serverResponse_517.data.beansCoinBet.ToString(); historyPanel.getEggText.text = serverResponse_517.data.beansCoinWin.ToString(); + + historyPanel.CreateJournalPanel(serverResponse_517.data.gameEscapeUserRecordResponseVoPageResult.dataList); } diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/JournalPanel.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/JournalPanel.cs index 70fae0a..cd180ce 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/JournalPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/JournalPanel.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Drawing; using TMPro; using UnityEngine; @@ -7,7 +8,7 @@ public class JournalPanel : MonoBehaviour { public string gameNo;//游戏期号 public float bet;//下注的蜗牛蛋 - public int roomN;// 下注房间号 + public int roomNo;// 下注房间号 public string roomNoKill;// 击杀房间号 public int outcome;//本局结果：默认0还未结束，1胜利，2失败 @@ -16,7 +17,7 @@ public class JournalPanel : MonoBehaviour public TextMeshProUGUI gameNoText;//游戏期号 public TextMeshProUGUI betText;//下注的蜗牛蛋 - public TextMeshProUGUI roomNText;// 下注房间号 + public TextMeshProUGUI roomNoText;// 下注房间号 public TextMeshProUGUI roomNameKillText;// 击杀房间号 public TextMeshProUGUI outcomeText;//本局结果：默认0还未结束，1胜利，2失败 @@ -26,8 +27,58 @@ public class JournalPanel : MonoBehaviour // Start is called before the first frame update void Start() { - + SetOutcomeText(); + JudgeRoomName(roomNo); } - + public void SetOutcomeText()//设置成功或者失败文本 + { + if (outcome == 1) + { + outcomeText.text = "逃脱成功"; + + } + else if (outcome == 2) + { + outcomeText.text = "逃脱失败"; + + } + } + + public void JudgeRoomName(int roomNo) + { + if (roomNo == 1) + { + roomNoText.text = "【紫怪屋】"; + } + else if (roomNo == 2) + { + roomNoText.text = "【青嬉舍】"; + } + else if (roomNo == 3) + { + roomNoText.text = "【粉乐居】"; + } + else if (roomNo == 4) + { + roomNoText.text = "【黄逗室】"; + } + else if (roomNo == 5) + { + roomNoText.text = "【蓝笑窟】"; + } + else if (roomNo == 6) + { + roomNoText.text = "【绿趣巢】"; + } + } + + public void SetKillRoomText() + { + string[] parts = roomNoKill.Split(","); + foreach (string part in parts) + { + + } + } } diff --git a/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs b/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs index c293604..0e29486 100644 --- a/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/HistoryPanel.cs @@ -15,7 +15,9 @@ public class HistoryPanel : BasePanel public TextMeshProUGUI throwEggText;//投入蜗牛蛋的文本 public TextMeshProUGUI getEggText;//获得蜗牛蛋的文本 - public GameObject SelfHistroyPanel; + public GameObject JournalPanelPre;//用户参与面板预制体 + public Transform JournParent;//用户参与面板父物体 + public override void Start() { base.Start(); @@ -44,6 +46,22 @@ public class HistoryPanel : BasePanel } } + public void CreateJournalPanel(List gameData)//创建参与历史记录 + { + foreach (dataList item in gameData) + { + JournalPanelPre.GetComponent().gameNoText.text = item.gameNo+"期"; + JournalPanelPre.GetComponent().betText.text = item.bet.ToString(); + JournalPanelPre.GetComponent().roomNo = item.roomNo; + JournalPanelPre.GetComponent().roomNameKillText.text = item.roomNoKill; + JournalPanelPre.GetComponent().beansCoinText.text = item.beansCoin.ToString(); + JournalPanelPre.GetComponent().createTimeText.text = item.createTime; + JournalPanelPre.GetComponent().outcome=item.outcome; + Instantiate(JournalPanelPre, JournParent); + } + } + + public void SetKillHouse(gameEscapeModel gameEscapeModelList)//记录近10次被击杀的房间 { diff --git a/TheStrongestSnail/Assets/Scripts/Login/Global.cs b/TheStrongestSnail/Assets/Scripts/Login/Global.cs index a2e83b6..2d4fee5 100644 --- a/TheStrongestSnail/Assets/Scripts/Login/Global.cs +++ b/TheStrongestSnail/Assets/Scripts/Login/Global.cs @@ -223,7 +223,7 @@ public class Data517 { public float beansCoinBet;//当前用户总投入的欢乐豆 public float beansCoinWin;//当前用户总赚取的欢乐豆 - public gameEscapeUserRecordResponseVoPageResult gameEscapeUserRecordResponseVoPageResultList; //用户参与的大逃亡分页 + public gameEscapeUserRecordResponseVoPageResult gameEscapeUserRecordResponseVoPageResult; //用户参与的大逃亡分页 @@ -233,7 +233,7 @@ public class Data517 public class gameEscapeUserRecordResponseVoPageResult { - public dataList dataList; + public List dataList; }