新互动 研究&玩游戏

VPet-Simulator.Core/Display/MainLogic.cs

@@ -194,7 +194,13 @@ namespace VPet_Simulator.Core
                     else
                         Core.Save.Exp += addmoney;
                     WorkTimer.GetCount += addmoney;
-                    Core.Save.FeelingChange(-freedrop * nowwork.Feeling);
+                    if (nowwork.Type == GraphHelper.Work.WorkType.Play)
+                    {
+                        LastInteractionTime = DateTime.Now;
+                        Core.Save.FeelingChange(nowwork.Feeling * TimePass);
+                    }
+                    else
+                        Core.Save.FeelingChange(-freedrop * nowwork.Feeling);
                     break;
                 default://默认
                     //饮食等乱七八糟的消耗

VPet-Simulator.Core/Display/ToolBar.xaml.cs

@@ -51,21 +51,29 @@ namespace VPet_Simulator.Core
             MenuWork.Visibility = Visibility.Visible;
             MenuStudy.Click -= MenuStudy_Click;
             MenuStudy.Visibility = Visibility.Visible;
+            MenuPlay.Click -= MenuPlay_Click;
+
 
             MenuWork.Items.Clear();
             MenuStudy.Items.Clear();
+            MenuPlay.Items.Clear();
             List<Work> ws = new List<Work>();
             List<Work> ss = new List<Work>();
+            List<Work> ps = new List<Work>();
             foreach (var w in m.Core.Graph.GraphConfig.Works)
             {
-                if (w.Type == Work.WorkType.Work)
+                switch (w.Type)
                 {
-                    ws.Add(w);
-                }
-                else
-                {
-                    ss.Add(w);
-                }
+                    case Work.WorkType.Study:
+                        ss.Add(w);
+                        break;
+                    case Work.WorkType.Work:
+                        ws.Add(w);
+                        break;
+                    case Work.WorkType.Play:
+                        ps.Add(w);
+                        break;
+                }              
             }
             if (ws.Count == 0)
             {
@@ -111,6 +119,28 @@ namespace VPet_Simulator.Core
                     MenuStudy.Items.Add(mi);
                 }
             }
+            if (ps.Count == 0)
+            {
+                MenuPlay.Visibility = Visibility.Collapsed;
+            }
+            else if (ps.Count == 1)
+            {
+                MenuPlay.Click += MenuPlay_Click;
+                wplay = ps[0];
+                MenuPlay.Header = ps[0].NameTrans;
+            }
+            else
+            {
+                foreach (var w in ps)
+                {
+                    var mi = new MenuItem()
+                    {
+                        Header = w.NameTrans
+                    };
+                    mi.Click += (s, e) => StartWork(w);
+                    MenuPlay.Items.Add(mi);
+                }
+            }
         }
 
         private void MenuStudy_Click(object sender, RoutedEventArgs e)
@@ -119,6 +149,7 @@ namespace VPet_Simulator.Core
         }
         Work wwork;
         Work wstudy;
