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

投喂限制更改为等级

Browse Source
This commit is contained in:
ZouJin
2024-04-10 16:55:51 +08:00
parent bb9dbe35dc
commit 6fe73e958b
7 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml
View File

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:VPet_Simulator.Windows" mc:Ignorable="d"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF"
Title="{ll:Str 访客表}" MinHeight="400" Height="400" Width="600" Closed="Window_Closed"
Title="{ll:Str 访客表}" MinHeight="400" Height="400" Width="660" Closed="Window_Closed"
Style="{DynamicResource BaseWindowXStyle}" Background="{DynamicResource PrimaryLighter}"
FontSize="{Binding FontSize, Source={x:Static pu:GlobalSettings.Setting}}" MaxHeight="400"
ResizeMode="CanMinimize" Closing="Window_Closing">
@ -69,7 +69,9 @@
</Grid>
</pu:TabControlHelper.FrontControl>
<TabItem Header="{ll:Str 访客列表}">
<StackPanel x:Name="MUUCList" />
<ScrollViewer>
<StackPanel x:Name="MUUCList" />
</ScrollViewer>
</TabItem>
<TabItem Header="{ll:Str 消息日志}">
<TextBox x:Name="tbLog" Margin="0" Padding="7" VerticalContentAlignment="Stretch" BorderThickness="0"

26
VPet-Simulator.Windows/MutiPlayer/winMutiPlayer.xaml.cs
View File

