Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15 from Grange007/dev
feat: ✨ finish UI and basic front-end logic
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version = "1.0" encoding = "UTF-8" ?> | ||
| <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||
| xmlns:local="clr-namespace:Client" | ||
| x:Class="Client.App"> | ||
| <Application.Resources> | ||
| <ResourceDictionary> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceDictionary Source="Resources/Styles/Colors.xaml" /> | ||
| <ResourceDictionary Source="Resources/Styles/Styles.xaml" /> | ||
| </ResourceDictionary.MergedDictionaries> | ||
|
|
||
| <Style x:Key="littleAttributes" | ||
| TargetType="Label"> | ||
| <Setter Property="VerticalOptions" Value="Center" /> | ||
| <Setter Property="HorizontalOptions" Value="Start" /> | ||
| <Setter Property="FontSize" Value="Micro" /> | ||
| </Style> | ||
| </ResourceDictionary> | ||
|
|
||
|
|
||
| </Application.Resources> | ||
| </Application> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| namespace Client | ||
| { | ||
| public partial class App : Application | ||
| { | ||
| public App() | ||
| { | ||
| InitializeComponent(); | ||
| MainPage = new AppShell(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <Shell | ||
| x:Class="Client.AppShell" | ||
| xmlns="http://schemas.microsoft.com/dotnet/2021/maui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||
| xmlns:local="clr-namespace:Client" | ||
| Shell.FlyoutBehavior="Disabled"> | ||
|
|
||
| <ShellContent | ||
| ContentTemplate="{DataTemplate local:MainPage}" | ||
| Route="MainPage" | ||
| /> | ||
|
|
||
| </Shell> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| namespace Client | ||
| { | ||
| public partial class AppShell : Shell | ||
| { | ||
| public AppShell() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,97 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks> | ||
| <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks> | ||
| <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET --> | ||
| <!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> --> | ||
| <OutputType>Exe</OutputType> | ||
| <RootNamespace>Client</RootNamespace> | ||
| <UseMaui>true</UseMaui> | ||
| <SingleProject>true</SingleProject> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
|
|
||
| <!-- Display name --> | ||
| <ApplicationTitle>Client</ApplicationTitle> | ||
|
|
||
| <!-- App Identifier --> | ||
| <ApplicationId>com.companyname.client</ApplicationId> | ||
| <ApplicationIdGuid>872eca96-e290-4365-952b-f5e5b16e7217</ApplicationIdGuid> | ||
|
|
||
| <!-- Versions --> | ||
| <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> | ||
| <ApplicationVersion>1</ApplicationVersion> | ||
|
|
||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion> | ||
| <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion> | ||
| <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- App Icon --> | ||
| <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" /> | ||
|
|
||
| <!-- Splash Screen --> | ||
| <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" /> | ||
|
|
||
| <!-- Images --> | ||
| <MauiImage Include="Resources\Images\*" /> | ||
| <MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" /> | ||
| <MauiImage Include="Resources\Images\eesast_logo_32x32.png" /> | ||
| <MauiImage Include="Resources\Images\eesast_software_trans_enlarged_256x256.png" /> | ||
|
|
||
| <!-- Custom Fonts --> | ||
| <MauiFont Include="Resources\Fonts\*" /> | ||
|
|
||
| <!-- Raw Assets (also remove the "Resources\Raw" prefix) --> | ||
| <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> | ||
| </ItemGroup> | ||
|
|
||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Google.Protobuf" Version="3.24.4" /> | ||
| <PackageReference Include="Grpc" Version="2.46.6" /> | ||
| <PackageReference Include="Grpc.Tools" Version="2.54.0"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
|
|
||
| <ItemGroup> | ||
| <Compile Update="MainPage.xaml.cs"> | ||
| <DependentUpon>MainPage.xaml</DependentUpon> | ||
| </Compile> | ||
| <Compile Update="Map.xaml.cs"> | ||
| <DependentUpon>Map.xaml</DependentUpon> | ||
| </Compile> | ||
| <Compile Update="GameStatusBar.xaml.cs"> | ||
| <DependentUpon>GameStatusBar.xaml</DependentUpon> | ||
| </Compile> | ||
| <Compile Update="PlayerStatusBar.xaml.cs"> | ||
| <DependentUpon>PlayerStatusBar.xaml</DependentUpon> | ||
| </Compile> | ||
| </ItemGroup> | ||
|
|
||
|
|
||
| <ItemGroup> | ||
| <MauiXaml Update="Map.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </MauiXaml> | ||
| <MauiXaml Update="GameStatusBar.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </MauiXaml> | ||
| <MauiXaml Update="PlayerStatusBar.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| </MauiXaml> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\dependency\proto\Protos.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,33 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.7.34202.233 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client.csproj", "{F75BC602-8C64-4645-9C9A-2DF71085C52C}" | ||
| EndProject | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Protos", "..\..\dependency\proto\Protos.csproj", "{DAE45955-E55C-4E11-80B4-E7EC77E11C89}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {F75BC602-8C64-4645-9C9A-2DF71085C52C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {F75BC602-8C64-4645-9C9A-2DF71085C52C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {F75BC602-8C64-4645-9C9A-2DF71085C52C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU | ||
| {F75BC602-8C64-4645-9C9A-2DF71085C52C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {F75BC602-8C64-4645-9C9A-2DF71085C52C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {F75BC602-8C64-4645-9C9A-2DF71085C52C}.Release|Any CPU.Deploy.0 = Release|Any CPU | ||
| {DAE45955-E55C-4E11-80B4-E7EC77E11C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {DAE45955-E55C-4E11-80B4-E7EC77E11C89}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {DAE45955-E55C-4E11-80B4-E7EC77E11C89}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {DAE45955-E55C-4E11-80B4-E7EC77E11C89}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {4C1CF739-9F04-4B0F-B148-BCC1629AACE7} | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||
| x:Class="Client.GameStatusBar"> | ||
| <Grid x:Name="GameStatusGrid" Grid.Row="0" Grid.Column="4" Grid.RowSpan="2"> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="5*" /> | ||
| <RowDefinition Height="10*"/> | ||
| <RowDefinition Height="10*"/> | ||
| <RowDefinition Height="1*"/> | ||
| <RowDefinition Height="20*"/> | ||
| <RowDefinition Height="1*"/> | ||
| <RowDefinition Height="20*"/> | ||
| <RowDefinition Height="1*"/> | ||
| <RowDefinition Height="50*" /> | ||
| </Grid.RowDefinitions> | ||
|
|
||
| <Label x:Name="GameTime" Text="时间：00:00" Grid.Row="1" HorizontalOptions="Start" VerticalOptions="Start"/> | ||
| <Label x:Name="WormHole1HP" Text="虫洞1生命值" Grid.Row="2" HorizontalOptions="Start" VerticalOptions="End"/> | ||
| <BoxView x:Name="WormHole1HpSlide" Color="Green" HeightRequest="3" WidthRequest="80" Grid.Row="3" HorizontalOptions="Start" VerticalOptions="End"/> | ||
| <Label x:Name="WormHole2Hp" Text="虫洞2生命值" Grid.Row="4" HorizontalOptions="Start" VerticalOptions="End"/> | ||
| <BoxView x:Name="WormHole2HpSlide" Color="Green" HeightRequest="3" WidthRequest="80" Grid.Row="5" HorizontalOptions="Start" VerticalOptions="End"/> | ||
| <Label x:Name="WormHole3Hp" Text="虫洞3生命值" Grid.Row="6" HorizontalOptions="Start" VerticalOptions="End"/> | ||
| <BoxView x:Name="WormHole3HpSlide" Color="Green" HeightRequest="3" WidthRequest="80" Grid.Row="7" HorizontalOptions="Start" VerticalOptions="End"/> | ||
| </Grid> | ||
| </ContentView> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| using Protobuf; | ||
|
|
||
| namespace Client; | ||
|
|
||
| public partial class GameStatusBar : ContentView | ||
| { | ||
| private readonly int lengthOfHp1Slide; | ||
| private readonly int lengthOfHp2Slide; | ||
| private readonly int lengthOfHp3Slide; | ||
| private readonly int WormHoleFullHp = 18000; | ||
| public GameStatusBar(Grid parent, int Row, int Column) | ||
| { | ||
| InitializeComponent(); | ||
| parent.Children.Add(this); | ||
| parent.SetColumn(this, Column); | ||
| parent.SetRow(this, Row); | ||
| parent.SetRowSpan(this, 2); | ||
| } | ||
| public void SetWormHoleValue(MessageOfBuilding wormholeMsg) | ||
| { | ||
| if (wormholeMsg.BuildingType != BuildingType.Wormhole) | ||
| { | ||
| return; | ||
| } | ||
| switch (wormholeMsg.BuildingId) | ||
| { | ||
| case 0: | ||
| WormHole1HpSlide.WidthRequest = wormholeMsg.Hp / WormHoleFullHp * lengthOfHp1Slide; | ||
| break; | ||
| case 1: | ||
| WormHole2HpSlide.WidthRequest = wormholeMsg.Hp / WormHoleFullHp * lengthOfHp2Slide; | ||
| break; | ||
| case 2: | ||
| WormHole3HpSlide.WidthRequest = wormholeMsg.Hp / WormHoleFullHp * lengthOfHp3Slide; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| public void SetGameTimeValue(MessageOfAll obj) | ||
| { | ||
| int min, sec; | ||
| sec = obj.GameTime / 1000; | ||
| min = sec / 60; | ||
| sec = sec % 60; | ||
| GameTime.Text = "时间："; | ||
| if (min / 10 == 0) | ||
| { | ||
| GameTime.Text += "0"; | ||
| } | ||
| GameTime.Text += min.ToString() + ":"; | ||
| if (sec / 10 == 0) | ||
| { | ||
| GameTime.Text += "0"; | ||
| } | ||
| GameTime.Text += sec.ToString(); | ||
| } | ||
|
|
||
| } | ||
Binary file not shown.
Oops, something went wrong.