修改计划

This commit is contained in:
muqing 2024-08-13 21:59:14 +08:00
parent 0c3fa3e424
commit 0ca31ea406
7 changed files with 242 additions and 148 deletions

View File

@ -141,9 +141,9 @@ public partial class App : Microsoft.UI.Xaml.Application
} }
else else
{ {
new Editor.EditorWin().Activate(); //new Editor.EditorWin().Activate();
//MainWindow = new MainWindow(); MainWindow = new MainWindow();
//await App.GetService<IActivationService>().ActivateAsync(args); await App.GetService<IActivationService>().ActivateAsync(args);
} }
} }
} }

View File

@ -11,14 +11,11 @@
必须安装Net框架 https://dotnet.microsoft.com/zh-cn/download 必须安装Net框架 https://dotnet.microsoft.com/zh-cn/download
Net版本必须大于或者等于7 Net版本必须大于或者等于7
## 计划 ## 计划(1.0)
基本的社区界面 我尝试自己写编译器组件,但科研了很多天没有一点点的思路,我想我的实力应该还是不够强(毕竟开发只有我一个人)所以
代码表 咱们的软件先做好基础的社区功能代码表也尝试做出来,大家不着急呀</br>
模组编辑器 WinUI还是比较冷门的一个技术,代码和例子都不多 关于编译器的话现在是不准备写WinUI版本了
git(可能会废弃) 和WinUI分开,找一种比较简单的语言框架来写,所以等吧各位,也希望有人能够和我一起做PC端上面的铁锈助手
AI辅助(可能会废弃)
目前不考虑支持其他语言
自动识别steam下铁锈的模组和地图的路径
## 开发者Muqing ## 开发者Muqing
对于进一步的技术交流、合作或项目贡献,您可以直接联系开发者 Muqing 对于进一步的技术交流、合作或项目贡献,您可以直接联系开发者 Muqing

View File

@ -60,4 +60,14 @@
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'"> <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<ProjectCapability Include="Msix" /> <ProjectCapability Include="Msix" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Remove="Themes\NullPage.xaml" />
</ItemGroup>
<ItemGroup>
<Page Update="Themes\NullPage.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
</Project> </Project>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<UserControl
x:Class="RustTools.Themes.NullPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:RustTools.Themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid>
<TextBlock FontSize="10000" Text="未登录" />
</Grid>
</UserControl>

View File

@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using RustTools.Styles;
namespace RustTools.Themes;
public sealed partial class NullPage : UserControl
{
public NullPage()
{
DefaultStyleKey = typeof(NullPage);
}
}

View File

