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 2023-06-11 19:10:09 +10:00
parent dfc75030e8
commit b92d0280bd
10 changed files with 166 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
VPet-Simulator.Core/Display/Main.xaml.cs
View File

@ -104,8 +104,23 @@ namespace VPet_Simulator.Core
/// </summary>
public void LoadTouchEvent()
{
Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchHeadLocate, Core.Graph.GraphConfig.TouchHeadSize, DisplayTouchHead));
Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchRaisedLocate, Core.Graph.GraphConfig.TouchRaisedSize, DisplayRaised, true));
Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchHeadLocate, Core.Graph.GraphConfig.TouchHeadSize, () => { DisplayTouchHead(); return true; }));
for (int i = 0; i < 4; i++)
{
GameSave.ModeType m = (GameSave.ModeType)i;
Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchRaisedLocate[i], Core.Graph.GraphConfig.TouchRaisedSize[i],
() =>
{
if (Core.Save.Mode == m)
{
DisplayRaised();
return true;
}
else
return false;
}, true));
}
}
/// <summary>
/// 播放语音 语音播放时不会停止播放说话表情
@ -186,17 +201,20 @@ namespace VPet_Simulator.Core
//mp = new Point(mp.X * Core.Controller.ZoomRatio, mp.Y * Core.Controller.ZoomRatio);
if (isPress && presstime == pth)
{//历遍长按事件
var act = Core.TouchEvent.FirstOrDefault(x => x.IsPress == true && x.Touch(mp));
if (act != null)
Dispatcher.Invoke(act.DoAction);
foreach (var x in Core.TouchEvent)
{
if (x.IsPress == true && x.Touch(mp) && x.DoAction())
return;
}
}
else
{//历遍点击事件
var act = Core.TouchEvent.FirstOrDefault(x => x.IsPress == false && x.Touch(mp));
if (act != null)
Dispatcher.Invoke(act.DoAction);
else
DefaultClickAction?.Invoke();
foreach (var x in Core.TouchEvent)
{
if (x.IsPress == false && x.Touch(mp) && x.DoAction())
return;
}
DefaultClickAction?.Invoke();
}
});
}

140
VPet-Simulator.Core/Display/MainLogic.cs
View File

