GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-22 01:16:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
rmbgame
2020-12-15 12:39:30 +08:00
parent dfdf9a11af
commit d3bc8dbd33
13 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SteamTool.Core/SteamToolService.cs
+3 -3
View File
@@ -43,8 +43,8 @@ namespace SteamTool.Core
{
var steamExePath = registryKeyService.ReadRegistryKey(Registry.CurrentUser, SteamRegistryPath, "SteamExe");
var steamPath = registryKeyService.ReadRegistryKey(Registry.CurrentUser, SteamRegistryPath, "SteamPath");
steamExePath = Path.GetFullPath(steamExePath);
steamPath = Path.GetFullPath(steamPath);
//steamExePath = Path.GetFullPath(steamExePath);
//steamPath = Path.GetFullPath(steamPath);
if (File.Exists(steamExePath))
{
SteamExePath = steamExePath;
@@ -91,7 +91,7 @@ namespace SteamTool.Core
public List<SteamUser> GetAllUser()
{
var users = new List<SteamUser>();
if (SteamPath != null)
if (File.Exists(SteamPath + UserVdfPath))
{
var v = vdfService.GetVdfModelByPath(SteamPath + UserVdfPath);
SteamTools/App.xaml.cs
+2 -3
View File
@@ -68,12 +68,11 @@ namespace SteamTools
}
Logger.EnableTextLog = true;
#endif
this.DispatcherUnhandledException += App_DispatcherUnhandledException;
DispatcherHelper.UIDispatcher = this.Dispatcher;
if (e.Args.ContainsArg("-log"))
{
Logger.EnableTextLog = true;
this.DispatcherUnhandledException += App_DispatcherUnhandledException;
DispatcherHelper.UIDispatcher = this.Dispatcher;
}
if (e.Args.ContainsArg("-safe"))
{
SteamTools/Properties/AssemblyInfo.cs
BIN
View File
Binary file not shown.
SteamTools/Services/ProxyService.cs
+10 -10
View File
@@ -55,20 +55,20 @@ namespace SteamTools.Services
DomainTag = DomainTag.SteamStore,
IsEnable= false,
},
new ProxyDomainModel{
Index=2,
Name=Resources.SteamImage,
Domains = new List<string>{"steamcdn-a.akamaihd.net" },
ToDomain = "steamstore-a.akamaihd.net",
Hosts = new List<string>{ "steamcdn-a.akamaihd.net"},
DomainTag = DomainTag.SteamImage,
IsEnable= false,
},
//new ProxyDomainModel{
// Index=2,
// Name=Resources.SteamImage,
// Domains = new List<string>{"steamcdn-a.akamaihd.net" },
// ToDomain = "steamuserimages-a.akamaihd.net",
// Hosts = new List<string>{ "steamcdn-a.akamaihd.net"},
// DomainTag = DomainTag.SteamImage,
// IsEnable= false,
//},
new ProxyDomainModel{
Index=3,
Name=Resources.SteamChat,
Domains = new List<string>{"steam-chat.com" },
ToDomain = "steamstore-a.akamaihd.net",
ToDomain = "s.team",
Hosts = new List<string>{ "steam-chat.com"},
DomainTag = DomainTag.SteamChat,
IsEnable= false,
SteamTools/Services/SteamConnectService.cs
+6
View File
@@ -106,6 +106,12 @@ namespace SteamTools.Services
if (IsConnectToSteam)
{
var id = ApiService.GetSteamId64();
if (id == 76561197960265728)
{
//该64位id的steamID3等于0，是steam未获取到当前登录用户的默认返回值，所以直接重新获取
IsConnectToSteam = false;
continue;
}
CurrentSteamUser = await steamDbApiService.GetUserInfo(id);
var mainViewModel = (WindowService.Current.MainWindow as MainWindowViewModel);
mainViewModel.SteamAppPage.Initialize();
SteamTools/SteamTools.csproj
+3 -3
View File
@@ -35,6 +35,8 @@
<Platforms>AnyCPU;x86</Platforms>
<Product>SteamTools</Product>
<PackageId />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
@@ -316,9 +318,7 @@
<Reference Include="MetroTrilithon.Desktop">
<HintPath>..\Lib\MetroTrilithon.Desktop.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms">
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Forms.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
SteamTools/ViewModels/Page/CommunityProxyPageViewModel.cs
+2 -1
View File
@@ -88,7 +88,8 @@ namespace SteamTools.ViewModels
if (ProxySettings.SupportProxyServicesStatus.Value.ContainsKey(proxyDomain.Index))
{
dic.Remove(proxyDomain.Index);
dic.Add(proxyDomain.Index, proxyDomain.IsEnable);
if (proxyDomain.IsEnable)
dic.Add(proxyDomain.Index, proxyDomain.IsEnable);
}
else
{
SteamTools/ViewModels/Page/SteamAccountPageViewModel.cs
+9 -2
View File
@@ -62,8 +62,15 @@ namespace SteamTools.ViewModels
users[i].Timestamp = temp.Timestamp;
users[i].LastLoginTime = temp.LastLoginTime;
}
SteamUsers = users.OrderByDescending(o=>o.MostRecent).ThenByDescending(o=>o.RememberPassword).ThenByDescending(o=>o.LastLoginTime).ToList();
StatusService.Current.Notify("加载本地Steam用户数据完成");
if (SteamUsers.Count > 0)
{
SteamUsers = users.OrderByDescending(o => o.MostRecent).ThenByDescending(o => o.RememberPassword).ThenByDescending(o => o.LastLoginTime).ToList();
StatusService.Current.Notify("加载本地Steam用户数据完成");
}
else
{
StatusService.Current.Notify("没有检测到Steam用户数据");
}
}).ContinueWith(s => s.Dispose());
}
SteamTools/Views/Content/About/AboutDonate.xaml
+4 -3
View File
@@ -35,7 +35,7 @@
TextAlignment="Left"
MaxPageWidth="900">
<Paragraph Language="zh-cn">
<Run Text="「Steam++」的开发耗费了作者大量精力，每天下班后，熬了无数个通宵才有了这个工具的诞生。" />
<Run Text="「Steam++」这个工具的想法起始于2018年5月8日，但是一直没有多少时间开始写，直到2020年中旬辞职，有了足够的时间和精力投入开发。开发的过程耗费了我大量精力，熬了无数个通宵才有了此软件的诞生。" />
<LineBreak />
<LineBreak />
<Run Text="如果Steam++有帮助到您，您可以考虑给我一点捐助，以使我更有动力的更新维护Steam++。" />
@@ -51,11 +51,12 @@
<Image Source="pack://application:,,,/Resources/Asstes/wechatpay.png" Height="300"></Image>
<LineBreak/>
<LineBreak/>
<Run Text="或者赞助"></Run>
<LineBreak/>
<Run Text="或者可以赞助"></Run>
<metro2:HyperlinkEx Uri="{Binding Source={x:Static model:Const.MY_WISHLIST_URL}}">
<Run Text="我的愿望单" />
</metro2:HyperlinkEx>
<Run Text="里的游戏，让我闲暇时可以玩玩游戏，谢谢。"></Run>
<Run Text="里的游戏，你的支持是我最大的开发动力，十分感谢！！"></Run>
</Paragraph>
<Paragraph>
<InlineUIContainer>
SteamTools/Views/Controls/StatusBar.xaml
+2 -13
View File
@@ -44,19 +44,8 @@
Value="Center" />
</Style>
</StackPanel.Resources>
<TextBlock VerticalAlignment="Center" Text="{Binding Source={x:Static services:ResourceService.Current}, Path=Resources.Steam_Not_Runing_Tips}">
<TextBlock.Style>
<Style TargetType="{x:Type TextBlock}">
<Style.Triggers>
<DataTrigger Binding="{Binding Source={x:Static services:SteamConnectService.Current}, Path=IsConnectToSteam,Mode=OneWay}" Value="False">
<Setter Property="Visibility" Value="Visible"></Setter>
</DataTrigger>
<DataTrigger Binding="{Binding Source={x:Static services:SteamConnectService.Current}, Path=IsConnectToSteam,Mode=OneWay}" Value="True">
<Setter Property="Visibility" Value="Hidden"></Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
<TextBlock VerticalAlignment="Center" Text="{Binding Source={x:Static services:ResourceService.Current}, Path=Resources.Steam_Not_Runing_Tips}"
Visibility="{Binding Source={x:Static services:SteamConnectService.Current}, Path=IsConnectToSteam,Mode=OneWay,Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
</TextBlock>
<TextBlock Text="{Binding Source={x:Static services:ResourceService.Current}, Path=Resources.Game_Total, StringFormat='{}{0}: '}" />
<TextBlock Text="{Binding Games.Count,Mode=OneWay}"
SteamTools/Views/Pages/CommunityProxyPage.xaml
+6
View File
@@ -131,6 +131,12 @@
MethodParameter="{Binding}"
MethodTarget="{Binding DataContext,ElementName=u}" />
</i:EventTrigger>
<i:EventTrigger EventName="Unchecked">
<livet:LivetCallMethodAction
MethodName="ProxyServices_Checked"
MethodParameter="{Binding}"
MethodTarget="{Binding DataContext,ElementName=u}" />
</i:EventTrigger>
</i:Interaction.Triggers>
</CheckBox>
<TextBlock HorizontalAlignment="Right" Text="{Binding Domains[0]}"
SteamTools/Views/Pages/WelcomePage.xaml
+14 -16
View File
@@ -161,41 +161,39 @@
<LineBreak/>
<LineBreak />
<Run Text=" "></Run>
<Run Text="5.结合社区反代和成就管理的API实现的自动挂卡功能。" />
<Run Text="5.一些游戏工具，目前已有强制游戏无边框窗口化，CSGO修复VAC屏蔽。" />
<Run Text="（正在开发...）"></Run>
</Paragraph>
<Paragraph>
<Run Text="预计推出" FontSize="18"/>
<LineBreak/>
<LineBreak/>
<Run Text=" "></Run>
<Run Text="尝试用社区反代和成就管理的API实现一个全自动的挂卡功能。" />
<Run Text="（接下来要做的...）"></Run>
<LineBreak/>
<LineBreak />
<Run Text=" "></Run>
<Run Text="6.Steam皮肤的可视化设计编辑功能。" />
<Run Text="（难度较大还没开工...）"></Run>
<Run Text="Steam皮肤的可视化设计编辑功能。" />
<Run Text="（短期内应该做不完...）"></Run>
<LineBreak/>
<LineBreak />
<Run Text=" "></Run>
<Run Text="7.以插件形式支持ASF在工具内运行并增强ASF在Windows Desktop环境下的使用。例如注册协议 &quot;spp://xxxxxx&quot; 实现快速运行的asf指令和激活复制的Steam Key。" />
<Run Text="以插件形式支持ASF在工具内运行并增强ASF在Windows Desktop环境下的使用。" />
<Run Text="（接下来要做的...）"></Run>
<LineBreak/>
<LineBreak />
<Run Text=" "></Run>
<Run Text="8.增强Steam自定义封面的管理以及从" />
<Run Text="增强Steam自定义封面的管理以及从" />
<metro2:HyperlinkEx Uri="www.steamgriddb.com">
<Run Text="www.steamgriddb.com"/>
</metro2:HyperlinkEx>
<Run Text="快速匹配下载应用封面。" />
<Run Text="（更多正在开发...）"></Run>
<LineBreak/>
<LineBreak />
<Run Text=" "></Run>
<Run Text="9.其它游戏平台的一些功能，GOG、Origin、EPIC、Uplay相关的功能" />
<Run Text="（正在开发...）"></Run>
<LineBreak/>
<LineBreak />
<Run Text=" "></Run>
<Run Text="10.一些游戏工具，目前已有强制游戏无边框窗口化，CSGO修复VAC屏蔽。" />
<Run Text="（正在开发...）"></Run>
<LineBreak/>
<LineBreak />
<Run Text=" "></Run>
<Run Text="以后也会加入许多可能没用但我闲着无聊做的功能，这些功能可能会越来越多，不过我也会时不时删掉没用的功能防止软件太过臃肿。" />
<Run Text="功能陆续开发中...大家如果有好的建议可以提供给我，不限于Steam，可以是其它平台或者游戏相关的，发送到底下bug反馈的邮箱。" />
</Paragraph>
<Paragraph>
<!--<InlineUIContainer>
SteamTools/Views/Window/AddAuthWindow.xaml
+7 -8
View File
@@ -14,7 +14,7 @@
xmlns:controls="clr-namespace:SteamTools.Views.Controls"
mc:Ignorable="d"
Width="600"
Height="530"
Height="540"
IsRestoringWindowPlacement="True"
WindowStartupLocation="CenterScreen"
UseLayoutRounding="True"
@@ -240,14 +240,14 @@
<Run Text="然后将以下两个文件的内容复制到下面的对应输入框中"/>
</TextBlock>
<StackPanel Visibility="{Binding ElementName=ImportSteamApp,Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
<metro:PromptTextBox Grid.Row="1"
<metro:PromptTextBox Margin="0,5,0,0" Grid.Row="1"
Grid.Column="1"
Text="{Binding AuthName, Mode=TwoWay}"
Prompt="输入令牌的自定义名称" />
<TextBlock Grid.Row="0" Grid.Column="0">
<Run Text="从shared_prefs文件夹中，粘贴'steam_uuid.xml'的内容" />
<Run Text=": " />
<Run Text="从shared_prefs文件夹中，粘贴'steam_uuid.xml'的uuidKey" />
<LineBreak/>
<Run Text="格式：android:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" />
</TextBlock>
<metro:PromptTextBox Grid.Row="0"
Grid.Column="1"
@@ -255,8 +255,7 @@
Prompt="" />
<TextBlock Grid.Row="1" Grid.Column="0">
<Run Text="从文件文件夹中，粘贴'SteamGuard-NNNNNNNN'的内容" />
<Run Text=": " />
<Run Text="从文件文件夹中，粘贴'SteamGuard-NNNNNNNN'的全部内容" />
</TextBlock>
<metro:PromptTextBox Grid.Row="1"
Grid.Column="1"
@@ -289,7 +288,7 @@
MinWidth="110"
Padding="16,6" />-->
</StackPanel>
</StackPanel>
</StackPanel>
</ScrollViewer>