From 9de755c874a541921a21fb53b3ac3d5f2a7164ca Mon Sep 17 00:00:00 2001 From: GL <2365963573@qq.com> Date: Fri, 29 Nov 2024 18:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BB=A5=E5=8F=8A=E8=9C=97=E7=89=9B=E9=AA=91=E5=A3=AB?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scenes/RacingPanel.unity | 168 ++++++++++-------- TheStrongestSnail/Assets/Scenes/logo.unity | 8 +- .../Assets/Scripts/Login/LoginAndGetToken.cs | 6 +- .../Assets/Scripts/Login/UI/logoPanel.cs | 27 +-- .../Assets/Scripts/RacingPanel/AllManeger.cs | 46 +++-- .../Scripts/RacingPanel/NewLoadPanel.cs | 20 +++ .../Scripts/RacingPanel/NewLoadPanel.cs.meta | 11 ++ .../Assets/Scripts/RacingPanel/snailRider.cs | 15 +- 8 files changed, 192 insertions(+), 109 deletions(-) create mode 100644 TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs create mode 100644 TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs.meta diff --git a/TheStrongestSnail/Assets/Scenes/RacingPanel.unity b/TheStrongestSnail/Assets/Scenes/RacingPanel.unity index d3edc84..44e8930 100644 --- a/TheStrongestSnail/Assets/Scenes/RacingPanel.unity +++ b/TheStrongestSnail/Assets/Scenes/RacingPanel.unity @@ -2822,7 +2822,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: -103} + m_AnchoredPosition: {x: 84, y: -103} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &238215578 @@ -5238,6 +5238,7 @@ MonoBehaviour: is_jisha: 0 is_jieshuan: 0 is_Reflash: 0 + is_NOneedReflash: 0 --- !u!1 &402443204 GameObject: m_ObjectHideFlags: 0 @@ -6603,7 +6604,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: 329} + m_AnchoredPosition: {x: 83, y: 329} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &532751786 @@ -8732,88 +8733,92 @@ PrefabInstance: m_Modifications: - target: {fileID: 1574451516597611413, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516597611413, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516597611413, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 1317.4369 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516597611413, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516626885862, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516626885862, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516626885862, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 304.0239 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516626885862, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516796566995, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516796566995, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516796566995, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 506.7065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516796566995, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516872370445, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516872370445, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516872370445, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 101.3413 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516872370445, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516962071581, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516962071581, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516962071581, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 1114.7543 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451516962071581, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517034624560, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_Name value: LoadPanel objectReference: {fileID: 0} + - target: {fileID: 1574451517034624564, guid: 52525b7ee4a02b947be72267c965e811, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1574451517034624567, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8900,67 +8905,67 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1574451517038294151, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517038294151, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517038294151, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 709.3891 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517038294151, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517080850946, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517080850946, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517080850946, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 506.7065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517080850946, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517258934524, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517258934524, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517258934524, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 709.3891 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517258934524, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517287618817, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517287618817, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517287618817, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 1520.1195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517287618817, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517526691391, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_SizeDelta.x @@ -8968,115 +8973,115 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1574451517602680720, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517602680720, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517602680720, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 912.0717 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517602680720, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517626038754, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517626038754, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517626038754, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 1317.4369 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517626038754, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517695183498, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517695183498, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517695183498, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 1114.7543 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517695183498, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517745085721, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517745085721, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517745085721, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 1520.1195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517745085721, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517816687805, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517816687805, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517816687805, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 101.3413 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451517816687805, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518099636616, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518099636616, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518099636616, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 304.0239 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518099636616, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518214997481, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518214997481, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518214997481, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.x - value: 912.0717 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518214997481, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_AnchoredPosition.y - value: -97.07 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574451518253800653, guid: 52525b7ee4a02b947be72267c965e811, type: 3} propertyPath: m_SizeDelta.x @@ -9089,6 +9094,25 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1574451517034624567, guid: 52525b7ee4a02b947be72267c965e811, type: 3} m_PrefabInstance: {fileID: 745637400} m_PrefabAsset: {fileID: 0} +--- !u!1 &745637402 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1574451517034624560, guid: 52525b7ee4a02b947be72267c965e811, type: 3} + m_PrefabInstance: {fileID: 745637400} + m_PrefabAsset: {fileID: 0} +--- !u!114 &745637403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745637402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e0746ff5e42cce4ba311939504ca42e, type: 3} + m_Name: + m_EditorClassIdentifier: + panel: {fileID: 0} + canvasGroup: {fileID: 0} --- !u!1 &762791593 GameObject: m_ObjectHideFlags: 0 @@ -10758,7 +10782,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: -496} + m_AnchoredPosition: {x: 86, y: -496} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &885686526 @@ -17203,7 +17227,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: -294} + m_AnchoredPosition: {x: 86, y: -294} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1363431410 @@ -22873,7 +22897,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: 533} + m_AnchoredPosition: {x: 83, y: 533} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1812578929 @@ -23409,7 +23433,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: 941} + m_AnchoredPosition: {x: 77, y: 941} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1852265334 @@ -24889,7 +24913,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: 737} + m_AnchoredPosition: {x: 80, y: 737} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1966002265 @@ -26208,7 +26232,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: 112} + m_AnchoredPosition: {x: 83, y: 112} m_SizeDelta: {x: 79, y: 285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2137823195 diff --git a/TheStrongestSnail/Assets/Scenes/logo.unity b/TheStrongestSnail/Assets/Scenes/logo.unity index 7a09e90..a85f85d 100644 --- a/TheStrongestSnail/Assets/Scenes/logo.unity +++ b/TheStrongestSnail/Assets/Scenes/logo.unity @@ -1107,13 +1107,13 @@ MonoBehaviour: m_TargetGraphic: {fileID: 345431931} m_TextComponent: {fileID: 1690230837} m_Placeholder: {fileID: 598945199} - m_ContentType: 0 + m_ContentType: 2 m_InputType: 0 m_AsteriskChar: 42 - m_KeyboardType: 0 + m_KeyboardType: 4 m_LineType: 0 m_HideMobileInput: 0 - m_CharacterValidation: 0 + m_CharacterValidation: 1 m_CharacterLimit: 0 m_OnSubmit: m_PersistentCalls: @@ -3616,7 +3616,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: 685.125, y: -1387.5} + m_AnchoredPosition: {x: 686, y: -1387.5} m_SizeDelta: {x: 1018, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1071890038 diff --git a/TheStrongestSnail/Assets/Scripts/Login/LoginAndGetToken.cs b/TheStrongestSnail/Assets/Scripts/Login/LoginAndGetToken.cs index 438ce64..06488e7 100644 --- a/TheStrongestSnail/Assets/Scripts/Login/LoginAndGetToken.cs +++ b/TheStrongestSnail/Assets/Scripts/Login/LoginAndGetToken.cs @@ -85,9 +85,9 @@ public class LoginAndGetToken : MonoBehaviour [Serializable] public class loginbody//登录和注册用 { - public string userName; - public string password; - public int verifyCode; + public string userName = ""; + public string password = ""; + public int verifyCode = 0; } } diff --git a/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs b/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs index 98bc6ba..bde4e7c 100644 --- a/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs @@ -87,18 +87,23 @@ public class logoPanel : Base { - loginbody body = new loginbody + loginbody body = new loginbody(); + body.userName = userNameField.text; + body.password = passwordField.text; + if (!string.IsNullOrWhiteSpace(verifyCodeField.text)) { - userName = userNameField.text, - password = passwordField.text, - verifyCode = int.Parse(verifyCodeField.text) - }; - /*loginbody body = new loginbody - { - userName = "15151658596", - password = "123456", - verifyCode = 111111 - };*/ + body.verifyCode = int.Parse(verifyCodeField.text); + } + + Debug.Log(body.userName); + Debug.Log(body.password); + Debug.Log(body.verifyCode); + //loginbody body = new loginbody + //{ + // userName = "15151658596", + // password = "123456", + // verifyCode = 111111 + //}; string loginResponse = await web.SendRequest(web.URL+"/snail/user/login", "POST", JsonUtility.ToJson(body)); ServerResponse response = JsonUtility.FromJson(loginResponse); if (response != null && response.code == 200 && response.data != null) diff --git a/TheStrongestSnail/Assets/Scripts/RacingPanel/AllManeger.cs b/TheStrongestSnail/Assets/Scripts/RacingPanel/AllManeger.cs index cf2d965..cb89b5d 100644 --- a/TheStrongestSnail/Assets/Scripts/RacingPanel/AllManeger.cs +++ b/TheStrongestSnail/Assets/Scripts/RacingPanel/AllManeger.cs @@ -44,6 +44,10 @@ public class AllManeger : MonoBehaviour public bool is_jisha;//是否击杀 public bool is_jieshuan;//是否结算 public bool is_Reflash;//是否获取最新游戏 + + public bool is_NOneedReflash;//是否需要刷新 + + public int snailMoveNum;//蜗牛出动数量 // Start is called before the first frame update async void Start() { @@ -71,10 +75,10 @@ public class AllManeger : MonoBehaviour GetHorseInfo521(closestKnight521.Data.GameKnightRoomResponseVoList); GetKillInfo521(closestKnight521.Data.GameKnightModel); - LoadPanel.instance.HidePanel(); - is_jieshuan = false; + + is_jieshuan = false; is_jisha = false; - + is_Reflash = true; } public async void Fuck522() @@ -97,20 +101,31 @@ public class AllManeger : MonoBehaviour } - if (knightRoomBetList522.Data.CarrySeconds==-1) + if (knightRoomBetList522.Data.CarrySeconds<0|| knightRoomBetList522.Data.CarrySeconds>59) { - LoadPanel.instance.ShowPanel(); + NewLoadPanel.instance.ShowPanel(); + is_Reflash = false; Allreturn(); ClearAllHouseBet();//清空本地投注 + + Fuck521();//获取最新游戏 + - Fuck521();//获取最新游戏 - - - + + + //LoadPanel.instance.HidePanel(); } else if(knightRoomBetList522.Data.CarrySeconds<45)//倒计时 { + + if (is_Reflash) + { + NewLoadPanel.instance.HidePanel();//刷新完隐藏加载界面 + is_Reflash = false; + Allreturn(); + } + timeText.text = (45 - knightRoomBetList522.Data.CarrySeconds).ToString(); await Task.Delay(1000); timeText.text = (45 - knightRoomBetList522.Data.CarrySeconds - 1).ToString(); @@ -129,7 +144,7 @@ public class AllManeger : MonoBehaviour } - else if (knightRoomBetList522.Data.CarrySeconds > 50)//结算 + else if (knightRoomBetList522.Data.CarrySeconds >=50)//结算 { if (!is_jieshuan) { @@ -230,7 +245,7 @@ public class AllManeger : MonoBehaviour if (GameKnightModel.HorseNoAll!="") { - string[] parts = GameKnightModel.HorseNoAll.Split(","); + string[] parts = GameKnightModel.HorseNoAll.Split(","); List allNos= parts.Select(int.Parse).ToList(); HashSet allNosSet = new HashSet(allNos); @@ -298,21 +313,22 @@ public class AllManeger : MonoBehaviour } public void Allreturn()//所有蜗牛回去 { + foreach (snailRider snail in snailRiders) - { - + { snail.returnStart(); } } - public void ClearAllHouseBet()//清空投注 + public void ClearAllHouseBet()//清空投注//顺便刷新所有蜗牛状态 { foreach (HorseInfo horse in horseInfos) { horse.BetCoins=0; horse.betText.text = horse.BetCoins.ToString(); - + horse.snail.is_victory = false; } } + } diff --git a/TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs b/TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs new file mode 100644 index 0000000..84952de --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NewLoadPanel : BasePanel +{ + public static NewLoadPanel instance; + // Start is called before the first frame update + public override void Start() + { + base.Start(); + instance = this; + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs.meta b/TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs.meta new file mode 100644 index 0000000..72230d4 --- /dev/null +++ b/TheStrongestSnail/Assets/Scripts/RacingPanel/NewLoadPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e0746ff5e42cce4ba311939504ca42e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TheStrongestSnail/Assets/Scripts/RacingPanel/snailRider.cs b/TheStrongestSnail/Assets/Scripts/RacingPanel/snailRider.cs index 090cab8..181a236 100644 --- a/TheStrongestSnail/Assets/Scripts/RacingPanel/snailRider.cs +++ b/TheStrongestSnail/Assets/Scripts/RacingPanel/snailRider.cs @@ -52,23 +52,30 @@ public class snailRider : MonoBehaviour float suiji = 0; if (is_victory) { - suiji = UnityEngine.Random.Range(-1f,0f); + suiji = UnityEngine.Random.Range(-2f,-1f); } else { - suiji = UnityEngine.Random.Range(1f, 5f); + suiji = UnityEngine.Random.Range(-1f, 0f); } - + mySequence.Append(transform.DOMove(startingPoint.transform.position, 0.01f)) - .Append(transform.DOMove(end.transform.position, 10f + suiji)) + .Append(transform.DOMove(end.transform.position, 4f + suiji)) ; + mySequence.OnKill(()=> { AllManeger.instance.snailMoveNum++; }); } } public void returnStart() { + Debug.Log(transform.name); + Debug.Log(transform.position); mySequence.Kill(); // 停止并销毁动画 transform.position=startingPoint.transform.position; + + Debug.Log(startingPoint.transform.position); + + Debug.Log(transform.position); } private void Update() {