@ -60,22 +60,23 @@ namespace VPet_Simulator.Core
{
Display(GraphCore.Helper.Convert(type, GraphCore.Helper.AnimatType.B_Loop), () => Saying(type));
}
int lowstrengthAskCount = 1;
int lowstrengthAskCountFood = 1;
int lowstrengthAskCountDrink = 1;
private void lowStrengthFood()//未来的Display
{
if (Function.Rnd.Next(lowstrengthAskCount--) == 0)
if (Function.Rnd.Next(lowstrengthAskCountFood--) == 0)
{
Display(GraphCore.GraphType.Switch_Thirsty, () => Say("肚子饿了,想吃东西", GraphCore.Helper.SayType.Serious));//TODO:不同的饥饿说话方式
lowstrengthAskCount = 15;
Display(GraphCore.GraphType.Switch_Thirsty, () => Say("肚子饿了,想吃东西", GraphCore.Helper.SayType.Serious, true));//TODO:不同的饥饿说话方式
lowstrengthAskCountFood = 20;
}
}
private void lowStrengthDrink()//未来的Display
{
if (Function.Rnd.Next(lowstrengthAskCount--) == 0)
if (Function.Rnd.Next(lowstrengthAskCountDrink--) == 0)
{
Display(GraphCore.GraphType.Switch_Thirsty, () => Say("渴了,想喝东西", GraphCore.Helper.SayType.Serious));//TODO:不同的饥饿说话方式
lowstrengthAskCount = 15;
Display(GraphCore.GraphType.Switch_Thirsty, () => Say("渴了,想喝东西", GraphCore.Helper.SayType.Serious, true));//TODO:不同的饥饿说话方式
lowstrengthAskCountDrink = 20;
}
}
@ -172,7 +173,7 @@ namespace VPet_Simulator.Core
Core.Save.Health -= TimePass;
}
lowStrengthFood();
var addmoney = TimePass * 6;
var addmoney = TimePass * (6 + Core.Save.Level);
Core.Save.Exp += addmoney;
WorkTimer.GetCount += addmoney;
}
@ -223,10 +224,12 @@ namespace VPet_Simulator.Core
else if (Core.Save.Feeling <= 25)
{
Core.Save.Likability -= TimePass;
Core.Save.Exp -= TimePass;
}
if (Core.Save.StrengthDrink <= 25)
{
Core.Save.Health -= Function.Rnd.Next(0, 1) * TimePass;
Core.Save.Exp -= TimePass;
lowStrengthDrink();
}
else if (Core.Save.StrengthDrink >= 75)
@ -264,65 +267,70 @@ namespace VPet_Simulator.Core
Dispatcher.Invoke(() => TimeUIHandle.Invoke(this));
if (DisplayType == GraphCore.GraphType.Default && !isPress)
switch (Function.Rnd.Next(Math.Max(20, Core.Controller.InteractionCycle - CountNomal)))
{
case 0:
//随机向右
DisplayWalk_Left();
break;
case 1:
DisplayClimb_Left_UP();
break;
case 2:
DisplayClimb_Left_DOWN();
break;
case 3:
DisplayClimb_Right_UP();
break;
case 4:
DisplayClimb_Right_DOWN();
break;
case 5:
DisplayWalk_Right();
break;
case 6:
DisplayFall_Left();
break;
case 7:
DisplayFall_Right();
break;
case 8:
DisplayClimb_Top_Right();
break;
case 9:
DisplayClimb_Top_Left();
break;
case 10:
DisplayCrawl_Left();
break;
case 11:
DisplayCrawl_Right();
break;
case 13:
case 14:
DisplaySleep();
break;
case 15:
case 16:
DisplayBoring();
break;
case 18:
case 17:
DisplaySquat();
break;
case 12:
case 19:
case 20:
DisplayIdel_StateONE();
break;
default:
break;
if (Core.Save.Mode == GameSave.ModeType.Ill)
{//生病时候的随机
}
else//TODO:制作随机列表
switch (Function.Rnd.Next(Math.Max(20, Core.Controller.InteractionCycle - CountNomal)))
{
case 0:
//随机向右
DisplayWalk_Left();
break;
case 1:
DisplayClimb_Left_UP();
break;
case 2:
DisplayClimb_Left_DOWN();
break;
case 3:
DisplayClimb_Right_UP();
break;
case 4:
DisplayClimb_Right_DOWN();
break;
case 5:
DisplayWalk_Right();
break;
case 6:
DisplayFall_Left();
break;
case 7:
DisplayFall_Right();
break;
case 8:
DisplayClimb_Top_Right();
break;
case 9:
DisplayClimb_Top_Left();
break;
case 10:
DisplayCrawl_Left();
break;
case 11:
DisplayCrawl_Right();
break;
case 13:
case 14:
DisplaySleep();
break;
case 15:
case 16:
DisplayBoring();
break;
case 18:
case 17:
DisplaySquat();
break;
case 12:
case 19:
case 20:
DisplayIdel_StateONE();
break;
default:
break;
}
}
/// <summary>

44
VPet-Simulator.Core/Graph/GraphCore.cs
View File

