diff --git a/Source/GrasscutterTools/Controls/TextBoxXP.cs b/Source/GrasscutterTools/Controls/TextBoxXP.cs
deleted file mode 100644
index 0f72617..0000000
--- a/Source/GrasscutterTools/Controls/TextBoxXP.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-
-
-namespace GrasscutterTools.Controls
-{
- [ToolboxItem(true)]
- public class TextBoxXP : TextBox
- {
-
- ///
- /// 获得当前进程，以便重绘控件
- ///
- ///
- ///
- [DllImport("user32.dll")]
- private static extern IntPtr GetWindowDC(IntPtr hWnd);
-
- [DllImport("user32.dll")]
- private static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
- private const int EM_SETCUEBANNER = 0x1501;
-
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
- private static extern Int32 SendMessage
- (IntPtr hWnd, int msg, int wParam, [MarshalAs(UnmanagedType.LPWStr)] string lParam);
-
- ///
- /// 水印文本
- ///
- private string _Watermark = "";
-
- private float maximum;
- private float minimum;
-
- #region 属性
-
- ///
- /// 是否启用热点效果
- ///
- [Category("外观")]
- [Browsable(true)]
- [Localizable(true)]
- [Description("获取或设置输入框水印文本")]
- [DefaultValue("")]
- public string Watermark
- {
- get
- {
- return this._Watermark;
- }
- set
- {
- this._Watermark = value;
- SendMessage(Handle, EM_SETCUEBANNER, 0, _Watermark);
- this.Invalidate();
- }
- }
-
- ///
- /// 是否只能输入数字
- ///
- [Category("行为")]
- [Browsable(true)]
- [Description("获取或设置TextBox是否只允许输入数字")]
- [DefaultValue(false)]
- public bool DigitOnly { get; set; }
-
- ///
- /// 转为数值
- ///
- public float Number
- {
- get
- {
- if (float.TryParse(Text, out float value))
- return value;
- else
- return 0f;
- }
- }
-
- [Category("数据")]
- [Browsable(true)]
- [DefaultValue(0)]
- [Description("指示小数点后位数")]
- public int DecimalPlaces { get; set; }
-
- [Category("数据")]
- [Description("获取或设置限制的最大值")]
- public float Maximum
- {
- get
- {
- return maximum;
- }
- set
- {
- maximum = value;
- if (minimum > maximum)
- {
- minimum = maximum;
- }
- }
- }
-
- [Category("数据")]
- [Browsable(true)]
- [Description("获取或设置限制的最小值")]
- public float Minimum
- {
- get
- {
- return minimum;
- }
- set
- {
- minimum = value;
- if (minimum > maximum)
- {
- maximum = value;
- }
- }
- }
-
- #endregion 属性
-
- ///
- ///
- ///
- public TextBoxXP()
- : base()
- {
- //BorderStyle = BorderStyle.FixedSingle;
- //Font = Styles.StaticResources.DefaultFont;
- }
-
- protected override void OnKeyPress(KeyPressEventArgs e)
- {
- base.OnKeyPress(e);
- // 如果只允许输入数字，则判断输入是否为退格或者数字
- if (DigitOnly)
- {
- //IsNumber：指定字符串中位于指定位置的字符是否属于数字类别
- //IsPunctuation：指定字符串中位于指定位置的字符是否属于标点符号类别
- //IsControl：指定字符串中位于指定位置的字符是否属于控制字符类别
- if (!Char.IsNumber(e.KeyChar) && !Char.IsPunctuation(e.KeyChar) && !Char.IsControl(e.KeyChar))
- {
- e.Handled = true; //获取或设置一个值，指示是否处理过System.Windows.Forms.Control.KeyPress事件
- }
- else if (Char.IsPunctuation(e.KeyChar) && DecimalPlaces > 0)
- {
- if (e.KeyChar == '.')
- {
- if (Text.LastIndexOf('.') != -1)
- {
- e.Handled = true;
- }
- }
- else
- {
- e.Handled = true;
- }
- }
- }
- }
-
- protected override void OnLeave(EventArgs e)
- {
- base.OnLeave(e);
-
- if (DigitOnly)
- {
- if (!string.IsNullOrWhiteSpace(Text))
- {
- if (Number > Maximum)
- Text = Maximum.ToString("F" + DecimalPlaces);
- if (Number < Minimum)
- Text = Minimum.ToString("F" + DecimalPlaces);
- }
- }
- }
- }
-}
diff --git a/Source/GrasscutterTools/DispatchServer/DispatchServerAPI.cs b/Source/GrasscutterTools/DispatchServer/DispatchServerAPI.cs
index 80b90c9..243d44e 100644
--- a/Source/GrasscutterTools/DispatchServer/DispatchServerAPI.cs
+++ b/Source/GrasscutterTools/DispatchServer/DispatchServerAPI.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Threading.Tasks;
using GrasscutterTools.DispatchServer.Model;
diff --git a/Source/GrasscutterTools/DispatchServer/Model/ServerStatus.cs b/Source/GrasscutterTools/DispatchServer/Model/ServerStatus.cs
index ab69b5d..7133f8c 100644
--- a/Source/GrasscutterTools/DispatchServer/Model/ServerStatus.cs
+++ b/Source/GrasscutterTools/DispatchServer/Model/ServerStatus.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using Newtonsoft.Json;
namespace GrasscutterTools.DispatchServer.Model
diff --git a/Source/GrasscutterTools/Forms/FormDropEditor.cs b/Source/GrasscutterTools/Forms/FormDropEditor.cs
index 7a27bfa..2f7da37 100644
--- a/Source/GrasscutterTools/Forms/FormDropEditor.cs
+++ b/Source/GrasscutterTools/Forms/FormDropEditor.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
using System.IO;
@@ -485,7 +486,6 @@ namespace GrasscutterTools.Forms
dropList[i] = data;
}
-
#endregion - 掉落物列表 -
#region - 物品列表 -
diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs
index ecd8b1f..6f383dd 100644
--- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs
+++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
using System.Linq;
@@ -99,25 +100,25 @@ namespace GrasscutterTools.Forms
{
try
{
- NUDGachaType.Value = banner.GachaType;
- NUDScheduleId.Value = banner.ScheduleId;
+ NUDGachaType.Value = banner.GachaType;
+ NUDScheduleId.Value = banner.ScheduleId;
CmbBannerType.SelectedIndex = (int)banner.BannerType;
if (string.IsNullOrEmpty(banner.TitlePath) || !int.TryParse(banner.TitlePath.Substring("UI_GACHA_SHOW_PANEL_A".Length, 3), out int prefabId))
CmbPrefab.SelectedIndex = -1;
else
CmbPrefab.SelectedIndex = Array.IndexOf(GameData.GachaBannerPrefabs.Ids, prefabId);
- RbCostItem224.Checked = banner.CostItem == 224;
- RbCostItem223.Checked = banner.CostItem == 223;
- NUDBeginTime.Value = banner.BeginTime;
- NUDEndTime.Value = banner.EndTime;
- NUDSortId.Value = banner.SortId;
- TxtRateUpItems1.Text = string.Join(", ", banner.RateUpItems1);
- TxtRateUpItems2.Text = string.Join(", ", banner.RateUpItems2);
- NUDBaseYellowWeight.Value = banner.BaseYellowWeight * 0.01M;
- NUDBasePurpleWeight.Value = banner.BasePurpleWeight * 0.01M;
- NUDEventChance.Value = banner.EventChance;
- NUDSoftPity.Value = banner.SoftPity;
- NUDHardPity.Value = banner.HardPity;
+ RbCostItem224.Checked = banner.CostItem == 224;
+ RbCostItem223.Checked = banner.CostItem == 223;
+ NUDBeginTime.Value = banner.BeginTime;
+ NUDEndTime.Value = banner.EndTime;
+ NUDSortId.Value = banner.SortId;
+ TxtRateUpItems1.Text = string.Join(", ", banner.RateUpItems1);
+ TxtRateUpItems2.Text = string.Join(", ", banner.RateUpItems2);
+ NUDBaseYellowWeight.Value = banner.BaseYellowWeight * 0.01M;
+ NUDBasePurpleWeight.Value = banner.BasePurpleWeight * 0.01M;
+ NUDEventChance.Value = banner.EventChance;
+ NUDSoftPity.Value = banner.SoftPity;
+ NUDHardPity.Value = banner.HardPity;
InitRateUpItems(banner);
}
catch (Exception ex)
@@ -155,23 +156,23 @@ namespace GrasscutterTools.Forms
var prefabId = GameData.GachaBannerPrefabs.Ids[CmbPrefab.SelectedIndex];
GachaBanner banner = new GachaBanner
{
- GachaType = (int)NUDGachaType.Value,
- ScheduleId = (int)NUDScheduleId.Value,
- BannerType = (BannerType)CmbBannerType.SelectedIndex,
- PrefabPath = $"GachaShowPanel_A{prefabId:000}",
+ GachaType = (int)NUDGachaType.Value,
+ ScheduleId = (int)NUDScheduleId.Value,
+ BannerType = (BannerType)CmbBannerType.SelectedIndex,
+ PrefabPath = $"GachaShowPanel_A{prefabId:000}",
PreviewPrefabPath = $"UI_Tab_GachaShowPanel_A{prefabId:000}",
- TitlePath = $"UI_GACHA_SHOW_PANEL_A{prefabId:000}_TITLE",
- CostItem = RbCostItem224.Checked ? 224 : 223,
- BeginTime = (int)NUDBeginTime.Value,
- EndTime = (int)NUDEndTime.Value,
- SortId = (int)NUDSortId.Value,
- RateUpItems1 = yellowIds,
- RateUpItems2 = purpleIds,
- BaseYellowWeight = (int)(NUDBaseYellowWeight.Value * 100),
- BasePurpleWeight = (int)(NUDBasePurpleWeight.Value * 100),
- EventChance = (int)NUDEventChance.Value,
- SoftPity = (int)NUDSoftPity.Value,
- HardPity = (int)NUDHardPity.Value
+ TitlePath = $"UI_GACHA_SHOW_PANEL_A{prefabId:000}_TITLE",
+ CostItem = RbCostItem224.Checked ? 224 : 223,
+ BeginTime = (int)NUDBeginTime.Value,
+ EndTime = (int)NUDEndTime.Value,
+ SortId = (int)NUDSortId.Value,
+ RateUpItems1 = yellowIds,
+ RateUpItems2 = purpleIds,
+ BaseYellowWeight = (int)(NUDBaseYellowWeight.Value * 100),
+ BasePurpleWeight = (int)(NUDBasePurpleWeight.Value * 100),
+ EventChance = (int)NUDEventChance.Value,
+ SoftPity = (int)NUDSoftPity.Value,
+ HardPity = (int)NUDHardPity.Value
};
return banner;
}
diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs
index 667443c..e6c809d 100644
--- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs
+++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs
@@ -22,7 +22,6 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
using GrasscutterTools.Game;
using GrasscutterTools.Game.Gacha;
@@ -301,7 +300,7 @@ namespace GrasscutterTools.Forms
{
var json = JsonConvert.SerializeObject(banner);
json = json.Replace(",\"", ",\r\n \"").Insert(1, "\r\n ");
- TxtJson.Text = json.Insert(json.Length-1, "\r\n");
+ TxtJson.Text = json.Insert(json.Length - 1, "\r\n");
ShowBanner(banner);
}
}
diff --git a/Source/GrasscutterTools/Forms/FormGachaBannersEditor3.cs b/Source/GrasscutterTools/Forms/FormGachaBannersEditor3.cs
index 321389d..f79a25b 100644
--- a/Source/GrasscutterTools/Forms/FormGachaBannersEditor3.cs
+++ b/Source/GrasscutterTools/Forms/FormGachaBannersEditor3.cs
@@ -24,10 +24,8 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
using GrasscutterTools.Game;
-using GrasscutterTools.Game.Drop;
using GrasscutterTools.Game.Gacha;
using GrasscutterTools.Properties;
@@ -44,7 +42,7 @@ namespace GrasscutterTools.Forms
private List Banners;
- #endregion
+ #endregion - 成员 -
#region - 构造与窗体事件 -
@@ -105,11 +103,10 @@ namespace GrasscutterTools.Forms
new FormGachaBannerEditor().ShowDialog();
}
- #endregion
+ #endregion - 构造与窗体事件 -
#region - Banners.json 文件相关 -
-
///
/// 加载按钮点击时触发
///
@@ -174,7 +171,7 @@ namespace GrasscutterTools.Forms
}
}
- #endregion
+ #endregion - Banners.json 文件相关 -
#region - 卡池列表 -
@@ -254,7 +251,7 @@ namespace GrasscutterTools.Forms
}
}
- #endregion
+ #endregion - 卡池列表 -
#region - 卡池 -
@@ -497,8 +494,6 @@ namespace GrasscutterTools.Forms
return banner;
}
-
#endregion - 卡池参数 -
-
}
}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Forms/FormShopEditor.cs b/Source/GrasscutterTools/Forms/FormShopEditor.cs
index 4febe65..dc3c928 100644
--- a/Source/GrasscutterTools/Forms/FormShopEditor.cs
+++ b/Source/GrasscutterTools/Forms/FormShopEditor.cs
@@ -163,7 +163,6 @@ namespace GrasscutterTools.Forms
}
throw firstEx;
-
//{
// try
// {
diff --git a/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs
index c869c83..fb2bc4d 100644
--- a/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs
+++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/Source/GrasscutterTools/GOOD/Artifact.cs b/Source/GrasscutterTools/GOOD/Artifact.cs
index 5702ad6..a78a87f 100644
--- a/Source/GrasscutterTools/GOOD/Artifact.cs
+++ b/Source/GrasscutterTools/GOOD/Artifact.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using Newtonsoft.Json;
namespace GrasscutterTools.GOOD
@@ -91,4 +92,4 @@ namespace GrasscutterTools.GOOD
public double Value { get; set; }
}
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/GOOD/Character.cs b/Source/GrasscutterTools/GOOD/Character.cs
index 91112b0..93b2c1f 100644
--- a/Source/GrasscutterTools/GOOD/Character.cs
+++ b/Source/GrasscutterTools/GOOD/Character.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using Newtonsoft.Json;
namespace GrasscutterTools.GOOD
diff --git a/Source/GrasscutterTools/GOOD/GOOD.cs b/Source/GrasscutterTools/GOOD/GOOD.cs
index b1f9dae..2c95386 100644
--- a/Source/GrasscutterTools/GOOD/GOOD.cs
+++ b/Source/GrasscutterTools/GOOD/GOOD.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Collections.Generic;
using Newtonsoft.Json;
@@ -26,7 +27,7 @@ namespace GrasscutterTools.GOOD
/// Genshin Open Object Description (GOOD)
/// Doc: https://frzyc.github.io/genshin-optimizer/#/doc
/// Modified from https://github.com/Andrewthe13th/Inventory_Kamera/blob/master/InventoryKamera/data/GOOD.cs
- ///
+ ///
/// Available for
/// https://frzyc.github.io/genshin-optimizer/
/// https://github.com/Andrewthe13th/Inventory_Kamera
@@ -60,4 +61,4 @@ namespace GrasscutterTools.GOOD
[JsonProperty("materials", DefaultValueHandling = DefaultValueHandling.Ignore)]
public Dictionary Materials { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/GOOD/GOODData.cs b/Source/GrasscutterTools/GOOD/GOODData.cs
index b19aedb..07ff520 100644
--- a/Source/GrasscutterTools/GOOD/GOODData.cs
+++ b/Source/GrasscutterTools/GOOD/GOODData.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Collections.Generic;
using System.Globalization;
using System.Text.RegularExpressions;
@@ -55,10 +56,8 @@ namespace GrasscutterTools.GOOD
Weapons = ToGOODMap(weapons);
}
-
public static Dictionary ArtifactCats { get; private set; }
-
public static Dictionary ArtifactSlotMap = new Dictionary {
{"goblet", 1}, {"plume", 2}, {"circlet", 3}, {"flower", 4}, {"sands", 5}
};
@@ -103,6 +102,5 @@ namespace GrasscutterTools.GOOD
public static Dictionary Avatars { get; private set; }
public static Dictionary Weapons { get; private set; }
-
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/GOOD/Weapon.cs b/Source/GrasscutterTools/GOOD/Weapon.cs
index 027377a..f83858f 100644
--- a/Source/GrasscutterTools/GOOD/Weapon.cs
+++ b/Source/GrasscutterTools/GOOD/Weapon.cs
@@ -14,9 +14,11 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.ComponentModel;
+
using Newtonsoft.Json;
namespace GrasscutterTools.GOOD
diff --git a/Source/GrasscutterTools/Game/CommandVersion.cs b/Source/GrasscutterTools/Game/CommandVersion.cs
index 5410c67..005fede 100644
--- a/Source/GrasscutterTools/Game/CommandVersion.cs
+++ b/Source/GrasscutterTools/Game/CommandVersion.cs
@@ -14,18 +14,19 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
namespace GrasscutterTools.Game
{
///
/// 命令版本
- ///
+ ///
/// 用法：
/// ver = Version.TryParse(input, out Version current) ? new CommandVersion(current) : CommandVersion.Latest();
- ///
+ ///
///
internal class CommandVersion
{
@@ -152,4 +153,4 @@ namespace GrasscutterTools.Game
#endregion - 版本列表 Version List -
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Drop/DropData.cs b/Source/GrasscutterTools/Game/Drop/DropData.cs
index fbb141b..56be11c 100644
--- a/Source/GrasscutterTools/Game/Drop/DropData.cs
+++ b/Source/GrasscutterTools/Game/Drop/DropData.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using Newtonsoft.Json;
namespace GrasscutterTools.Game.Drop
diff --git a/Source/GrasscutterTools/Game/Drop/DropInfo.cs b/Source/GrasscutterTools/Game/Drop/DropInfo.cs
index 65eabef..5ed9d2e 100644
--- a/Source/GrasscutterTools/Game/Drop/DropInfo.cs
+++ b/Source/GrasscutterTools/Game/Drop/DropInfo.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Collections.Generic;
using Newtonsoft.Json;
@@ -36,4 +37,4 @@ namespace GrasscutterTools.Game.Drop
[JsonProperty("dropDataList")]
public List DropDataList { get; set; } = new List();
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Gacha/BannerType.cs b/Source/GrasscutterTools/Game/Gacha/BannerType.cs
index a46ff89..fb4133d 100644
--- a/Source/GrasscutterTools/Game/Gacha/BannerType.cs
+++ b/Source/GrasscutterTools/Game/Gacha/BannerType.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
namespace GrasscutterTools.Game.Gacha
{
public enum BannerType
diff --git a/Source/GrasscutterTools/Game/Gacha/GachaBanner.cs b/Source/GrasscutterTools/Game/Gacha/GachaBanner.cs
index 9c5e80b..cab568c 100644
--- a/Source/GrasscutterTools/Game/Gacha/GachaBanner.cs
+++ b/Source/GrasscutterTools/Game/Gacha/GachaBanner.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.ComponentModel;
using Newtonsoft.Json;
diff --git a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs
index a8288af..20921ca 100644
--- a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs
+++ b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
diff --git a/Source/GrasscutterTools/Game/Gacha/GachaBanner3.cs b/Source/GrasscutterTools/Game/Gacha/GachaBanner3.cs
index f0265bb..bc52a94 100644
--- a/Source/GrasscutterTools/Game/Gacha/GachaBanner3.cs
+++ b/Source/GrasscutterTools/Game/Gacha/GachaBanner3.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.ComponentModel;
using System.Linq;
@@ -215,7 +216,6 @@ namespace GrasscutterTools.Game.Gacha
[JsonProperty("bannerType"), JsonConverter(typeof(StringEnumConverter)), DefaultValue(BannerType.STANDARD)]
public BannerType BannerType { get; set; } = BannerType.STANDARD;
-
public override string ToString()
{
return $"[{GachaType}|{ScheduleId}] 5*:[{string.Join(",", RateUpItems5.Select(GetName))}] 4*:[{string.Join(",", RateUpItems4.Select(GetName))}]";
diff --git a/Source/GrasscutterTools/Game/GameCommand.cs b/Source/GrasscutterTools/Game/GameCommand.cs
index 287f372..8d67ad4 100644
--- a/Source/GrasscutterTools/Game/GameCommand.cs
+++ b/Source/GrasscutterTools/Game/GameCommand.cs
@@ -1,6 +1,6 @@
-
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Text;
+
/**
* Grasscutter Tools
* Copyright (C) 2022 jie65535
@@ -17,8 +17,9 @@ using System.Text;
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
namespace GrasscutterTools.Game
{
public class GameCommand
diff --git a/Source/GrasscutterTools/Game/GameData.cs b/Source/GrasscutterTools/Game/GameData.cs
index f5daddf..cb44d17 100644
--- a/Source/GrasscutterTools/Game/GameData.cs
+++ b/Source/GrasscutterTools/Game/GameData.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using GrasscutterTools.Properties;
namespace GrasscutterTools.Game
@@ -43,7 +44,6 @@ namespace GrasscutterTools.Game
ShopType = new ItemMap(Resources.ShopType);
}
-
public static ItemMap Artifacts { get; private set; }
public static ItemMap ArtifactCats { get; private set; }
@@ -71,11 +71,11 @@ namespace GrasscutterTools.Game
public static ItemMap WeaponColors { get; private set; }
public static ItemMap GachaBannerPrefabs { get; private set; }
-
+
public static ItemMap GachaBannerTitles { get; private set; }
public static ItemMap Quests { get; private set; }
public static ItemMap ShopType { get; private set; }
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/ItemMap.cs b/Source/GrasscutterTools/Game/ItemMap.cs
index 36896d9..3def395 100644
--- a/Source/GrasscutterTools/Game/ItemMap.cs
+++ b/Source/GrasscutterTools/Game/ItemMap.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
diff --git a/Source/GrasscutterTools/Game/ItemMapGroup.cs b/Source/GrasscutterTools/Game/ItemMapGroup.cs
index dd02cd2..2ec8b5d 100644
--- a/Source/GrasscutterTools/Game/ItemMapGroup.cs
+++ b/Source/GrasscutterTools/Game/ItemMapGroup.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Collections.Generic;
using System.Linq;
@@ -37,7 +38,7 @@ namespace GrasscutterTools.Game
if (categoryLineEndIndex == -1)
break;
- var category = idNamePairs.Substring(categoryLineStartIndex+2, categoryLineEndIndex - categoryLineStartIndex - 3).Trim();
+ var category = idNamePairs.Substring(categoryLineStartIndex + 2, categoryLineEndIndex - categoryLineStartIndex - 3).Trim();
var nextStartIndex = idNamePairs.IndexOf("//", categoryLineEndIndex);
if (nextStartIndex == -1)
@@ -63,4 +64,4 @@ namespace GrasscutterTools.Game
///
public IEnumerable AllLines => Values.SelectMany(it => it.Lines);
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Mail/Mail.cs b/Source/GrasscutterTools/Game/Mail/Mail.cs
index f44847a..c898c8a 100644
--- a/Source/GrasscutterTools/Game/Mail/Mail.cs
+++ b/Source/GrasscutterTools/Game/Mail/Mail.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
@@ -58,7 +59,7 @@ namespace GrasscutterTools.Game.Mail
/// 附件列表
///
public List ItemList { get; set; }
-
+
///
/// 发送时间
///
@@ -72,4 +73,4 @@ namespace GrasscutterTools.Game.Mail
return $"To[{Recipient}]: [{Title}] {Content} | {SendTime}";
}
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Mail/MailItem.cs b/Source/GrasscutterTools/Game/Mail/MailItem.cs
index 220f4d8..90d9b6f 100644
--- a/Source/GrasscutterTools/Game/Mail/MailItem.cs
+++ b/Source/GrasscutterTools/Game/Mail/MailItem.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
namespace GrasscutterTools.Game.Mail
{
///
@@ -53,4 +54,4 @@ namespace GrasscutterTools.Game.Mail
return $"{ItemId}:{name}";
}
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Player/PlayerData.cs b/Source/GrasscutterTools/Game/Player/PlayerData.cs
index 413e2a8..2973651 100644
--- a/Source/GrasscutterTools/Game/Player/PlayerData.cs
+++ b/Source/GrasscutterTools/Game/Player/PlayerData.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
namespace GrasscutterTools.Game.Player
{
///
@@ -39,4 +40,4 @@ namespace GrasscutterTools.Game.Player
///
public const int PlayerMaxLevel = 60;
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/SetStatsCommand.cs b/Source/GrasscutterTools/Game/SetStatsCommand.cs
index 0f891cf..bcb3fd3 100644
--- a/Source/GrasscutterTools/Game/SetStatsCommand.cs
+++ b/Source/GrasscutterTools/Game/SetStatsCommand.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Text;
using GrasscutterTools.Properties;
diff --git a/Source/GrasscutterTools/Game/Shop/ItemParamData.cs b/Source/GrasscutterTools/Game/Shop/ItemParamData.cs
index da6d9c8..bdf2e75 100644
--- a/Source/GrasscutterTools/Game/Shop/ItemParamData.cs
+++ b/Source/GrasscutterTools/Game/Shop/ItemParamData.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using Newtonsoft.Json;
namespace GrasscutterTools.Game.Shop
@@ -34,4 +35,4 @@ namespace GrasscutterTools.Game.Shop
[JsonProperty("count")]
public int Count { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Shop/ShopGoodsData.cs b/Source/GrasscutterTools/Game/Shop/ShopGoodsData.cs
index 5e0af4f..127f72d 100644
--- a/Source/GrasscutterTools/Game/Shop/ShopGoodsData.cs
+++ b/Source/GrasscutterTools/Game/Shop/ShopGoodsData.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
@@ -74,4 +75,4 @@ namespace GrasscutterTools.Game.Shop
[JsonProperty("endTime")]
public DateTime? EndTime { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Shop/ShopInfo.cs b/Source/GrasscutterTools/Game/Shop/ShopInfo.cs
index bd72140..6eb581f 100644
--- a/Source/GrasscutterTools/Game/Shop/ShopInfo.cs
+++ b/Source/GrasscutterTools/Game/Shop/ShopInfo.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
using System.Linq;
@@ -29,28 +30,27 @@ namespace GrasscutterTools.Game.Shop
{
public ShopInfo()
{
-
}
public ShopInfo(ShopGoodsData sgd)
{
- GoodsId = sgd.GoodsId;
- GoodsItem = new ItemParamData(sgd.ItemId, sgd.ItemCount);
- SCoin = sgd.CostScoin;
- MCoin = sgd.CostMcion;
- HCoin = sgd.CostHcoin;
- BuyLimit = sgd.BuyLimit;
+ GoodsId = sgd.GoodsId;
+ GoodsItem = new ItemParamData(sgd.ItemId, sgd.ItemCount);
+ SCoin = sgd.CostScoin;
+ MCoin = sgd.CostMcion;
+ HCoin = sgd.CostHcoin;
+ BuyLimit = sgd.BuyLimit;
- MinLevel = sgd.MinPlayerLevel;
- MaxLevel = sgd.MaxPlayerLevel;
- CostItemList = sgd.CostItems.Where(it => it.Id != 0).ToList();
+ MinLevel = sgd.MinPlayerLevel;
+ MaxLevel = sgd.MaxPlayerLevel;
+ CostItemList = sgd.CostItems.Where(it => it.Id != 0).ToList();
SecondarySheetId = sgd.SubTabId;
- RefreshType = sgd.RefreshType;
+ RefreshType = sgd.RefreshType;
ShopRefreshParam = sgd.RefreshParam;
if (sgd.BeginTime != null && sgd.EndTime != null)
{
- BeginTime = (int)new DateTimeOffset(sgd.BeginTime.Value).ToUnixTimeSeconds();
- EndTime = (int)new DateTimeOffset(sgd.EndTime.Value).ToUnixTimeSeconds();
+ BeginTime = (int)new DateTimeOffset(sgd.BeginTime.Value).ToUnixTimeSeconds();
+ EndTime = (int)new DateTimeOffset(sgd.EndTime.Value).ToUnixTimeSeconds();
}
}
@@ -115,10 +115,9 @@ namespace GrasscutterTools.Game.Shop
[JsonProperty("shopRefreshParam")]
public int ShopRefreshParam { get; set; }
-
public override string ToString()
{
return $"{GoodsId}:{GameData.Items[GoodsItem.Id]} x{GoodsItem.Count}";
}
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Shop/ShopRefreshType.cs b/Source/GrasscutterTools/Game/Shop/ShopRefreshType.cs
index 7a13bd2..c822eee 100644
--- a/Source/GrasscutterTools/Game/Shop/ShopRefreshType.cs
+++ b/Source/GrasscutterTools/Game/Shop/ShopRefreshType.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
namespace GrasscutterTools.Game.Shop
{
///
@@ -43,4 +44,4 @@ namespace GrasscutterTools.Game.Shop
///
SHOP_REFRESH_MONTHLY,
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/Shop/ShopTable.cs b/Source/GrasscutterTools/Game/Shop/ShopTable.cs
index 3a5d983..2b52895 100644
--- a/Source/GrasscutterTools/Game/Shop/ShopTable.cs
+++ b/Source/GrasscutterTools/Game/Shop/ShopTable.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Collections.Generic;
using Newtonsoft.Json;
@@ -30,4 +31,4 @@ namespace GrasscutterTools.Game.Shop
[JsonProperty("items")]
public List Items { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Game/TextMapData.cs b/Source/GrasscutterTools/Game/TextMapData.cs
index 5bcce83..82ac5db 100644
--- a/Source/GrasscutterTools/Game/TextMapData.cs
+++ b/Source/GrasscutterTools/Game/TextMapData.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System.Collections.Generic;
using System.IO;
using System.Linq;
diff --git a/Source/GrasscutterTools/GrasscutterTools.csproj b/Source/GrasscutterTools/GrasscutterTools.csproj
index 682e89a..ad02e34 100644
--- a/Source/GrasscutterTools/GrasscutterTools.csproj
+++ b/Source/GrasscutterTools/GrasscutterTools.csproj
@@ -85,9 +85,6 @@
-
- Component
-
diff --git a/Source/GrasscutterTools/MultiLanguage.cs b/Source/GrasscutterTools/MultiLanguage.cs
index 4a1fb5f..0fb7f14 100644
--- a/Source/GrasscutterTools/MultiLanguage.cs
+++ b/Source/GrasscutterTools/MultiLanguage.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Windows.Forms;
diff --git a/Source/GrasscutterTools/OpenCommand/OpenCommandAPI.cs b/Source/GrasscutterTools/OpenCommand/OpenCommandAPI.cs
index 83d2c4a..67ed3fe 100644
--- a/Source/GrasscutterTools/OpenCommand/OpenCommandAPI.cs
+++ b/Source/GrasscutterTools/OpenCommand/OpenCommandAPI.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Threading.Tasks;
diff --git a/Source/GrasscutterTools/Pages/BasePage.cs b/Source/GrasscutterTools/Pages/BasePage.cs
index 1ef7ba7..bac567e 100644
--- a/Source/GrasscutterTools/Pages/BasePage.cs
+++ b/Source/GrasscutterTools/Pages/BasePage.cs
@@ -63,25 +63,28 @@ namespace GrasscutterTools.Pages
///
public Func GetCommand { get; set; }
- #endregion
+ #endregion - 命令相关 -
#region - 生命周期事件 -
///
/// 加载时触发（修改语言时会再次触发）
///
- public virtual void OnLoad() { }
+ public virtual void OnLoad()
+ { }
///
/// 进入页面时触发（可触发多次）
///
- public virtual void OnEnter() { }
+ public virtual void OnEnter()
+ { }
///
/// 关闭时触发（用于保存页面数据）
///
- public virtual void OnClosed() { }
+ public virtual void OnClosed()
+ { }
- #endregion
+ #endregion - 生命周期事件 -
}
}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Pages/PageGiveItem.cs b/Source/GrasscutterTools/Pages/PageGiveItem.cs
index 6009891..2b7bd64 100644
--- a/Source/GrasscutterTools/Pages/PageGiveItem.cs
+++ b/Source/GrasscutterTools/Pages/PageGiveItem.cs
@@ -22,6 +22,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows.Forms;
+
using GrasscutterTools.Game;
using GrasscutterTools.Properties;
@@ -40,7 +41,6 @@ namespace GrasscutterTools.Pages
InitGiveItemRecord();
}
-
///
/// 初始化游戏物品列表
///
@@ -185,6 +185,5 @@ namespace GrasscutterTools.Pages
}
#endregion -- 物品记录 --
-
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Pages/PageGiveWeapon.cs b/Source/GrasscutterTools/Pages/PageGiveWeapon.cs
index d9d01fb..3365a5d 100644
--- a/Source/GrasscutterTools/Pages/PageGiveWeapon.cs
+++ b/Source/GrasscutterTools/Pages/PageGiveWeapon.cs
@@ -18,14 +18,6 @@
**/
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using GrasscutterTools.Game;
using GrasscutterTools.Utils;
@@ -39,7 +31,6 @@ namespace GrasscutterTools.Pages
InitializeComponent();
}
-
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
@@ -80,4 +71,4 @@ namespace GrasscutterTools.Pages
SetCommand("/give", $"weapons x{NUDWeaponAmout.Value} lv{NUDWeaponLevel.Value} r{NUDWeaponRefinement.Value}");
}
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Pages/PageHome.cs b/Source/GrasscutterTools/Pages/PageHome.cs
index a13aaa2..4e23b7e 100644
--- a/Source/GrasscutterTools/Pages/PageHome.cs
+++ b/Source/GrasscutterTools/Pages/PageHome.cs
@@ -85,7 +85,6 @@ namespace GrasscutterTools.Pages
#region - 检查更新 Check update -
-
private ReleaseAPI.ReleaseInfo LastestInfo = null;
private Version lastestVersion = null;
diff --git a/Source/GrasscutterTools/Program.cs b/Source/GrasscutterTools/Program.cs
index a1f19a8..732224d 100644
--- a/Source/GrasscutterTools/Program.cs
+++ b/Source/GrasscutterTools/Program.cs
@@ -14,10 +14,10 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
-using System.Globalization;
using System.Reflection;
using System.Text;
using System.Threading;
@@ -77,7 +77,7 @@ namespace GrasscutterTools
MultiLanguage.SetDefaultLanguage(Settings.Default.DefaultLanguage);
Application.Run(new Forms.FormMain());
- Console.WriteLine("Program end.");
+ Console.WriteLine("Program end.");
}
#region - 全局异常处理 -
diff --git a/Source/GrasscutterTools/Resources/Banners.json b/Source/GrasscutterTools/Resources/Banners.json
index 636577c..c1d7a76 100644
--- a/Source/GrasscutterTools/Resources/Banners.json
+++ b/Source/GrasscutterTools/Resources/Banners.json
@@ -1,707 +1,707 @@
[
- //新手
- {
- "comment": "Beginner's Banner. Do not change for no reason.",
- "gachaType": 100,
- "scheduleId": 803,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A016",
- "titlePath": "UI_GACHA_SHOW_PANEL_A016_TITLE",
- "costItemId": 224,
- "costItemAmount10": 8,
- "gachaTimesLimit": 20,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 100,
- "rateUpItems5": [],
- "rateUpItems4": [ 1034 ]
- },
- //常驻1
- {
- "comment": "Standard",
- "gachaType": 200,
- "scheduleId": 2000,
- "bannerType": "STANDARD",
- "prefabPath": "GachaShowPanel_A022",
- "titlePath": "UI_GACHA_SHOW_PANEL_A022_TITLE",
- "costItemId": 224,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 1,
- "fallbackItems4Pool1": [ 1006, 1014, 1015, 1020, 1021, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064 ],
- "weights5": [
- [ 1, 75 ],
- [ 73, 150 ],
- [ 90, 10000 ]
- ]
- },
- //常驻2
- {
- "comment": "Standard",
- "gachaType": 201,
- "scheduleId": 2001,
- "bannerType": "STANDARD",
- "prefabPath": "GachaShowPanel_A017",
- "titlePath": "UI_GACHA_SHOW_PANEL_A017_TITLE",
- "costItemId": 224,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 1,
- "fallbackItems4Pool1": [ 1006, 1014, 1015, 1020, 1021, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064 ],
- "weights5": [
- [ 1, 75 ],
- [ 73, 150 ],
- [ 90, 10000 ]
- ]
- },
- //1.0上角色-杯装之诗：温迪、菲谢尔、香菱、芭芭拉
- {
- "comment": "1.0",
- "gachaType": 400,
- "scheduleId": 800,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A019",
- "titlePath": "UI_GACHA_SHOW_PANEL_A019_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 1000,
- "rateUpItems4": [ 1023, 1031, 1014 ],
- "rateUpItems5": [ 1022 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.0下角色-闪焰的驻足：可莉、行秋、诺艾尔、砂糖
- {
- "comment": "1.0",
- "gachaType": 401,
- "scheduleId": 801,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A018",
- "titlePath": "UI_GACHA_SHOW_PANEL_A018_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 999,
- "rateUpItems4": [ 1025, 1034, 1043 ],
- "rateUpItems5": [ 1029 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.1上角色-暂别冬都：达达利亚、迪奥娜、北斗、凝光
- {
- "comment": "1.0",
- "gachaType": 402,
- "scheduleId": 802,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A023",
- "titlePath": "UI_GACHA_SHOW_PANEL_A023_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 998,
- "rateUpItems4": [ 1027, 1024, 1039 ],
- "rateUpItems5": [ 1033 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.1下角色-陵薮市朝：钟离、辛焱、雷泽、重云
- {
- "comment": "1.0",
- "gachaType": 403,
- "scheduleId": 803,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A024",
- "titlePath": "UI_GACHA_SHOW_PANEL_A024_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 997,
- "rateUpItems4": [ 1044, 1020, 1036 ],
- "rateUpItems5": [ 1030 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.2上角色-深秘之息：阿贝多、菲谢尔、砂糖、班尼特
- {
- "comment": "1.0",
- "gachaType": 404,
- "scheduleId": 804,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A027",
- "titlePath": "UI_GACHA_SHOW_PANEL_A027_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 996,
- "rateUpItems4": [ 1031, 1043, 1032 ],
- "rateUpItems5": [ 1038 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.2下角色-浮生孰来：甘雨，香菱，行秋，诺艾尔
- {
- "comment": "1.0",
- "gachaType": 405,
- "scheduleId": 805,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A028",
- "titlePath": "UI_GACHA_SHOW_PANEL_A028_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 995,
- "rateUpItems4": [ 1023, 1025, 1034 ],
- "rateUpItems5": [ 1037 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.3上角色-烟火之邀：魈、迪奥娜、北斗、辛焱
- {
- "comment": "1.0",
- "gachaType": 406,
- "scheduleId": 806,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A031",
- "titlePath": "UI_GACHA_SHOW_PANEL_A031_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 994,
- "rateUpItems4": [ 1039, 1024, 1044 ],
- "rateUpItems5": [ 1026 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.3中角色-鱼龙灯昼：刻晴、凝光、班尼特、芭芭拉
- {
- "comment": "1.0",
- "gachaType": 407,
- "scheduleId": 807,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A032",
- "titlePath": "UI_GACHA_SHOW_PANEL_A032_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 993,
- "rateUpItems4": [ 1027, 1032, 1014 ],
- "rateUpItems5": [ 1042 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.3下角色-赤团开时：胡桃、行秋、重云、香菱
- {
- "comment": "1.0",
- "gachaType": 408,
- "scheduleId": 808,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A033",
- "titlePath": "UI_GACHA_SHOW_PANEL_A033_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 992,
- "rateUpItems4": [ 1025, 1036, 1023 ],
- "rateUpItems5": [ 1046 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.4上角色-杯装之诗：温迪、砂糖、雷泽、诺艾尔
- {
- "comment": "1.0",
- "gachaType": 409,
- "scheduleId": 809,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A036",
- "titlePath": "UI_GACHA_SHOW_PANEL_A036_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 991,
- "rateUpItems4": [ 1043, 1020, 1034 ],
- "rateUpItems5": [ 1022 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.4下角色-暂别冬都：达达利亚、罗莎莉亚、芭芭拉，菲谢尔
- {
- "comment": "1.0",
- "gachaType": 410,
- "scheduleId": 810,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A037",
- "titlePath": "UI_GACHA_SHOW_PANEL_A037_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 990,
- "rateUpItems4": [ 1045, 1014, 1031 ],
- "rateUpItems5": [ 1033 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.5上角色-陵薮市朝：钟离、烟绯、诺艾尔、迪奥娜
- {
- "comment": "1.0",
- "gachaType": 411,
- "scheduleId": 811,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A040",
- "titlePath": "UI_GACHA_SHOW_PANEL_A040_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 989,
- "rateUpItems4": [ 1048, 1034, 1039 ],
- "rateUpItems5": [ 1030 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.5下角色-浪涌之瞬：优菈、辛焱、行秋、北斗
- {
- "comment": "1.0",
- "gachaType": 412,
- "scheduleId": 812,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A041",
- "titlePath": "UI_GACHA_SHOW_PANEL_A041_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 988,
- "rateUpItems4": [ 1044, 1025, 1024 ],
- "rateUpItems5": [ 1051 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.6上角色-闪焰的驻足：可莉、芭芭拉、砂糖、菲谢尔
- {
- "comment": "1.0",
- "gachaType": 413,
- "scheduleId": 813,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A044",
- "titlePath": "UI_GACHA_SHOW_PANEL_A044_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 987,
- "rateUpItems4": [ 1014, 1043, 1031 ],
- "rateUpItems5": [ 1029 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //1.6下角色-叶落风随：枫原万叶、罗莎莉亚、班尼特、雷泽
- {
- "comment": "1.0",
- "gachaType": 414,
- "scheduleId": 814,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A045",
- "titlePath": "UI_GACHA_SHOW_PANEL_A045_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 986,
- "rateUpItems4": [ 1045, 1032, 1020 ],
- "rateUpItems5": [ 1047 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.0上角色-白鹭之庭：神里绫华、 凝光、 重云、 烟绯
- {
- "comment": "2.0",
- "gachaType": 415,
- "scheduleId": 815,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A048",
- "titlePath": "UI_GACHA_SHOW_PANEL_A048_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 985,
- "rateUpItems4": [ 1027, 1036, 1048 ],
- "rateUpItems5": [ 1002 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.0下角色-焰色天河：宵宫、早柚、迪奥娜、辛焱
- {
- "comment": "2.0",
- "gachaType": 416,
- "scheduleId": 816,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A049",
- "titlePath": "UI_GACHA_SHOW_PANEL_A049_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 984,
- "rateUpItems4": [ 1053, 1039, 1044 ],
- "rateUpItems5": [ 1049 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.1上角色-影寂天下人：雷电将军、九条裟罗、香菱、砂糖
- {
- "comment": "2.0",
- "gachaType": 417,
- "scheduleId": 817,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A052",
- "titlePath": "UI_GACHA_SHOW_PANEL_A052_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 983,
- "rateUpItems4": [ 1056, 1023, 1043 ],
- "rateUpItems5": [ 1052 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.1下角色-浮岳虹珠：珊瑚宫心海、罗莎莉亚、北斗、行秋
- {
- "comment": "2.0",
- "gachaType": 418,
- "scheduleId": 818,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A053",
- "titlePath": "UI_GACHA_SHOW_PANEL_A053_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 982,
- "rateUpItems4": [ 1045, 1024, 1025 ],
- "rateUpItems5": [ 1054 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.2上角色-暂别冬都：达达利亚、凝光、重云、烟绯
- {
- "comment": "2.0",
- "gachaType": 419,
- "scheduleId": 819,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A056",
- "titlePath": "UI_GACHA_SHOW_PANEL_A056_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 981,
- "rateUpItems4": [ 1027, 1036, 1048 ],
- "rateUpItems5": [ 1033 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.2下角色-赤团开时：胡桃、托马、迪奥娜、早柚
- {
- "comment": "2.0",
- "gachaType": 420,
- "scheduleId": 820,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A057",
- "titlePath": "UI_GACHA_SHOW_PANEL_A057_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 980,
- "rateUpItems4": [ 1050, 1039, 1053 ],
- "rateUpItems5": [ 1046 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.3上角色1-浪涌之瞬：优菈、班尼特、诺艾尔、罗莎莉亚
- {
- "comment": "2.0",
- "gachaType": 421,
- "scheduleId": 821,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A062",
- "titlePath": "UI_GACHA_SHOW_PANEL_A062_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 979,
- "rateUpItems4": [ 1032, 1034, 1045 ],
- "rateUpItems5": [ 1051 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.3上角色2-深秘之息：阿贝多、班尼特、诺艾尔、罗莎莉亚
- {
- "comment": "2.0",
- "gachaType": 422,
- "scheduleId": 822,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A060",
- "titlePath": "UI_GACHA_SHOW_PANEL_A060_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 978,
- "rateUpItems4": [ 1032, 1034, 1045 ],
- "rateUpItems5": [ 1038 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.3下角色-鬼门斗宴：荒泷一斗、五郎、芭芭拉、香菱
- {
- "comment": "2.0",
- "gachaType": 423,
- "scheduleId": 823,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A061",
- "titlePath": "UI_GACHA_SHOW_PANEL_A061_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 977,
- "rateUpItems4": [ 1055, 1014, 1023 ],
- "rateUpItems5": [ 1057 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.4上角色1-烟火之邀：魈、云堇、凝光、重云
- //2.4上角色2-出尘入世：申鹤、云堇、凝光、重云
- {
- "comment": "2.0",
- "gachaType": 424,
- "scheduleId": 824,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A065",
- "titlePath": "UI_GACHA_SHOW_PANEL_A065_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 976,
- "rateUpItems4": [ 1027, 1036, 1064 ],
- "rateUpItems5": [ 1063 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.4下角色1-浮生孰来：甘雨、行秋、北斗、烟绯(复刻不放卡池)
- //2.4下角色2-陵薮市朝：钟离、行秋、北斗、烟绯(复刻不放卡池)
- //2.5上角色-华紫樱绯：八重神子、菲谢尔、迪奥娜、托马
- {
- "comment": "2.0",
- "gachaType": 425,
- "scheduleId": 825,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A071",
- "titlePath": "UI_GACHA_SHOW_PANEL_A071_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 975,
- "rateUpItems4": [ 1031, 1039, 1050 ],
- "rateUpItems5": [ 1058 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.5下角色1-影寂天下人：雷电将军、九条裟罗、辛焱、班尼特(复刻不放卡池)
- //2.5下角色2-浮岳虹珠：珊瑚宫心海、九条裟罗、辛焱、班尼特(复刻不放卡池)
- //2.6上角色1-苍流踏花：神里绫人、砂糖、香菱、云堇
- {
- "comment": "2.0",
- "gachaType": 426,
- "scheduleId": 826,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A076",
- "titlePath": "UI_GACHA_SHOW_PANEL_A076_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 974,
- "rateUpItems4": [ 1043, 1023, 1064 ],
- "rateUpItems5": [ 1066 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.6上角色2-杯装之诗：神里绫人、砂糖、香菱、云堇(复刻不放卡池)
- //2.6下角色-白鹭之庭：神里绫华、雷泽、罗莎莉亚、早柚(复刻不放卡池)
- //2.7上角色1-素霓伣天：夜兰、诺艾尔、烟绯、芭芭拉
- {
- "comment": "2.0",
- "gachaType": 427,
- "scheduleId": 827,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A081",
- "titlePath": "UI_GACHA_SHOW_PANEL_A081_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 973,
- "rateUpItems4": [ 1034, 1048, 1014 ],
- "rateUpItems5": [ 1060 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //2.7上角色2-烟火之邀：魈、诺艾尔、烟绯、芭芭拉(复刻不放卡池)
- //2.7下角色-鬼门斗宴：荒泷一斗、久岐忍、五郎、重云(复刻不放卡池)
- //2.8上角色1-闪焰的驻足：可莉、凝光、托马、鹿野原平藏(复刻不放卡池)
- //2.8上角色2-叶落风随：枫原万叶、凝光、托马、鹿野原平藏(复刻不放卡池)
- //2.8下角色-焰色天河：宵宫、班尼特、云堇、辛焱(复刻不放卡池)
- //3.0上角色1-巡御蘙荟：提纳里、柯莱、迪奥娜、菲谢尔
- {
- "comment": "3.0",
- "gachaType": 428,
- "scheduleId": 828,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A091",
- "titlePath": "UI_GACHA_SHOW_PANEL_A091_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 972,
- "rateUpItems4": [ 1031, 1039, 1067 ],
- "rateUpItems5": [ 1069 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //3.0上角色2-陵薮市朝：钟离、柯莱、迪奥娜、菲谢尔(复刻不放卡池)
- //3.0下角色1-浮岳虹珠：珊瑚宫心海、多莉、砂糖、行秋(复刻不放卡池)
- //3.0下角色2-浮生孰来：甘雨、多莉、砂糖、行秋(复刻不放卡池)
- //3.1上角色1-杯装之诗：温迪、早柚、坎蒂丝、久岐忍(复刻不放卡池)
- //3.1上角色2-雳裁冥昭：温迪、早柚、坎蒂丝、久岐忍
- {
- "comment": "3.0",
- "gachaType": 429,
- "scheduleId": 829,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A097",
- "titlePath": "UI_GACHA_SHOW_PANEL_A097_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 971,
- "rateUpItems4": [ 1053, 1065, 1072 ],
- "rateUpItems5": [ 1071 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //3.1下角色1-翩舞歈莲：妮露、芭芭拉、北斗、香菱
- /*{
+ //新手
+ {
+ "comment": "Beginner's Banner. Do not change for no reason.",
+ "gachaType": 100,
+ "scheduleId": 803,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A016",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A016_TITLE",
+ "costItemId": 224,
+ "costItemAmount10": 8,
+ "gachaTimesLimit": 20,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 100,
+ "rateUpItems5": [],
+ "rateUpItems4": [ 1034 ]
+ },
+ //常驻1
+ {
+ "comment": "Standard",
+ "gachaType": 200,
+ "scheduleId": 2000,
+ "bannerType": "STANDARD",
+ "prefabPath": "GachaShowPanel_A022",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A022_TITLE",
+ "costItemId": 224,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 1,
+ "fallbackItems4Pool1": [ 1006, 1014, 1015, 1020, 1021, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064 ],
+ "weights5": [
+ [ 1, 75 ],
+ [ 73, 150 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //常驻2
+ {
+ "comment": "Standard",
+ "gachaType": 201,
+ "scheduleId": 2001,
+ "bannerType": "STANDARD",
+ "prefabPath": "GachaShowPanel_A017",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A017_TITLE",
+ "costItemId": 224,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 1,
+ "fallbackItems4Pool1": [ 1006, 1014, 1015, 1020, 1021, 1023, 1024, 1025, 1027, 1031, 1032, 1034, 1036, 1039, 1043, 1044, 1045, 1048, 1053, 1055, 1056, 1064 ],
+ "weights5": [
+ [ 1, 75 ],
+ [ 73, 150 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.0上角色-杯装之诗：温迪、菲谢尔、香菱、芭芭拉
+ {
+ "comment": "1.0",
+ "gachaType": 400,
+ "scheduleId": 800,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A019",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A019_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 1000,
+ "rateUpItems4": [ 1023, 1031, 1014 ],
+ "rateUpItems5": [ 1022 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.0下角色-闪焰的驻足：可莉、行秋、诺艾尔、砂糖
+ {
+ "comment": "1.0",
+ "gachaType": 401,
+ "scheduleId": 801,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A018",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A018_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 999,
+ "rateUpItems4": [ 1025, 1034, 1043 ],
+ "rateUpItems5": [ 1029 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.1上角色-暂别冬都：达达利亚、迪奥娜、北斗、凝光
+ {
+ "comment": "1.0",
+ "gachaType": 402,
+ "scheduleId": 802,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A023",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A023_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 998,
+ "rateUpItems4": [ 1027, 1024, 1039 ],
+ "rateUpItems5": [ 1033 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.1下角色-陵薮市朝：钟离、辛焱、雷泽、重云
+ {
+ "comment": "1.0",
+ "gachaType": 403,
+ "scheduleId": 803,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A024",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A024_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 997,
+ "rateUpItems4": [ 1044, 1020, 1036 ],
+ "rateUpItems5": [ 1030 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.2上角色-深秘之息：阿贝多、菲谢尔、砂糖、班尼特
+ {
+ "comment": "1.0",
+ "gachaType": 404,
+ "scheduleId": 804,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A027",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A027_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 996,
+ "rateUpItems4": [ 1031, 1043, 1032 ],
+ "rateUpItems5": [ 1038 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.2下角色-浮生孰来：甘雨，香菱，行秋，诺艾尔
+ {
+ "comment": "1.0",
+ "gachaType": 405,
+ "scheduleId": 805,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A028",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A028_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 995,
+ "rateUpItems4": [ 1023, 1025, 1034 ],
+ "rateUpItems5": [ 1037 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.3上角色-烟火之邀：魈、迪奥娜、北斗、辛焱
+ {
+ "comment": "1.0",
+ "gachaType": 406,
+ "scheduleId": 806,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A031",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A031_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 994,
+ "rateUpItems4": [ 1039, 1024, 1044 ],
+ "rateUpItems5": [ 1026 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.3中角色-鱼龙灯昼：刻晴、凝光、班尼特、芭芭拉
+ {
+ "comment": "1.0",
+ "gachaType": 407,
+ "scheduleId": 807,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A032",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A032_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 993,
+ "rateUpItems4": [ 1027, 1032, 1014 ],
+ "rateUpItems5": [ 1042 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.3下角色-赤团开时：胡桃、行秋、重云、香菱
+ {
+ "comment": "1.0",
+ "gachaType": 408,
+ "scheduleId": 808,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A033",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A033_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 992,
+ "rateUpItems4": [ 1025, 1036, 1023 ],
+ "rateUpItems5": [ 1046 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.4上角色-杯装之诗：温迪、砂糖、雷泽、诺艾尔
+ {
+ "comment": "1.0",
+ "gachaType": 409,
+ "scheduleId": 809,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A036",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A036_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 991,
+ "rateUpItems4": [ 1043, 1020, 1034 ],
+ "rateUpItems5": [ 1022 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.4下角色-暂别冬都：达达利亚、罗莎莉亚、芭芭拉，菲谢尔
+ {
+ "comment": "1.0",
+ "gachaType": 410,
+ "scheduleId": 810,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A037",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A037_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 990,
+ "rateUpItems4": [ 1045, 1014, 1031 ],
+ "rateUpItems5": [ 1033 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.5上角色-陵薮市朝：钟离、烟绯、诺艾尔、迪奥娜
+ {
+ "comment": "1.0",
+ "gachaType": 411,
+ "scheduleId": 811,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A040",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A040_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 989,
+ "rateUpItems4": [ 1048, 1034, 1039 ],
+ "rateUpItems5": [ 1030 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.5下角色-浪涌之瞬：优菈、辛焱、行秋、北斗
+ {
+ "comment": "1.0",
+ "gachaType": 412,
+ "scheduleId": 812,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A041",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A041_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 988,
+ "rateUpItems4": [ 1044, 1025, 1024 ],
+ "rateUpItems5": [ 1051 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.6上角色-闪焰的驻足：可莉、芭芭拉、砂糖、菲谢尔
+ {
+ "comment": "1.0",
+ "gachaType": 413,
+ "scheduleId": 813,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A044",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A044_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 987,
+ "rateUpItems4": [ 1014, 1043, 1031 ],
+ "rateUpItems5": [ 1029 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //1.6下角色-叶落风随：枫原万叶、罗莎莉亚、班尼特、雷泽
+ {
+ "comment": "1.0",
+ "gachaType": 414,
+ "scheduleId": 814,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A045",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A045_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 986,
+ "rateUpItems4": [ 1045, 1032, 1020 ],
+ "rateUpItems5": [ 1047 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.0上角色-白鹭之庭：神里绫华、 凝光、 重云、 烟绯
+ {
+ "comment": "2.0",
+ "gachaType": 415,
+ "scheduleId": 815,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A048",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A048_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 985,
+ "rateUpItems4": [ 1027, 1036, 1048 ],
+ "rateUpItems5": [ 1002 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.0下角色-焰色天河：宵宫、早柚、迪奥娜、辛焱
+ {
+ "comment": "2.0",
+ "gachaType": 416,
+ "scheduleId": 816,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A049",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A049_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 984,
+ "rateUpItems4": [ 1053, 1039, 1044 ],
+ "rateUpItems5": [ 1049 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.1上角色-影寂天下人：雷电将军、九条裟罗、香菱、砂糖
+ {
+ "comment": "2.0",
+ "gachaType": 417,
+ "scheduleId": 817,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A052",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A052_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 983,
+ "rateUpItems4": [ 1056, 1023, 1043 ],
+ "rateUpItems5": [ 1052 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.1下角色-浮岳虹珠：珊瑚宫心海、罗莎莉亚、北斗、行秋
+ {
+ "comment": "2.0",
+ "gachaType": 418,
+ "scheduleId": 818,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A053",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A053_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 982,
+ "rateUpItems4": [ 1045, 1024, 1025 ],
+ "rateUpItems5": [ 1054 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.2上角色-暂别冬都：达达利亚、凝光、重云、烟绯
+ {
+ "comment": "2.0",
+ "gachaType": 419,
+ "scheduleId": 819,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A056",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A056_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 981,
+ "rateUpItems4": [ 1027, 1036, 1048 ],
+ "rateUpItems5": [ 1033 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.2下角色-赤团开时：胡桃、托马、迪奥娜、早柚
+ {
+ "comment": "2.0",
+ "gachaType": 420,
+ "scheduleId": 820,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A057",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A057_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 980,
+ "rateUpItems4": [ 1050, 1039, 1053 ],
+ "rateUpItems5": [ 1046 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.3上角色1-浪涌之瞬：优菈、班尼特、诺艾尔、罗莎莉亚
+ {
+ "comment": "2.0",
+ "gachaType": 421,
+ "scheduleId": 821,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A062",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A062_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 979,
+ "rateUpItems4": [ 1032, 1034, 1045 ],
+ "rateUpItems5": [ 1051 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.3上角色2-深秘之息：阿贝多、班尼特、诺艾尔、罗莎莉亚
+ {
+ "comment": "2.0",
+ "gachaType": 422,
+ "scheduleId": 822,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A060",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A060_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 978,
+ "rateUpItems4": [ 1032, 1034, 1045 ],
+ "rateUpItems5": [ 1038 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.3下角色-鬼门斗宴：荒泷一斗、五郎、芭芭拉、香菱
+ {
+ "comment": "2.0",
+ "gachaType": 423,
+ "scheduleId": 823,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A061",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A061_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 977,
+ "rateUpItems4": [ 1055, 1014, 1023 ],
+ "rateUpItems5": [ 1057 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.4上角色1-烟火之邀：魈、云堇、凝光、重云
+ //2.4上角色2-出尘入世：申鹤、云堇、凝光、重云
+ {
+ "comment": "2.0",
+ "gachaType": 424,
+ "scheduleId": 824,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A065",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A065_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 976,
+ "rateUpItems4": [ 1027, 1036, 1064 ],
+ "rateUpItems5": [ 1063 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.4下角色1-浮生孰来：甘雨、行秋、北斗、烟绯(复刻不放卡池)
+ //2.4下角色2-陵薮市朝：钟离、行秋、北斗、烟绯(复刻不放卡池)
+ //2.5上角色-华紫樱绯：八重神子、菲谢尔、迪奥娜、托马
+ {
+ "comment": "2.0",
+ "gachaType": 425,
+ "scheduleId": 825,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A071",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A071_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 975,
+ "rateUpItems4": [ 1031, 1039, 1050 ],
+ "rateUpItems5": [ 1058 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.5下角色1-影寂天下人：雷电将军、九条裟罗、辛焱、班尼特(复刻不放卡池)
+ //2.5下角色2-浮岳虹珠：珊瑚宫心海、九条裟罗、辛焱、班尼特(复刻不放卡池)
+ //2.6上角色1-苍流踏花：神里绫人、砂糖、香菱、云堇
+ {
+ "comment": "2.0",
+ "gachaType": 426,
+ "scheduleId": 826,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A076",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A076_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 974,
+ "rateUpItems4": [ 1043, 1023, 1064 ],
+ "rateUpItems5": [ 1066 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.6上角色2-杯装之诗：神里绫人、砂糖、香菱、云堇(复刻不放卡池)
+ //2.6下角色-白鹭之庭：神里绫华、雷泽、罗莎莉亚、早柚(复刻不放卡池)
+ //2.7上角色1-素霓伣天：夜兰、诺艾尔、烟绯、芭芭拉
+ {
+ "comment": "2.0",
+ "gachaType": 427,
+ "scheduleId": 827,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A081",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A081_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 973,
+ "rateUpItems4": [ 1034, 1048, 1014 ],
+ "rateUpItems5": [ 1060 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //2.7上角色2-烟火之邀：魈、诺艾尔、烟绯、芭芭拉(复刻不放卡池)
+ //2.7下角色-鬼门斗宴：荒泷一斗、久岐忍、五郎、重云(复刻不放卡池)
+ //2.8上角色1-闪焰的驻足：可莉、凝光、托马、鹿野原平藏(复刻不放卡池)
+ //2.8上角色2-叶落风随：枫原万叶、凝光、托马、鹿野原平藏(复刻不放卡池)
+ //2.8下角色-焰色天河：宵宫、班尼特、云堇、辛焱(复刻不放卡池)
+ //3.0上角色1-巡御蘙荟：提纳里、柯莱、迪奥娜、菲谢尔
+ {
+ "comment": "3.0",
+ "gachaType": 428,
+ "scheduleId": 828,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A091",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A091_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 972,
+ "rateUpItems4": [ 1031, 1039, 1067 ],
+ "rateUpItems5": [ 1069 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //3.0上角色2-陵薮市朝：钟离、柯莱、迪奥娜、菲谢尔(复刻不放卡池)
+ //3.0下角色1-浮岳虹珠：珊瑚宫心海、多莉、砂糖、行秋(复刻不放卡池)
+ //3.0下角色2-浮生孰来：甘雨、多莉、砂糖、行秋(复刻不放卡池)
+ //3.1上角色1-杯装之诗：温迪、早柚、坎蒂丝、久岐忍(复刻不放卡池)
+ //3.1上角色2-雳裁冥昭：温迪、早柚、坎蒂丝、久岐忍
+ {
+ "comment": "3.0",
+ "gachaType": 429,
+ "scheduleId": 829,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A097",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A097_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 971,
+ "rateUpItems4": [ 1053, 1065, 1072 ],
+ "rateUpItems5": [ 1071 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //3.1下角色1-翩舞歈莲：妮露、芭芭拉、北斗、香菱
+ /*{
"comment": "3.0",
"gachaType": 430,
"scheduleId": 830,
@@ -717,57 +717,57 @@
"fallbackItems5Pool2": [],
"weights5": [[1,80], [73,80], [90,10000]]
},*/
- //3.2上角色1-月草的赐慧：纳西妲、诺艾尔、班尼特、雷泽
- {
- "comment": "Character Event Banner 1",
- "gachaType": 431,
- "scheduleId": 831,
- "bannerType": "EVENT",
- "prefabPath": "GachaShowPanel_A103",
- "titlePath": "UI_GACHA_SHOW_PANEL_A0103_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 969,
- "rateUpItems4": [ 1034, 1020, 1032 ],
- "rateUpItems5": [ 1073 ],
- "fallbackItems5Pool2": [],
- "weights5": [
- [ 1, 80 ],
- [ 73, 80 ],
- [ 90, 10000 ]
- ]
- },
- //3.2上角色-焰色天河：宵宫、诺艾尔、班尼特、雷泽(复刻不放卡池)
- //3.2上武器-神铸赋形：飞雷之弦振、
- {
- "comment": "Weapon Event Banner",
- "gachaType": 502,
- "scheduleId": 602,
- "bannerType": "WEAPON",
- "prefabPath": "GachaShowPanel_A105",
- "titlePath": "UI_GACHA_SHOW_PANEL_A020_TITLE",
- "costItemId": 223,
- "beginTime": 0,
- "endTime": 1924992000,
- "sortId": 2,
- "rateUpItems4": [ 15405, 11402, 14402, 13407, 12403 ],
- "rateUpItems5": [ 114511, 15509 ],
- "fallbackItems5Pool1": [],
- "weights4": [
- [ 1, 600 ],
- [ 7, 600 ],
- [ 8, 6600 ],
- [ 10, 12600 ]
- ],
- "weights5": [
- [ 1, 100 ],
- [ 62, 100 ],
- [ 73, 7800 ],
- [ 80, 10000 ]
- ],
- "eventChance4": 75,
- "eventChance5": 75
- }
- //3.1下角色2-深秘之息：阿贝多、芭芭拉、北斗、香菱(复刻不放卡池)
-]
+ //3.2上角色1-月草的赐慧：纳西妲、诺艾尔、班尼特、雷泽
+ {
+ "comment": "Character Event Banner 1",
+ "gachaType": 431,
+ "scheduleId": 831,
+ "bannerType": "EVENT",
+ "prefabPath": "GachaShowPanel_A103",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A0103_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 969,
+ "rateUpItems4": [ 1034, 1020, 1032 ],
+ "rateUpItems5": [ 1073 ],
+ "fallbackItems5Pool2": [],
+ "weights5": [
+ [ 1, 80 ],
+ [ 73, 80 ],
+ [ 90, 10000 ]
+ ]
+ },
+ //3.2上角色-焰色天河：宵宫、诺艾尔、班尼特、雷泽(复刻不放卡池)
+ //3.2上武器-神铸赋形：飞雷之弦振、
+ {
+ "comment": "Weapon Event Banner",
+ "gachaType": 502,
+ "scheduleId": 602,
+ "bannerType": "WEAPON",
+ "prefabPath": "GachaShowPanel_A105",
+ "titlePath": "UI_GACHA_SHOW_PANEL_A020_TITLE",
+ "costItemId": 223,
+ "beginTime": 0,
+ "endTime": 1924992000,
+ "sortId": 2,
+ "rateUpItems4": [ 15405, 11402, 14402, 13407, 12403 ],
+ "rateUpItems5": [ 114511, 15509 ],
+ "fallbackItems5Pool1": [],
+ "weights4": [
+ [ 1, 600 ],
+ [ 7, 600 ],
+ [ 8, 6600 ],
+ [ 10, 12600 ]
+ ],
+ "weights5": [
+ [ 1, 100 ],
+ [ 62, 100 ],
+ [ 73, 7800 ],
+ [ 80, 10000 ]
+ ],
+ "eventChance4": 75,
+ "eventChance5": 75
+ }
+ //3.1下角色2-深秘之息：阿贝多、芭芭拉、北斗、香菱(复刻不放卡池)
+]
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Resources/en-us/AvatarStats.json b/Source/GrasscutterTools/Resources/en-us/AvatarStats.json
index c78b946..c94df37 100644
--- a/Source/GrasscutterTools/Resources/en-us/AvatarStats.json
+++ b/Source/GrasscutterTools/Resources/en-us/AvatarStats.json
@@ -191,4 +191,4 @@
"Percent": true,
"Tip": "This doesn't seem to work."
}
-]
+]
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Resources/ru-ru/AvatarStats.json b/Source/GrasscutterTools/Resources/ru-ru/AvatarStats.json
index 1b169a4..316b4a2 100644
--- a/Source/GrasscutterTools/Resources/ru-ru/AvatarStats.json
+++ b/Source/GrasscutterTools/Resources/ru-ru/AvatarStats.json
@@ -191,4 +191,4 @@
"Percent": true,
"Tip": "Это, кажется, не работает."
}
-]
+]
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Resources/zh-cn/AvatarStats.json b/Source/GrasscutterTools/Resources/zh-cn/AvatarStats.json
index c9d3a32..382fe79 100644
--- a/Source/GrasscutterTools/Resources/zh-cn/AvatarStats.json
+++ b/Source/GrasscutterTools/Resources/zh-cn/AvatarStats.json
@@ -191,4 +191,4 @@
"Percent": true,
"Tip": "似乎不起作用"
}
-]
+]
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Utils/ArtifactUtils.cs b/Source/GrasscutterTools/Utils/ArtifactUtils.cs
index 6af4a71..8c2334b 100644
--- a/Source/GrasscutterTools/Utils/ArtifactUtils.cs
+++ b/Source/GrasscutterTools/Utils/ArtifactUtils.cs
@@ -14,15 +14,16 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Collections.Generic;
using System.Linq;
namespace GrasscutterTools.Utils
{
- class SubstatSumEquality : IEqualityComparer>>
+ internal class SubstatSumEquality : IEqualityComparer>>
{
public bool Equals(List> left, List> right)
{
@@ -48,8 +49,8 @@ namespace GrasscutterTools.Utils
}
}
- class ArtifactUtils
- {
+ internal class ArtifactUtils
+ {
public static Dictionary substats_rolls = new Dictionary
{
{
@@ -179,6 +180,7 @@ namespace GrasscutterTools.Utils
// Default, should never happen
return last_stat_list;
}
+
private static void InitSubstats()
{
substats_dict = new Dictionary>>>();
@@ -193,7 +195,7 @@ namespace GrasscutterTools.Utils
substat_options.Add(new KeyValuePair(0, 0));
for (int substat_index = 0; substat_index < substats_rolls[stat_name][rarity_index].Length; substat_index++)
{
- substat_options.Add(new KeyValuePair(substat_index+1, substats_rolls[stat_name][rarity_index][substat_index]));
+ substat_options.Add(new KeyValuePair(substat_index + 1, substats_rolls[stat_name][rarity_index][substat_index]));
}
var substat_sum_data = (from s1 in substat_options from s2 in substat_options from s3 in substat_options from s4 in substat_options from s5 in substat_options from s6 in substat_options select new { s1, s2, s3, s4, s5, s6 })
@@ -219,4 +221,4 @@ namespace GrasscutterTools.Utils
private static bool substats_initiated = false;
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Utils/Common.cs b/Source/GrasscutterTools/Utils/Common.cs
index 69f4eef..9556e52 100644
--- a/Source/GrasscutterTools/Utils/Common.cs
+++ b/Source/GrasscutterTools/Utils/Common.cs
@@ -32,4 +32,4 @@ namespace GrasscutterTools.Utils
"GrasscutterTools",
filename);
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Utils/HttpHelper.cs b/Source/GrasscutterTools/Utils/HttpHelper.cs
index 324b649..bb20ef3 100644
--- a/Source/GrasscutterTools/Utils/HttpHelper.cs
+++ b/Source/GrasscutterTools/Utils/HttpHelper.cs
@@ -14,8 +14,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
**/
+
using System;
using System.Net;
using System.Net.Http;
diff --git a/Source/GrasscutterTools/Utils/ReleaseAPI.cs b/Source/GrasscutterTools/Utils/ReleaseAPI.cs
index 1317070..89b671d 100644
--- a/Source/GrasscutterTools/Utils/ReleaseAPI.cs
+++ b/Source/GrasscutterTools/Utils/ReleaseAPI.cs
@@ -47,4 +47,4 @@ namespace GrasscutterTools.Utils
public string Body { get; set; }
}
}
-}
+}
\ No newline at end of file
diff --git a/Source/GrasscutterTools/Utils/UIUtil.cs b/Source/GrasscutterTools/Utils/UIUtil.cs
index 3644f3b..01be5d0 100644
--- a/Source/GrasscutterTools/Utils/UIUtil.cs
+++ b/Source/GrasscutterTools/Utils/UIUtil.cs
@@ -45,7 +45,6 @@ namespace GrasscutterTools.Utils
listBox.EndUpdate();
}
-
///
/// 使用浏览器打开网址
///
@@ -63,11 +62,10 @@ namespace GrasscutterTools.Utils
}
}
-
///
/// 提示气泡对象
///
- private readonly static ToolTip TTip = new ToolTip();
+ private static readonly ToolTip TTip = new ToolTip();
///
/// 在指定控件上显示提示气泡
@@ -79,4 +77,4 @@ namespace GrasscutterTools.Utils
TTip.Show(message, control, 0, control.Size.Height, 3000);
}
}
-}
+}
\ No newline at end of file