From d556052cee698303fcae19807bdf7d5a95692233 Mon Sep 17 00:00:00 2001 From: ZouJin Date: Thu, 21 Mar 2024 23:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E8=AF=BB=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WinDesign/winWorkMenu.xaml.cs | 4 ++-- .../mod/0000_core/image/work/readme.txt | 16 ++++++++++++++++ .../0000_core/image/work/{ => vup}/PlayONE.png | Bin .../image/work/{ => vup}/RemoveObject.png | Bin .../0000_core/image/work/{ => vup}/Study.png | Bin .../0000_core/image/work/{ => vup}/StudyTWO.png | Bin .../image/work/{ => vup}/WorkClean.png | Bin .../0000_core/image/work/{ => vup}/WorkONE.png | Bin .../0000_core/image/work/{ => vup}/WorkTWO.png | Bin .../image/{vup => work/vup/t}/Play.png | Bin .../image/{vup => work/vup/t}/Study.png | Bin .../image/{vup => work/vup/t}/Work.png | Bin 12 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 VPet-Simulator.Windows/mod/0000_core/image/work/readme.txt rename VPet-Simulator.Windows/mod/0000_core/image/work/{ => vup}/PlayONE.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/work/{ => vup}/RemoveObject.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/work/{ => vup}/Study.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/work/{ => vup}/StudyTWO.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/work/{ => vup}/WorkClean.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/work/{ => vup}/WorkONE.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/work/{ => vup}/WorkTWO.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/{vup => work/vup/t}/Play.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/{vup => work/vup/t}/Study.png (100%) rename VPet-Simulator.Windows/mod/0000_core/image/{vup => work/vup/t}/Work.png (100%) diff --git a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs index 0324378..2d36701 100644 --- a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs +++ b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs @@ -26,7 +26,7 @@ public partial class winWorkMenu : Window List ws; List ss; List ps; - public void ShowImageDefault(Work.WorkType type) => WorkViewImage.Source = mw.ImageSources.FindImage(mw.Set.PetGraph + "_" + type.ToString(), "work"); + public void ShowImageDefault(Work.WorkType type) => WorkViewImage.Source = mw.ImageSources.FindImage("work_" + mw.Set.PetGraph + "_t_" + type.ToString(), "work_" + type.ToString()); public winWorkMenu(MainWindow mw, Work.WorkType type) { InitializeComponent(); @@ -96,7 +96,7 @@ public partial class winWorkMenu : Window nowworkdisplay = work; lName.Content = work.NameTrans; //显示图像 - string source = mw.ImageSources.FindSource("work_" + work.Graph) ?? mw.ImageSources.FindSource("work_" + work.Name); + string source = mw.ImageSources.FindSource("work_" + mw.Set.PetGraph + "_" + work.Graph) ?? mw.ImageSources.FindSource("work_" + mw.Set.PetGraph + "_" + work.Name); if (source == null) { //尝试显示默认图像 diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/readme.txt b/VPet-Simulator.Windows/mod/0000_core/image/work/readme.txt new file mode 100644 index 0000000..2dad050 --- /dev/null +++ b/VPet-Simulator.Windows/mod/0000_core/image/work/readme.txt @@ -0,0 +1,16 @@ +这里是工作图片目录, 给工作图片显示的 +第一层: 如果实在找不到图片,显示的默认图 +第二层(宠物皮肤id): 该宠物对应工作的图片 + 对于大类(play玩耍/study学习/work工作) 前面需要加't'前缀 + +顺带一提, 在桌宠文件系统中, 每个文件夹会自动转换成'_', +例如 "work\vpet\t\play.png" = "work_vpet_t_play.png" + + +This is the working image directory, which displays the working images +First layer: If the image cannot be found, the default image will be displayed +Second layer (pet skin ID): Image of the corresponding job for the pet + For major categories (play/study/work), the prefix 't' needs to be added before them + +By the way, in the desktop pet file system, each folder is automatically converted to '_', +for example, "work\vpet\t\play.png" = "work_vpet_t_play.png" \ No newline at end of file diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/PlayONE.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/PlayONE.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/work/PlayONE.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/PlayONE.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/RemoveObject.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/RemoveObject.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/work/RemoveObject.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/RemoveObject.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/Study.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/Study.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/work/Study.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/Study.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/StudyTWO.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/StudyTWO.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/work/StudyTWO.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/StudyTWO.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/WorkClean.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/WorkClean.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/work/WorkClean.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/WorkClean.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/WorkONE.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/WorkONE.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/work/WorkONE.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/WorkONE.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/WorkTWO.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/WorkTWO.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/work/WorkTWO.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/WorkTWO.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/vup/Play.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/t/Play.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/vup/Play.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/t/Play.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/vup/Study.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/t/Study.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/vup/Study.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/t/Study.png diff --git a/VPet-Simulator.Windows/mod/0000_core/image/vup/Work.png b/VPet-Simulator.Windows/mod/0000_core/image/work/vup/t/Work.png similarity index 100% rename from VPet-Simulator.Windows/mod/0000_core/image/vup/Work.png rename to VPet-Simulator.Windows/mod/0000_core/image/work/vup/t/Work.png