@ -6,45 +6,56 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:RustTools.Views" xmlns:local="using:RustTools.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:themes="using:RustTools.Themes"
SizeChanged="Page_SizeChanged" SizeChanged="Page_SizeChanged"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" /> <Grid>
</Grid.RowDefinitions> <TextBlock
<Grid.ColumnDefinitions> HorizontalAlignment="Center"
<ColumnDefinition MinWidth="56" MaxWidth="320" /> Style="{StaticResource BodyStrongTextBlockStyle}"
<ColumnDefinition Width="*" /> Text="请登陆后使用此功能" />
</Grid.ColumnDefinitions> </Grid>
<StackPanel <!--<themes:NullPage x:Name="nullpage" Visibility="Visible" />-->
Margin="0,9,9,9" <Grid x:Name="gridview" Visibility="Collapsed">
Padding="9"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <Grid.RowDefinitions>
<ListView <RowDefinition Height="*" />
Name="ListViewA" </Grid.RowDefinitions>
Grid.Column="0" <Grid.ColumnDefinitions>
ItemTemplate="{StaticResource ConCernItem}" <ColumnDefinition MinWidth="56" MaxWidth="320" />
ItemsSource="{x:Bind ViewModels.communitylist}" <ColumnDefinition Width="*" />
Loaded="ListViewA_Loaded" </Grid.ColumnDefinitions>
ScrollViewer.HorizontalScrollBarVisibility="Hidden" <StackPanel
ScrollViewer.VerticalScrollBarVisibility="Hidden" Margin="0,9,9,9"
SelectionChanged="ListViewA_SelectionChanged" Padding="9"
SelectionMode="Single" /> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
</StackPanel> <ListView
<StackPanel Name="ListViewA"
Grid.Column="1" Grid.Column="0"
Margin="9" ItemTemplate="{StaticResource ConCernItem}"
Padding="9" ItemsSource="{x:Bind ViewModels.communitylist}"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Loaded="ListViewA_Loaded"
<ListView ScrollViewer.HorizontalScrollBarVisibility="Hidden"
Name="ListViewB" ScrollViewer.VerticalScrollBarVisibility="Hidden"
IsItemClickEnabled="False" SelectionChanged="ListViewA_SelectionChanged"
ItemTemplate="{StaticResource MovingInfo}" SelectionMode="Single" />
ItemsSource="{x:Bind ViewModels.MovingInfoList}" </StackPanel>
ScrollViewer.HorizontalScrollBarVisibility="Hidden" <StackPanel
ScrollViewer.VerticalScrollBarVisibility="Hidden" Grid.Column="1"
SelectionMode="None" /> Margin="9"
</StackPanel> Padding="9"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<ListView
Name="ListViewB"
IsItemClickEnabled="False"
ItemTemplate="{StaticResource MovingInfo}"
ItemsSource="{x:Bind ViewModels.MovingInfoList}"
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden"
SelectionMode="None" />
</StackPanel>
</Grid>
</Grid> </Grid>
</Page> </Page>

View File

