Merge pull request #149 from entrylabs/develop

Develop to Master

Author: Tnks2U

src/main/ipcMainHelper.ts

@@ -174,6 +174,9 @@ new (class {
             // 기본 이미지 및 사운드인 경우 상대경로이므로 기준 위치 수정
             if (typedPath.startsWith('renderer')) {
                 typedPath = path.resolve(app.getAppPath(), 'src', typedPath);
+            }else if(typedPath.startsWith('../../..')){
+                typedPath = typedPath.replace('../../../', '');
+                typedPath = path.resolve(app.getAppPath(), typedPath);
             }
         } else {
             switch (type) {

src/renderer/helper/ipcRendererHelper.ts

@@ -39,7 +39,8 @@ export default class {
     }
 
     static tempResourceDownload(entryObject: IEntry.Object, type: string, targetFilePath: string) {
-        ipcInvoke('tempResourceDownload', entryObject, type, targetFilePath);
+        const convertObject = { fileurl: entryObject.fileurl, filename: entryObject.name };
+        ipcInvoke('tempResourceDownload', convertObject, type, targetFilePath);
     }
 
     static writeFile(data: any, filePath: string) {

src/renderer/resources/lang/en.json

@@ -6839,7 +6839,9 @@
         "play_my_project": "Let's play what you've created.",
         "goal_project": "Explore Goal Project",
         "look_target_project": "Let's take a look at what you're going to do with the project.",
-        "ai_learning_login_required": "Training model is not available \nwhen logged out."
+        "ai_learning_login_required": "Training model is not available \nwhen logged out.",
+        "bring_forward": "Bring Forward",
+        "send_backward": "Send Backward"
     },
     "code": "view code",
     "EntryStatic": {

src/renderer/resources/lang/jp.json

@@ -6847,7 +6847,9 @@
         "play_my_project": "作った作品を実行してみましょう。",
         "goal_project": "目標作品をよく見る",
         "look_target_project": "作品を実行して何を作るのかよく見てみましょう。",
-        "ai_learning_login_required": "ログアウト状態ではモデル学習機能を\n使用することはできません。"
+        "ai_learning_login_required": "ログアウト状態ではモデル学習機能を\n使用することはできません。",
+        "bring_forward": "上に移す",
+        "send_backward": "下に移す"
     },
     "code": "コードを見る",
     "EntryStatic": {

src/renderer/resources/lang/ko.json

@@ -1825,7 +1825,9 @@
         "play_my_project": "만든 작품을 실행해봅시다.",
         "goal_project": "목표작품 살펴보기",
         "look_target_project": "작품을 실행하며 무엇을 만들지 살펴봅시다.",
-        "ai_learning_login_required": "모델 학습 기능을 사용하시려면 \n로그인이 필요합니다."
+        "ai_learning_login_required": "모델 학습 기능을 사용하시려면 \n로그인이 필요합니다.",
+        "bring_forward": "위로 옮기기",
+        "send_backward": "아래로 옮기기"
     },
     "code": "코드보기",
     "EntryStatic": {

src/renderer/resources/lang/vn.json

@@ -6838,7 +6838,9 @@
         "play_my_project": "Let's play what you've created.",
         "goal_project": "Explore Goal Project",
         "look_target_project": "Let's take a look at what you're going to do with the project.",
-        "ai_learning_login_required": "Training model is not available \nwhen logged out."
+        "ai_learning_login_required": "Training model is not available \nwhen logged out.",
+        "bring_forward": "Bring Forward",
+        "send_backward": "Send Backward"
     },
     "code": "view code",
     "EntryStatic": {

types/index.d.ts

@@ -142,6 +142,7 @@ declare module IEntry {
         script?: any;
         objectType: string;
         entity?: EntityObject;
+        fileurl?: string;
         // sprite: {
         //     name: string;
         //     pictures: Picture[];