Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Время до эвака в кпк #210

Merged
merged 17 commits into from
May 31, 2024
Merged

Время до эвака в кпк #210

merged 17 commits into from
May 31, 2024

Conversation

user424242420
Copy link

About the PR

Вообщем. Время до эвака в кпк

Media

image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

add: Время до эвака в кпк
add: добавил знак доллара в баланс

@user424242420
Copy link
Author

Наименование на скрине пофиксил

@Geliant
Copy link

Geliant commented May 26, 2024

  1. первый скрин
  2. Второй скрин
  3. третий скрин
  4. чётвёртый скрин
  5. пятый и шестой скрин
  6. по наблюдениям , всё соответствует.
    В целом всё работает , но чтобы таймер обновился нужно закрыть и открыть кпк (если во время отзыва/вызыва шатла кпк был открыт) Также если не закрывать кпк , а шатл вызвали и отозвали , то таймер дойдёт до нуля и начнёт считать в обратную сторону(просто забавно)
    1
    3
    2
    4
    5
    6

FireNameFN
FireNameFN suggested changes May 26, 2024
View reviewed changes
Copy link
Member

@FireNameFN FireNameFN left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Так. Пока что достаточно.

Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Server/PDA/PdaSystem.cs Outdated Show resolved Hide resolved
Content.Shared/CCVar/CCVars.cs Outdated Show resolved Hide resolved
Content.Shared/PDA/PdaUpdateState.cs Outdated Show resolved Hide resolved
Content.Server/PDA/PdaSystem.cs Show resolved Hide resolved
Content.Server/PDA/PdaSystem.cs Outdated Show resolved Hide resolved
@user424242420
Copy link
Author

Теперь не надо перезаходить в кпк чтобы обновить данные

@user424242420 user424242420 requested a review from FireNameFN May 29, 2024 23:06
FireNameFN
FireNameFN suggested changes May 30, 2024
View reviewed changes
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Show resolved Hide resolved
Content.Shared/CCVar/CCVars.cs Outdated Show resolved Hide resolved
Content.Shared/PDA/PdaUpdateState.cs Outdated Show resolved Hide resolved
Content.Server/PDA/PdaSystem.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Show resolved Hide resolved
@user424242420 user424242420 requested a review from FireNameFN May 30, 2024 13:46
@FireNameFN
Copy link
Member

Какой ревью реквест? Исправляй. Я анресолвнул всё, что надо исправить.

FireNameFN
FireNameFN suggested changes May 31, 2024
View reviewed changes
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Show resolved Hide resolved
FireNameFN
FireNameFN suggested changes May 31, 2024
View reviewed changes
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
Content.Client/PDA/PdaMenu.xaml.cs Outdated Show resolved Hide resolved
@Vonsant Vonsant merged commit 346e1f3 into Corvax-Frontier:master May 31, 2024
11 checks passed
@user424242420 user424242420 deleted the time-left-pda branch June 3, 2024 14:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@FireNameFN FireNameFN FireNameFN approved these changes

Assignees
No one assigned
Labels
C# FTL UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@user424242420 @Geliant @FireNameFN @Vonsant