ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix stuff n tings

Browse Source
This commit is contained in:
ntr 2019-06-10 21:53:38 +10:00
parent 2596b88b75
commit 440376e5c3
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/events.jsx
View File

@ -113,6 +113,18 @@ function registerEvents(store) {
console.log('event clear item');
}
function clearInstance() {
store.dispatch(actions.setCombiner([null, null, null]));
store.dispatch(actions.setReclaiming(false));
store.dispatch(actions.setActiveSkill(null));
store.dispatch(actions.setActiveConstruct(null));
store.dispatch(actions.setInfo(null));
store.dispatch(actions.setItemEquip(null));
store.dispatch(actions.setItemUnequip(null));
store.dispatch(actions.setVboxHighlight([]));
store.dispatch(actions.setConstructDeleteId(null));
}
function setAccountInstances(v) {
return store.dispatch(actions.setInstances(v));
}
@ -187,6 +199,7 @@ function registerEvents(store) {
return {
errorPrompt,
clearCombiner,
clearInstance,
setAccount,
setActiveSkill,
setActiveItem,

7
client/src/socket.jsx
View File

@ -81,20 +81,22 @@ function createSocket(events) {
function sendVboxAccept(instanceId, group, index) {
send({ method: 'vbox_accept', params: { instance_id: instanceId, group, index } });
events.clearInstance();
}
function sendVboxApply(instanceId, constructId, index) {
send({ method: 'vbox_apply', params: { instance_id: instanceId, construct_id: constructId, index } });
events.setActiveItem(null);
events.clearInstance();
}
function sendVboxUnequip(instanceId, constructId, target) {
send({ method: 'vbox_unequip', params: { instance_id: instanceId, construct_id: constructId, target } });
events.clearInfo();
events.clearInstance();
}
function sendVboxDiscard(instanceId) {
send({ method: 'vbox_discard', params: { instance_id: instanceId } });
events.clearInstance();
}
function sendVboxCombine(instanceId, indices) {
@ -104,6 +106,7 @@ function createSocket(events) {
function sendVboxReclaim(instanceId, index) {
send({ method: 'vbox_reclaim', params: { instance_id: instanceId, index } });
events.clearInstance();
}
function sendItemInfo() {