Чекпоинт
This commit is contained in:
parent
465468d053
commit
2681a69a3d
@ -11349,7 +11349,7 @@ Material:
|
||||
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
|
||||
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _GlowColor: {r: 0.008461237, g: 1, b: 0, a: 1}
|
||||
- _GlowColor: {r: 0.06446934, g: 0, b: 1, a: 1}
|
||||
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
|
||||
- _OutlineColor: {r: 0.554717, g: 0.554717, b: 0.554717, a: 1}
|
||||
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
|
||||
@ -2378,6 +2378,7 @@ RectTransform:
|
||||
- {fileID: 1330002615}
|
||||
- {fileID: 1730674645}
|
||||
- {fileID: 599592678}
|
||||
- {fileID: 455099231}
|
||||
m_Father: {fileID: 916045828}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
@ -8629,11 +8630,11 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 916045828}
|
||||
m_Father: {fileID: 109738548}
|
||||
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: -160.41571}
|
||||
m_AnchoredPosition: {x: 0, y: 122}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &455099232
|
||||
@ -23456,7 +23457,6 @@ RectTransform:
|
||||
- {fileID: 95872202}
|
||||
- {fileID: 382964715}
|
||||
- {fileID: 109738548}
|
||||
- {fileID: 455099231}
|
||||
m_Father: {fileID: 1122363135}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@ -23958,8 +23958,8 @@ MonoBehaviour:
|
||||
\u043F\u043E\u0434\u0441\u0432\u0435\u0442\u043A\u0438 \u0438 \u0434\u0438\u043E\u0440\u0430\u043C\u044B,
|
||||
\u0441\u0431\u043E\u0440\u043A\u0430 \u043F\u0435\u0440\u0438\u0444\u0435\u0440\u0438\u0439\u043D\u043E\u0439
|
||||
\u043F\u043B\u0430\u0442\u044B\r\n\u0412\u0438\u043A\u0442\u043E\u0440\u0438\u044F
|
||||
\u0417\u0430\u0446\u0430\u0440\u0438\u043D\u0430 - \u041F\u0435\u0447\u0430\u0442\u044C
|
||||
\u043D\u0430\u043A\u043B\u0435\u0435\u043A\r\n\u0413\u0430\u0441\u043F\u0430\u0440\u044F\u043D
|
||||
\u0417\u0430\u0446\u0430\u0440\u0438\u043D\u0430 - \u0413\u043B\u0430\u0432\u043D\u044B\u0439
|
||||
\u0434\u0438\u0437\u0430\u0439\u043D\u0435\u0440\r\n\u0413\u0430\u0441\u043F\u0430\u0440\u044F\u043D
|
||||
\u041C\u0435\u043B\u0430\u043D\u044F - \u0421\u044A\u0435\u043C\u043A\u0438\r\n\u0410\u043D\u0430\u0441\u0442\u0430\u0441\u0438\u044F
|
||||
\u0418\u0432\u0430\u043D\u043E\u0432\u0430 - \u0422\u0435\u0441\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
|
||||
\u0438 \u043E\u0431\u0440\u0430\u0442\u043D\u0430\u044F \u0441\u0432\u044F\u0437\u044C\r\n\u041C\u0430\u043A\u0441\u0438\u043C
|
||||
@ -25742,7 +25742,11 @@ MonoBehaviour:
|
||||
movesPrefix: "\u0425\u043E\u0434\u044B: "
|
||||
timeLabel: {fileID: 1547278205}
|
||||
timePrefix: "\u0412\u0440\u0435\u043C\u044F: "
|
||||
digitsAfterComma: 2
|
||||
graphicsToVisibility:
|
||||
- {fileID: 2014460}
|
||||
- {fileID: 60816062}
|
||||
- {fileID: 1547278205}
|
||||
digitsAfterComma: 1
|
||||
--- !u!223 &1039507333
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -31194,7 +31198,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "100 \u0422\u0423\u0413\u0420\u0418\u041A\u041E\u0412!!!"
|
||||
m_text: "\u0411\u0430\u043B\u0430\u043D\u0441:<br>15 \u0440\u0443\u0431."
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 6eadce2d7083d384dbcb7e2f40fc590d, type: 2}
|
||||
m_sharedMaterial: {fileID: -8978430179854350208, guid: 6eadce2d7083d384dbcb7e2f40fc590d, type: 2}
|
||||
@ -31233,7 +31237,7 @@ MonoBehaviour:
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacing: -50
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
@ -34756,11 +34760,11 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2047831684}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 73.90001}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 26}
|
||||
m_SizeDelta: {x: 500, y: 48.4}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!114 &1253636792
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -34774,7 +34778,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
label: {fileID: 1253636793}
|
||||
prefix:
|
||||
prefix: "\u0426\u0435\u043D\u0430:"
|
||||
GameModePriceKey: PricePVE
|
||||
ValutaNameKey: ValutaName
|
||||
--- !u!114 &1253636793
|
||||
@ -34797,7 +34801,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "10 \u0440\u0443\u0431."
|
||||
m_text: "\u0426\u0435\u043D\u0430: 10 \u0440\u0443\u0431."
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2}
|
||||
m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2}
|
||||
@ -34831,7 +34835,7 @@ MonoBehaviour:
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 1
|
||||
m_HorizontalAlignment: 2
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
@ -51372,7 +51376,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.571, y: -0.843}
|
||||
m_AnchoredPosition: {x: 0, y: -1.211}
|
||||
m_SizeDelta: {x: 4, y: 0.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1944123994
|
||||
@ -53623,11 +53627,11 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 95872202}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 73.90001}
|
||||
m_SizeDelta: {x: 500, y: 48.4}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 26}
|
||||
m_SizeDelta: {x: 500, y: 48.399994}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!114 &2081061933
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -53641,7 +53645,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
label: {fileID: 2081061934}
|
||||
prefix:
|
||||
prefix: "\u0426\u0435\u043D\u0430:"
|
||||
GameModePriceKey: PricePVP
|
||||
ValutaNameKey: ValutaName
|
||||
--- !u!114 &2081061934
|
||||
@ -53664,7 +53668,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "10 \u0440\u0443\u0431."
|
||||
m_text: "\u0426\u0435\u043D\u0430: 10 \u0440\u0443\u0431."
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2}
|
||||
m_sharedMaterial: {fileID: 4262305343556741190, guid: 3f10bbcf486189d4f95b8de6dc2e2177, type: 2}
|
||||
@ -53698,7 +53702,7 @@ MonoBehaviour:
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 1
|
||||
m_HorizontalAlignment: 2
|
||||
m_HorizontalAlignment: 4
|
||||
m_VerticalAlignment: 256
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
|
||||
@ -31,7 +31,7 @@ public class CoinCounter : MonoBehaviour
|
||||
public void UpdateCoins(int newCount)
|
||||
{
|
||||
string valutaName = PlayerPrefs.GetString("ValutaName", "руб.");
|
||||
tmp.text = $"{newCount} {valutaName}";
|
||||
tmp.text = $"Баланс:<br>{newCount} {valutaName}";
|
||||
}
|
||||
|
||||
public void SetRevengePriceVisibility(bool visibility)
|
||||
|
||||
@ -36,7 +36,6 @@ public class DifficultyManager : MonoBehaviour
|
||||
currentOpponent--;
|
||||
}
|
||||
}
|
||||
|
||||
public void ResetDifficulty()
|
||||
{
|
||||
currentOpponent = 0;
|
||||
|
||||
@ -143,7 +143,6 @@ public class Leaderboard : MonoBehaviour
|
||||
Rows = new List<Transform>();
|
||||
int latestRecordIndex = gm.StatsService.GetRecordRank(gm.StatsService.GetLatestRecord()) - 1;
|
||||
|
||||
|
||||
for (int i = 0; i < amount; i++)
|
||||
{
|
||||
GameObject prefab = i == latestRecordIndex ? RowPrefabRanked : RowPrefab;
|
||||
@ -153,7 +152,6 @@ public class Leaderboard : MonoBehaviour
|
||||
|
||||
Rows.Add(rect);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -213,7 +211,6 @@ public class Leaderboard : MonoBehaviour
|
||||
List<Color> colors = isBot ? botColors : playerColors;
|
||||
if (colors == null || colors.Count == 0) return name;
|
||||
|
||||
|
||||
int rand = Random.Range(0, colors.Count);
|
||||
string hex = ColorUtility.ToHtmlStringRGB(colors[rand]);
|
||||
|
||||
|
||||
@ -2,16 +2,21 @@
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class MovesAndTimeCounter : MonoBehaviour
|
||||
{
|
||||
|
||||
|
||||
|
||||
[SerializeField] TextMeshProUGUI movesLabel;
|
||||
[SerializeField] string movesPrefix = "Ходы: ";
|
||||
|
||||
[SerializeField] TextMeshProUGUI timeLabel;
|
||||
[SerializeField] string timePrefix = "Время: ";
|
||||
|
||||
[SerializeField] List<Graphic> graphicsToVisibility;
|
||||
|
||||
[SerializeField] int digitsAfterComma = 2;
|
||||
|
||||
private bool visible = false;
|
||||
@ -20,8 +25,10 @@ public class MovesAndTimeCounter : MonoBehaviour
|
||||
{
|
||||
this.visible = visible;
|
||||
|
||||
movesLabel.enabled = visible;
|
||||
timeLabel.enabled = visible;
|
||||
foreach (Graphic g in graphicsToVisibility)
|
||||
{
|
||||
g.enabled = visible;
|
||||
}
|
||||
}
|
||||
|
||||
private void Start()
|
||||
|
||||
@ -275,13 +275,19 @@ public class PlayerStatsService : IDisposable
|
||||
"ОМЕГА", "АБСОЛЮТ", "ТЕРМИНАТОР", "БЕЗУМНЫЙ_М",
|
||||
};
|
||||
|
||||
if (count > highScoreNames.Count)
|
||||
{
|
||||
count = highScoreNames.Count;
|
||||
Debug.Log("Запрогено больше имен, чем есть в списке. Взято количество доступных имен.");
|
||||
}
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
string name = highScoreNames[UnityEngine.Random.Range(0, highScoreNames.Count)];
|
||||
highScoreNames.Remove(name);
|
||||
|
||||
int moves = UnityEngine.Random.Range(20, 80);
|
||||
float time = UnityEngine.Random.Range(60f, 500f);
|
||||
int moves = UnityEngine.Random.Range(60, 200);
|
||||
float time = UnityEngine.Random.Range(120f, 800f);
|
||||
DateTime date = GetRandomDateTimeInRange();
|
||||
|
||||
// Все начальные записи - боты
|
||||
@ -294,15 +300,32 @@ public class PlayerStatsService : IDisposable
|
||||
{
|
||||
List<string> highScoreNames = new List<string>
|
||||
{
|
||||
"ПОБЕДИТЕЛЬ", "ЛЕГЕНДА", "ЧЕМПИОН", "МАСТЕР", "ГЕРОЙ",
|
||||
"ЦАРЬ ГОРЫ", "УМНЯШКА300", "НЕЗНАКОМЕЦ", "ТЕНЬ", "НОМЕР_007",
|
||||
"ОМЕГА", "АБСОЛЮТ", "ТЕРМИНАТОР", "БЕЗУМНЫЙ_М",
|
||||
"АНЯ",
|
||||
"ВАСЯ",
|
||||
"КОЛЯ",
|
||||
"МИША",
|
||||
"ТАНЯ",
|
||||
"СВЕТА",
|
||||
"ИГОРЬ",
|
||||
"ОЛЕГ",
|
||||
"МАКСИМ",
|
||||
"ДИМА",
|
||||
"ЛЕХА ТОП",
|
||||
"ДАНЯ ПРО",
|
||||
"ААА",
|
||||
"ГРОЗА",
|
||||
"ЧАЙ",
|
||||
"Я",
|
||||
"РОБЛОКС",
|
||||
"НАГИБ",
|
||||
"БОБО",
|
||||
"",
|
||||
};
|
||||
|
||||
string name = highScoreNames[UnityEngine.Random.Range(0, highScoreNames.Count)];
|
||||
|
||||
int moves = UnityEngine.Random.Range(20, 80);
|
||||
float time = UnityEngine.Random.Range(60f, 500f);
|
||||
int moves = UnityEngine.Random.Range(60, 200);
|
||||
float time = UnityEngine.Random.Range(120f, 800f);
|
||||
DateTime date = DateTime.Now;
|
||||
|
||||
PlayerStatsRecord record = new PlayerStatsRecord(name, time, moves, date, true);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user