poi-plugin-milk 1.1.1 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.idea/workspace.xml +30 -24
- package/index.js +30 -4
- package/package.json +1 -1
- package/parts/fleet-list.js +55 -14
package/.idea/workspace.xml
CHANGED
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
<file leaf-file-name="fleet-list.js" pinned="false" current-in-tab="false">
|
|
25
25
|
<entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
|
|
26
26
|
<provider selected="true" editor-type-id="text-editor">
|
|
27
|
-
<state relative-caret-position="
|
|
28
|
-
<caret line="
|
|
27
|
+
<state relative-caret-position="1057">
|
|
28
|
+
<caret line="113" column="0" lean-forward="false" selection-start-line="113" selection-start-column="0" selection-end-line="118" selection-end-column="44" />
|
|
29
29
|
<folding />
|
|
30
30
|
</state>
|
|
31
31
|
</provider>
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
|
|
35
35
|
<entry file="file://$PROJECT_DIR$/index.js">
|
|
36
36
|
<provider selected="true" editor-type-id="text-editor">
|
|
37
|
-
<state relative-caret-position="
|
|
38
|
-
<caret line="
|
|
37
|
+
<state relative-caret-position="975">
|
|
38
|
+
<caret line="104" column="10" lean-forward="false" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="10" />
|
|
39
39
|
<folding />
|
|
40
40
|
</state>
|
|
41
41
|
</provider>
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
<file leaf-file-name="countup-timer.js" pinned="false" current-in-tab="false">
|
|
55
55
|
<entry file="file://$PROJECT_DIR$/parts/countup-timer.js">
|
|
56
56
|
<provider selected="true" editor-type-id="text-editor">
|
|
57
|
-
<state relative-caret-position="
|
|
57
|
+
<state relative-caret-position="-492">
|
|
58
58
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
59
59
|
<folding />
|
|
60
60
|
</state>
|
|
@@ -128,7 +128,6 @@
|
|
|
128
128
|
</component>
|
|
129
129
|
<component name="FindInProjectRecents">
|
|
130
130
|
<findStrings>
|
|
131
|
-
<find>fleetAkashiConv</find>
|
|
132
131
|
<find>Not ready</find>
|
|
133
132
|
<find>canRepair</find>
|
|
134
133
|
<find>HP</find>
|
|
@@ -144,6 +143,13 @@
|
|
|
144
143
|
<find>api_port</find>
|
|
145
144
|
<find>expedReturnLock</find>
|
|
146
145
|
<find>lastRefresh</find>
|
|
146
|
+
<find>fleetsAkashiSelector</find>
|
|
147
|
+
<find>FleetList</find>
|
|
148
|
+
<find>_fleetList</find>
|
|
149
|
+
<find>handleSort</find>
|
|
150
|
+
<find>fleetAkashiConv</find>
|
|
151
|
+
<find>fleets</find>
|
|
152
|
+
<find>console.log</find>
|
|
147
153
|
</findStrings>
|
|
148
154
|
</component>
|
|
149
155
|
<component name="IdeDocumentHistory">
|
|
@@ -152,8 +158,8 @@
|
|
|
152
158
|
<option value="$PROJECT_DIR$/parts/functions.js" />
|
|
153
159
|
<option value="$PROJECT_DIR$/i18n/zh-CN.json" />
|
|
154
160
|
<option value="$PROJECT_DIR$/parts/ship-row.js" />
|
|
155
|
-
<option value="$PROJECT_DIR$/index.js" />
|
|
156
161
|
<option value="$PROJECT_DIR$/parts/fleet-list.js" />
|
|
162
|
+
<option value="$PROJECT_DIR$/index.js" />
|
|
157
163
|
<option value="$PROJECT_DIR$/package.json" />
|
|
158
164
|
</list>
|
|
159
165
|
</option>
|
|
@@ -259,7 +265,7 @@
|
|
|
259
265
|
<property name="options.splitter.main.proportions" value="0.3" />
|
|
260
266
|
<property name="settings.editor.selected.configurable" value="editor.preferences.smartKeys" />
|
|
261
267
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
262
|
-
<property name="last_opened_file_path" value="$PROJECT_DIR
|
|
268
|
+
<property name="last_opened_file_path" value="$PROJECT_DIR$/../poi-plugin-achievement" />
|
|
263
269
|
<property name="HbShouldOpenHtmlAsHb" value="" />
|
|
264
270
|
</component>
|
|
265
271
|
<component name="RunManager">
|
|
@@ -281,12 +287,12 @@
|
|
|
281
287
|
<workItem from="1764814660477" duration="9930000" />
|
|
282
288
|
<workItem from="1764899367749" duration="6504000" />
|
|
283
289
|
<workItem from="1765159374589" duration="297000" />
|
|
284
|
-
<workItem from="1765245689368" duration="
|
|
290
|
+
<workItem from="1765245689368" duration="9953000" />
|
|
285
291
|
</task>
|
|
286
292
|
<servers />
|
|
287
293
|
</component>
|
|
288
294
|
<component name="TimeTrackingManager">
|
|
289
|
-
<option name="totallyTimeSpent" value="
|
|
295
|
+
<option name="totallyTimeSpent" value="27020000" />
|
|
290
296
|
</component>
|
|
291
297
|
<component name="ToolWindowManager">
|
|
292
298
|
<frame x="140" y="22" width="3700" height="2138" extended-state="0" />
|
|
@@ -622,7 +628,7 @@
|
|
|
622
628
|
</state>
|
|
623
629
|
</provider>
|
|
624
630
|
</entry>
|
|
625
|
-
<entry file="file://$PROJECT_DIR$/parts/
|
|
631
|
+
<entry file="file://$PROJECT_DIR$/parts/factor.js">
|
|
626
632
|
<provider selected="true" editor-type-id="text-editor">
|
|
627
633
|
<state relative-caret-position="0">
|
|
628
634
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
@@ -630,15 +636,15 @@
|
|
|
630
636
|
</state>
|
|
631
637
|
</provider>
|
|
632
638
|
</entry>
|
|
633
|
-
<entry file="file://$PROJECT_DIR$/parts/
|
|
639
|
+
<entry file="file://$PROJECT_DIR$/parts/functions.js">
|
|
634
640
|
<provider selected="true" editor-type-id="text-editor">
|
|
635
|
-
<state relative-caret-position="
|
|
636
|
-
<caret line="
|
|
641
|
+
<state relative-caret-position="246">
|
|
642
|
+
<caret line="5" column="156" lean-forward="false" selection-start-line="5" selection-start-column="156" selection-end-line="5" selection-end-column="156" />
|
|
637
643
|
<folding />
|
|
638
644
|
</state>
|
|
639
645
|
</provider>
|
|
640
646
|
</entry>
|
|
641
|
-
<entry file="file://$PROJECT_DIR$/parts/
|
|
647
|
+
<entry file="file://$PROJECT_DIR$/parts/candidates.js">
|
|
642
648
|
<provider selected="true" editor-type-id="text-editor">
|
|
643
649
|
<state relative-caret-position="0">
|
|
644
650
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
@@ -646,10 +652,10 @@
|
|
|
646
652
|
</state>
|
|
647
653
|
</provider>
|
|
648
654
|
</entry>
|
|
649
|
-
<entry file="file://$PROJECT_DIR$/parts/
|
|
655
|
+
<entry file="file://$PROJECT_DIR$/parts/countup-timer.js">
|
|
650
656
|
<provider selected="true" editor-type-id="text-editor">
|
|
651
|
-
<state relative-caret-position="
|
|
652
|
-
<caret line="
|
|
657
|
+
<state relative-caret-position="-492">
|
|
658
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
653
659
|
<folding />
|
|
654
660
|
</state>
|
|
655
661
|
</provider>
|
|
@@ -662,18 +668,18 @@
|
|
|
662
668
|
</state>
|
|
663
669
|
</provider>
|
|
664
670
|
</entry>
|
|
665
|
-
<entry file="file://$PROJECT_DIR$/
|
|
671
|
+
<entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
|
|
666
672
|
<provider selected="true" editor-type-id="text-editor">
|
|
667
|
-
<state relative-caret-position="
|
|
668
|
-
<caret line="
|
|
673
|
+
<state relative-caret-position="1057">
|
|
674
|
+
<caret line="113" column="0" lean-forward="false" selection-start-line="113" selection-start-column="0" selection-end-line="118" selection-end-column="44" />
|
|
669
675
|
<folding />
|
|
670
676
|
</state>
|
|
671
677
|
</provider>
|
|
672
678
|
</entry>
|
|
673
|
-
<entry file="file://$PROJECT_DIR$/
|
|
679
|
+
<entry file="file://$PROJECT_DIR$/index.js">
|
|
674
680
|
<provider selected="true" editor-type-id="text-editor">
|
|
675
|
-
<state relative-caret-position="
|
|
676
|
-
<caret line="
|
|
681
|
+
<state relative-caret-position="975">
|
|
682
|
+
<caret line="104" column="10" lean-forward="false" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="10" />
|
|
677
683
|
<folding />
|
|
678
684
|
</state>
|
|
679
685
|
</provider>
|
package/index.js
CHANGED
|
@@ -82,7 +82,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
|
|
|
82
82
|
});
|
|
83
83
|
});
|
|
84
84
|
|
|
85
|
-
console.log(repairDetail)
|
|
85
|
+
//console.log(repairDetail)
|
|
86
86
|
|
|
87
87
|
var repairStatus = 0
|
|
88
88
|
var flagshipa = _lodash2.default.get(fleet, 'api_ship.0', -1)
|
|
@@ -115,6 +115,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
|
|
|
115
115
|
canRepair = repairStatus;
|
|
116
116
|
var lastCanRepair = canRepair;
|
|
117
117
|
//console.log("cc2:"+canRepair)
|
|
118
|
+
var lastUpdate = Date.now();
|
|
118
119
|
return {
|
|
119
120
|
api_id: fleet.api_id || -1,
|
|
120
121
|
shipId: fleet.api_ship || [],
|
|
@@ -123,7 +124,8 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
|
|
|
123
124
|
inExpedition,
|
|
124
125
|
flagShipInRepair,
|
|
125
126
|
repairCount,
|
|
126
|
-
repairDetail
|
|
127
|
+
repairDetail,
|
|
128
|
+
lastUpdate
|
|
127
129
|
};
|
|
128
130
|
};
|
|
129
131
|
|
|
@@ -135,6 +137,9 @@ const constShipsSelector = state => state.const.$ships || {};
|
|
|
135
137
|
|
|
136
138
|
const fleetsAkashiSelector = (0, _reselect.createSelector)([constShipsSelector, _selectors.fleetsSelector, _selectors.shipsSelector, _selectors.equipsSelector, repairIdSelector], ($ships, fleets, ships, equips, repairId) => ({ fleets: _lodash2.default.map(fleets, fleet => fleetAkashiConv(fleet, $ships, ships, equips, repairId)) })
|
|
137
139
|
|
|
140
|
+
|
|
141
|
+
|
|
142
|
+
|
|
138
143
|
// React
|
|
139
144
|
|
|
140
145
|
);const reactClass = exports.reactClass = (0, _reactRedux.connect)((0, _selectors.createDeepCompareArraySelector)([fleetsAkashiSelector, _selectors.miscSelector], (data, { canNotify }) => _extends({}, data, {
|
|
@@ -154,6 +159,24 @@ const fleetsAkashiSelector = (0, _reselect.createSelector)([constShipsSelector,
|
|
|
154
159
|
});
|
|
155
160
|
};
|
|
156
161
|
|
|
162
|
+
// this.componentDidMount = () => {
|
|
163
|
+
// window.addEventListener('game.response', this.handleResponse);
|
|
164
|
+
// };
|
|
165
|
+
//
|
|
166
|
+
// this.componentWillUnmount = () => {
|
|
167
|
+
// window.removeEventListener('game.response', this.handleResponse);
|
|
168
|
+
// };
|
|
169
|
+
//
|
|
170
|
+
// this.handleResponse = e => {
|
|
171
|
+
// const {path, postBody} = e.detail;
|
|
172
|
+
// switch (path) {
|
|
173
|
+
// case '/kcsapi/api_req_hensei/change': {
|
|
174
|
+
// this.setState({fleetts:Date.now()});
|
|
175
|
+
// }
|
|
176
|
+
// default:
|
|
177
|
+
// }
|
|
178
|
+
// }
|
|
179
|
+
|
|
157
180
|
this.state = {
|
|
158
181
|
activeTab: 1,
|
|
159
182
|
sortIndex: 0
|
|
@@ -168,7 +191,9 @@ const fleetsAkashiSelector = (0, _reselect.createSelector)([constShipsSelector,
|
|
|
168
191
|
_react2.default.createElement(
|
|
169
192
|
_reactBootstrap.Tabs,
|
|
170
193
|
{ activeKey: this.state.activeTab, onSelect: this.handleSelectTab, id: 'anchorage-tabs' },
|
|
171
|
-
_lodash2.default.map(this.props.fleets, (fleet, index)
|
|
194
|
+
_lodash2.default.map(this.props.fleets, function(fleet, index){
|
|
195
|
+
//console.log(fleet);
|
|
196
|
+
return _react2.default.createElement(
|
|
172
197
|
_reactBootstrap.Tab,
|
|
173
198
|
{
|
|
174
199
|
eventKey: fleet.api_id,
|
|
@@ -177,7 +202,8 @@ const fleetsAkashiSelector = (0, _reselect.createSelector)([constShipsSelector,
|
|
|
177
202
|
tabClassName: fleet.canRepair ? 'can-repair' : ''
|
|
178
203
|
},
|
|
179
204
|
_react2.default.createElement(_fleetList2.default, { fleet: fleet })
|
|
180
|
-
)
|
|
205
|
+
)}
|
|
206
|
+
),
|
|
181
207
|
_react2.default.createElement(
|
|
182
208
|
_reactBootstrap.Tab,
|
|
183
209
|
{
|
package/package.json
CHANGED
package/parts/fleet-list.js
CHANGED
|
@@ -46,24 +46,26 @@ class FleetList extends _react.Component {
|
|
|
46
46
|
window.removeEventListener('game.response', this.handleResponse);
|
|
47
47
|
};
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
var needtime = 900;
|
|
51
|
-
//console.log('can repair:'+fleet.canRepair);
|
|
52
|
-
if(fleet.canRepair==0){
|
|
53
|
-
needtime = _functions.AKASHI_INTERVAL / 1000;
|
|
54
|
-
}else if(fleet.canRepair==1){
|
|
55
|
-
needtime = _functions.AKASHI_INTERVAL / 1000;;
|
|
56
|
-
}else if(fleet.canRepair==2||fleet.canRepair==3){
|
|
57
|
-
needtime = 900;
|
|
58
|
-
}else if(fleet.canRepair==4||fleet.canRepair==5){
|
|
59
|
-
needtime = 900;
|
|
60
|
-
}
|
|
49
|
+
|
|
61
50
|
|
|
62
51
|
this.handleResponse = e => {
|
|
63
52
|
const { path, postBody } = e.detail;
|
|
64
53
|
const { timeElapsed, lastRefresh } = this.state;
|
|
65
54
|
switch (path) {
|
|
66
55
|
case '/kcsapi/api_port/port':
|
|
56
|
+
|
|
57
|
+
const { fleet } = this.props;
|
|
58
|
+
var needtime = 900;
|
|
59
|
+
if(fleet.canRepair==0){
|
|
60
|
+
needtime = _functions.AKASHI_INTERVAL / 1000;
|
|
61
|
+
}else if(fleet.canRepair==1){
|
|
62
|
+
needtime = _functions.AKASHI_INTERVAL / 1000;;
|
|
63
|
+
}else if(fleet.canRepair==2||fleet.canRepair==3){
|
|
64
|
+
needtime = 900;
|
|
65
|
+
}else if(fleet.canRepair==4||fleet.canRepair==5){
|
|
66
|
+
needtime = 900;
|
|
67
|
+
}
|
|
68
|
+
|
|
67
69
|
if (timeElapsed >= needtime || lastRefresh === 0) {
|
|
68
70
|
this.setState({
|
|
69
71
|
lastRefresh: Date.now(),
|
|
@@ -74,13 +76,52 @@ class FleetList extends _react.Component {
|
|
|
74
76
|
|
|
75
77
|
case '/kcsapi/api_req_hensei/change':
|
|
76
78
|
{
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
const { fleet} = this.props;
|
|
82
|
+
var needtime = 900;
|
|
83
|
+
if(fleet.canRepair==0){
|
|
84
|
+
needtime = _functions.AKASHI_INTERVAL / 1000;
|
|
85
|
+
}else if(fleet.canRepair==1){
|
|
86
|
+
needtime = _functions.AKASHI_INTERVAL / 1000;;
|
|
87
|
+
}else if(fleet.canRepair==2||fleet.canRepair==3){
|
|
88
|
+
needtime = 900;
|
|
89
|
+
}else if(fleet.canRepair==4||fleet.canRepair==5){
|
|
90
|
+
needtime = 900;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
|
|
77
94
|
const fleetId = parseInt(postBody.api_id, 10);
|
|
78
95
|
const shipId = parseInt(postBody.api_ship_id, 10
|
|
79
96
|
// const shipIndex = parseInt(postBody.api_ship_idx)
|
|
80
97
|
);if (!Number.isNaN(fleetId) && fleetId === this.props.fleet.api_id && shipId >= 0) {
|
|
81
98
|
if (timeElapsed < needtime) {
|
|
82
|
-
|
|
83
|
-
|
|
99
|
+
var newFleet = getStore('info.fleets')[fleetId-1];
|
|
100
|
+
var newCanRepair = 0;
|
|
101
|
+
if(newFleet){
|
|
102
|
+
var flagshipa = _lodash2.default.get(newFleet, 'api_ship.0', -1)
|
|
103
|
+
var secondshipa = _lodash2.default.get(newFleet, 'api_ship.1', -1)
|
|
104
|
+
var flagshipid = _ships[flagshipa]?_ships[flagshipa].api_ship_id:-1;
|
|
105
|
+
var secondshipid = _ships[secondshipa]?_ships[secondshipa].api_ship_id:-1;
|
|
106
|
+
if(
|
|
107
|
+
flagshipid==182||flagshipid==187||
|
|
108
|
+
flagshipid==996||flagshipid==1002||
|
|
109
|
+
secondshipid==996||secondshipid==1002
|
|
110
|
+
){
|
|
111
|
+
newCanRepair = 1
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
// console.log(3333333333)
|
|
115
|
+
// console.log(fleetId)
|
|
116
|
+
// console.log(fleet)
|
|
117
|
+
// console.log(flagshipid,secondshipid)
|
|
118
|
+
// console.log(newFleet)
|
|
119
|
+
// console.log(newCanRepair)
|
|
120
|
+
if(fleet.canRepair==0&&newCanRepair==0){
|
|
121
|
+
this.setState({
|
|
122
|
+
// lastRefresh: Date.now(),
|
|
123
|
+
// timeElapsed: 0
|
|
124
|
+
});
|
|
84
125
|
}else{
|
|
85
126
|
this.setState({
|
|
86
127
|
lastRefresh: Date.now(),
|