Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复若干bug

Browse Source
This commit is contained in:
ZouJin 2023-01-24 17:06:06 +08:00
parent bf91728284
commit 0ea5d40c79
6 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
VPet-Simulator.Windows/MainWindow.xaml.cs
View File

@ -63,7 +63,10 @@ namespace VPet_Simulator.Windows
}
else
Set = new Setting("Setting#VPET:|\n");
//this.Width = 400 * ZoomSlider.Value;
//this.Height = 450 * ZoomSlider.Value;
this.Height = 500 * Set.ZoomLevel;
this.Width = 500 * Set.ZoomLevel;
InitializeComponent();
//不存在就关掉
@ -145,6 +148,7 @@ namespace VPet_Simulator.Windows
Main.SetLogicInterval((int)(Set.LogicInterval * 1000));
//加载图标
notifyIcon = new NotifyIcon();
notifyIcon.Text = "虚拟桌宠模拟器";
ContextMenu m_menu;
m_menu = new ContextMenu();
@ -197,6 +201,7 @@ namespace VPet_Simulator.Windows
{
Save();
Main?.Dispose();
notifyIcon.Visible = false;
notifyIcon?.Dispose();
System.Environment.Exit(0);
}

2
VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
View File

@ -37,7 +37,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>

33
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
View File

@ -484,18 +484,6 @@
<Run x:Name="runActivate">已通过Steam[uid]激活服务注册</Run><LineBreak />
</TextBlock>
<TextBlock Margin="0,100,0,0" Text="制作组名单" FontSize="20" FontWeight="Bold" />
<TextBlock Margin="0,130,0,0" FontWeight="Bold">
<Run>游戏策划</Run><LineBreak />
<Run>UI&amp;程序</Run><LineBreak />
<Run>动画绘制</Run><LineBreak />
<Run>开源项目</Run><LineBreak /><LineBreak /><LineBreak />
<Run>项目页面</Run><LineBreak />
<LineBreak /><LineBreak />
<LineBreak /><Run xml:space="preserve">Power By </Run>
<Hyperlink TextDecorations="Underline" Foreground="Black" Click="VPET_Click">exLB.net</Hyperlink>
<Run> </Run>
<Hyperlink TextDecorations="Underline" Foreground="Black" Click="LB_Click">LBGame</Hyperlink>
</TextBlock>
<TextBlock Margin="100,130,0,0">
<Run>杨远洛里斯, 广大MOD作者</Run><LineBreak />
<Run>洛里斯杨远, トニーちゃん</Run> <Hyperlink Click="Git_Click">Git贡献名单</Hyperlink><LineBreak />
@ -512,6 +500,27 @@
</TextBlock>
<Image Source="/Res/TopLogo2018.PNG" Width="38" Margin="208,257,0,0" HorizontalAlignment="Left"
VerticalAlignment="Top" Height="38" />
<TextBlock Margin="0,130,0,0" FontWeight="Bold">
<Run>游戏策划</Run><LineBreak />
<Run>UI&amp;程序</Run><LineBreak />
<Run>动画绘制</Run><LineBreak />
<Run>开源项目</Run><LineBreak /><LineBreak /><LineBreak />
<Run>项目页面</Run><LineBreak />
<LineBreak /><LineBreak />
<LineBreak /><Run xml:space="preserve">Power By </Run>
<Hyperlink TextDecorations="Underline" Foreground="Black" Click="VPET_Click">exLB.net</Hyperlink>
<Run> </Run>
<Hyperlink TextDecorations="Underline" Foreground="Black" Click="LB_Click">LBGame</Hyperlink>
<LineBreak /><LineBreak />
<Run xml:space="preserve">相关链接 </Run>
<Hyperlink TextDecorations="Underline"
Foreground="{DynamicResource DARKPrimaryDarker}"
Click="VUP_Click" FontWeight="Normal">虚拟主播模拟器</Hyperlink>
<Hyperlink TextDecorations="Underline" Foreground="{DynamicResource DARKPrimaryDarker}"
Click="Group_Click" FontWeight="Normal">相关群</Hyperlink>
</TextBlock>
</Grid>
</TabItem>
</TabControl>

11
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
View File

@ -482,6 +482,15 @@ namespace VPet_Simulator.Windows
{
Process.Start("https://www.exlb.net/");
}
private void VUP_Click(object sender, RoutedEventArgs e)
{
Process.Start("https://store.steampowered.com/app/1352140/_/");
}
private void Group_Click(object sender, RoutedEventArgs e)
{
Process.Start("https://jq.qq.com/?_wv=1027&k=zmeWNHyI");
}
#endregion
private void sDesktopAlignment_Checked_1(object sender, RoutedEventArgs e)
{
@ -525,5 +534,7 @@ namespace VPet_Simulator.Windows
{
mw.Main.SetMoveMode(mw.Set.AllowMove, mw.Set.SmartMove, mw.Set.SmartMoveInterval * 1000);
}
}
}

2
VPet-Simulator.Windows/WinDesign/winReport.xaml
View File

@ -38,7 +38,7 @@
<TextBox x:Name="tContact" pu:TextBoxHelper.Watermark="提供联系方式以获得反馈,可不填&#13;eg:QQ430081239"
AcceptsReturn="True" MaxHeight="44" />
</pu:FormGroup>
<Button Content="提交" Margin="10,10,0,10" FontSize="16" Background="{DynamicResource DARKPrimary}"
<Button x:Name="btn_Report" Content="提交" Margin="10,10,0,10" FontSize="16" Background="{DynamicResource DARKPrimary}"
BorderThickness="1" pu:ButtonHelper.CornerRadius="5" BorderBrush="{DynamicResource DARKPrimaryDarker}"
Foreground="{DynamicResource DARKPrimaryText}" Padding="2" Click="btn_upload" />
</StackPanel>

6
VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
View File

@ -19,6 +19,7 @@ using System.Windows.Shapes;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using VPet_Simulator.Core;
using System.Web;
using System.Threading;
namespace VPet_Simulator.Windows
{
@ -46,7 +47,6 @@ namespace VPet_Simulator.Windows
if (!mw.IsSteamUser)
{
IsEnabled = false;
MessageBoxX.Show("您不是Steam用户，无法使用反馈中心\n欢迎加入虚拟主播模拟器群430081239反馈问题", "非Steam用户无法使用反馈中心", MessageBoxButton.OK, MessageBoxIcon.Info);
}
}
@ -67,8 +67,10 @@ namespace VPet_Simulator.Windows
return;
}
if (!mw.IsSteamUser)
{
MessageBoxX.Show("您不是Steam用户，无法使用反馈中心\n欢迎加入虚拟主播模拟器群430081239反馈问题", "非Steam用户无法使用反馈中心", MessageBoxButton.OK, MessageBoxIcon.Info);
return;//不遥测非Steam用户
}
try
{
string _url = "http://cn.exlb.org:5810/VPET/Report";