diff --git a/.gitignore b/.gitignore index 950df99eb..863fee441 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ d3dcompiler_47.dll credits.html build/Entry_1.0.0_Setup.exe build/์—”ํŠธ๋ฆฌ_1.0.1_Setup.exe +build/*.exe diff --git a/bower.json b/bower.json index b54b6d535..7ed2d47c9 100644 --- a/bower.json +++ b/bower.json @@ -8,7 +8,5 @@ "sound_lib" ], "dependencies": { - "entry-offline-editor-win32" : "https://github.com/entrylabs/entry-offline/releases/download/v1.0.0/Entry_1.0.0_Setup.exe", - "entry-offline-editor-osx64" : "https://github.com/entrylabs/entry-offline/releases/download/v1.0.0/Entry_1.0.0_64.dmg" } } diff --git a/build/entry.nsi b/build/entry.nsi index 7f3da115f..dbca0d6f6 100644 --- a/build/entry.nsi +++ b/build/entry.nsi @@ -28,7 +28,7 @@ Name "ฟฃฦฎธฎ" ; The file to write -OutFile "Entry_1.0.6_Setup.exe" +OutFile "Entry_1.0.7_Setup.exe" ; The default installation directory InstallDir "C:\Entry" diff --git a/entry/fonts/NanumMyeongjo-Bold.woff2 b/entry/builds/01844f679e9b8c2bfd7f5975be7a61dc.woff2 similarity index 100% rename from entry/fonts/NanumMyeongjo-Bold.woff2 rename to entry/builds/01844f679e9b8c2bfd7f5975be7a61dc.woff2 diff --git a/entry/fonts/NanumBarunGothicUltraLight.woff2 b/entry/builds/04f20ede49df3e836b48461d086af635.woff2 similarity index 100% rename from entry/fonts/NanumBarunGothicUltraLight.woff2 rename to entry/builds/04f20ede49df3e836b48461d086af635.woff2 diff --git a/entry/fonts/NanumGothic-Regular.woff2 b/entry/builds/1d98d61bb3f3c62920b0edcdbade3070.woff2 similarity index 100% rename from entry/fonts/NanumGothic-Regular.woff2 rename to entry/builds/1d98d61bb3f3c62920b0edcdbade3070.woff2 diff --git a/entry/fonts/NanumGothicCoding-Regular.woff2 b/entry/builds/20ceacd97b149e278f098d2f62c3168a.woff2 similarity index 100% rename from entry/fonts/NanumGothicCoding-Regular.woff2 rename to entry/builds/20ceacd97b149e278f098d2f62c3168a.woff2 diff --git a/entry/fonts/NanumMyeongjo-ExtraBold.woff2 b/entry/builds/31ca60966758447206bdb9494b823cd4.woff2 similarity index 100% rename from entry/fonts/NanumMyeongjo-ExtraBold.woff2 rename to entry/builds/31ca60966758447206bdb9494b823cd4.woff2 diff --git a/entry/fonts/NanumMyeongjo-Regular.woff2 b/entry/builds/4d943809d88c7be6ae3f4e3857b2a99f.woff2 similarity index 100% rename from entry/fonts/NanumMyeongjo-Regular.woff2 rename to entry/builds/4d943809d88c7be6ae3f4e3857b2a99f.woff2 diff --git a/entry/fonts/NanumPenScript-Regular.woff2 b/entry/builds/5559f596796afae6edfa01b371809890.woff2 similarity index 100% rename from entry/fonts/NanumPenScript-Regular.woff2 rename to entry/builds/5559f596796afae6edfa01b371809890.woff2 diff --git a/entry/fonts/NanumBarunGothicBold.woff2 b/entry/builds/5ecca925eabf53461c5aaefd7891b9fb.woff2 similarity index 100% rename from entry/fonts/NanumBarunGothicBold.woff2 rename to entry/builds/5ecca925eabf53461c5aaefd7891b9fb.woff2 diff --git a/entry/fonts/NanumGothic-Bold.woff2 b/entry/builds/60ccd866579bed370ea18836602a9330.woff2 similarity index 100% rename from entry/fonts/NanumGothic-Bold.woff2 rename to entry/builds/60ccd866579bed370ea18836602a9330.woff2 diff --git a/entry/fonts/NanumGothicCoding-Bold.woff2 b/entry/builds/6f8957f56bce4e9320c8633b2e23cfde.woff2 similarity index 100% rename from entry/fonts/NanumGothicCoding-Bold.woff2 rename to entry/builds/6f8957f56bce4e9320c8633b2e23cfde.woff2 diff --git a/entry/fonts/JejuHallasan-Regular.woff2 b/entry/builds/7b62334f6d1c91d4cbd1316988c749a6.woff2 similarity index 100% rename from entry/fonts/JejuHallasan-Regular.woff2 rename to entry/builds/7b62334f6d1c91d4cbd1316988c749a6.woff2 diff --git a/entry/fonts/KoPubBatang-Light.woff2 b/entry/builds/8930466d85ef6c3cee4bbc212acbcbb4.woff2 similarity index 100% rename from entry/fonts/KoPubBatang-Light.woff2 rename to entry/builds/8930466d85ef6c3cee4bbc212acbcbb4.woff2 diff --git a/entry/fonts/NanumBarunGothicLight.woff2 b/entry/builds/8e349777827d56ad0ab2e33037c26cb8.woff2 similarity index 100% rename from entry/fonts/NanumBarunGothicLight.woff2 rename to entry/builds/8e349777827d56ad0ab2e33037c26cb8.woff2 diff --git a/entry/fonts/KoPubBatang-Regular.woff2 b/entry/builds/bf1e186f410a4ad62811e8931e1a539e.woff2 similarity index 100% rename from entry/fonts/KoPubBatang-Regular.woff2 rename to entry/builds/bf1e186f410a4ad62811e8931e1a539e.woff2 diff --git a/entry/fonts/KoPubBatang-Bold.woff2 b/entry/builds/df9949188eda8fd8c7244b407cf5787f.woff2 similarity index 100% rename from entry/fonts/KoPubBatang-Bold.woff2 rename to entry/builds/df9949188eda8fd8c7244b407cf5787f.woff2 diff --git a/entry/fonts/NanumGothic-ExtraBold.woff2 b/entry/builds/e8d3c62208f618bf2ca1e878c6bf9927.woff2 similarity index 100% rename from entry/fonts/NanumGothic-ExtraBold.woff2 rename to entry/builds/e8d3c62208f618bf2ca1e878c6bf9927.woff2 diff --git a/entry/fonts/NanumBarunGothic.woff2 b/entry/builds/ecf17559a7d726e924c87764d4e869d5.woff2 similarity index 100% rename from entry/fonts/NanumBarunGothic.woff2 rename to entry/builds/ecf17559a7d726e924c87764d4e869d5.woff2 diff --git a/entry/controllers/filters.js b/entry/controllers/filters.js index 5a8ed11ac..b6a14791a 100644 --- a/entry/controllers/filters.js +++ b/entry/controllers/filters.js @@ -55,3 +55,27 @@ common.filter('text', function() { } } }); + + +common.filter('nameTranslate', function() { + return function(str, type) { + var dict = SpriteNames; + if (type == 'picture') + dict = PictureNames; + else if (type == 'sound') + dict = SoundNames; + + var lang = localStorage.getItem('lang') || 'ko'; + if (window.lang) + lang = window.lang; + + if (window.user && window.user.language) + lang = window.user.language; + + if (!dict || lang == 'ko' || lang == 'code') { + return str; + } else { + return dict[str] ? dict[str] : str; + } + } +}); diff --git a/entry/controllers/main.js b/entry/controllers/main.js new file mode 100644 index 000000000..4522cab87 --- /dev/null +++ b/entry/controllers/main.js @@ -0,0 +1,717 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; + +/******/ // The require function +/******/ function __webpack_require__(moduleId) { + +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; + +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ exports: {}, +/******/ id: moduleId, +/******/ loaded: false +/******/ }; + +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); + +/******/ // Flag the module as loaded +/******/ module.loaded = true; + +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } + + +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; + +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; + +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = "/builds/"; + +/******/ // Load entry module and return exports +/******/ return __webpack_require__(0); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 0: +/***/ function(module, exports, __webpack_require__) { + + __webpack_require__(792); + __webpack_require__(46); + +/***/ }, + +/***/ 46: +/***/ function(module, exports, __webpack_require__) { + + // style-loader: Adds some css to the DOM by adding a