Skip to content

Commit

Permalink
版本:0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
WhatDamon committed Feb 3, 2023
1 parent 12eeca9 commit 2ac69a0
Show file tree
Hide file tree
Showing 10 changed files with 345 additions and 202 deletions.
4 changes: 2 additions & 2 deletions MCLauncher.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.489
# Visual Studio Version 17
VisualStudioVersion = 17.4.33213.308
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MCLauncher", "MCLauncher\MCLauncher.csproj", "{9FEBCF6C-14EF-49E9-B57D-FCBC3BA4BC77}"
ProjectSection(ProjectDependencies) = postProject
Expand Down
6 changes: 3 additions & 3 deletions MCLauncher/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
</configuration>
7 changes: 6 additions & 1 deletion MCLauncher/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
xmlns:local="clr-namespace:MCLauncher"
StartupUri="MainWindow.xaml">
<Application.Resources>

<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
19 changes: 12 additions & 7 deletions MCLauncher/MCLauncher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
<OutputType>WinExe</OutputType>
<RootNamespace>MCLauncher</RootNamespace>
<AssemblyName>MCLauncher</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -26,11 +30,8 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -154,7 +155,7 @@
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
Expand All @@ -164,12 +165,16 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<PackageReference Include="HandyControl">
<Version>3.4.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Windows.SDK.Contracts">
<Version>10.0.17763.1000</Version>
<Version>10.0.22621.755</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.1</Version>
<Version>13.0.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
247 changes: 183 additions & 64 deletions MCLauncher/MainWindow.xaml

Large diffs are not rendered by default.

158 changes: 85 additions & 73 deletions MCLauncher/MainWindow.xaml.cs

Large diffs are not rendered by default.

43 changes: 22 additions & 21 deletions MCLauncher/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions MCLauncher/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 21 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
# MCLauncher
# Minecraft 基岩版版本管理器

This tool allows you to install several versions of Minecraft: Windows 10 Edition (Bedrock) side-by-side.
This is useful if you want to test beta versions, releases or anything else side-by-side without needing to uninstall and reinstall the game.
源项目:https://github.com/MCMrARM/mc-w10-version-launcher

## Disclaimer
This tool will **not** help you to pirate the game; it requires that you have a Microsoft account which can be used to download Minecraft from the Store.
## 要求

## Prerequisites
- A Microsoft account connected to Microsoft Store which **owns Minecraft for Windows 10**
- **Administrator permissions** on your user account (or access to an account that has)
- **Developer mode** enabled for app installation in Windows 10 Settings
- If you want to be able to use beta versions, you'll additionally need to **subscribe to the Minecraft Beta program using Xbox Insider Hub**.
- [Microsoft Visual C++ Redistributable](https://aka.ms/vs/16/release/vc_redist.x64.exe) installed.
1. Windows 10及更高版本
2. 您需要先获取 Minecraft 试玩版。
3. .NET Framework 4.8

## Setup
- Download the latest release from the [Releases](https://github.com/MCMrARM/mc-w10-version-launcher/releases) section. Unzip it somewhere.
- Run `MCLauncher.exe` to start the launcher.
## 亮点

## Compiling the launcher yourself
You'll need Visual Studio with Windows 10 SDK version 10.0.17763 and .NET Framework 4.6.1 SDK installed. You can find these in the Visual Studio Installer if you don't have them out of the box.
The project should build out of the box with VS as long as you haven't done anything bizarre.
1. 完全汉化
2. 使用了第三方主题替代原版 WPF 主题
3. 使用 FastGit 替换了原来的 Github Raw(国内可以正常使用)
4. 集成了解除使用限制工具

## Frequently Asked Questions
**Does this allow running multiple instances of Minecraft: Bedrock at the same time?**
## 编译

At the time of writing, no. It allows you to _install_ multiple versions, but only one version can run at a time.
请使用 Visual Studio 2022,并包含最新的 Windows SDK!

## TODO

- [x] 汉化
- [x] 美化UI
- [x] 使用更快的 GitHub Raw
- [ ] 整合解除限制程序
- [ ] 使用 TaskDialog 全局替换 MessageBox
4 changes: 2 additions & 2 deletions WUTokenHelper/WUTokenHelper.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ProjectGuid>{b7336ba7-1e83-43d8-bd0e-3d44c6e3d4e7}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>WUTokenHelper</RootNamespace>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand All @@ -32,7 +32,7 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
Expand Down

0 comments on commit 2ac69a0

Please sign in to comment.