@ -434,12 +434,12 @@ namespace VPet_Simulator.Core
return list[Function.Rnd.Next(list.Count)];
}
if (mode != GameSave.ModeType.Ill)
{
list = Graphs[type].FindAll(x => x.ModeType != GameSave.ModeType.Ill);
if (list.Count > 0)
return list[Function.Rnd.Next(list.Count)];
}
//if (mode != GameSave.ModeType.Ill)
//{
list = Graphs[type].FindAll(x => x.ModeType != GameSave.ModeType.Ill);
if (list.Count > 0)
return list[Function.Rnd.Next(list.Count)];
//}
}
return null;// FindGraph(GraphType.Default, mode);
}
@ -516,7 +516,7 @@ namespace VPet_Simulator.Core
/// <summary>
/// 提起触发位置
/// </summary>
public Point TouchRaisedLocate;
public Point[] TouchRaisedLocate;
/// <summary>
/// 摸头触发大小
/// </summary>
@ -524,7 +524,7 @@ namespace VPet_Simulator.Core
/// <summary>
/// 提起触发大小
/// </summary>
public Size TouchRaisedSize;
public Size[] TouchRaisedSize;
/// <summary>
/// 提起定位点
@ -580,8 +580,18 @@ namespace VPet_Simulator.Core
{
TouchHeadLocate = new Point(lps["touchhead"][(gdbe)"px"], lps["touchhead"][(gdbe)"py"]);
TouchHeadSize = new Size(lps["touchhead"][(gdbe)"sw"], lps["touchhead"][(gdbe)"sh"]);
TouchRaisedLocate = new Point(lps["touchraised"][(gdbe)"px"], lps["touchraised"][(gdbe)"py"]);
TouchRaisedSize = new Size(lps["touchraised"][(gdbe)"sw"], lps["touchraised"][(gdbe)"sh"]);
TouchRaisedLocate = new Point[] {
new Point(lps["touchraised"][(gdbe)"happy_px"], lps["touchraised"][(gdbe)"happy_py"]),
new Point(lps["touchraised"][(gdbe)"nomal_px"], lps["touchraised"][(gdbe)"nomal_py"]),
new Point(lps["touchraised"][(gdbe)"poorcondition_px"], lps["touchraised"][(gdbe)"poorcondition_py"]),
new Point(lps["touchraised"][(gdbe)"ill_px"], lps["touchraised"][(gdbe)"ill_py"])
};
TouchRaisedSize = new Size[] {
new Size(lps["touchraised"][(gdbe)"happy_sw"], lps["touchraised"][(gdbe)"happy_sh"]),
new Size(lps["touchraised"][(gdbe)"nomal_sw"], lps["touchraised"][(gdbe)"nomal_sh"]),
new Size(lps["touchraised"][(gdbe)"poorcondition_sw"], lps["touchraised"][(gdbe)"poorcondition_sh"]),
new Size(lps["touchraised"][(gdbe)"ill_sw"], lps["touchraised"][(gdbe)"ill_sh"])
};
RaisePoint = new Point[] {
new Point(lps["raisepoint"][(gdbe)"happy_x"], lps["raisepoint"][(gdbe)"happy_y"]),
new Point(lps["raisepoint"][(gdbe)"nomal_x"], lps["raisepoint"][(gdbe)"nomal_y"]),
@ -626,8 +636,18 @@ namespace VPet_Simulator.Core
}
if (lps.FindLine("touchraised") != null)
{
TouchRaisedLocate = new Point(lps["touchraised"][(gdbe)"px"], lps["touchraised"][(gdbe)"py"]);
TouchRaisedSize = new Size(lps["touchraised"][(gdbe)"sw"], lps["touchraised"][(gdbe)"wh"]);
TouchRaisedLocate = new Point[] {
new Point(lps["touchraised"][(gdbe)"happy_px"], lps["touchraised"][(gdbe)"happy_py"]),
new Point(lps["touchraised"][(gdbe)"nomal_px"], lps["touchraised"][(gdbe)"nomal_py"]),
new Point(lps["touchraised"][(gdbe)"poorcondition_px"], lps["raistouchraisedepoint"][(gdbe)"poorcondition_py"]),
new Point(lps["touchraised"][(gdbe)"ill_px"], lps["touchraised"][(gdbe)"ill_py"])
};
TouchRaisedSize = new Size[] {
new Size(lps["touchraised"][(gdbe)"happy_sx"], lps["touchraised"][(gdbe)"happy_sy"]),
new Size(lps["touchraised"][(gdbe)"nomal_sx"], lps["touchraised"][(gdbe)"nomal_sy"]),
new Size(lps["touchraised"][(gdbe)"poorcondition_sx"], lps["touchraised"][(gdbe)"poorcondition_sy"]),
new Size(lps["touchraised"][(gdbe)"ill_sx"], lps["touchraised"][(gdbe)"ill_sy"])
};
}
if (lps.FindLine("raisepoint") != null)
{

4
VPet-Simulator.Core/Handle/GameCore.cs
View File

@ -42,7 +42,7 @@ namespace VPet_Simulator.Core
/// <summary>
/// 如果是触发的内容
/// </summary>
public Action DoAction;
public Func<bool> DoAction;
/// <summary>
/// 否:立即触发/是:长按触发
/// </summary>
@ -54,7 +54,7 @@ namespace VPet_Simulator.Core
/// <param name="size">大小</param>
/// <param name="doAction">如果是触发的内容</param>
/// <param name="isPress">否:立即触发/是:长按触发</param>
public TouchArea(Point locate, Size size, Action doAction, bool isPress = false)
public TouchArea(Point locate, Size size, Func<bool> doAction, bool isPress = false)
{
Locate = locate;
Size = size;

2
VPet-Simulator.Core/Handle/GameSave.cs
View File

@ -27,7 +27,7 @@ namespace VPet_Simulator.Core
/// <summary>
/// 等级
/// </summary>
public int Level => (int)(Math.Sqrt(Exp) / 10) + 1;
public int Level => Exp < 0 ? 1 : (int)(Math.Sqrt(Exp) / 10) + 1;
/// <summary>
/// 升级所需经验值

16
VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
View File

@ -29,8 +29,8 @@
VerticalAlignment="Center" Margin="30,0,0,0" />
<Button Style="{DynamicResource TextButtonStyle}" Foreground="{DynamicResource DARKPrimaryText}"
Content="更好买" VerticalAlignment="Center" FontSize="20" Click="BtnTitle_Click"
pu:WindowX.IsDragMoveArea="False" Margin="10,0,0,0"/>
<Grid Grid.Column="1" Margin="15,0,0,0" Width="200" pu:WindowX.IsDragMoveArea="False">
pu:WindowX.IsDragMoveArea="False" Margin="10,0,0,0" />
<Grid Grid.Column="1" Margin="15,0,0,0" pu:WindowX.IsDragMoveArea="False" Width="200">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
@ -46,8 +46,14 @@
Foreground="{DynamicResource DARKPrimaryText}" FontSize="16" Cursor="Hand"
Click="BtnSearch_Click" />
</Grid>
</StackPanel>
<pu:Switch Content="购买后不自动关闭窗口" Grid.Column="2" FontSize="14" Margin="10,0,5,0" Height="20"
VerticalAlignment="Center" HorizontalAlignment="Right" BoxHeight="14" ToggleSize="18"
CheckedBackground="{DynamicResource Primary}" CheckedBorderBrush="{DynamicResource Primary}"
Background="Transparent" ToggleShadowColor="{x:Null}" IsChecked="{Binding StateOpen}"
CheckedToggleBrush="{DynamicResource DARKPrimaryText}"
ToggleBrush="{DynamicResource PrimaryDark}" pu:WindowX.IsDragMoveArea="False" BoxWidth="30"
Loaded="Switch_Loaded" Checked="Switch_Checked" Unchecked="Switch_Checked" />
</Grid>
</DataTemplate>
</pu:WindowXCaption.HeaderTemplate>
@ -78,7 +84,7 @@
</Grid.RowDefinitions>
<StackPanel Grid.Row="1" Orientation="Horizontal">
<TextBlock x:Name="TxtPrice" VerticalAlignment="Bottom"
Text="{Binding Price, StringFormat='¥ 0.0'}" FontWeight="Bold" FontSize="18"
Text="{Binding Price, StringFormat='$ 0.0'}" FontWeight="Bold" FontSize="18"
Foreground="{DynamicResource DARKPrimary}" />
<!--<TextBlock x:Name="TxtDiscountPrice" Margin="5,0,0,0" FontWeight="Bold"
FontSize="18" Foreground="{DynamicResource DARKPrimary}">
@ -145,7 +151,7 @@
</Border>
<ToggleButton x:Name="TbtnStar" Grid.ColumnSpan="2" Margin="0,5,32,0" HorizontalAlignment="Right"
VerticalAlignment="Top" Width="30" Height="30" Padding="0" FontSize="22"
Foreground="#FFB300" Background="Transparent" ToolTip="收藏食物"
Foreground="#FFB300" Background="Transparent" ToolTip="收藏食物"
pu:ToggleButtonHelper.CornerRadius="5" pu:ToggleButtonHelper.CheckedContent="&#xF186;"
pu:IconHelper.Margin="0" FontFamily="/VPet-Simulator.Windows;component/Res/#remixicon"
Content="&#xF18B;" IsChecked="{Binding Star}" />

15
VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
View File

@ -30,6 +30,7 @@ namespace VPet_Simulator.Windows
private TextBox _searchTextBox;
MainWindow mw;
private bool AllowChange = false;
private Switch _puswitch;
public winBetterBuy(MainWindow mw)
{
@ -172,7 +173,8 @@ namespace VPet_Simulator.Windows
mw.Core.Save.EatFood(item);
mw.Core.Save.Money -= item.Price;
}
TryClose();
if (!_puswitch.IsChecked.Value)
TryClose();
IRunImage eat = (IRunImage)mw.Core.Graph.FindGraph(GraphType.Eat, GameSave.ModeType.Nomal);
var b = mw.Main.FindDisplayBorder(eat);
eat.Run(b, item.ImageSource, mw.Main.DisplayToNomal);
@ -220,5 +222,16 @@ namespace VPet_Simulator.Windows
TryClose();
e.Cancel = true;
}
private void Switch_Loaded(object sender, RoutedEventArgs e)
{
_puswitch = sender as Switch;
_puswitch.IsChecked = mw.Set["betterbuy"].GetBool("noautoclose");
}
private void Switch_Checked(object sender, RoutedEventArgs e)
{
mw.Set["betterbuy"].SetBool("noautoclose", _puswitch.IsChecked.Value);
}
}
}

