OSDN > Entwickler > jopde6vovgedsah > Kammer > KancolleSniffer > Commit

KancolleSniffer
Fork

Commit

Revision	c699688b3d72765a51fdbf54c75478ee9ca8cf1f (tree)
Zeit	2020-03-22 20:41:46
Autor	Kazuhiro Fujieda <fujieda@user...>
Commiter	Kazuhiro Fujieda

装備一覧が何も変化がなくても更新されるのを直す

--- a/KancolleSniffer/Model/ItemInfo.cs

+++ b/KancolleSniffer/Model/ItemInfo.cs

		@@ -131,19 +131,12 @@ namespace KancolleSniffer.Model
131	131
132	132	public string GetUseItemName(int id) => _itemMaster.GetUseItemName(id);
133	133
134		- private const int EmergencyRepairId = 91;
135		-
136	134	private IEnumerable<ItemStatus> UseItemList =>
137	135	Enumerable.Repeat(new ItemStatus
138	136	{
139		- Spec = new ItemSpec
140		- {
141		- Type = 31,
142		- Id = 10000 + EmergencyRepairId,
143		- Name = _itemMaster.GetUseItemName(EmergencyRepairId)
144		- },
	137	+ Spec = GetSpecByItemId(ItemMaster.EmergencyRepairSpecId),
145	138	Holder = new ShipStatus()
146		- }, _useItem.TryGetValue(EmergencyRepairId, out var count) ? count : 0);
	139	+ }, _useItem.TryGetValue(ItemMaster.EmergencyRepairId, out var count) ? count : 0);
147	140
148	141	public void InjectItemSpec(IEnumerable<ItemSpec> specs)
149	142	{

--- a/KancolleSniffer/Model/ItemMaster.cs

+++ b/KancolleSniffer/Model/ItemMaster.cs

		@@ -21,6 +21,9 @@ namespace KancolleSniffer.Model
21	21	private readonly Dictionary<int, ItemSpec> _itemSpecs = new Dictionary<int, ItemSpec>();
22	22	private readonly Dictionary<int, string> _useItemName = new Dictionary<int, string>();
23	23
	24	+ public const int EmergencyRepairId = 91;
	25	+ public const int EmergencyRepairSpecId = 10091;
	26	+
24	27	public AdditionalData AdditionalData { get; set; }
25	28
26	29	public void InspectMaster(dynamic json)

		@@ -54,7 +57,19 @@ namespace KancolleSniffer.Model
54	57	}
55	58	_itemSpecs[-1] = _itemSpecs[0] = new ItemSpec();
56	59	foreach (var entry in json.api_mst_useitem)
57		- _useItemName[(int)entry.api_id] = entry.api_name;
	60	+ {
	61	+ var id = (int)entry.api_id;
	62	+ _useItemName[id] = entry.api_name;
	63	+ }
	64	+ if (_useItemName.ContainsKey(EmergencyRepairId))
	65	+ {
	66	+ _itemSpecs[EmergencyRepairSpecId] = new ItemSpec
	67	+ {
	68	+ Type = 31,
	69	+ Id = EmergencyRepairSpecId,
	70	+ Name = _useItemName[EmergencyRepairId]
	71	+ };
	72	+ }
58	73	}
59	74
60	75	public ItemSpec this[int id]