Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复学习完毕后会给钱, 奖学金BUG

Browse Source
This commit is contained in:
ZouJin 2023-08-18 22:02:41 +10:00
parent 4e969521dd
commit 11736363b4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VPet-Simulator.Core/Display/WorkTimer.xaml.cs
View File

@ -62,9 +62,11 @@ namespace VPet_Simulator.Core
nowWork.Time, nowWork.NameTrans), true));
}
else
m.Core.Save.Money += GetCount * nowWork.FinishBonus;
Stop(() => m.SayRnd(LocalizeCore.Translate("{2}完成啦, 累计获得 {0:f2} 经验\n共计花费了{1}分钟", GetCount * (1 + nowWork.FinishBonus),
nowWork.Time, nowWork.NameTrans), true));
{
m.Core.Save.Exp += GetCount * nowWork.FinishBonus;
Stop(() => m.SayRnd(LocalizeCore.Translate("{2}完成啦, 累计获得 {0:f2} 经验\n共计花费了{1}分钟", GetCount * (1 + nowWork.FinishBonus),
nowWork.Time, nowWork.NameTrans), true));
}
return;
}
else
@ -132,16 +134,16 @@ namespace VPet_Simulator.Core
tNow.Text = LocalizeCore.Translate("累计金钱收益");
else
tNow.Text = LocalizeCore.Translate("获得经验值");
break;
break;
}
}
}
M_TimeUIHandle(m);
}
private void SwitchState_Click(object sender, RoutedEventArgs e)
{
DisplayType++;
if (DisplayType >= 4)
DisplayType = 0;
DisplayType = 0;
DisplayUI();
}
public void Start(Work work)

3
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
View File

@ -344,8 +344,7 @@
<Run FontSize="18" FontWeight="Bold" Text="{ll:Str 游戏操作}" />
</TextBlock>
<Button Grid.Row="1" Grid.Column="2" Margin="4" Padding="1" pu:ButtonHelper.CornerRadius="4"
Background="{DynamicResource SecondaryLight}" Click="cleancache_click"
Content="{ll:Str 保存游戏}" ToolTip="{ll:Str '手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存'}" />
Background="{DynamicResource SecondaryLight}" Click="save_click" Content="{ll:Str 保存游戏}" ToolTip="{ll:Str '手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存'}" />
<Button Grid.Row="1" Grid.Column="2" Margin="4" Padding="1" pu:ButtonHelper.CornerRadius="4"
Background="{DynamicResource SecondaryLight}" Click="cleancache_click"
Content="{ll:Str 清理缓存}" ToolTip="{ll:Str '清理缓存的动画,声音文件'}" />