3
VPet-Simulator.Windows/mod/0000_core/food/food.lps
View File

@ -28,7 +28,7 @@ food:|type#Snack:|name#牛扎糖:|price#4.0:|desc#好甜，像你一样:|Exp#10:
food:|type#Snack:|name#泡泡糖:|price#3.5:|desc#就吹吧你:|Exp#15:|Strength#5:|StrengthDrink#-1:|StrengthFood#5:|Feeling#17:|
food:|type#Snack:|name#巧克力:|price#10.0:|desc#纵享丝滑:|Exp#10:|Strength#30:|StrengthDrink#-5:|StrengthFood#38:|Feeling#15:|
food:|type#Snack:|name#软糖:|price#3.0:|desc#come on baby~:|Exp#10:|Strength#5:|StrengthDrink#-2:|StrengthFood#12:|Feeling#5:|
food:|type#Snack:|name#薯片:|price#7.0:|desc#开趴必备:|Exp#10:|Strength#10:|StrengthDrink#5:|StrengthFood#28:|Feeling#5:|
food:|type#Snack:|name#薯片:|price#6.0:|desc#开趴必备:|Exp#10:|Strength#10:|StrengthDrink#-5:|StrengthFood#28:|Feeling#5:|
food:|type#Snack:|name#娃仔小馒头:|price#4.5:|desc#这是我们的宝贝~~:|Exp#10:|Strength#15:|StrengthDrink#0:|StrengthFood#12:|Feeling#10:|
food:|type#Snack:|name#小布丁:|price#4.0:|desc#没关系，小小的也很好吃:|Exp#10:|Strength#10:|StrengthDrink#5:|StrengthFood#10:|Feeling#5:|
food:|type#Snack:|name#雪饼:|price#5.5:|desc#小时候的一口吃不下:|Exp#10:|Strength#10:|StrengthDrink#5:|StrengthFood#15:|Feeling#10:|
@ -61,3 +61,4 @@ food:|type#Meal:|name#芝士焗虾:|price#28.5:|desc#焗虾闭嘴:|Exp#125:|Stre
food:|type#Meal:|name#纸包鸡:|price#28.0:|desc#纸包鸡包纸包鸡包鸡包纸:|Exp#100:|Strength#85:|StrengthFood#75:|Feeling#30:|
food:|type#Meal:|name#炸鸡腿:|price#14.5:|desc#:|Exp#50:|Strength#40:|StrengthFood#40:|Feeling#20:|
food:|type#Meal:|name#汉堡:|price#19.5:|desc#还想要汉O王？这价格不是华O士已经对你很好了。:|Exp#50:|Strength#60:|StrengthFood#60:|Feeling#20:|
food:|type#Functional:|name#地球:|price#0.0:|desc#没钱也能吃,可以用来拯救存档:|Exp#-300:|Strength#-200:|StrengthDrink#200:|StrengthFood#200:|Feeling#-200:|

