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

Merge branch 'main' into beta-v1.10

Browse Source
This commit is contained in:
ZouJin
2024-03-21 22:03:06 +08:00
parent 6669a527ef 5bea4c2a74
commit a5522bc663
12 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
VPet-Simulator.Windows/App.xaml.cs
View File

@ -1,4 +1,5 @@
using LinePutScript.Localization.WPF;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -15,7 +16,8 @@ namespace VPet_Simulator.Windows
public App() : base()
{
#if !DEBUG
base.DispatcherUnhandledException += App_DispatcherUnhandledException;
base.DispatcherUnhandledException += (s, e) => { e.Handled = true; UnhandledException(e.Exception, false); };
AppDomain.CurrentDomain.UnhandledException += (s, e) => { UnhandledException((e.ExceptionObject as Exception), true); };
#endif
//AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
}
@ -43,11 +45,9 @@ namespace VPet_Simulator.Windows
}
}
private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
private void UnhandledException(Exception e, bool isFatality)
{
e.Handled = true;
var expt = e.Exception.ToString();
var expt = e.ToString();
if (expt.ToLower().Contains("value") && expt.ToLower().Contains("nan"))
{
MessageBox.Show("由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD".Translate());
@ -82,7 +82,7 @@ namespace VPet_Simulator.Windows
"游戏或者MOD".Translate() : $"MOD({CoreMOD.NowLoading})") +
"导致的\n如有可能请发送 错误信息截图和引发错误之前的操作 给开发者:service@exlb.net\n感谢您对游戏开发的支持\n".Translate()
+ expt;
if (MainWindow == null)
if (isFatality || MainWindow == null)
{
MessageBox.Show(errstr, "游戏致命性错误".Translate());
return;

3
VPet-Simulator.Windows/mod/0000_core/lang/en/Base2401.lps
View File

@ -3,4 +3,5 @@
尝试加载动画和生成缓存\n该步骤可能会耗时比较长\n请耐心等待#Attempting to load animations and generate cache\nThis step may take a while\nPlease be patient:|
检测到经验值超过 9,223,372,036 导致算数溢出\n已经自动回正#Detected experience value exceeding 9,223,372,036 causing arithmetic overflow\nAutomatically corrected:|
检测到金钱超过 9,223,372,036 导致算数溢出\n已经自动回正#Detected money exceeding 9,223,372,036 causing arithmetic overflow\nAutomatically corrected:|
数据溢出警告#Data Overflow Warning:|
数据溢出警告#Data Overflow Warning:|
缓存清理完成#Cache cleared:|

2
VPet-Simulator.Windows/mod/0000_core/lang/en/Text2308.lps
View File

@ -63,7 +63,7 @@ chatGPT，启动！#chatGPT, initialize!:|
如写。写了吗？如写#How do i write this word master?... bologna or baloney?......... Now im hungry...!:|
（奋笔疾书中）#I need to write faster and more precise to make master proud.:|
阿巴巴巴阿巴巴巴#I was not sleeping at all! There is no drool on my face!:|
我设定本扔那里去了#Where is my dictionary?:|
我设定本扔哪里去了#Where is my dictionary?:|
我他妈写写写写写！# ...scribble, scribble, scribble...!:|
开编！呸！开写！#Start editing! Hmmmm....Nah! There is no need for an edit...:|
人家写不动了啦。。#I can't do this anymore...help me master...:|

3
VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2401.lps
View File

@ -3,4 +3,5 @@
尝试加载动画和生成缓存\n该步骤可能会耗时比较长\n请耐心等待#尝试加载动画和生成缓存\n该步骤可能会耗时比较长\n请耐心等待:|
检测到经验值超过 9,223,372,036 导致算数溢出\n已经自动回正#检测到经验值超过 9,223,372,036 导致算数溢出\n已经自动回正:|
检测到金钱超过 9,223,372,036 导致算数溢出\n已经自动回正#检测到金钱超过 9,223,372,036 导致算数溢出\n已经自动回正:|
数据溢出警告#数据溢出警告:|
数据溢出警告#数据溢出警告:|
缓存清理完成#缓存清理完成:|

2
VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Text2308.lps
View File

@ -63,7 +63,7 @@ chatGPT，启动！#chatGPT，启动！:|
如写。写了吗？如写#如写。写了吗？如写:|
（奋笔疾书中）#（奋笔疾书中）:|
阿巴巴巴阿巴巴巴#阿巴巴巴阿巴巴巴:|
我设定本扔那里去了#我设定本扔那里去了:|
我设定本扔哪里去了#我设定本扔哪里去了:|
我他妈写写写写写！#我他妈写写写写写！:|
开编！呸！开写！#开编！呸！开写！:|
人家写不动了啦。。#人家写不动了啦。。:|

1
VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2401.lps
View File

@ -4,3 +4,4 @@
检测到经验值超过 9,223,372,036 导致算数溢出\n已经自动回正#偵測到經驗值超過 9,223,372,036 導致算術溢位\n已經自動修正:|
检测到金钱超过 9,223,372,036 导致算数溢出\n已经自动回正#偵測到金錢超過 9,223,372,036 導致算術溢位\n已經自動修正:|
数据溢出警告#數據溢出警告:|
缓存清理完成#快取清理完成:|

2
VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Text2308.lps
View File

@ -63,7 +63,7 @@ chatGPT，启动！#ChatGPT，啟動！:|
如写。写了吗？如写#如寫。寫了嗎？如寫:|
（奋笔疾书中）#（奮筆疾書中）:|
阿巴巴巴阿巴巴巴#阿巴巴巴阿巴巴巴。:|
我设定本扔那里去了#我的設定集扔到哪了？:|
我设定本扔哪里去了#我的設定集扔到哪了？:|
我他妈写写写写写！#我他媽寫寫寫寫寫！:|
开编！呸！开写！#開編！呸！開寫！:|
人家写不动了啦。。#人家寫不動了啦……:|

BIN
VPet-Simulator.Windows/mod/0000_core/pet/vup/MOVE/climb.top.right/C_Happy/Happy_001_125.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 203 KiB

4
VPet-Simulator.Windows/mod/0000_core/text/ClickText.lps
View File

@ -62,7 +62,7 @@ clicktext:|LikeMin#0:|State#Work:|Working#文案:|Text#123456789。。。:|tag#v
clicktext:|LikeMin#0:|State#Work:|Working#文案:|Text#如写。写了吗？如写:|tag#vup,girl:|
clicktext:|LikeMin#0:|State#Work:|Working#文案:|Text#（奋笔疾书中）:|Exp#1:|tag#vup,girl:|
clicktext:|LikeMin#0:|State#Work:|Working#文案:|Text#阿巴巴巴阿巴巴巴:|Exp#-1:|tag#vup,girl:|
clicktext:|LikeMin#0:|State#Work:|Working#文案:|Text#我设定本扔那里去了:|Exp#-1:|tag#vup,girl:|
clicktext:|LikeMin#0:|State#Work:|Working#文案:|Text#我设定本扔哪里去了:|Exp#-1:|tag#vup,girl:|
clicktext:|LikeMin#0:|State#Work:|Working#学习:|Mode#1:|Text#我他妈写写写写写！:|Exp#1:|tag#vup,girl:|
clicktext:|LikeMin#0:|State#Work:|Working#学习:|Mode#1:|Text#开编！呸！开写！:|Exp#-1:|tag#vup,girl:|
clicktext:|LikeMin#0:|State#Work:|Working#学习:|Mode#4:|Text#《我的奋斗》:|Exp#1:|tag#vup,girl:|
@ -134,4 +134,4 @@ clicktext:|State#Work:|Working#直播:|dayTime#4:|Text#8点了？下播！:|tag#
clicktext:|State#Work:|Working#直播:|dayTime#4:|Text#宝子们，咱们不过这关不睡觉嗷，把666打在公屏上:|Money#1:|tag#vup,girl:|
clicktext:|State#Nomal:|dayTime#8:|Text#夜深了主人:|tag#vup,girl:|
clicktext:|State#Nomal:|dayTime#8:|Text#要早点休息，不要搞太晚哦，身体才是革命的本钱:|tag#vup,girl:|
clicktext:|State#Work:|Working#学习:|dayTime#8:|Text#深夜自习室！:|Exp#1:|tag#vup,girl:|
clicktext:|State#Work:|Working#学习:|dayTime#8:|Text#深夜自习室！:|Exp#1:|tag#vup,girl:|

5
VPet.Solution/ViewModels/MainWindowVM.cs
View File

@ -30,6 +30,7 @@ public class MainWindowVM : ObservableClass<MainWindowVM>
FirstStartFailedCommand.ExecuteCommand += FirstStartFailedCommand_ExecuteCommand;
OpenLocalTextCommand.ExecuteCommand += OpenLocalTextCommand_ExecuteCommand;
}
private void OpenLocalTextCommand_ExecuteCommand()
@ -43,10 +44,10 @@ public class MainWindowVM : ObservableClass<MainWindowVM>
private void FirstStartFailedCommand_ExecuteCommand()
{
if (LocalizeCore.CurrentCulture == "zh-Hans")
HKWUtils.OpenLink("https://www.bilibili.com/read/cv26510496/");
HKWUtils.OpenLink("https://www.bilibili.com/read/cv31370459/");
else
HKWUtils.OpenLink(
"https://steamcommunity.com/games/1920960/announcements/detail/3681184905256253203"
"https://store.steampowered.com/news/app/1920960/view/7950611950256749982"
);
}

2
VPet.Solution/Views/MainWindow.xaml
View File

@ -32,6 +32,8 @@
Content="{ll:Str 打开设置编辑器}" FontSize="16" Style="{DynamicResource Button_BaseStyle}" />
<Button MinWidth="150" x:Name="Button_OpenSaveViewer" Click="Button_OpenSaveViewer_Click"
Content="{ll:Str 打开存档查看器}" FontSize="16" Style="{DynamicResource Button_BaseStyle}" />
<Button MinWidth="150" x:Name="Button_CleanCache" Click="Button_CleanCache_Click"
Content="{ll:Str 清理缓存}" FontSize="16" Style="{DynamicResource Button_BaseStyle}" />
</StackPanel>
<Button Grid.Row="1" Command="{Binding FirstStartFailedCommand}" Content="{ll:Str '第一次启动桌宠打不开?'}"
FontSize="16" Style="{DynamicResource LinkButtonStyle}" />

10
VPet.Solution/Views/MainWindow.xaml.cs
View File

@ -9,6 +9,7 @@ using VPet.Solution.Models.SettingEditor;
using VPet.Solution.ViewModels;
using VPet.Solution.Views.SaveViewer;
using VPet.Solution.Views.SettingEditor;
using VPet_Simulator.Core;
using VPet_Simulator.Windows.Interface;
namespace VPet.Solution.Views;
@ -48,4 +49,13 @@ public partial class MainWindow : WindowX
{
SaveWindow.ShowOrActivate();
}
private void Button_CleanCache_Click(object sender, RoutedEventArgs e)
{
if(Directory.Exists(GraphCore.CachePath))
{
Directory.Delete(GraphCore.CachePath, true);
}
MessageBox.Show("缓存清理完成".Translate());
}
}