1.6.7 업데이트

entrylabs · Apr 30, 2018 · 2c47c1b · 2c47c1b
1 parent 08cfb9d
commit 2c47c1b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/build/entryx64.nsi b/build/entryx64.nsi
@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "1.6.6"
+!define PRODUCT_VERSION "1.6.7"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git a/build/entryx86.nsi b/build/entryx86.nsi
@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "1.6.6"
+!define PRODUCT_VERSION "1.6.7"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "name": "entry",
   "productName": "Entry",
   "main": "src/entry_offline.js",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "config": {
     "forge": "./forge.config.js"
   },

diff --git a/src/entry_offline.js b/src/entry_offline.js
@@ -20,6 +20,7 @@ import { addBypassChecker, init } from 'electron-compile';
 const packageJson = require('../package.json');
 
 let hostURI = 'playentry.org';
+let hostProtocol = 'https:';
 const bypassList = ['.png', '.jpg', '.mp3', '.wav', '.gif'];
 addBypassChecker((filePath) => {
     const { ext = '' } = path.parse(filePath);
@@ -78,6 +79,9 @@ for (var i = 0; i < argv.length; i++) {
     } else if (argv[i].match(/^--host=/) || argv[i].match(/^-h=/)) {
         hostURI = argv[i].split('=')[1];
         continue;
+    } else if (argv[i].match(/^--protocol=/) || argv[i].match(/^-p=/)) {
+        hostProtocol = argv[i].split('=')[1];
+        continue;
     } else if (argv[i][0] == '-') {
         continue;
     } else {
@@ -330,6 +334,7 @@ if (shouldQuit) {
         const request = net.request({
             method: 'POST',
             host: hostURI,
+            protocol: hostProtocol,
             path: '/api/checkVersion',
         });
         let body = '';

diff --git a/src/renderer/src/block_converter.js b/src/renderer/src/block_converter.js
@@ -131,7 +131,7 @@ function processBlock (block, thread) {
     parsedBlock.x ? parsedBlock.x = Number(parsedBlock.x) : 0;
     parsedBlock.y ? parsedBlock.y = Number(parsedBlock.y) : 0;
 
-    var keyMap = entry.block[parsedBlock.type].paramsKeyMap;
+    var keyMap = Entry.block[parsedBlock.type].paramsKeyMap;
 
     var blockValues = [];
     var fields = block.field;