diff --git a/src/Common/Fischless.Globalization/Assets/Langs/en.xaml b/src/Common/Fischless.Globalization/Assets/Langs/en.xaml index cbd5af8..1739a0c 100644 --- a/src/Common/Fischless.Globalization/Assets/Langs/en.xaml +++ b/src/Common/Fischless.Globalization/Assets/Langs/en.xaml @@ -5,7 +5,6 @@ ( ) : - -> Loading Info Warn @@ -24,5 +23,8 @@ Home Global Settings Copy version information + Account + ReShade + Fischless diff --git a/src/Common/Fischless.Globalization/Assets/Langs/ja.xaml b/src/Common/Fischless.Globalization/Assets/Langs/ja.xaml index 1741a07..c1433bb 100644 --- a/src/Common/Fischless.Globalization/Assets/Langs/ja.xaml +++ b/src/Common/Fischless.Globalization/Assets/Langs/ja.xaml @@ -5,7 +5,6 @@ 「 」 ： - ⇒ ローディング ヒント 警告 @@ -24,5 +23,8 @@ ホームページ グローバル設定 バージョン情報をコピー + アカウント + 幽夜浄土 + 極夜の真夢 diff --git a/src/Common/Fischless.Globalization/Assets/Langs/zh.xaml b/src/Common/Fischless.Globalization/Assets/Langs/zh.xaml index e0a7bba..3e28bf2 100644 --- a/src/Common/Fischless.Globalization/Assets/Langs/zh.xaml +++ b/src/Common/Fischless.Globalization/Assets/Langs/zh.xaml @@ -5,7 +5,6 @@ （ ） ： - ⇒ 载入中 提示 警告 @@ -24,5 +23,8 @@ 主页 全局设定 复制版本信息 + 角色账号 + 幽夜净土 + 极夜真梦 diff --git a/src/Common/Fischless.Mapper/Fischless.Mapper.csproj b/src/Common/Fischless.Mapper/Fischless.Mapper.csproj index 77ca794..56e7681 100644 --- a/src/Common/Fischless.Mapper/Fischless.Mapper.csproj +++ b/src/Common/Fischless.Mapper/Fischless.Mapper.csproj @@ -7,20 +7,20 @@ 11.0 - - - - - - - NETSTANDARD2_0 - NETSTANDARD2_1 - + + + + + + + NETSTANDARD2_0 + + diff --git a/src/Desktop/Fischless.WindowCapture/WindowCaptureFactory.cs b/src/Desktop/Fischless.WindowCapture/WindowCaptureFactory.cs index 29f18d5..2b1307a 100644 --- a/src/Desktop/Fischless.WindowCapture/WindowCaptureFactory.cs +++ b/src/Desktop/Fischless.WindowCapture/WindowCaptureFactory.cs @@ -3,6 +3,7 @@ public enum CaptureMode { BitBlt, + StretchBlt, WindowsGraphicsCapture, } @@ -26,6 +27,7 @@ public static IWindowCapture Create(CaptureMode mode) return mode switch { CaptureMode.BitBlt => new BitBlt.BitBltCapture(), + CaptureMode.StretchBlt => new StretchBlt.StretchBltCapture(), CaptureMode.WindowsGraphicsCapture => new GraphicsCapture.GraphicsCapture(), _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), }; diff --git a/src/Desktop/Fischless/App.xaml b/src/Desktop/Fischless/App.xaml index f910c11..cc73f76 100644 --- a/src/Desktop/Fischless/App.xaml +++ b/src/Desktop/Fischless/App.xaml @@ -28,7 +28,7 @@ diff --git a/src/Desktop/Fischless/AppConfig.cs b/src/Desktop/Fischless/AppConfig.cs index e524b50..72f648a 100644 --- a/src/Desktop/Fischless/AppConfig.cs +++ b/src/Desktop/Fischless/AppConfig.cs @@ -10,8 +10,9 @@ namespace Fischless; internal static class AppConfig { - public static string? AppName => "Fischless"; - public static string? AutoStartCommand = "-autostart"; + public static string? AppName => Mui(PackName) ?? PackName; + public static string? PackName => "Fischless"; + public static string? AutoStartCommand => "-autostart"; public static bool Preview => true; public static string? AppVersion { get; private set; } public static string LogFile { get; internal set; } diff --git a/src/Desktop/Fischless/Assets/Icons/SummerTime_Ball.ico b/src/Desktop/Fischless/Assets/Icons/SummerTime_Ball.ico index 254ce94..3bb3e44 100644 Binary files a/src/Desktop/Fischless/Assets/Icons/SummerTime_Ball.ico and b/src/Desktop/Fischless/Assets/Icons/SummerTime_Ball.ico differ diff --git a/src/Desktop/Fischless/Assets/Icons/UI_Img_Aster_MainRewardS.ico b/src/Desktop/Fischless/Assets/Icons/UI_Img_Aster_MainRewardS.ico deleted file mode 100644 index d762a2f..0000000 Binary files a/src/Desktop/Fischless/Assets/Icons/UI_Img_Aster_MainRewardS.ico and /dev/null differ diff --git a/src/Desktop/Fischless/Assets/Icons/UI_ItemIcon_223.ico b/src/Desktop/Fischless/Assets/Icons/UI_ItemIcon_223.ico deleted file mode 100644 index 5ac5e61..0000000 Binary files a/src/Desktop/Fischless/Assets/Icons/UI_ItemIcon_223.ico and /dev/null differ diff --git a/src/Desktop/Fischless/Assets/Icons/i2Q2r-284hK1yT3cSix-ir.ico b/src/Desktop/Fischless/Assets/Icons/i2Q2r-284hK1yT3cSix-ir.ico new file mode 100644 index 0000000..eb0245e Binary files /dev/null and b/src/Desktop/Fischless/Assets/Icons/i2Q2r-284hK1yT3cSix-ir.ico differ diff --git a/src/Desktop/Fischless/Assets/Icons/i2Q2r-4cr2K2kT3cSkf-ke.ico b/src/Desktop/Fischless/Assets/Icons/i2Q2r-4cr2K2kT3cSkf-ke.ico new file mode 100644 index 0000000..10ae777 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Icons/i2Q2r-4cr2K2kT3cSkf-ke.ico differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/CreateCSharp.py b/src/Desktop/Fischless/Assets/Images/LocalAvatars/CreateCSharp.py index 1d11f7c..458eac0 100644 --- a/src/Desktop/Fischless/Assets/Images/LocalAvatars/CreateCSharp.py +++ b/src/Desktop/Fischless/Assets/Images/LocalAvatars/CreateCSharp.py @@ -4,4 +4,4 @@ for f in files: fname, ext = os.path.splitext(f) if ext == '.png': - print('public const string ' + fname + ' = "ms-appx:///Assets/Images/LocalAvatars/' + fname + ext + '";') + print('public const string ' + fname + ' = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/' + fname + ext + '";') diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_ALbedo.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_ALbedo.png new file mode 100644 index 0000000..22bd0ae Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_ALbedo.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Amber.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Amber.png new file mode 100644 index 0000000..2a3fe23 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Amber.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Ayato.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Ayato.png new file mode 100644 index 0000000..83f883d Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Ayato.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Beidou.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Beidou.png new file mode 100644 index 0000000..639b2ab Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Beidou.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Candace.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Candace.png new file mode 100644 index 0000000..c7718e9 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Candace.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Eula.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Eula.png new file mode 100644 index 0000000..bc1a4d7 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Eula.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Feiyan.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Feiyan.png new file mode 100644 index 0000000..a56374b Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Feiyan.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Hutao.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Hutao.png new file mode 100644 index 0000000..80ff248 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Hutao.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Itto.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Itto.png new file mode 100644 index 0000000..262bbb7 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Itto.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kazuha.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kazuha.png new file mode 100644 index 0000000..35af488 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kazuha.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Klee.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Klee.png new file mode 100644 index 0000000..caa3fa6 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Klee.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kokomi.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kokomi.png new file mode 100644 index 0000000..eccbf46 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kokomi.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Lisa.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Lisa.png new file mode 100644 index 0000000..5f27437 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Lisa.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Nahida.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Nahida.png new file mode 100644 index 0000000..7eb13ab Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Nahida.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Qiqi.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Qiqi.png new file mode 100644 index 0000000..b9acb64 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Qiqi.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Sara.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Sara.png new file mode 100644 index 0000000..b50bbf7 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Sara.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shenhe.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shenhe.png new file mode 100644 index 0000000..322445f Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shenhe.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shougun.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shougun.png new file mode 100644 index 0000000..6c7803b Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shougun.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tartaglia.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tartaglia.png new file mode 100644 index 0000000..e4b1e8f Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tartaglia.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tighnari.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tighnari.png new file mode 100644 index 0000000..81037a9 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tighnari.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Venti.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Venti.png new file mode 100644 index 0000000..bf97df2 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Venti.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Xiao.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Xiao.png new file mode 100644 index 0000000..c076c73 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Xiao.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Yae.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Yae.png new file mode 100644 index 0000000..20d273b Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Yae.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Zhongli.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Zhongli.png new file mode 100644 index 0000000..2a5080e Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Zhongli.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_AbyssEle.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_AbyssEle.png new file mode 100644 index 0000000..853536c Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_AbyssEle.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteRockShield.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteRockShield.png new file mode 100644 index 0000000..d544574 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteRockShield.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteShield.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteShield.png new file mode 100644 index 0000000..97a72bb Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteShield.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Rockdog.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Rockdog.png new file mode 100644 index 0000000..67e093f Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Rockdog.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_ShamanRock.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_ShamanRock.png new file mode 100644 index 0000000..64c7b8c Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_ShamanRock.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SkirmisherIce.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SkirmisherIce.png new file mode 100644 index 0000000..b3b1162 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SkirmisherIce.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatfire.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatfire.png new file mode 100644 index 0000000..0c6a7a5 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatfire.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatrock.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatrock.png new file mode 100644 index 0000000..5877d1b Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatrock.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherstrongele.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherstrongele.png new file mode 100644 index 0000000..6fdd11d Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherstrongele.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaIce.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaIce.png new file mode 100644 index 0000000..7faba19 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaIce.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaRock.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaRock.png new file mode 100644 index 0000000..c727b1e Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaRock.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaWater.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaWater.png new file mode 100644 index 0000000..1f375df Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaWater.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_EffigyElectric.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_EffigyElectric.png new file mode 100644 index 0000000..aea29fb Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_EffigyElectric.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_FatuusMageIce.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_FatuusMageIce.png new file mode 100644 index 0000000..0473c8a Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_FatuusMageIce.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_InvokerDeaconFire.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_InvokerDeaconFire.png new file mode 100644 index 0000000..2820d9c Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_InvokerDeaconFire.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_09_Small_Round.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_09_Small_Round.png new file mode 100644 index 0000000..bc89342 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_09_Small_Round.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_10_Small_Round.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_10_Small_Round.png new file mode 100644 index 0000000..d164882 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_10_Small_Round.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_11_Small_Round.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_11_Small_Round.png new file mode 100644 index 0000000..98efbff Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_11_Small_Round.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_12_Small_Round.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_12_Small_Round.png new file mode 100644 index 0000000..0d29092 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_12_Small_Round.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_13_Small_Round.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_13_Small_Round.png new file mode 100644 index 0000000..d8639d7 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_13_Small_Round.png differ diff --git a/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_14_Small_Round.png b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_14_Small_Round.png new file mode 100644 index 0000000..917f9db Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/LocalAvatars/UI_MusicV3_Album_14_Small_Round.png differ diff --git a/src/Desktop/Fischless/Assets/Images/UI_EmotionIcon63.png b/src/Desktop/Fischless/Assets/Images/UI_EmotionIcon63.png new file mode 100644 index 0000000..b9a5497 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/UI_EmotionIcon63.png differ diff --git a/src/Desktop/Fischless/Assets/Images/UI_EmotionIcon64.png b/src/Desktop/Fischless/Assets/Images/UI_EmotionIcon64.png new file mode 100644 index 0000000..cf6f3ec Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/UI_EmotionIcon64.png differ diff --git a/src/Desktop/Fischless/Assets/Images/UI_Img_Activity_GcgBanner_Kv_00.png b/src/Desktop/Fischless/Assets/Images/UI_Img_Activity_GcgBanner_Kv_00.png new file mode 100644 index 0000000..c2e4638 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/UI_Img_Activity_GcgBanner_Kv_00.png differ diff --git a/src/Desktop/Fischless/Assets/Images/UI_Img_Aster_MainRewardS.png b/src/Desktop/Fischless/Assets/Images/UI_Img_Aster_MainRewardS.png deleted file mode 100644 index 4fee047..0000000 Binary files a/src/Desktop/Fischless/Assets/Images/UI_Img_Aster_MainRewardS.png and /dev/null differ diff --git a/src/Desktop/Fischless/Assets/Images/UI_ItemIcon_223.png b/src/Desktop/Fischless/Assets/Images/UI_ItemIcon_223.png deleted file mode 100644 index f4ccf11..0000000 Binary files a/src/Desktop/Fischless/Assets/Images/UI_ItemIcon_223.png and /dev/null differ diff --git a/src/Desktop/Fischless/Assets/Images/UI_ItemIcon_224.png b/src/Desktop/Fischless/Assets/Images/UI_ItemIcon_224.png deleted file mode 100644 index dd532bf..0000000 Binary files a/src/Desktop/Fischless/Assets/Images/UI_ItemIcon_224.png and /dev/null differ diff --git a/src/Desktop/Fischless/Assets/Images/i2Q2r-284hK1yT3cSix-ir.png b/src/Desktop/Fischless/Assets/Images/i2Q2r-284hK1yT3cSix-ir.png new file mode 100644 index 0000000..057c9eb Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/i2Q2r-284hK1yT3cSix-ir.png differ diff --git a/src/Desktop/Fischless/Assets/Images/i2Q2r-4cr2K2kT3cSkf-ke.png b/src/Desktop/Fischless/Assets/Images/i2Q2r-4cr2K2kT3cSkf-ke.png new file mode 100644 index 0000000..585f151 Binary files /dev/null and b/src/Desktop/Fischless/Assets/Images/i2Q2r-4cr2K2kT3cSkf-ke.png differ diff --git a/src/Desktop/Fischless/Extensions/ApplicationBuilderExtension.cs b/src/Desktop/Fischless/Extensions/ApplicationBuilderExtension.cs index ba145c8..2cb2969 100644 --- a/src/Desktop/Fischless/Extensions/ApplicationBuilderExtension.cs +++ b/src/Desktop/Fischless/Extensions/ApplicationBuilderExtension.cs @@ -95,7 +95,7 @@ public static IApplicationBuilder UseLogger(this IApplicationBuilder app) Directory.CreateDirectory(logFolder); AppConfig.LogFile = Path.Combine(logFolder, $"Fischless_{DateTime.Now:yyMMdd_HHmmss}.log"); Log.Logger = new LoggerConfiguration() - .WriteTo.File(path: AppConfig.LogFile, outputTemplate: "{Timestamp:HH:mm:ss.fff}|{Level:u4}|{SourceContext}|{Message}{NewLine}{Exception}{NewLine}") + .WriteTo.File(path: AppConfig.LogFile, outputTemplate: "{Timestamp:HH:mm:ss.fff}|{Level:u4}|{SourceContext}|{Message}{NewLine}{Exception}") .Enrich.FromLogContext() .CreateLogger(); return app; diff --git a/src/Desktop/Fischless/Fischless.csproj b/src/Desktop/Fischless/Fischless.csproj index 4da1dcf..31e0c3f 100644 --- a/src/Desktop/Fischless/Fischless.csproj +++ b/src/Desktop/Fischless/Fischless.csproj @@ -8,10 +8,10 @@ 11.0 Fischless.Program x64 - 0.0.1 - 0.0.1 - $(VersionPrefix)0.0.1 - Assets\Icons\SummerTime_Ball.ico + 0.0.2 + 0.0.2 + $(VersionPrefix)0.0.2 + Assets\Icons\i2Q2r-4cr2K2kT3cSkf-ke.ico @@ -36,7 +36,7 @@ - + diff --git a/src/Desktop/Fischless/Helpers/SpecialPathHelper.cs b/src/Desktop/Fischless/Helpers/SpecialPathHelper.cs index 6d368c9..a0e2bdc 100644 --- a/src/Desktop/Fischless/Helpers/SpecialPathHelper.cs +++ b/src/Desktop/Fischless/Helpers/SpecialPathHelper.cs @@ -10,7 +10,7 @@ internal static class SpecialPathHelper public static string GetFolder(string optionFolder = null!) { - return Path.Combine(_localApplicationData, optionFolder ?? AppConfig.AppName); + return Path.Combine(_localApplicationData, optionFolder ?? AppConfig.PackName); } public static string GetPath(string? baseName = null) @@ -26,6 +26,6 @@ public static string GetPath(string? baseName = null) public static string GetTempPath(string baseName) { - return Path.Combine(TempPath + AppConfig.AppName, baseName); + return Path.Combine(TempPath + AppConfig.PackName, baseName); } } diff --git a/src/Desktop/Fischless/Models/LocalAvatars.cs b/src/Desktop/Fischless/Models/LocalAvatars.cs index 4c6afd3..fd4be74 100644 --- a/src/Desktop/Fischless/Models/LocalAvatars.cs +++ b/src/Desktop/Fischless/Models/LocalAvatars.cs @@ -6,33 +6,60 @@ namespace Fischless.Models; internal static class LocalAvatars { + public const string UI_Gcg_Char_AvatarIcon_ALbedo = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_ALbedo.png"; + public const string UI_Gcg_Char_AvatarIcon_Amber = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Amber.png"; public const string UI_Gcg_Char_AvatarIcon_Ayaka = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Ayaka.png"; + public const string UI_Gcg_Char_AvatarIcon_Ayato = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Ayato.png"; public const string UI_Gcg_Char_AvatarIcon_Barbara = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Barbara.png"; + public const string UI_Gcg_Char_AvatarIcon_Beidou = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Beidou.png"; public const string UI_Gcg_Char_AvatarIcon_Bennett = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Bennett.png"; + public const string UI_Gcg_Char_AvatarIcon_Candace = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Candace.png"; public const string UI_Gcg_Char_AvatarIcon_Chongyun = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Chongyun.png"; public const string UI_Gcg_Char_AvatarIcon_Collei = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Collei.png"; public const string UI_Gcg_Char_AvatarIcon_Cyno = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Cyno.png"; public const string UI_Gcg_Char_AvatarIcon_Diluc = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Diluc.png"; public const string UI_Gcg_Char_AvatarIcon_Diona = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Diona.png"; + public const string UI_Gcg_Char_AvatarIcon_Eula = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Eula.png"; + public const string UI_Gcg_Char_AvatarIcon_Feiyan = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Feiyan.png"; public const string UI_Gcg_Char_AvatarIcon_Fischl = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Fischl.png"; public const string UI_Gcg_Char_AvatarIcon_Ganyu = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Ganyu.png"; + public const string UI_Gcg_Char_AvatarIcon_Hutao = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Hutao.png"; + public const string UI_Gcg_Char_AvatarIcon_Itto = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Itto.png"; public const string UI_Gcg_Char_AvatarIcon_Kaeya = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kaeya.png"; + public const string UI_Gcg_Char_AvatarIcon_Kazuha = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kazuha.png"; public const string UI_Gcg_Char_AvatarIcon_Keqing = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Keqing.png"; + public const string UI_Gcg_Char_AvatarIcon_Klee = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Klee.png"; + public const string UI_Gcg_Char_AvatarIcon_Kokomi = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Kokomi.png"; + public const string UI_Gcg_Char_AvatarIcon_Lisa = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Lisa.png"; public const string UI_Gcg_Char_AvatarIcon_Mona = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Mona.png"; + public const string UI_Gcg_Char_AvatarIcon_Nahida = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Nahida.png"; public const string UI_Gcg_Char_AvatarIcon_Ningguang = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Ningguang.png"; public const string UI_Gcg_Char_AvatarIcon_Noel = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Noel.png"; public const string UI_Gcg_Char_AvatarIcon_Qin = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Qin.png"; + public const string UI_Gcg_Char_AvatarIcon_Qiqi = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Qiqi.png"; public const string UI_Gcg_Char_AvatarIcon_Razor = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Razor.png"; + public const string UI_Gcg_Char_AvatarIcon_Sara = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Sara.png"; + public const string UI_Gcg_Char_AvatarIcon_Shenhe = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shenhe.png"; + public const string UI_Gcg_Char_AvatarIcon_Shougun = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Shougun.png"; public const string UI_Gcg_Char_AvatarIcon_Sucrose = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Sucrose.png"; + public const string UI_Gcg_Char_AvatarIcon_Tartaglia = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tartaglia.png"; + public const string UI_Gcg_Char_AvatarIcon_Tighnari = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Tighnari.png"; + public const string UI_Gcg_Char_AvatarIcon_Venti = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Venti.png"; public const string UI_Gcg_Char_AvatarIcon_Xiangling = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Xiangling.png"; + public const string UI_Gcg_Char_AvatarIcon_Xiao = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Xiao.png"; public const string UI_Gcg_Char_AvatarIcon_Xingqiu = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Xingqiu.png"; + public const string UI_Gcg_Char_AvatarIcon_Yae = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Yae.png"; public const string UI_Gcg_Char_AvatarIcon_Yoimiya = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Yoimiya.png"; + public const string UI_Gcg_Char_AvatarIcon_Zhongli = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_AvatarIcon_Zhongli.png"; + public const string UI_Gcg_Char_EnemyIcon_AbyssEle = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_AbyssEle.png"; public const string UI_Gcg_Char_EnemyIcon_AbyssFire = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_AbyssFire.png"; public const string UI_Gcg_Char_EnemyIcon_AbyssIce = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_AbyssIce.png"; public const string UI_Gcg_Char_EnemyIcon_AbyssWater = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_AbyssWater.png"; public const string UI_Gcg_Char_EnemyIcon_BruteAxeElec = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteAxeElec.png"; public const string UI_Gcg_Char_EnemyIcon_BruteAxeFire = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteAxeFire.png"; public const string UI_Gcg_Char_EnemyIcon_BruteIceShield = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteIceShield.png"; + public const string UI_Gcg_Char_EnemyIcon_BruteRockShield = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteRockShield.png"; + public const string UI_Gcg_Char_EnemyIcon_BruteShield = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_BruteShield.png"; public const string UI_Gcg_Char_EnemyIcon_Hili = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Hili.png"; public const string UI_Gcg_Char_EnemyIcon_HiliClub = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_HiliClub.png"; public const string UI_Gcg_Char_EnemyIcon_HiliIce = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_HiliIce.png"; @@ -40,18 +67,30 @@ internal static class LocalAvatars public const string UI_Gcg_Char_EnemyIcon_HiliRangeElec = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_HiliRangeElec.png"; public const string UI_Gcg_Char_EnemyIcon_KairagiElec = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_KairagiElec.png"; public const string UI_Gcg_Char_EnemyIcon_KairagiFire = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_KairagiFire.png"; + public const string UI_Gcg_Char_EnemyIcon_Rockdog = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Rockdog.png"; public const string UI_Gcg_Char_EnemyIcon_SamuraiRonin01 = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SamuraiRonin01.png"; public const string UI_Gcg_Char_EnemyIcon_SamuraiRonin02 = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SamuraiRonin02.png"; public const string UI_Gcg_Char_EnemyIcon_SamuraiRonin03 = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SamuraiRonin03.png"; public const string UI_Gcg_Char_EnemyIcon_ShamanGrass = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_ShamanGrass.png"; + public const string UI_Gcg_Char_EnemyIcon_ShamanRock = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_ShamanRock.png"; public const string UI_Gcg_Char_EnemyIcon_ShamanWater = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_ShamanWater.png"; public const string UI_Gcg_Char_EnemyIcon_ShamanWind = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_ShamanWind.png"; + public const string UI_Gcg_Char_EnemyIcon_SkirmisherIce = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SkirmisherIce.png"; + public const string UI_Gcg_Char_EnemyIcon_Skirnisherfatfire = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatfire.png"; + public const string UI_Gcg_Char_EnemyIcon_Skirnisherfatrock = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherfatrock.png"; + public const string UI_Gcg_Char_EnemyIcon_Skirnisherstrongele = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_Skirnisherstrongele.png"; public const string UI_Gcg_Char_EnemyIcon_SlimeElec = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SlimeElec.png"; public const string UI_Gcg_Char_EnemyIcon_SlimeWater = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_SlimeWater.png"; + public const string UI_Gcg_Char_EnemyIcon_UnDeltaIce = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaIce.png"; + public const string UI_Gcg_Char_EnemyIcon_UnDeltaRock = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaRock.png"; + public const string UI_Gcg_Char_EnemyIcon_UnDeltaWater = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnDeltaWater.png"; public const string UI_Gcg_Char_EnemyIcon_UnuAnudattaGrass = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_EnemyIcon_UnuAnudattaGrass.png"; public const string UI_Gcg_Char_MonsterIcon_Bruterock = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_Bruterock.png"; + public const string UI_Gcg_Char_MonsterIcon_EffigyElectric = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_EffigyElectric.png"; public const string UI_Gcg_Char_MonsterIcon_Fatuus = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_Fatuus.png"; + public const string UI_Gcg_Char_MonsterIcon_FatuusMageIce = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_FatuusMageIce.png"; public const string UI_Gcg_Char_MonsterIcon_Fungusgrass = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_Fungusgrass.png"; + public const string UI_Gcg_Char_MonsterIcon_InvokerDeaconFire = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_InvokerDeaconFire.png"; public const string UI_Gcg_Char_MonsterIcon_Maidenwater = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_Maidenwater.png"; public const string UI_Gcg_Char_MonsterIcon_Ningyo = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_Ningyo.png"; public const string UI_Gcg_Char_MonsterIcon_Oceanid = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_Gcg_Char_MonsterIcon_Oceanid.png"; @@ -64,6 +103,12 @@ internal static class LocalAvatars public const string UI_MusicV3SelectPage_Album_Pic05 = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3SelectPage_Album_Pic05.png"; public const string UI_MusicV3SelectPage_Album_Pic06 = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3SelectPage_Album_Pic06.png"; public const string UI_MusicV3SelectPage_Album_Pic07 = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3SelectPage_Album_Pic07.png"; + public const string UI_MusicV3_Album_09_Small_Round = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3_Album_09_Small_Round.png"; + public const string UI_MusicV3_Album_10_Small_Round = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3_Album_10_Small_Round.png"; + public const string UI_MusicV3_Album_11_Small_Round = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3_Album_11_Small_Round.png"; + public const string UI_MusicV3_Album_12_Small_Round = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3_Album_12_Small_Round.png"; + public const string UI_MusicV3_Album_13_Small_Round = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3_Album_13_Small_Round.png"; + public const string UI_MusicV3_Album_14_Small_Round = "pack://application:,,,/Fischless;component/Assets/Images/LocalAvatars/UI_MusicV3_Album_14_Small_Round.png"; public static readonly Dictionary Stocks = new(); public static string Default => UI_MusicV3SelectPage_Album_Pic05; diff --git a/src/Desktop/Fischless/Services/AutoStartProgramDataService.cs b/src/Desktop/Fischless/Services/AutoStartProgramDataService.cs index e4b07dd..b422e44 100644 --- a/src/Desktop/Fischless/Services/AutoStartProgramDataService.cs +++ b/src/Desktop/Fischless/Services/AutoStartProgramDataService.cs @@ -16,7 +16,7 @@ public AutoStartProgramDataService() { } - public string? GetAppName() => AppConfig.AppName; + public string? GetAppName() => AppConfig.PackName; public string? GetLaunchCommand() => AppConfig.AutoStartCommand; public void Enable() diff --git a/src/Desktop/Fischless/Services/AutoStartRegistyService.cs b/src/Desktop/Fischless/Services/AutoStartRegistyService.cs index c3e347c..6c45124 100644 --- a/src/Desktop/Fischless/Services/AutoStartRegistyService.cs +++ b/src/Desktop/Fischless/Services/AutoStartRegistyService.cs @@ -16,7 +16,7 @@ public AutoStartRegistyService() launchCommand = $"\"{Environment.ProcessPath!}\" {GetLaunchCommand()}"; } - public string? GetAppName() => AppConfig.AppName; + public string? GetAppName() => AppConfig.PackName; public string? GetLaunchCommand() => AppConfig.AutoStartCommand; public void Enable() diff --git a/src/Desktop/Fischless/Startup.cs b/src/Desktop/Fischless/Startup.cs index 0b3b144..9dcb840 100644 --- a/src/Desktop/Fischless/Startup.cs +++ b/src/Desktop/Fischless/Startup.cs @@ -1,6 +1,7 @@ using Fischless.Extensions; using Fischless.Hosting.Absraction; using Fischless.Services; +using Fischless.ViewModels; using Fischless.Views; using Microsoft.Extensions.DependencyInjection; using Serilog; @@ -23,12 +24,16 @@ public void ConfigureServices(IServiceCollection services) .AddLogging(c => c.AddSerilog(Log.Logger)) .AddPlugins(app) .AddSingleton() + .AddTransient() .AddSingleton() + .AddTransient() .AddTransient() + .AddTransient() + .AddTransient() .AddTransient(); } - public void Configure(IApplicationBuilder app, IWpfHostEnvironment env) + public void Configure(IApplicationBuilder app, IWpfHostEnvironment env, IServiceCollection services) { app.UseLogger() .UseConfiguration() diff --git a/src/Desktop/Fischless/ViewModels/NotifyIconViewModel.cs b/src/Desktop/Fischless/ViewModels/NotifyIconViewModel.cs index 92e2c13..3cf2d23 100644 --- a/src/Desktop/Fischless/ViewModels/NotifyIconViewModel.cs +++ b/src/Desktop/Fischless/ViewModels/NotifyIconViewModel.cs @@ -13,13 +13,18 @@ namespace Fischless.ViewModels; -public partial class NotifyIconViewModel : ObservableObject +public partial class NotifyIconViewModel : ObservableRecipient, IDisposable { public NotifyIconViewModel() { WeakReferenceMessenger.Default.Register(this, (_, _) => OnAutoMuteChangedReceived()); } + public void Dispose() + { + WeakReferenceMessenger.Default.UnregisterAll(this); + } + [RelayCommand] public static void ShowOrHide() { diff --git a/src/Desktop/Fischless/ViewModels/Pages/PageReShadeViewModel.cs b/src/Desktop/Fischless/ViewModels/Pages/PageReShadeViewModel.cs new file mode 100644 index 0000000..cf70eae --- /dev/null +++ b/src/Desktop/Fischless/ViewModels/Pages/PageReShadeViewModel.cs @@ -0,0 +1,13 @@ +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Messaging; +using System; + +namespace Fischless.ViewModels; + +public partial class PageReShadeViewModel : ObservableRecipient, IDisposable +{ + public void Dispose() + { + WeakReferenceMessenger.Default.UnregisterAll(this); + } +} diff --git a/src/Desktop/Fischless/ViewModels/Pages/PageSettingsViewModel.cs b/src/Desktop/Fischless/ViewModels/Pages/PageSettingsViewModel.cs index 460a25a..415b649 100644 --- a/src/Desktop/Fischless/ViewModels/Pages/PageSettingsViewModel.cs +++ b/src/Desktop/Fischless/ViewModels/Pages/PageSettingsViewModel.cs @@ -16,7 +16,7 @@ namespace Fischless.ViewModels; -public partial class PageSettingsViewModel : ObservableRecipient +public partial class PageSettingsViewModel : ObservableRecipient, IDisposable { [ObservableProperty] private AboutViewModel about = new(); @@ -43,14 +43,14 @@ partial void OnAutoStartChanged(bool value) } [ObservableProperty] - private bool desktopShortcut = LnkHelper.HasShortcutOnDesktop(AppConfig.AppName); + private bool desktopShortcut = LnkHelper.HasShortcutOnDesktop(AppConfig.PackName); partial void OnDesktopShortcutChanged(bool value) { if (value) { try { - LnkHelper.CreateShortcutOnDesktop(AppConfig.AppName, Environment.ProcessPath!); + LnkHelper.CreateShortcutOnDesktop(AppConfig.PackName, Environment.ProcessPath!); Notification.AddNotice("创建桌面快捷方式", "操作成功"); } catch (Exception e) @@ -61,7 +61,7 @@ partial void OnDesktopShortcutChanged(bool value) } else { - LnkHelper.RemoveShortcutOnDesktop(AppConfig.AppName); + LnkHelper.RemoveShortcutOnDesktop(AppConfig.PackName); } } @@ -90,6 +90,16 @@ private void OnAutoMuteChangedReceived() OnPropertyChanged(nameof(AutoMute)); } + public PageSettingsViewModel() + { + WeakReferenceMessenger.Default.Register(this, (_, _) => OnAutoMuteChangedReceived()); + } + + public void Dispose() + { + WeakReferenceMessenger.Default.UnregisterAll(this); + } + [RelayCommand] public static async Task LaunchWindowsSettingsAppsVolume() { diff --git a/src/Desktop/Fischless/Views/MainWindow.xaml b/src/Desktop/Fischless/Views/MainWindow.xaml index 8ef95da..6209f58 100644 --- a/src/Desktop/Fischless/Views/MainWindow.xaml +++ b/src/Desktop/Fischless/Views/MainWindow.xaml @@ -12,7 +12,7 @@ xmlns:services="clr-namespace:Fischless.Services" xmlns:ui="http://schemas.modernwpf.com/2019" xmlns:wui="http://schemas.lepo.co/wpfui/2022/xaml" - Title="Fischless" + Title="{x:Static app:AppConfig.AppName}" Width="1100" Height="700" controls:WindowXCaption.Height="36" @@ -20,7 +20,7 @@ Cursor="{markups:Cursor CursorUri='pack://application:,,,/Fischless;component/Assets/Images/UI_Img_Cursor_PC.png'}" FontFamily="{StaticResource TextThemeFontFamily}" FontSize="14" - Icon="/Assets/Icons/SummerTime_Ball.ico" + Icon="/Assets/Icons/i2Q2r-4cr2K2kT3cSkf-ke.ico" Style="{StaticResource DefaultWindowXStyle}" WindowStartupLocation="CenterScreen" mc:Ignorable="d"> @@ -107,13 +107,24 @@ + Glyph="{x:Static controls:FontSymbols.Contact}" /> + + + + + + diff --git a/src/Desktop/Fischless/Views/Pages/PageHome.xaml.cs b/src/Desktop/Fischless/Views/Pages/PageHome.xaml.cs index 3da9acd..d72aa88 100644 --- a/src/Desktop/Fischless/Views/Pages/PageHome.xaml.cs +++ b/src/Desktop/Fischless/Views/Pages/PageHome.xaml.cs @@ -9,9 +9,9 @@ public partial class PageHome : Page, IDisposable { public PageHomeViewModel ViewModel { get; } = null!; - public PageHome() + public PageHome(PageHomeViewModel viewModel) { - DataContext = ViewModel = new(); + DataContext = ViewModel = viewModel; InitializeComponent(); } diff --git a/src/Desktop/Fischless/Views/Pages/PageReShade.xaml b/src/Desktop/Fischless/Views/Pages/PageReShade.xaml new file mode 100644 index 0000000..cac9b11 --- /dev/null +++ b/src/Desktop/Fischless/Views/Pages/PageReShade.xaml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Desktop/Fischless/Views/Pages/PageReShade.xaml.cs b/src/Desktop/Fischless/Views/Pages/PageReShade.xaml.cs new file mode 100644 index 0000000..bf3b199 --- /dev/null +++ b/src/Desktop/Fischless/Views/Pages/PageReShade.xaml.cs @@ -0,0 +1,20 @@ +using Fischless.ViewModels; +using ModernWpf.Controls; +using System; + +namespace Fischless.Views; + +public partial class PageReShade : Page, IDisposable +{ + public PageReShadeViewModel ViewModel { get; } = null!; + + public PageReShade(PageReShadeViewModel viewModel) + { + DataContext = ViewModel = viewModel; + InitializeComponent(); + } + + public void Dispose() + { + } +} diff --git a/src/Desktop/Fischless/Views/Pages/PageSettings.xaml b/src/Desktop/Fischless/Views/Pages/PageSettings.xaml index fee8715..732bba4 100644 --- a/src/Desktop/Fischless/Views/Pages/PageSettings.xaml +++ b/src/Desktop/Fischless/Views/Pages/PageSettings.xaml @@ -81,7 +81,7 @@ FontSize="14" FontWeight="Bold" Foreground="{DynamicResource TextFillColorPrimaryBrush}" - Text="Fischless" /> + Text="{x:Static app:AppConfig.AppName}" />