@ -33,7 +33,7 @@ public partial class winMutiPlayer : WindowX, IMPWindows
public winMutiPlayer(MainWindow mw, ulong? lobbyid = null)
{
InitializeComponent();
if(mw.Core.Save.Mode == IGameSave.ModeType.Ill)
if (mw.Core.Save.Mode == IGameSave.ModeType.Ill)
{
MessageBoxX.Show("{0}生病了,无法创建或者加入访客表".Translate());
Close();
@ -126,6 +126,7 @@ public partial class winMutiPlayer : WindowX, IMPWindows
public void ShowLobbyInfo()
{
giveprice = -1000 + mw.Core.Save.Level * -10;
_ = Task.Run(async () =>
{
lb.SetMemberData("save", mw.GameSavesData.GameSave.ToLine().ToString());
@ -201,17 +202,16 @@ public partial class winMutiPlayer : WindowX, IMPWindows
private void Main_TimeHandle(Main obj)
{
if (mw.GameSavesData.GameSave.Mode == IGameSave.ModeType.Ill)
{//生病自动退出访客表
ClosingMutiPlayer?.Invoke();
isOPEN = false;
lb.Leave();
lb = default;
MessageBoxX.Show("{0}生病了,已自动退出访客表".Translate(obj.Core.Save.Name));
Close();
return;
}
//if (mw.GameSavesData.GameSave.Mode == IGameSave.ModeType.Ill)
//{//生病自动退出访客表
// ClosingMutiPlayer?.Invoke();
// isOPEN = false;
// lb.Leave();
// lb = default;
// MessageBoxX.Show("{0}生病了,已自动退出访客表".Translate(obj.Core.Save.Name));
// Close();
// return;
//}
lb.SetMemberData("save", mw.GameSavesData.GameSave.ToLine().ToString());
}
@ -398,7 +398,7 @@ public partial class winMutiPlayer : WindowX, IMPWindows
mw.Main.LabelDisplayShow("{0}花费${3}给{1}买了{2}".Translate(byname, mw.GameSavesData.GameSave.Name, feed.Item.TranslateName, feed.Item.Price), 6000);
Log("{0}花费${3}给{1}买了{2}".Translate(byname, mw.GameSavesData.GameSave.Name, feed.Item.TranslateName, feed.Item.Price));
//对于要修改数据的物品一定要再次检查,避免联机开挂毁存档
if (item.Price >= 10 && item.Price <= 1000 && item.Health >= 0 && item.Exp >= 0 && item.Likability >= 0 && giveprice < 1000
if (item.Price >= 10 && item.Price <= 1000 && item.Health >= 0 && item.Exp >= 0 && item.Likability >= 0 && giveprice < 0
&& item.Strength >= 0 && item.StrengthDrink >= 0 && item.StrengthFood >= 0 && item.Feeling >= 0)
{//单次联机收礼物上限1000
giveprice += item.Price;

2
VPet-Simulator.Windows/mod/0000_core/lang/en/Text2307.lps
View File

@ -25,7 +25,7 @@ M属性爆发！主人我要吃麦O劳!#I am McHungry! Master, I want McTonald's
喝！继续喝！还没尽兴呢！#Drink! I need a drink to keep me hydrated!:|
大家好，我是本群的“提醒喝水小助手”希望此刻看到消息的人可以和我一起来喝一杯水。和我一起成为一天八杯水的人吧!#Hello everyone, I am the "water reminder assistant" in this group. I hope people who see this message can drink a glass of water with me. Join me as a person who drinks eight glasses of water a day.:|
主人我的宠物快乐水呢！#Master, Where is my Pet Cola?!:|
渴了就喝水,别老扒拉我腿行不行呀#I need to drink water when i am thirsty, don't make me wait okay?!:|
渴了就喝水,别老扒拉我腿行不行呀#I need to drink water when i am thirsty.:|
本人自愿放下水杯停止喝水, 没有受到客观阻碍,不能算喝水未遂,只能算喝水中止#I voluntarily put down my water cup and stopped drinking without any withdrawal symptoms. I can stop whenever i want okay ??!:|
我夸父只喝一口#Please master just one sip ?:|
主人该喝水了#Master, let's have some tea.:|

2
VPet-Simulator.Windows/mod/0000_core/lang/en/Text2308.lps
View File

@ -133,7 +133,7 @@ ZZZZ#ZZZZZZZ:|
打游戏才不用睡午觉呢#Playing games is relaxing - there is no need to take a nap...:|
大残！一丝！#Big damage! HEADSHOT!:|
晚上好主人~#Good evening master.:|
是先吃饭，还是先洗澡，还是说，先·吃·我？#Do you want to have a dinner first, have a shower first, or have me first?:|
欢迎回来主人，好好吃晚饭吗？#Welcome back master, did you have a good dinner?:|
晚修达~#Late night study!:|
夜来风雨声，花落知多少。#Mrs. Moon sitting up in the sky, little old lady rock-a-bye, with a ball of fading light and silvery needles knitting the night...:|
8点了？下播！#8 o'clock already? I'm off!:|

2
VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Text2308.lps
View File

@ -133,7 +133,7 @@ ZZZZ#ZZZZ:|
打游戏才不用睡午觉呢#打游戏才不用睡午觉呢:|
大残！一丝！#大残！一丝！:|
晚上好主人~#晚上好主人~:|
是先吃饭，还是先洗澡，还是说，先·吃·我？#是先吃饭，还是先洗澡，还是说，先·吃·我？:|
欢迎回来主人，好好吃晚饭吗？#欢迎回来主人，好好吃晚饭吗？:|
晚修达~#晚修达~:|
夜来风雨声，花落知多少。#夜来风雨声，花落知多少。:|
8点了？下播！#8点了？下播！:|

2
VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Text2308.lps
View File

@ -133,7 +133,7 @@ ZZZZ#Zzzz:|
打游戏才不用睡午觉呢#打遊戲才不用睡午覺呢:|
大残！一丝！#大殘！一滴！:|
晚上好主人~#晚上好主人～:|
是先吃饭，还是先洗澡，还是说，先·吃·我？#是先吃飯，還是先洗澡，還是說，先．吃．我？:|
欢迎回来主人，好好吃晚饭吗？#歡迎回來主人，好好吃晚餐了嗎？:|
晚修达~#晚自習噠～:|
夜来风雨声，花落知多少。#夜來風雨聲，花落知多少。:|
8点了？下播！#8點了？關台！:|

2
VPet-Simulator.Windows/mod/0000_core/text/ClickText.lps
View File

@ -127,7 +127,7 @@ clicktext:|State#Work:|Working#学习:|dayTime#2:|Text#没有午休的吗？！:
clicktext:|State#Work:|Working#直播:|dayTime#2:|Text#打游戏才不用睡午觉呢:|tag#vup,girl:|
clicktext:|State#Work:|Working#直播:|dayTime#2:|Text#大残！一丝！:|Exp#-1:|tag#vup,girl:|
clicktext:|State#Nomal:|dayTime#4:|Text#晚上好主人~:|tag#vup,girl:|
clicktext:|State#Nomal:|dayTime#4:|Text#是先吃饭，还是先洗澡，还是说，先·吃·我？:|Likability#1:|tag#vup,girl:|
clicktext:|State#Nomal:|dayTime#4:|Text#欢迎回来主人，好好吃晚饭吗？:|Likability#1:|tag#vup,girl:|
clicktext:|State#Work:|Working#学习:|dayTime#4:|Text#晚修达~:|Exp#1:|tag#vup,girl:|
clicktext:|State#Work:|Working#学习:|dayTime#4:|Text#夜来风雨声，花落知多少。:|Exp#1:|tag#vup,girl:|
clicktext:|State#Work:|Working#直播:|dayTime#4:|Text#8点了？下播！:|tag#vup,girl:|