Merge pull request #2890 from entrylabs/develop

운영반영

Author: kimorkim

extern/lang/en.js

@@ -466,7 +466,6 @@ EntryStatic.getAllBlocks = function () {
                 'get_time_weather',
                 'get_time_weather_data',
                 'check_time_weather',
-
                 'check_weather',
                 'check_finedust',
                 'get_weather_data',
@@ -480,12 +479,13 @@ EntryStatic.getAllBlocks = function () {
                 'festival_title',
                 'count_festival',
                 'get_festival_info',
-                'behaviorConductDisaster_title',
-                'count_disaster_behavior',
-                'get_disaster_behavior',
-                'behaviorConductLifeSafety_title',
-                'count_lifeSafety_behavior',
-                'get_lifeSafety_behavior',
+                'emergencyActionGuidelines_title',
+                'count_disaster_guideline',
+                'get_disaster_guideline',
+                'count_social_disaster_guideline',
+                'get_social_disaster_guideline',
+                'count_safety_accident_guideline',
+                'get_safety_accident_guideline',
             ],
         },
         {

extern/lang/ko.js

@@ -3,6 +3,7 @@ import '../playground/blocks/block_expansion_weather';
 import '../playground/blocks/block_expansion_festival';
 import '../playground/blocks/block_expansion_behaviorconduct_disaster';
 import '../playground/blocks/block_expansion_behaviorconduct_lifesafety';
+import '../playground/blocks/block_expansion_emergencyActionGuidelines';
 
 export default class Expansion {
     constructor(playground) {
@@ -12,7 +13,9 @@ export default class Expansion {
     async init() {
         const blockObject = {};
         Object.entries(Entry.EXPANSION_BLOCK).forEach(([key, value]) => {
-            Entry.EXPANSION_BLOCK_LIST[key] = value;
+            if (!value.disabled) {
+                Entry.EXPANSION_BLOCK_LIST[key] = value;
+            }
             if ('getBlocks' in value) {
                 Object.assign(blockObject, value.getBlocks());
             }

extern/util/static.js

@@ -2060,15 +2060,7 @@ module.exports = {
                 func(sprite, script) {
                     const originStr = script.getStringValue('STRING', script);
                     const targetStr = script.getStringValue('TARGET', script);
-
-                    let count = 0;
-                    const substrLength = targetStr.length;
-                    for (let i = 0; i <= originStr.length - substrLength; i++) {
-                        if (originStr.substring(i, i + substrLength) === targetStr) {
-                            count++;
-                        }
-                    }
-                    return count;
+                    return originStr.split(targetStr).length - 1;
                 },
                 syntax: {
                     js: [],
@@ -2253,13 +2245,9 @@ module.exports = {
                     const oldWord = script
                         .getStringValue('OLD_WORD', script)
                         .replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-
-                    return script
-                        .getStringValue('STRING', script)
-                        .replace(
-                            new RegExp(oldWord, 'gm'),
-                            script.getStringValue('NEW_WORD', script)
-                        );
+                    const newWord = script.getStringValue('NEW_WORD', script);
+                    const originalString = script.getStringValue('STRING', script);
+                    return originalString.split(oldWord).join(newWord);
                 },
                 syntax: {
                     js: [],
@@ -2600,7 +2588,6 @@ module.exports = {
                 },
                 func(sprite, script) {
                     const bool = script.getValue('BOOLEAN', script);
-                    console.log('bool', bool);
                     if (Boolean(bool)) {
                         return 'TRUE';
                     }

images/hardware/guideline.png

@@ -72,6 +72,7 @@ Entry.EXPANSION_BLOCK.behaviorConductDisaster = {
     description: Lang.Msgs.expansion_behaviorConductDisaster_description,
     descriptionKey: 'Msgs.expansion_behaviorConductDisaster_description',
     isInitialized: false,
+    disabled: true,
     init() {
         if (this.isInitialized) {
             return;
@@ -82,9 +83,9 @@ Entry.EXPANSION_BLOCK.behaviorConductDisaster = {
     apiType: '01',
 };
 
-Entry.EXPANSION_BLOCK.behaviorConductDisaster.getBlocks = function() {
+Entry.EXPANSION_BLOCK.behaviorConductDisaster.getBlocks = function () {
     const categoryMap = getInitialCategoryMap();
-    const getCategory = function() {
+    const getCategory = function () {
         return Object.keys(categoryMap).map((category) => [categoryMap[category].lang, category]);
     };
     const defaultCategory = Object.keys(categoryMap)[0];

src/class/Expansion.js

@@ -76,6 +76,7 @@ Entry.EXPANSION_BLOCK.behaviorConductLifeSafety = {
     description: Lang.Msgs.expansion_behaviorConductLifeSafety_description,
     descriptionKey: 'Msgs.expansion_behaviorConductLifeSafety_description',
     isInitialized: false,
+    disabled: true,
     init() {
         if (this.isInitialized) {
             return;
@@ -86,9 +87,9 @@ Entry.EXPANSION_BLOCK.behaviorConductLifeSafety = {
     apiType: '03',
 };
 
-Entry.EXPANSION_BLOCK.behaviorConductLifeSafety.getBlocks = function() {
+Entry.EXPANSION_BLOCK.behaviorConductLifeSafety.getBlocks = function () {
     const categoryMap = getInitialCategoryMap();
-    const getCategory = function() {
+    const getCategory = function () {
         return Object.keys(categoryMap).map((category) => [categoryMap[category].lang, category]);
     };
     const defaultCategory = Object.keys(categoryMap)[0];