+        Work wplay;
         public void StartWork(Work work)
         {
             if (!m.Core.Controller.EnableFunction || m.Core.Save.Mode != GameSave.ModeType.Ill)
@@ -138,7 +169,10 @@ namespace VPet_Simulator.Core
         {
             StartWork(wwork);
         }
-
+        private void MenuPlay_Click(object sender, RoutedEventArgs e)
+        {
+            StartWork(wplay);
+        }
 
         private void M_TimeUIHandle(Main m)
         {

VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2308.lps

@@ -1,3 +1,5 @@
 创意工坊物品无法进行上传,请移动到mod文件夹后重试#Creative Workshop items can not be uploaded, please move to `mod` folder and try again.:|
 由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD#Due to the modification of the game data caused by data overflow, the archive may be wrong\nThe developer reminds you not to use too much supermodel MOD.:|
-玩耍#Play:|
+玩耍#Play:|
+研究#Research:|
+玩游戏#Play game:|

VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2308.lps

@@ -1,3 +1,5 @@
 创意工坊物品无法进行上传,请移动到mod文件夹后重试#创意工坊物品无法进行上传,请移动到mod文件夹后重试:|
 由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD#由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD:|
-玩耍#玩耍:|
+玩耍#玩耍:|
+研究#研究:|
+玩游戏#玩游戏:|

VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2308.lps

@@ -1,3 +1,5 @@
 创意工坊物品无法进行上传,请移动到mod文件夹后重试#創意工坊物品無法進行上傳，請移動到mod資料夾後重試:|
 由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD#由於修改遊戲數據導致數據溢出，存檔可能會出錯\n開發者提醒您請不要使用過於超模的MOD:|
-玩耍#玩耍:|
+玩耍#玩耍:|
+研究#研究:|
+玩游戏#玩遊戲:|

VPet-Simulator.Windows/mod/0000_core/pet/vup.lps

@@ -5,6 +5,8 @@ raisepoint:|happy_x#290:|happy_y#128:|nomal_x#290:|nomal_y#128:|poorcondition_x#
 work:|Type#Work:|Name#文案:|MoneyBase#8:|MoneyLevel#0.5:|Graph#workone:|StrengthFood#3.5:|StrengthDrink#2.5:|Feeling#1.5:|Time#60:|FinishBonus#0.1:|BorderBrush#000000:|Background#413d39:|ButtonBackground#322e2b:|ButtonForeground#FFFFFF:|Foreground#ccbdad:|Left#113:|Top#315:|Width#280:|
 work:|Type#Work:|Name#直播:|MoneyBase#16:|MoneyLevel#1:|Graph#worktwo:|StrengthFood#4.5:|StrengthDrink#7.5:|Feeling#2.5:|Time#180:|FinishBonus#0.25:|LevelLimit#10:|BorderBrush#000000:|Background#413d39:|ButtonBackground#322e2b:|ButtonForeground#FFFFFF:|Foreground#ccbdad:|Left#113:|Top#315:|Width#280:|
 work:|Type#Study:|Name#学习:|MoneyBase#16:|MoneyLevel#2:|Graph#study:|StrengthFood#1.5:|StrengthDrink#2:|Feeling#3:|Time#45:|FinishBonus#0.2:|BorderBrush#000000:|Background#413d39:|ButtonBackground#322e2b:|ButtonForeground#FFFFFF:|Foreground#ccbdad:|Left#113:|Top#315:|Width#280:|
+work:|Type#Study:|Name#研究:|MoneyBase#30:|MoneyLevel#3:|Graph#studytwo:|StrengthFood#2.5:|StrengthDrink#3.5:|Feeling#4.5:|Time#75:|FinishBonus#0.4:|BorderBrush#000000:|Background#413d39:|ButtonBackground#322e2b:|LevelLimit#15:|ButtonForeground#FFFFFF:|Foreground#ccbdad:|Left#113:|Top#315:|Width#280:|
+work:|Type#Play:|Name#玩游戏:|MoneyBase#10:|MoneyLevel#2:|Graph#playone:|StrengthFood#1.5:|StrengthDrink#1.5:|Feeling#4:|Time#30:|FinishBonus#0.2:|BorderBrush#000000:|Background#413d39:|ButtonBackground#322e2b:|ButtonForeground#FFFFFF:|Foreground#ccbdad:|Left#113:|Top#315:|Width#280:|
 move:|graph#climb.left:|LocateType#Left:|LocateLength#145:|TriggerLeft#100:|TriggerTop#200:|TriggerType#65:|CheckType#64:|CheckTop#100:|SpeedY#-10:|Distance#7:|ModeType#14:|
 move:|graph#climb.left:|LocateType#Left:|LocateLength#145:|TriggerLeft#100:|TriggerBottom#200:|TriggerType#129:|CheckType#128:|CheckBottom#100:|SpeedY#10:|Distance#7:|ModeType#14:|
 move:|graph#climb.right:|LocateType#Right:|LocateLength#185:|TriggerRight#100:|TriggerTop#200:|TriggerType#66:|CheckType#64:|CheckTop#100:|SpeedY#-10:|Distance#7:|ModeType#14:|