diff --git a/TheStrongestSnail/Assets/Resources/FailPanel.prefab b/TheStrongestSnail/Assets/Resources/FailPanel.prefab index 59b00fa..84e40a2 100644 --- a/TheStrongestSnail/Assets/Resources/FailPanel.prefab +++ b/TheStrongestSnail/Assets/Resources/FailPanel.prefab @@ -201,7 +201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 28e1f1817dba7c746b322fe7cf443c74, type: 3} + m_Sprite: {fileID: 21300000, guid: 103940cba5cba7447b57cfb8af046a71, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -277,7 +277,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a62fb817cefc7b143a0a8ab16a954992, type: 3} + m_Sprite: {fileID: 21300000, guid: 9c77a0be5bdeb364e945efac690202df, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1187,7 +1187,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5b96f6e705bf6b84a8c94072e712de8e, type: 3} + m_Sprite: {fileID: 21300000, guid: 7c533bc20ee3c7d44b7fd980bb3c2897, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/TheStrongestSnail/Assets/Resources/SucceedPanel.prefab b/TheStrongestSnail/Assets/Resources/SucceedPanel.prefab index 9c66803..48f9828 100644 --- a/TheStrongestSnail/Assets/Resources/SucceedPanel.prefab +++ b/TheStrongestSnail/Assets/Resources/SucceedPanel.prefab @@ -104,7 +104,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 95f3553eb0acaf849b7379c27061bf1a, type: 3} + m_Sprite: {fileID: 21300000, guid: 52acfec73095ee74198fe426e3fb6613, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -180,7 +180,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a62fb817cefc7b143a0a8ab16a954992, type: 3} + m_Sprite: {fileID: 21300000, guid: 9c77a0be5bdeb364e945efac690202df, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1128,7 +1128,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5b96f6e705bf6b84a8c94072e712de8e, type: 3} + m_Sprite: {fileID: 21300000, guid: 7c533bc20ee3c7d44b7fd980bb3c2897, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1235,7 +1235,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7132688498580876379} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: diff --git a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity index ef9857d..a43d443 100644 --- a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity +++ b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity @@ -180,7 +180,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 848b61d05f202804194ccad0c8c73439, type: 3} + m_Sprite: {fileID: 21300000, guid: f1a08224d5c9b6e43a9fa5b80b3d0d15, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2449,10 +2449,10 @@ RectTransform: m_Father: {fileID: 385193887} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1043.4, y: -89.5} + m_SizeDelta: {x: 255, y: 165} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &143179106 MonoBehaviour: @@ -2713,7 +2713,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 @@ -2721,7 +2721,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 @@ -2761,11 +2761,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 @@ -4080,10 +4080,10 @@ RectTransform: m_Father: {fileID: 385193887} m_RootOrder: 4 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 647.95, y: -312.84} + m_SizeDelta: {x: 255, y: 165} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &245899061 MonoBehaviour: @@ -10024,7 +10024,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 @@ -10032,7 +10032,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 @@ -10072,11 +10072,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 @@ -10865,7 +10865,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 @@ -10873,7 +10873,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 @@ -10913,11 +10913,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 @@ -11182,7 +11182,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 @@ -11190,7 +11190,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 @@ -11230,11 +11230,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 @@ -11972,7 +11972,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 @@ -11980,7 +11980,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 @@ -12020,11 +12020,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 @@ -13693,8 +13693,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 61df42867aaecf54a90d83b6beecbf7a, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1003038a5ff8f87409817fec9360d639, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -15147,7 +15147,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 @@ -15155,7 +15155,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 @@ -15195,11 +15195,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 @@ -19521,7 +19521,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 @@ -19529,7 +19529,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 @@ -19569,11 +19569,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 @@ -20290,7 +20290,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 @@ -20298,7 +20298,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 @@ -20338,11 +20338,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 @@ -23188,10 +23188,10 @@ RectTransform: m_Father: {fileID: 385193887} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 647.95, y: -89.5} + m_SizeDelta: {x: 255, y: 165} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1545419445 MonoBehaviour: @@ -23706,7 +23706,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 @@ -23714,7 +23714,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 @@ -23754,11 +23754,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 @@ -24260,10 +24260,10 @@ RectTransform: m_Father: {fileID: 385193887} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 252.5, y: -312.84} + m_SizeDelta: {x: 255, y: 165} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1589406869 MonoBehaviour: @@ -24763,10 +24763,10 @@ RectTransform: m_Father: {fileID: 385193887} m_RootOrder: 0 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 252.5, y: -89.5} + m_SizeDelta: {x: 255, y: 165} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1636140092 MonoBehaviour: @@ -25563,7 +25563,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 02d04a26fc300024996725b9d8ddcf83, type: 3} + m_Sprite: {fileID: 21300000, guid: 95da516f33db2b441b13df5004241ce6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -25873,7 +25873,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 @@ -25881,7 +25881,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 @@ -25921,11 +25921,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 @@ -28143,10 +28143,10 @@ RectTransform: m_Father: {fileID: 385193887} m_RootOrder: 5 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1043.4, y: -312.84} + m_SizeDelta: {x: 255, y: 165} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1845977112 MonoBehaviour: @@ -28962,7 +28962,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 @@ -28970,7 +28970,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 @@ -29010,11 +29010,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 @@ -31921,7 +31921,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 @@ -31929,7 +31929,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 @@ -31969,11 +31969,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/BettingBtn.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BettingBtn.cs index 6103297..c5ed571 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/BettingBtn.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BettingBtn.cs @@ -9,7 +9,7 @@ using UnityEngine; using UnityEngine.UI; -public class BettingBtn : MonoBehaviour +public class BettingBtn : Base { public PlayerInfo playerCoinUpdate;//用于每次下注后更新左上角金币数 public static BettingBtn instance; @@ -84,12 +84,14 @@ public class BettingBtn : MonoBehaviour //调用玩家信息,更新左上角蜗蛋数量 playerCoinUpdate.QueryPlayerInfo(); - Debug.Log("-------投注成功-------"); - Promptmgr.Instance.PromptBubble(serverResponse_513.message); + addEventPopUp(serverResponse_513.message); + //Debug.Log("-------投注成功-------"); + //Promptmgr.Instance.PromptBubble(serverResponse_513.message); } else { - Debug.Log("-------投注失败-------"); - Promptmgr.Instance.PromptBubble(serverResponse_513.message); + // Debug.Log("-------投注失败-------"); + addEventPopUp(serverResponse_513.message); + //Promptmgr.Instance.PromptBubble(serverResponse_513.message); } Debug.Log("点击了下注按钮================================================" + playerCoinUpdate.Money); @@ -116,15 +118,17 @@ public class BettingBtn : MonoBehaviour if (serverResponse_513.code == 200) { - Debug.Log("-------切换投注成功-------"); - Promptmgr.Instance.PromptBubble(serverResponse_513.message); + // Debug.Log("-------切换投注成功-------"); + addEventPopUp(serverResponse_513.message); + //Promptmgr.Instance.PromptBubble(serverResponse_513.message); onComplete?.Invoke(); bg.GetComponentInChildren().ReHouseText();//5.1.2 } else { - Promptmgr.Instance.PromptBubble(serverResponse_513.message); - Debug.Log("-------切换投注失败-------"); + addEventPopUp(serverResponse_513.message); + // Promptmgr.Instance.PromptBubble(serverResponse_513.message); + //Debug.Log("-------切换投注失败-------"); } } diff --git a/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs b/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs index 3fe0ba0..03e19c3 100644 --- a/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; -public class logoPanel : MonoBehaviour +public class logoPanel : Base { public InputField userNameField; public InputField passwordField; @@ -85,6 +85,8 @@ public class logoPanel : MonoBehaviour public async void OnClickLoginBtnAsync() { + + loginbody body = new loginbody { userName = userNameField.text, diff --git a/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/BG_2.png b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/BG_2.png new file mode 100644 index 0000000..57991a3 Binary files /dev/null and b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/BG_2.png differ diff --git a/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/BG_2.png.meta b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/BG_2.png.meta new file mode 100644 index 0000000..83f320d --- /dev/null +++ b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/BG_2.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 1003038a5ff8f87409817fec9360d639 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 72, y: 94, z: 63, w: 100} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/line.png b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/line.png new file mode 100644 index 0000000..cf168b6 Binary files /dev/null and b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/line.png differ diff --git a/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/line.png.meta b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/line.png.meta new file mode 100644 index 0000000..9c19a02 --- /dev/null +++ b/TheStrongestSnail/Assets/res/Battle_Royale_UI/History/line.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: f1a08224d5c9b6e43a9fa5b80b3d0d15 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: