v1.0.1.1

xujiangjiang · Sep 12, 2019 · 3317e6d · 3317e6d
1 parent 0f9388b
commit 3317e6d
Show file tree

Hide file tree

Showing 142 changed files with 911 additions and 4,890 deletions.
diff --git a/CatTimer WpfProject/AppManager.cs b/CatTimer WpfProject/AppManager.cs
@@ -24,10 +24,10 @@ public static class AppManager
         private static MainWindow mainWindow;//窗口的逻辑
 
         /* 数据 */
-        private static AppDatas appDatas = new AppDatas();//App中的所有数据
+        private static AppDatas appDatas;//App中的所有数据
 
         /* 子系统 */
-        private static AppSystems appSystems = new AppSystems();//App中的所有系统
+        private static AppSystems appSystems;//App中的所有系统
 
 
 
@@ -75,6 +75,9 @@ public static AppSystems AppSystems
         /// </summary>
         public static void Awake()
         {
+            appDatas = new AppDatas();
+            appSystems = new AppSystems();
+
             //读取读取数据
             AppSystems.SaveSystem.Load();
         }

diff --git a/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/AddOrLessNumber/AddOrLessNumber(Volume0.8).wav
diff --git a/...pfProject/Asset/Audio/AddOrLessNumber.wav → ...LessNumber/AddOrLessNumber(Volume1.0).wav b/...pfProject/Asset/Audio/AddOrLessNumber.wav → ...LessNumber/AddOrLessNumber(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume0.8).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume1.0).wav b/CatTimer WpfProject/Asset/Audio/CatDown-01/CatDown-01(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume0.8).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume1.0).wav b/CatTimer WpfProject/Asset/Audio/CatDown-02/CatDown-02(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume0.8).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume1.0).wav b/CatTimer WpfProject/Asset/Audio/CatDown-03/CatDown-03(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatDown.wav b/CatTimer WpfProject/Asset/Audio/CatDown.wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/CatUp-01/CatUp-01(Volume0.8).wav
diff --git a/...mer WpfProject/Asset/Audio/VolumeTest.wav → ...et/Audio/CatUp-01/CatUp-01(Volume1.0).wav b/...mer WpfProject/Asset/Audio/VolumeTest.wav → ...et/Audio/CatUp-01/CatUp-01(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume0.8).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume1.0).wav b/CatTimer WpfProject/Asset/Audio/CatUp-02/CatUp-02(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume0.8).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume1.0).wav b/CatTimer WpfProject/Asset/Audio/CatUp-03/CatUp-03(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/CatUp.wav b/CatTimer WpfProject/Asset/Audio/CatUp.wav
diff --git a/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/Complete/Complete(Volume0.8).wav
diff --git a/CatTimer WpfProject/Asset/Audio/Complete.wav → ...et/Audio/Complete/Complete(Volume1.0).wav b/CatTimer WpfProject/Asset/Audio/Complete.wav → ...et/Audio/Complete/Complete(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonDown/DefaultButtonDown(Volume0.8).wav
diff --git a/...Project/Asset/Audio/DefaultButtonDown.wav → ...ttonDown/DefaultButtonDown(Volume1.0).wav b/...Project/Asset/Audio/DefaultButtonDown.wav → ...ttonDown/DefaultButtonDown(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.2).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.2).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.4).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.4).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.6).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.6).wav
diff --git a/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.8).wav b/CatTimer WpfProject/Asset/Audio/DefaultButtonUp/DefaultButtonUp(Volume0.8).wav
diff --git a/...pfProject/Asset/Audio/DefaultButtonUp.wav → ...ltButtonUp/DefaultButtonUp(Volume1.0).wav b/...pfProject/Asset/Audio/DefaultButtonUp.wav → ...ltButtonUp/DefaultButtonUp(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/VolumeTest/VolumeTest(Volume1.0).wav b/CatTimer WpfProject/Asset/Audio/VolumeTest/VolumeTest(Volume1.0).wav
diff --git a/CatTimer WpfProject/Asset/Audio/关于音频.txt b/CatTimer WpfProject/Asset/Audio/关于音频.txt
@@ -0,0 +1,14 @@
+��Ϊ����ʹ�õ���SoundPlayer�������Ƶ�Ĳ��š�
+��ˣ��޷�����������
+���ԣ����ǰ���Ƶ�ļ�����������������
+ÿ����Ƶ��5����Ƶ�ļ����ֱ��ǣ�
+(1) ����Ϊ100%����Ƶ�ļ����ļ�����Volume1.0��
+(2) ����Ϊ80%����Ƶ�ļ����ļ�����Volume0.8��
+(3) ����Ϊ60%����Ƶ�ļ����ļ�����Volume0.6��
+(4) ����Ϊ40%����Ƶ�ļ����ļ�����Volume0.4��
+(5) ����Ϊ20%����Ƶ�ļ����ļ�����Volume0.2��
+
+
+Ϊʲô����MediaPlayer���أ�
+(1) ��ΪMediaPlayer��������WMP(Windows Media Player)��������Щû�а�װWMP�������û��ᱨ��
+(2) ��������ʹ�ù�MediaPlayer�࣬��ο�Github�е�v1.0.1.0�汾������Ч�����Ǻܺã����Ҿ����ᱻ�������յ�
diff --git a/CatTimer WpfProject/CatTimer WpfProject.csproj b/CatTimer WpfProject/CatTimer WpfProject.csproj
@@ -356,27 +356,6 @@
     <Resource Include="Asset\Image\Cat\NotificationCat.png" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Asset\Audio\CatDown.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Asset\Audio\Complete.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Asset\Audio\DefaultButtonUp.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Asset\Audio\DefaultButtonDown.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Asset\Audio\VolumeTest.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Asset\Audio\CatUp.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Asset\Audio\AddOrLessNumber.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Resource Include="Asset\Image\Other\Staff.png" />
     <Resource Include="Asset\Icon\Icon.ico" />
   </ItemGroup>
@@ -392,5 +371,69 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Asset\Audio\AddOrLessNumber\AddOrLessNumber%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\AddOrLessNumber\AddOrLessNumber%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\AddOrLessNumber\AddOrLessNumber%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\AddOrLessNumber\AddOrLessNumber%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\AddOrLessNumber\AddOrLessNumber%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\CatDown-01\CatDown-01%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\CatDown-01\CatDown-01%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\CatDown-01\CatDown-01%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\CatDown-01\CatDown-01%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\CatDown-01\CatDown-01%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\CatDown-02\CatDown-02%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\CatDown-02\CatDown-02%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\CatDown-02\CatDown-02%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\CatDown-02\CatDown-02%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\CatDown-02\CatDown-02%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\CatDown-03\CatDown-03%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\CatDown-03\CatDown-03%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\CatDown-03\CatDown-03%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\CatDown-03\CatDown-03%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\CatDown-03\CatDown-03%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\CatUp-01\CatUp-01%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\CatUp-01\CatUp-01%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\CatUp-01\CatUp-01%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\CatUp-01\CatUp-01%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\CatUp-01\CatUp-01%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\CatUp-02\CatUp-02%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\CatUp-02\CatUp-02%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\CatUp-02\CatUp-02%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\CatUp-02\CatUp-02%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\CatUp-02\CatUp-02%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\CatUp-03\CatUp-03%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\CatUp-03\CatUp-03%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\CatUp-03\CatUp-03%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\CatUp-03\CatUp-03%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\CatUp-03\CatUp-03%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\Complete\Complete%28Volume0.2%29.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Asset\Audio\Complete\Complete%28Volume0.4%29.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Asset\Audio\Complete\Complete%28Volume0.6%29.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Asset\Audio\Complete\Complete%28Volume0.8%29.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Asset\Audio\Complete\Complete%28Volume1.0%29.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Asset\Audio\DefaultButtonDown\DefaultButtonDown%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonDown\DefaultButtonDown%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonDown\DefaultButtonDown%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonDown\DefaultButtonDown%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonDown\DefaultButtonDown%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonUp\DefaultButtonUp%28Volume0.2%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonUp\DefaultButtonUp%28Volume0.4%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonUp\DefaultButtonUp%28Volume0.6%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonUp\DefaultButtonUp%28Volume0.8%29.wav" />
+    <Content Include="Asset\Audio\DefaultButtonUp\DefaultButtonUp%28Volume1.0%29.wav" />
+    <Content Include="Asset\Audio\VolumeTest\VolumeTest%28Volume1.0%29.wav" />
+    <Resource Include="Asset\Audio\关于音频.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/CatTimer WpfProject/Code/Data/SettingData.cs b/CatTimer WpfProject/Code/Data/SettingData.cs
@@ -30,6 +30,7 @@ public int Volume
             {
                 volume = value;
                 PropertyChange("Volume");//更新UI
+                AppManager.AppSystems.AudioSystem.OnVolumeChange(volume);//触发[音量更改]的事件
             }
         }
 

