Merge tag '1.4.7' into develop

1.4.7
This commit is contained in:
ntr 2019-09-19 22:33:20 +10:00
commit 4a640784f1
6 changed files with 8 additions and 6 deletions

View File

@ -1 +1 @@
1.4.6 1.4.7

View File

@ -1,6 +1,6 @@
{ {
"name": "mnml-client", "name": "mnml-client",
"version": "1.4.6", "version": "1.4.7",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@ -1,6 +1,6 @@
{ {
"name": "mnml-client", "name": "mnml-client",
"version": "1.4.6", "version": "1.4.7",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@ -206,6 +206,7 @@ function registerEvents(store) {
} }
function setDemo(d) { function setDemo(d) {
const initial = { const initial = {
players: d, players: d,
combiner: [], combiner: [],
@ -215,7 +216,8 @@ function registerEvents(store) {
}; };
const startDemo = () => { const startDemo = () => {
console.log(initial); const { account } = store.getState();
if (account) return false;
store.dispatch(actions.setDemo(initial)); store.dispatch(actions.setDemo(initial));
store.dispatch(actions.setAnimTarget(null)); store.dispatch(actions.setAnimTarget(null));
setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0] }))), 2000); setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0] }))), 2000);

View File

@ -1,6 +1,6 @@
{ {
"name": "mnml-ops", "name": "mnml-ops",
"version": "1.4.6", "version": "1.4.7",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@ -1,6 +1,6 @@
[package] [package]
name = "mnml" name = "mnml"
version = "1.4.6" version = "1.4.7"
authors = ["ntr <ntr@smokestack.io>"] authors = ["ntr <ntr@smokestack.io>"]
[dependencies] [dependencies]