BIN
VPet-Simulator.Windows/mod/0000_core/image/food/地球.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 94 KiB

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

@ -1,7 +1,7 @@
pet#默认虚拟桌宠:|intor#虚拟主播模拟器默认人物形象:|path#vup:|
touchhead:|px#159:|py#16:|sw#189:|sh#178:|
touchraised:|px#0:|py#50:|sw#500:|sh#200:|
raisepoint:|happy_x#290:|happy_y#128:|nomal_x#290:|nomal_y#128:|poorcondition_x#290:|poorcondition_y#128:|ill_x#290:|ill_y#128:|
touchraised:|happy_px#0:|happy_py#50:|happy_sw#500:|happy_sh#200:|nomal_px#0:|nomal_py#50:|nomal_sw#500:|nomal_sh#200:|poorcondition_px#0:|poorcondition_py#50:|poorcondition_sw#500:|poorcondition_sh#200:|ill_px#0:|ill_py#200:|ill_sw#500:|ill_sh#300:|
raisepoint:|happy_x#290:|happy_y#128:|nomal_x#290:|nomal_y#128:|poorcondition_x#290:|poorcondition_y#128:|ill_x#225:|ill_y#115:|
speed:|walk#20:|climb#10:|climbtop#8:|crawl#8:|fallx#14:|fally#10:|crawl#10:|
locate:|climbleft#145:|climbright#185:|climbtop#150:|
storernd:|Touch_Body_A_Start:|Touch_Body_B_Loop:|Touch_Body_C_End:|