diff --git a/CatTimer WpfProject/Code/Notification/NotificationWindow.xaml b/CatTimer WpfProject/Code/Notification/NotificationWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:CatTimer_WpfProject"
         mc:Ignorable="d"
 
-        Title="Time Is Up!" 
+        Title="NotificationWindow" 
         Height="141" Width="490"
         ResizeMode="NoResize" WindowStyle="None"
         AllowsTransparency="True" Background="Transparent"

diff --git a/CatTimer WpfProject/Code/Other/Enums.cs b/CatTimer WpfProject/Code/Other/Enums.cs
@@ -33,7 +33,6 @@ public enum AudioType : byte
         CatDown,//猫咪坐下
         DefaultButtonDown,//普通按钮按下
         DefaultButtonUp,//普通按钮抬起
-        AddOrlessNumber,//[增加或减少][分钟数或者秒钟数]的音效（设定时间的界面）
-        VolumeTest,//[音量测试]的音效
+        AddOrlessNumberSoundPlayer//[增加或减少][分钟数或者秒钟数]的音效（设定时间的界面）
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ public int Volume @@
                 {
                     volume = value;
                     PropertyChange("Volume");//更新UI
+                    AppManager.AppSystems.AudioSystem.OnVolumeChange(volume);//触发[音量更改]的事件
                 }
             }
@@ Expand Down @@