Skip to content

Commit 3314a0f

Browse files
walkurewalkure
committed
v2.7.7.2
1 parent 86a835f commit 3314a0f

12 files changed

+479
-253
lines changed

‎HTTProxy.cs

+8-2
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,16 @@ private void OnHTTPRequest(IAsyncResult ar)
333333
{
334334
listener.BeginGetContext(OnHTTPRequest, listener);
335335
}
336-
catch(ObjectDisposedException ex)
336+
catch (ObjectDisposedException ex)
337337
{
338338
//コネクションが閉じた
339-
DebugOut("ObjectDisposedException\n{0}", ex.ToString());
339+
DebugOut("ObjectDisposedException\n{0}", ex.ToString());
340+
return;
341+
}
342+
catch (HttpListenerException ex)
343+
{
344+
//コネクションが閉じた
345+
DebugOut("HttpListenerException\n{0}", ex.ToString());
340346
return;
341347
}
342348

‎MasterData/Item.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class Item
1919
/// </summary>
2020
/// <param name="JSON"></param>
2121
/// <returns></returns>
22-
public bool LoadItemMaster(KCB.api_start2.ApiData.ApiMstSlotitem[] api_mst_slotitem)
22+
public bool LoadItemMaster(List<KCB.api_start2.ApiData.ApiMstSlotitem> api_mst_slotitem)
2323
{
2424
_itemMaster.Clear();
2525
if (_bUseMasterData)
@@ -612,7 +612,7 @@ public int CompareTo(object obj)
612612

613613
class LVParamArraySubItem : System.Windows.Forms.ListViewItem.ListViewSubItem, IComparable
614614
{
615-
public LVParamArraySubItem(System.Windows.Forms.ListViewItem lvitOwner, int[] values)
615+
public LVParamArraySubItem(System.Windows.Forms.ListViewItem lvitOwner, List<int> values)
616616
: base(lvitOwner, "")
617617
{
618618
List<string> data = new List<string>();
@@ -638,7 +638,7 @@ public int CompareTo(object obj)
638638

639639
class LVSlotItemTypeSubItem : System.Windows.Forms.ListViewItem.ListViewSubItem, IComparable
640640
{
641-
public LVSlotItemTypeSubItem(System.Windows.Forms.ListViewItem lvitOwner, int[] values)
641+
public LVSlotItemTypeSubItem(System.Windows.Forms.ListViewItem lvitOwner, List<int> values)
642642
: base(lvitOwner, "")
643643
{
644644
Text = string.Format("{0},{1},{2}({4}),{3}({5})",

‎MasterData/Mission.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace KCB2.MasterData
1414
public class Mission
1515
{
1616
ConcurrentDictionary<int, Item> _missionList = new ConcurrentDictionary<int, Item>();
17-
public bool UpdateMission(KCB.api_start2.ApiData.ApiMstMission[] missions)
17+
public bool UpdateMission(List<KCB.api_start2.ApiData.ApiMstMission> missions)
1818
{
1919
foreach (var data in missions)
2020
{

‎MasterData/Ship.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Ship
2323
/// </summary>
2424
/// <param name="JSON"></param>
2525
/// <returns></returns>
26-
public bool LoadShipMaster(KCB.api_start2.ApiData.ApiMstShip[] api_mst_ship, Item itemMaster)
26+
public bool LoadShipMaster(List<KCB.api_start2.ApiData.ApiMstShip> api_mst_ship, Item itemMaster)
2727
{
2828
_shipMaster.Clear();
2929
if (_bUseMasterData)
@@ -82,7 +82,7 @@ public ShipTypeInfo(KCB.api_start2.ApiData.ApiMstStype stype)
8282
/// </summary>
8383
/// <param name="JSON"></param>
8484
/// <returns></returns>
85-
public bool LoadShipType(KCB.api_start2.ApiData.ApiMstStype[] api_mst_stype)
85+
public bool LoadShipType(List<KCB.api_start2.ApiData.ApiMstStype> api_mst_stype)
8686
{
8787
_shipType.Clear();
8888
if (_bUseMasterData)
@@ -470,7 +470,7 @@ public int CompareTo(object obj)
470470

471471
class LVNowMaxSubItem : System.Windows.Forms.ListViewItem.ListViewSubItem, IComparable
472472
{
473-
public LVNowMaxSubItem(System.Windows.Forms.ListViewItem lvitOwner, int[] values)
473+
public LVNowMaxSubItem(System.Windows.Forms.ListViewItem lvitOwner, List<int> values)
474474
: base(lvitOwner, "")
475475
{
476476
if (values != null)
@@ -499,7 +499,7 @@ public int CompareTo(object obj)
499499

500500
class LVParamArraySubItem : System.Windows.Forms.ListViewItem.ListViewSubItem, IComparable
501501
{
502-
public LVParamArraySubItem(System.Windows.Forms.ListViewItem lvitOwner, int[] values)
502+
public LVParamArraySubItem(System.Windows.Forms.ListViewItem lvitOwner, List<int> values)
503503
: base(lvitOwner, "")
504504
{
505505
Value = 0;

‎MemberData/Basic.cs

+18-9
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,19 @@ public bool Update(String JSON)
117117

118118
public bool UpdatePort(KCB.api_port.Port.ApiData.ApiBasic data)
119119
{
120+
_initialiized = true;
121+
120122
MemberID = data.api_member_id;
121123
Nick = data.api_nickname;
122-
Level = (int)data.api_level;
123-
Rank = (int)data.api_rank;
124-
Experience = (int)data.api_experience;
125-
MaxShip = (int)data.api_max_chara;
126-
MaxItem = (int)data.api_max_slotitem;
127-
Deck = (int)data.api_count_deck;
128-
KDock = (int)data.api_count_kdock;
129-
NDock = (int)data.api_count_ndock;
130-
FurnitureCoin = (int)data.api_fcoin;
124+
Level = data.api_level;
125+
Rank = data.api_rank;
126+
Experience = data.api_experience;
127+
MaxShip = data.api_max_chara;
128+
MaxItem = data.api_max_slotitem;
129+
Deck = data.api_count_deck;
130+
KDock = data.api_count_kdock;
131+
NDock = data.api_count_ndock;
132+
FurnitureCoin = data.api_fcoin;
131133

132134
Debug.WriteLine(string.Format(
133135
"BASIC(2) MemberID:{0} Nick:{1} Lv:{2} Rank:{3} Exp;{4} ShipMax:{5} ItemMax:{6} Deck:{7} KDock:{8} NDock:{9} FCoin:{10}",
@@ -136,6 +138,13 @@ public bool UpdatePort(KCB.api_port.Port.ApiData.ApiBasic data)
136138
return true;
137139
}
138140

141+
public void UpdateRequireInfo(KCB.api_get_member.RequireInfo.ApiData.ApiBasic data)
142+
{
143+
MemberID = data.api_member_id.ToString();
144+
145+
Debug.WriteLine("BASIC(3) MemberID:" + MemberID);
146+
}
147+
139148
}
140149

141150
}

‎MemberData/Dock.cs

-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ public override string ToString()
201201
/// <returns></returns>
202202
public bool UpdateBuildKDock(string JSON, MasterData.Ship shipMaster)
203203
{
204-
// var json = DynamicJson.Parse(JSON);
205204
var json = JsonConvert.DeserializeObject<KCB.api_get_member.KDock>(JSON);
206205
if ((int)json.api_result != 1)
207206
return false;

‎MemberData/Item.cs

+16-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,20 @@ public bool UpdateItem(string JSON, MasterData.Item itemMaster)
2929
if ((int)json.api_result != 1)
3030
return false;
3131

32+
return UpdateItem(json.api_data,itemMaster);
33+
}
34+
35+
/// <summary>
36+
/// アイテム一覧の更新 /kcsapi/api_get_member/require_info
37+
/// </summary>
38+
/// <param name="api_data"></param>
39+
/// <param name="itemMaster"></param>
40+
/// <returns></returns>
41+
public bool UpdateItem(List<KCB.api_get_member.Slot_Item.ApiData> api_data, MasterData.Item itemMaster)
42+
{
3243
_itemDic.Clear();
3344

34-
foreach (var data in json.api_data)
45+
foreach (var data in api_data)
3546
{
3647
var item = new Info(data, itemMaster);
3748
_itemDic[data.api_id] = item;
@@ -362,8 +373,10 @@ public Info(KCB.api_get_member.Slot_Item.ApiData data, MasterData.Item itemMaste
362373
SlotItemType = data.api_slotitem_id;
363374
Locked = data.api_locked == 1;
364375

365-
if (data.api_alv > 0)
366-
Level = data.api_alv;
376+
if (data.api_alv == null)
377+
Level = data.api_level;
378+
else if (data.api_alv > 0)
379+
Level = (int) data.api_alv;
367380
else
368381
Level = data.api_level;
369382

‎ProcessImpl.cs

+35
Original file line numberDiff line numberDiff line change
@@ -620,5 +620,40 @@ void LoadPresetDeck(IDictionary<string, string> queryParam,string responseJson)
620620

621621
UpdateDetailStatus("スロット{1}の編成記録を第{0}艦隊へ展開させました", queryParam["api_deck_id"], queryParam["api_preset_no"]);
622622
}
623+
624+
/// <summary>
625+
/// api_get_member/require_info
626+
/// </summary>
627+
/// <param name="responseJson">JSON</param>
628+
void RequireInfo(string responseJson)
629+
{
630+
var json = JsonConvert.DeserializeObject<KCB.api_get_member.RequireInfo>(responseJson);
631+
632+
if (json.api_result != 1)
633+
return;
634+
635+
//basic
636+
_memberBasic.UpdateRequireInfo(json.api_data.api_basic);
637+
638+
//slot_item
639+
_memberItem.UpdateItem(json.api_data.api_slot_item, _masterItem);
640+
_memberItem.UpdateItemOwnerShip(_memberShip);
641+
_memberShip.ApplySlotItemData(_memberItem);
642+
643+
UpdateDetailStatus("装備一覧を更新しました");
644+
UpdateWindowTitle();
645+
646+
//kdock
647+
_memberDock.UpdateBuildKDock(json.api_data.api_kdock, _masterShip);
648+
var kit = _logCreateShip.CreateLogData(_memberDock, _memberBasic
649+
, _memberDeck, _memberShip);
650+
651+
if (kit != null)
652+
_parent.AddCreateShipResult(kit);
653+
_parent.UpdateBuildDock(_memberDock);
654+
_parent.UpdateDeckMemberList(_memberShip, _memberDeck.DeckList);
655+
_parent.UpdateItemList(_memberItem.ItemList);
656+
_parent.UpdateShipList(_memberShip.ShipList);
657+
}
623658
}
624659
}

‎Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
// 既定値にすることができます:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("2.0.0.0")]
36-
[assembly: AssemblyFileVersion("2.7.7.1")]
36+
[assembly: AssemblyFileVersion("2.7.7.2")]

0 commit comments

Comments
 (0)