diff --git a/VPet-Simulator.Windows/MainWindow.cs b/VPet-Simulator.Windows/MainWindow.cs index 608fb59..9943085 100644 --- a/VPet-Simulator.Windows/MainWindow.cs +++ b/VPet-Simulator.Windows/MainWindow.cs @@ -2106,6 +2106,8 @@ namespace VPet_Simulator.Windows else Main.DisplayToNomal(); } + else + Main.DisplayToNomal(); }); } else diff --git a/VPet-Simulator.Windows/MainWindow_Property.cs b/VPet-Simulator.Windows/MainWindow_Property.cs index f0802e5..099fbf7 100644 --- a/VPet-Simulator.Windows/MainWindow_Property.cs +++ b/VPet-Simulator.Windows/MainWindow_Property.cs @@ -19,7 +19,7 @@ public partial class MainWindow /// /// 版本号 /// - public int version { get; } = 11015; + public int version { get; } = 11016; /// /// 版本号 /// diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/1_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_000_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/1_000_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_000_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_001_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_001_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_001_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_002_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_002_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_002_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_003_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_003_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_003_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_004_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_004_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_004_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_005_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_005_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_005_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_005_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_006_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_006_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_006_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_006_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_007_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_007_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_007_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_007_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_008_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_008_125.png new file mode 100644 index 0000000..293e6c4 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_008_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_009_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_009_125.png new file mode 100644 index 0000000..49a7008 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_009_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_010_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_010_125.png new file mode 100644 index 0000000..293e6c4 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_010_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_011_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_011_125.png new file mode 100644 index 0000000..49a7008 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_011_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_012_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_012_125.png new file mode 100644 index 0000000..4088e3e Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_012_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_013_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_013_125.png new file mode 100644 index 0000000..620bc3a Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_013_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_014_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_014_125.png new file mode 100644 index 0000000..1dcf4ec Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_014_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_015_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_015_125.png new file mode 100644 index 0000000..826e45e Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_015_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_016_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_016_125.png new file mode 100644 index 0000000..e8fde10 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_016_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_017_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_017_125.png new file mode 100644 index 0000000..6ae2ed7 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_017_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_018_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_018_125.png new file mode 100644 index 0000000..d3c24e4 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_018_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_020_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_019_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_020_250.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_019_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_021_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_020_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_021_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_020_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_022_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_021_125.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_022_125.png rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/back_lay_021_125.png diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_008_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_008_125.png deleted file mode 100644 index 84df21f..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_008_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_009_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_009_125.png deleted file mode 100644 index 05b976b..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_009_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_010_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_010_125.png deleted file mode 100644 index 36862b3..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_010_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_011_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_011_125.png deleted file mode 100644 index 75a43c8..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_011_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_012_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_012_125.png deleted file mode 100644 index 4db32b4..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_012_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_013_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_013_125.png deleted file mode 100644 index bf8b303..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_013_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_014_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_014_125.png deleted file mode 100644 index 38d5dad..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_014_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_015_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_015_125.png deleted file mode 100644 index ebbefdf..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_015_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_016_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_016_125.png deleted file mode 100644 index b6980e1..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_016_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_017_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_017_125.png deleted file mode 100644 index 05b976b..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_017_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_018_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_018_125.png deleted file mode 100644 index 84df21f..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_018_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_019_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_019_125.png deleted file mode 100644 index 05b976b..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/back_lay/生病_019_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_000_1375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_000_1375.png new file mode 100644 index 0000000..f8c7202 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_000_1375.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_001_125.png new file mode 100644 index 0000000..76b7211 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_001_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_002_125.png new file mode 100644 index 0000000..10a31f4 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_002_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_003_125.png new file mode 100644 index 0000000..a647301 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_003_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_004_125.png new file mode 100644 index 0000000..15a7aa5 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_004_125.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_005_875.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_005_875.png new file mode 100644 index 0000000..f8c7202 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/收礼物手_005_875.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_000_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_000_375.png deleted file mode 100644 index 1b84a6d..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_000_375.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_001_125.png deleted file mode 100644 index ff158f3..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_001_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_002_125.png deleted file mode 100644 index 8970815..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_002_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_003_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_003_125.png deleted file mode 100644 index 7f6eb7b..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_003_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_004_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_004_125.png deleted file mode 100644 index 61dd1be..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_004_125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_005_2125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_005_2125.png deleted file mode 100644 index 1b84a6d..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/front_lay/遮挡部分_005_2125.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/info.lps b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/info.lps index ff8c62c..914600d 100644 --- a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/info.lps +++ b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Gift/Ill/info.lps @@ -1,3 +1,3 @@ PNGAnimation#gift_back_lay:|path#back_lay:|mode#ill:|graph#Common:| PNGAnimation#gift_front_lay:|path#front_lay:|mode#ill:|graph#Common:| -FoodAnimation#gift:|mode#ill:|a0#500:|a1#125,138,253,48:|a2#125,130,240,69:|a3#125,130,230,69:|a4#125,133,246,69:|a5#500,154,255,69:|a6#500,150,279,69:|a7#1000:|front_lay#gift_front_lay:|back_lay#gift_back_lay:|///Time,MarginX,Y,Width,Rotate,Opacity \ No newline at end of file +FoodAnimation#gift:|mode#ill:|a0#250:|a1#125,138,253,48:|a2#125,130,240,69:|a3#125,130,230,69:|a4#125,133,246,69:|a5#500,154,255,69:|a6#500,150,279,69:|a7#1000:|front_lay#gift_front_lay:|back_lay#gift_back_lay:|///Time,MarginX,Y,Width,Rotate,Opacity \ No newline at end of file