From 433bcc9367b63b0f96e73c91b5535352c0a9f444 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Sun, 29 Jan 2023 16:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=BC=BA=E5=B0=91=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/MainDisplay.cs             |  5 +++++
 VPet-Simulator.Core/Graph/GraphCore.cs                 |  2 +-
 VPet-Simulator.Core/Handle/PetLoader.cs                |  2 +-
 VPet-Simulator.Windows/App.xaml.cs                     |  2 ++
 VPet-Simulator.Windows/MainWindow.xaml.cs              |  2 +-
 VPet-Simulator.Windows/Properties/AssemblyInfo.cs      | 10 +++++-----
 VPet-Simulator.Windows/VPet-Simulator.Windows.csproj   |  2 +-
 .../WinDesign/winGameSetting.xaml.cs                   |  2 +-
 8 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs
index 521668f..35a7dc8 100644
--- a/VPet-Simulator.Core/Display/MainDisplay.cs
+++ b/VPet-Simulator.Core/Display/MainDisplay.cs
@@ -1035,6 +1035,11 @@ namespace VPet_Simulator.Core
         /// <param name="EndAction">结束操作</param>
         public void Display(IGraph graph, Action EndAction = null)
         {
+            if(graph == null)
+            {
+                EndAction?.Invoke();
+                return;
+            }
             //if(graph.GraphType == GraphType.Climb_Up_Left)
             //{
             //    Dispatcher.Invoke(() => Say(graph.GraphType.ToString()));
diff --git a/VPet-Simulator.Core/Graph/GraphCore.cs b/VPet-Simulator.Core/Graph/GraphCore.cs
index 02776de..26f00fd 100644
--- a/VPet-Simulator.Core/Graph/GraphCore.cs
+++ b/VPet-Simulator.Core/Graph/GraphCore.cs
@@ -339,7 +339,7 @@ namespace VPet_Simulator.Core
                     return Graphs[type][Function.Rnd.Next(Graphs[type].Count)];
                 }
             }
-            return FindGraph(GraphType.Default, mode);
+            return null;// FindGraph(GraphType.Default, mode);
         }
         static string[] graphtypevalue = null;
         /// <summary>
diff --git a/VPet-Simulator.Core/Handle/PetLoader.cs b/VPet-Simulator.Core/Handle/PetLoader.cs
index 5544d69..1a30ec8 100644
--- a/VPet-Simulator.Core/Handle/PetLoader.cs
+++ b/VPet-Simulator.Core/Handle/PetLoader.cs
@@ -83,7 +83,7 @@ namespace VPet_Simulator.Core
                             return;
                         }
                     }
-#if DEBUG
+#if DEMO
                     throw new Exception("未知的图像类型: " + path_name);
 #endif
                 }
diff --git a/VPet-Simulator.Windows/App.xaml.cs b/VPet-Simulator.Windows/App.xaml.cs
index a999989..9889535 100644
--- a/VPet-Simulator.Windows/App.xaml.cs
+++ b/VPet-Simulator.Windows/App.xaml.cs
@@ -15,7 +15,9 @@ namespace VPet_Simulator.Windows
     {
         public App() : base()
         {
+#if !DEBUG
             base.DispatcherUnhandledException += App_DispatcherUnhandledException;
+#endif
             //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
         }
 
diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index d21a355..986dff9 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -41,7 +41,7 @@ namespace VPet_Simulator.Windows
             //在 https://store.steampowered.com/app/1920960/VPet
             try
             {
-#if DEBUG
+#if DEMO
                 SteamClient.Init(2293870, true);
 #else
                 SteamClient.Init(1920960, true);
diff --git a/VPet-Simulator.Windows/Properties/AssemblyInfo.cs b/VPet-Simulator.Windows/Properties/AssemblyInfo.cs
index 4c14f88..8a6773c 100644
--- a/VPet-Simulator.Windows/Properties/AssemblyInfo.cs
+++ b/VPet-Simulator.Windows/Properties/AssemblyInfo.cs
@@ -7,13 +7,13 @@ using System.Windows;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("VPet-Simulator.Windows")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("虚拟桌宠模拟器")]
+[assembly: AssemblyDescription("VPET的独立窗口实现")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("LB Game")]
 [assembly: AssemblyProduct("VPet-Simulator.Windows")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCopyright("Copyright © exLB.org 2022")]
+[assembly: AssemblyTrademark("exLB.org")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 会使此程序集中的类型
diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
index c79b5b0..fab01de 100644
--- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
+++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;X64,DEMO</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
index 0360e66..b90f610 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
@@ -331,7 +331,7 @@ namespace VPet_Simulator.Windows
                 MessageBoxX.Show("模组 Core 为<虚拟桌宠模拟器>核心文件,无法发布\n如需发布自定义内容,请复制并更改名称", "MOD上传失败", MessageBoxIcon.Error);
                 return;
             }
-#if DEBUG
+#if DEMO
             MessageBoxX.Show("经测试,除正式版均无创意工坊权限,此功能仅作为展示", "特殊版无法上传创意工坊");
 #endif
             ButtonPublish.IsEnabled = false;