@ -10,108 +10,151 @@
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid
<RowDefinition Height="110" /> MinWidth="350"
<RowDefinition Height="*" /> Margin="16"
</Grid.RowDefinitions> HorizontalAlignment="Center">
<Grid> <StackPanel>
<Grid.ColumnDefinitions> <TextBlock HorizontalAlignment="Center" Text="登陆" />
<ColumnDefinition Width="*" /> <StackPanel>
<ColumnDefinition Width="auto" /> <TextBox
</Grid.ColumnDefinitions> Margin="0,16,0,16"
<Border InputScope="AlphanumericPin"
Grid.Column="0" PlaceholderText="账号" />
Padding="9,9,26,9" <PasswordBox Margin="0,0,0,16" PlaceholderText="密码" />
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
CornerRadius="10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Border
Grid.Column="0"
Width="86"
Height="86"
Background="BlanchedAlmond"
CornerRadius="16">
<Image Source="http://q1.qlogo.cn/g?b=qq&amp;nk=2923268971&amp;s=100" />
</Border>
<StackPanel Grid.Column="1" Margin="16,0,0,0">
<TextBlock
Margin="0,9,0,0"
Style="{StaticResource TitleTextBlockStyle}"
Text="Muqing" />
<TextBlock
Margin="0,6,0,0"
Style="{StaticResource BodyTextBlockStyle}"
Text="测试员,开发者,这里是签名哦" />
</StackPanel>
<FontIcon Grid.Column="2" Glyph="&#xE70F;" />
</Grid>
</Border>
<Border
Grid.Column="1"
Margin="16,0,0,0"
Padding="30,9,30,9"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
CornerRadius="10">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<styles:TitleSubtitleControl
Style="{StaticResource TitleSubtitleControlStyle}"
SubtitleText="关注"
TitleText="99" />
<Rectangle
Width="1"
Height="10"
Margin="16,0,16,0"
VerticalAlignment="Center"
Fill="Gray" />
<styles:TitleSubtitleControl
Style="{StaticResource TitleSubtitleControlStyle}"
SubtitleText="粉丝"
TitleText="99" />
<Rectangle
Width="1"
Height="10 "
Margin="16,0,16,0"
VerticalAlignment="Center"
Fill="Gray" />
<styles:TitleSubtitleControl
Style="{StaticResource TitleSubtitleControlStyle}"
SubtitleText="获赞"
TitleText="99" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
</Border>
</Grid>
<Pivot Grid.Row="1" Grid.Column="0">
<PivotItem Header="模组">
<TextBlock Text="这里是你全部发布的模组" />
</PivotItem>
<PivotItem Header="动态">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="这里是你全部发布的动态" />
<Button <Button
Grid.Row="1" Width="100"
Grid.Column="1" Margin="16"
Margin="16,16,0,16" Content="登陆"
HorizontalAlignment="Right" Style="{StaticResource AccentButtonStyle}" />
Content="我要发布动态" /> <Button Margin="0,0,0,0" Content="注册" />
</Grid> </StackPanel>
</PivotItem> <CheckBox>
</Pivot> <CheckBox.Content>
<StackPanel Orientation="Horizontal" ToolTipService.ToolTip="虽然没什么用但是这是常规的">
<TextBlock VerticalAlignment="Center" Text="我同意" />
<HyperlinkButton
x:Name="hlbTerms"
Content="《服务协议》"
NavigateUri="https://rust.coldmint.top/resources/agreement/service_agreement.html" />
<TextBlock VerticalAlignment="Center" Text="与" />
<HyperlinkButton
x:Name="hlbPrivacy"
Content="《隐私政策》"
NavigateUri="https://rust.coldmint.top/resources/agreement/privacy_policy.html" />
</StackPanel>
</CheckBox.Content>
</CheckBox>
</StackPanel>
</Grid>
<Grid Name="gridview" Visibility="Collapsed">
<Grid.RowDefinitions>
<RowDefinition Height="110" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Border
Grid.Column="0"
Padding="9,9,26,9"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
CornerRadius="10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Border
Grid.Column="0"
Width="86"
Height="86"
Background="BlanchedAlmond"
CornerRadius="16">
<Image Source="http://q1.qlogo.cn/g?b=qq&amp;nk=2923268971&amp;s=100" />
</Border>
<StackPanel Grid.Column="1" Margin="16,0,0,0">
<TextBlock
Margin="0,9,0,0"
Style="{StaticResource TitleTextBlockStyle}"
Text="Muqing" />
<TextBlock
Margin="0,6,0,0"
Style="{StaticResource BodyTextBlockStyle}"
Text="测试员,开发者,这里是签名哦" />
</StackPanel>
<FontIcon Grid.Column="2" Glyph="&#xE70F;" />
</Grid>
</Border>
<Border
Grid.Column="1"
Margin="16,0,0,0"
Padding="30,9,30,9"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
CornerRadius="10">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<styles:TitleSubtitleControl
Style="{StaticResource TitleSubtitleControlStyle}"
SubtitleText="关注"
TitleText="99" />
<Rectangle
Width="1"
Height="10"
Margin="16,0,16,0"
VerticalAlignment="Center"
Fill="Gray" />
<styles:TitleSubtitleControl
Style="{StaticResource TitleSubtitleControlStyle}"
SubtitleText="粉丝"
TitleText="99" />
<Rectangle
Width="1"
Height="10 "
Margin="16,0,16,0"
VerticalAlignment="Center"
Fill="Gray" />
<styles:TitleSubtitleControl
Style="{StaticResource TitleSubtitleControlStyle}"
SubtitleText="获赞"
TitleText="99" />
</StackPanel>
</Border>
</Grid>
<Pivot Grid.Row="1" Grid.Column="0">
<PivotItem Header="模组">
<TextBlock Text="这里是你全部发布的模组" />
</PivotItem>
<PivotItem Header="动态">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="这里是你全部发布的动态" />
<Button
Grid.Row="1"
Grid.Column="1"
Margin="16,16,0,16"
HorizontalAlignment="Right"
Content="我要发布动态" />
</Grid>
</PivotItem>
</Pivot>
</Grid>
</Grid> </Grid>
</Page> </Page>