diff --git a/VPet-Simulator.Windows/Function/MWController.cs b/VPet-Simulator.Windows/Function/MWController.cs
index 259be7f..939ab50 100644
--- a/VPet-Simulator.Windows/Function/MWController.cs
+++ b/VPet-Simulator.Windows/Function/MWController.cs
@@ -104,7 +104,7 @@ namespace VPet_Simulator.Windows
public void ShowPanel()
{
var panelWindow = new winCharacterPanel(mw);
- panelWindow.ShowDialog();
+ panelWindow.Show();
}
public double ZoomRatio => mw.Set.ZoomLevel;
diff --git a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml
index 73063e9..df49adc 100644
--- a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml
@@ -1,382 +1,203 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs
index 1ec0aa9..0b891ec 100644
--- a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs
@@ -24,7 +24,7 @@ namespace VPet_Simulator.Windows
foreach (var v in mw.GameSavesData.Statistics.Data)
{
- StatList.Add(new StatInfo(v.Key, v.Value));
+ StatList.Add(new StatInfo(v.Key, v.Value.GetDouble()));
}
DataGridStatic.ItemsSource = StatList;
}
@@ -33,13 +33,17 @@ namespace VPet_Simulator.Windows
private class StatInfo
{
- public StatInfo(string statId, string statCount)
+ public StatInfo(string statId, double statCount)
{
StatId = statId;
StatCount = statCount;
if (statId.StartsWith("buy_"))
{
- StatName = "购买次数".Translate() + statId.Substring(3);
+ StatName = "购买次数".Translate() + '_' + statId.Substring(4).Translate();
+ }
+ else if (statId.StartsWith("stat_"))
+ {
+ StatName = "统计".Translate() + '_' + statId.Substring(5).Translate();
}
else
{
@@ -60,7 +64,7 @@ namespace VPet_Simulator.Windows
///
/// 统计内容
///
- public string StatCount { get; set; }
+ public double StatCount { get; set; }
}
private void PgbExperience_GeneratingPercentText(
@@ -156,6 +160,9 @@ namespace VPet_Simulator.Windows
i.StatName.IndexOf(
textBox.Text,
StringComparison.InvariantCultureIgnoreCase
+ ) >= 0 || i.StatId.IndexOf(
+ textBox.Text,
+ StringComparison.InvariantCultureIgnoreCase
) >= 0
);
}
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2310.lps b/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2310.lps
new file mode 100644
index 0000000..8961def
--- /dev/null
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2310.lps
@@ -0,0 +1,47 @@
+统计面板#Statistics Panel:|
+搜索统计#Search Statistics:|
+数量#Quantity:|
+详情面板#Details Panel:|
+购买次数#Purchase:|
+统计#Statistics:|
+0_feel#Mood is 0:|
+0_sd_sf#Hungry and thirsty at the same time is 0:|
+0_strengthdrink#Thirst 0:|
+0_strengthfood#Hunger is 0:|
+100_all#Number of full states:|
+ill_nomoney#Sick with no money:|
+sleep_time#Sleeping time:|
+autobuy#Number of automatic purchases:|
+bb_drink#Drinks total cost:|
+bb_drug_exp#Drugs total experience:|
+bb_drug#Drugs Total Spend:|
+bb_functional#Functionality Total Spend:|
+bb_gift#Gift Total Cost:|
+bb_gift_like#Gift Total Favor:|
+bb_meal#Meal Totals:|
+bb_snack#Snacks Total:|
+betterbuy#Better Buys Total:|
+buytimes#Better Buys Purchase Count:|
+level#Level:|
+level_g_money#Rank is greater than money:|
+likability#Favorability:|
+menu_pop#Number of times the taskbar has been opened:|
+money#Money:|
+move_length#Movement distance (px):|
+music#Number of times music is danced to:|
+open_times#Game startup times:|
+say_exp_p#Talking experience value increase:|
+say_exp_d#Decrease in talk experience:|
+say_like_p#Talking favor increase:|
+say_like_d#Talking favor decreases:|
+say_money_p#Talking money increased:|
+say_money_d#Talking money decreases:|
+say_times#Speaking times:|
+single_profit_exp#Experience gained per job:|
+single_profit_money#Money gained in a single session of work:|
+sleep_time#Sleeping time (sec):|
+study_time#Study time (sec):|
+total_time#Total time (sec):|
+touch_body#Number of times you touch your body:|
+touch_head#Number of times you touch your head:|
+work_time#Working time (sec):|
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2310.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2310.lps
new file mode 100644
index 0000000..afdc4a8
--- /dev/null
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2310.lps
@@ -0,0 +1,47 @@
+统计面板#统计面板:|
+搜索统计#搜索统计:|
+数量#数量:|
+详情面板#详情面板:|
+购买次数#购买次数:|
+统计#统计:|
+0_feel#心情为0:|
+0_sd_sf#饥饿同时口渴为0:|
+0_strengthdrink#口渴为0:|
+0_strengthfood#饥饿为0:|
+100_all#满状态次数:|
+ill_nomoney#生病且没钱:|
+sleep_time#睡觉时间:|
+autobuy#自动购买次数:|
+bb_drink#饮料总计花费:|
+bb_drug_exp#药品总计经验:|
+bb_drug#药品总计花费:|
+bb_functional#功能性总计花费:|
+bb_gift#礼物总计花费:|
+bb_gift_like#礼物总计好感:|
+bb_meal#正餐总计花费:|
+bb_snack#零食总计花费:|
+betterbuy#更好买总计花费:|
+buytimes#更好买购买次数:|
+level#等级:|
+level_g_money#等级大于金钱:|
+likability#好感度:|
+menu_pop#任务栏打开次数:|
+money#金钱:|
+move_length#移动距离(px):|
+music#音乐跳舞次数:|
+open_times#游戏启动次数:|
+say_exp_p#说话经验值增加次数:|
+say_exp_d#说话经验值减少次数:|
+say_like_p#说话好感增加次数:|
+say_like_d#说话好感减少次数:|
+say_money_p#说话金钱增加次数:|
+say_money_d#说话金钱减少次数:|
+say_times#说话次数:|
+single_profit_exp#工作单次获得经验值:|
+single_profit_money#工作单次获得金钱:|
+sleep_time#睡觉时间(秒):|
+study_time#学习时间(秒):|
+total_time#总计时间(秒):|
+touch_body#摸身体次数:|
+touch_head#摸头次数:|
+work_time#工作时间(秒):|
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2310.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2310.lps
new file mode 100644
index 0000000..a2001f2
--- /dev/null
+++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2310.lps
@@ -0,0 +1,47 @@
+统计面板#統計面板:|
+搜索统计#蒐索統計:|
+数量#數量:|
+详情面板#詳情面板:|
+购买次数#購買次數:|
+统计#統計:|
+0_feel#心情為0:|
+0_sd_sf#饑餓同時口渴為0:|
+0_strengthdrink#口渴為0:|
+0_strengthfood#饑餓為0:|
+100_all#滿狀態次數:|
+ill_nomoney#生病且沒錢:|
+sleep_time#睡覺時間:|
+autobuy#自動購買次數:|
+bb_drink#飲料總計花費:|
+bb_drug_exp#藥品總計經驗:|
+bb_drug#藥品總計花費:|
+bb_functional#功能性總計花費:|
+bb_gift#禮物總計花費:|
+bb_gift_like#禮物總計好感:|
+bb_meal#正餐總計花費:|
+bb_snack#零食總計花費:|
+betterbuy#更好買總計花費:|
+buytimes#更好買購買次數:|
+level#等級:|
+level_g_money#等級大於金錢:|
+likability#好感度:|
+menu_pop#工作列打開次數:|
+money#金錢:|
+move_length#移動距離(px):|
+music#音樂跳舞次數:|
+open_times#遊戲啟動次數:|
+say_exp_p#說話經驗值新增次數:|
+say_exp_d#說話經驗值减少次數:|
+say_like_p#說話好感新增次數:|
+say_like_d#說話好感减少次數:|
+say_money_p#說話金錢新增次數:|
+say_money_d#說話金錢减少次數:|
+say_times#說話次數:|
+single_profit_exp#工作單次獲得經驗值:|
+single_profit_money#工作單次獲得金錢:|
+sleep_time#睡覺時間(秒):|
+study_time#學習時間(秒):|
+total_time#總計時間(秒):|
+touch_body#摸身體次數:|
+touch_head#摸頭次數:|
+work_time#工作時間(秒):|