1

1

assets/prefabs/ui/buyBoomerangUI.prefab

@@ -287,7 +287,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 159.23899999999998,
+      "y": 159.23900000000003,
       "z": 0
     },
     "_lrot": {
@@ -343,7 +343,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 260.8399999999999,
-      "y": 371.917,
+      "y": 350.4169999999998,
       "z": 0
     },
     "_lrot": {
@@ -583,7 +583,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 310.883,
+      "y": 289.3829999999998,
       "z": 0
     },
     "_lrot": {
@@ -3159,7 +3159,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 588,
-      "height": 773.0000000000003
+      "height": 730
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3188,8 +3188,8 @@
     "_target": null,
     "_left": 66,
     "_right": 66,
-    "_top": 254.26099999999983,
-    "_bottom": 572.7389999999998,
+    "_top": 275.76099999999997,
+    "_bottom": 594.239,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -3236,7 +3236,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -3262,8 +3262,6 @@
       "__id__": 0
     },
     "fileId": "12sdeePUtP4Ypk+9LrVnaB",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

assets/prefabs/ui/pauseUI.prefab

@@ -27,6 +27,9 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 78
+      },
       {
         "__id__": 80
       },
@@ -35,13 +38,10 @@
       },
       {
         "__id__": 84
-      },
-      {
-        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -273,13 +273,10 @@
       },
       {
         "__id__": 75
-      },
-      {
-        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 77
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1855,42 +1852,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "7amZSjImxJ6rUw610U8PVE"
   },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 10
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 76
-    },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 66,
-    "_right": 66,
-    "_top": 497,
-    "_bottom": 497,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 489,
-    "_originalHeight": 601,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9055hoqMRDj52MABHi7tQL"
-  },
   {
     "__type__": "cc.Sprite",
     "_name": "",
@@ -1901,7 +1862,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 76
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1919,7 +1880,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1959,7 +1920,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 79
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1987,7 +1948,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 81
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2023,7 +1984,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 83
     },
     "_id": ""
   },
@@ -2041,7 +2002,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 85
     },
     "_id": ""
   },

assets/prefabs/ui/settingUI.prefab

@@ -250,7 +250,7 @@
   {
     "__type__": "cc.Node",
     "_name": "UI",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 1
@@ -322,7 +322,7 @@
   {
     "__type__": "cc.Node",
     "_name": "top",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 10
@@ -376,7 +376,7 @@
   {
     "__type__": "cc.Node",
     "_name": "close_btn",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 11
@@ -687,7 +687,7 @@
   {
     "__type__": "cc.Node",
     "_name": "title_bg",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 10
@@ -744,7 +744,7 @@
   {
     "__type__": "cc.Node",
     "_name": "title_label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 27
@@ -1030,7 +1030,7 @@
   {
     "__type__": "cc.Node",
     "_name": "items",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 10
@@ -1090,7 +1090,7 @@
   {
     "__type__": "cc.Node",
     "_name": "vibrate_sp",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 41
@@ -1147,7 +1147,7 @@
   {
     "__type__": "cc.Node",
     "_name": "label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 42
@@ -1451,7 +1451,7 @@
   {
     "__type__": "cc.Node",
     "_name": "bgMusic_sp",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 41
@@ -1508,7 +1508,7 @@
   {
     "__type__": "cc.Node",
     "_name": "label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 56
@@ -1814,7 +1814,7 @@
   {
     "__type__": "cc.Node",
     "_name": "sound_sp",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 41
@@ -1871,7 +1871,7 @@
   {
     "__type__": "cc.Node",
     "_name": "label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 70
@@ -2256,7 +2256,7 @@
   {
     "__type__": "cc.Node",
     "_name": "slider_bg",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 10
@@ -2307,7 +2307,7 @@
   {
     "__type__": "cc.Node",
     "_name": "slider",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 89
@@ -2376,7 +2376,7 @@
   {
     "__type__": "cc.Node",
     "_name": "left",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 90
@@ -2512,7 +2512,7 @@
   {
     "__type__": "cc.Node",
     "_name": "handle",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 90
@@ -2709,7 +2709,7 @@
   {
     "__type__": "cc.Node",
     "_name": "right",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 90
@@ -2845,7 +2845,7 @@
   {
     "__type__": "cc.Node",
     "_name": "speed_label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 90
@@ -3007,7 +3007,7 @@
   {
     "__type__": "cc.Node",
     "_name": "speed_num_label",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 90
@@ -3334,7 +3334,7 @@
   {
     "__type__": "cc.Node",
     "_name": "remove_ads_btn",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 10
@@ -3529,7 +3529,7 @@
   {
     "__type__": "cc.Node",
     "_name": "des_bg",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 10
@@ -3583,7 +3583,7 @@
   {
     "__type__": "cc.Node",
     "_name": "task_des_lable",
-    "_objFlags": 512,
+    "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 142
@@ -3987,8 +3987,6 @@
       "__id__": 0
     },
     "fileId": "12sdeePUtP4Ypk+9LrVnaB",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

assets/scripts/data/Constants.ts

@@ -2,7 +2,7 @@ import { Enemy } from "../game/Enemy";
 
 const Constants = {
     //是否是测试包
-    isDebug: true,
+    isDebug: false,
     //游戏名字
     gameName: "GunfightShoot",
 

assets/scripts/game/Launch.ts

@@ -23,7 +23,6 @@ export class Launch extends BaseExp {
         //初始化平台接口
         PlatformSystem.initialize();
         //关闭FPS展示
-        profiler.hideStats()
         Constants.isDebug ? profiler.showStats() : profiler.hideStats();
         //先加载配置资源包 更新进度条
         await bundleMgr.preloadConfigAllRes((progress) => {

assets/scripts/platform/PlatformBrowser.ts

@@ -67,6 +67,7 @@ class PlatformBrowser {
             return
         }
         try {
+            console.log('调用了插屏广告interstitial');
             window['showAd']('interstitial').then(() => {
                 console.log("rewarded11111")
             }).catch(() => {
@@ -85,6 +86,7 @@ class PlatformBrowser {
             return
         }
         try {
+            console.log('调用了激励广告showAd');
             window["showAd"]('rewarded')
                 .then(() => {
                     cb?.(true)
@@ -94,7 +96,6 @@ class PlatformBrowser {
                     // GtagMgr.inst.doGameDot(GtagType.ad_error);
                     // cb && cb();
                 })
-                return
         } catch (error) {
         }
         //tgxUITips.show('The ads failed to load');

assets/scripts/platform/PlatformSystem.ts

@@ -10,10 +10,9 @@ class PlatformSystem {
     private _platformBrowser = PlatformBrowser;
     private _platformDefault = PlatformDefault;
 
-    //case sys.Platform.MOBILE_BROWSER: 
-    //case sys.Platform.DESKTOP_BROWSER:
     public get platform(): any {
-        switch (sys.platform) {
+       return this._platformBrowser;
+        /*switch (sys.platform) {
             //微信小游戏
             case sys.Platform.WECHAT_GAME:
                 return this._platformWX;
@@ -22,19 +21,21 @@ class PlatformSystem {
             case sys.Platform.BYTEDANCE_MINI_GAME:
                 return this._platformTT;
                 break;
-            //手机浏览器或者web浏览器
-            default:
-                return this._platformBrowser;
+            //手机浏览器 web浏览器
+            case sys.Platform.MOBILE_BROWSER:
+            case sys.Platform.DESKTOP_BROWSER:
+                this._platformBrowser;
                 break;
             //测试用
-            /*default:
+            default:
                 return this._platformDefault;
-                break;*/
-        }
+                break;
+        }*/
     }
 
     public initialize() {
-        switch (sys.platform) {
+        this._platformBrowser.initialize();
+        /*switch (sys.platform) {
             //微信小游戏
             case sys.Platform.WECHAT_GAME:
                 this._platformWX.initialize();
@@ -52,7 +53,7 @@ class PlatformSystem {
             default:
                 this._platformDefault.initialize();
                 break;
-        }
+        }*/
     }
 }
 

profiles/v2/packages/builder.json

@@ -38,8 +38,8 @@
         "progress": 1,
         "state": "success",
         "stage": "build",
-        "message": "2025-6-5 17:29:21 build success in 20 s!",
-        "detailMessage": "The Mesh used by component \"cc.ParticleSystem\" in prefab \"particle\" is missing. Detailed information:\rNode path: \"particle\"\rAsset url: \"db://assets/prefabs/particle/prb/particle\"\rAsset file: \"/Users/w...",
+        "message": "2025-6-9 11:09:26 build success in 23 s!",
+        "detailMessage": "builder:build-project-total (22838ms)\r",
         "options": {
           "name": "GunfightShoot",
           "server": "",
@@ -105,7 +105,7 @@
           "__version__": "1.3.9",
           "logDest": "project://temp/builder/log/web-mobile5-30-2025 15-30.log"
         },
-        "time": "6-5-2025 17:29:00",
+        "time": "6-9-2025 11:09:02",
         "dirty": false
       }
     }

profiles/v2/packages/scene.json

@@ -417,156 +417,6 @@
       },
       "scale": 0.6745512671698497
     },
-    "579247ec-5b8a-472e-bcb6-3e024b1a3564": {
-      "position": {
-        "x": 360.0000000000001,
-        "y": 800,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 302.4,
-        "height": 672
-      },
-      "scale": 0.42
-    },
-    "a4431508-a30c-430e-a50d-86f479d3fe98": {
-      "position": {
-        "x": 228.266734270891,
-        "y": 840.9191851331359,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -151.3505851572771,
-        "y": 464.4391989233823,
-        "width": 968,
-        "height": 960
-      },
-      "scale": 1.274968172498208
-    },
-    "10aa6375-5d6a-4091-bb55-e0322cd02e49": {
-      "position": {
-        "x": 484,
-        "y": 480,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 968,
-        "height": 960
-      },
-      "scale": 1
-    },
-    "ea775253-49d0-4ed3-b61d-b95637b22a14": {
-      "position": {
-        "x": 360,
-        "y": 800,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 302.4,
-        "height": 672
-      },
-      "scale": 0.42
-    },
-    "0ab8a800-8ba6-4fe1-9b37-6bb77d04047f": {
-      "position": {
-        "x": 661,
-        "y": 475,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 1322,
-        "height": 950
-      },
-      "scale": 1
-    },
-    "d2a4ee3f-42cc-4d35-b1c0-7062fce93a50": {
-      "position": {
-        "x": 360.0000000000001,
-        "y": 800,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 302.4,
-        "height": 672
-      },
-      "scale": 0.42
-    },
     "c418bfb3-8f04-402d-95bc-ba0ae00f18d6": {
       "position": {
         "x": 21.994871776239506,
@@ -1142,56 +992,6 @@
       },
       "scale": 0.34965328332814677
     },
-    "6fdfa45a-54d2-427e-9510-d0cbbbc63997": {
-      "position": {
-        "x": 538.7821912854931,
-        "y": 850.8641359845645,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 1449.6910000000003,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 72.90946880231455,
-        "y": 497.05268999058296,
-        "width": 1480,
-        "height": 1124
-      },
-      "scale": 1.5884166732400165
-    },
-    "3eadf28d-4c41-4582-afff-c8441fa5470a": {
-      "position": {
-        "x": 395.61071696030456,
-        "y": 939.9760588887193,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -810.7135127437281,
-        "y": -256.3785490822221,
-        "width": 968,
-        "height": 960
-      },
-      "scale": 0.40121883328062447
-    },
     "2a6d10bc-9c1e-4420-ae90-e9ba997eea5f": {
       "position": {
         "x": 728.8718116851277,
@@ -1217,31 +1017,6 @@
       },
       "scale": 1
     },
-    "99b412e6-33d6-4baf-87f9-25502bc99057": {
-      "position": {
-        "x": 648.9772461024235,
-        "y": 674.0067397533052,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -228.53960328083818,
-        "y": -206.64409837775386,
-        "width": 1120,
-        "height": 1124
-      },
-      "scale": 0.6381643844144764
-    },
     "b824d4a8-95d2-4112-8d63-f7df26c184ee": {
       "position": {
         "x": 723.8448047172891,
@@ -1317,15 +1092,10 @@
       },
       "scale": 1
     },
-    "10795865-5525-41fc-8bf7-0e8d6983b214": {
+    "ea775253-49d0-4ed3-b61d-b95637b22a14": {
       "position": {
-<<<<<<< HEAD
-        "x": 636.8554219633918,
-        "y": 1025.7816718953334,
-=======
-        "x": 781.7413022253235,
-        "y": 257.38568583187987,
->>>>>>> a7d2256 (1)
+        "x": 360.0000000000001,
+        "y": 800,
         "z": 5000
       },
       "rotation": {
@@ -1340,21 +1110,237 @@
         "z": 0
       },
       "contentRect": {
-<<<<<<< HEAD
-        "x": -1858.938355871912,
-        "y": -1198.1488551400537,
+        "x": 0,
+        "y": 0,
+        "width": 302.4,
+        "height": 672
+      },
+      "scale": 0.42
+    },
+    "6fdfa45a-54d2-427e-9510-d0cbbbc63997": {
+      "position": {
+        "x": 538.7821912854931,
+        "y": 850.8641359845645,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": 72.90946880231455,
+        "y": 497.05268999058296,
+        "width": 1480,
+        "height": 1124
+      },
+      "scale": 1.5884166732400165
+    },
+    "579247ec-5b8a-472e-bcb6-3e024b1a3564": {
+      "position": {
+        "x": 360.0000000000001,
+        "y": 800,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": 0,
+        "y": 0,
+        "width": 302.4,
+        "height": 672
+      },
+      "scale": 0.42
+    },
+    "99b412e6-33d6-4baf-87f9-25502bc99057": {
+      "position": {
+        "x": 648.9772461024235,
+        "y": 674.0067397533052,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -228.53960328083818,
+        "y": -206.64409837775386,
+        "width": 1120,
+        "height": 1124
+      },
+      "scale": 0.6381643844144764
+    },
+    "0ab8a800-8ba6-4fe1-9b37-6bb77d04047f": {
+      "position": {
+        "x": 1016.0265967146657,
+        "y": 840.8746316142801,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -96.2369981748142,
+        "y": -150.23167883188142,
+        "width": 1120,
+        "height": 998
+      },
+      "scale": 0.5034777750283596
+    },
+    "3eadf28d-4c41-4582-afff-c8441fa5470a": {
+      "position": {
+        "x": 395.61071696030456,
+        "y": 939.9760588887193,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -810.7135127437281,
+        "y": -256.3785490822221,
+        "width": 968,
+        "height": 960
+      },
+      "scale": 0.40121883328062447
+    },
+    "10aa6375-5d6a-4091-bb55-e0322cd02e49": {
+      "position": {
+        "x": 470.56346236115473,
+        "y": 528.7074489408153,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -1029.9941723580275,
+        "y": -808.3965862821703,
+        "width": 1120,
+        "height": 998
+      },
+      "scale": 0.37319459582423814
+    },
+    "a4431508-a30c-430e-a50d-86f479d3fe98": {
+      "position": {
+        "x": 409.6582907874692,
+        "y": 766.2695830282366,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -420.2578661339757,
+        "y": 26.75500748573489,
         "width": 1120,
         "height": 998
       },
-      "scale": 0.2243775126668154
-=======
+      "scale": 0.67476695727591
+    },
+    "10795865-5525-41fc-8bf7-0e8d6983b214": {
+      "position": {
+        "x": 781.7413022253235,
+        "y": 257.38568583188,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
         "x": -405.40581517963153,
-        "y": -934.0012427066641,
+        "y": -800.4471919986067,
         "width": 1120,
-        "height": 1124
+        "height": 998
       },
       "scale": 0.4717191254476803
->>>>>>> a7d2256 (1)
+    },
+    "d2a4ee3f-42cc-4d35-b1c0-7062fce93a50": {
+      "position": {
+        "x": 360.0000000000001,
+        "y": 800,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": 0,
+        "y": 0,
+        "width": 302.4,
+        "height": 672
+      },
+      "scale": 0.42
     }
   },
   "camera-uuids": [
@@ -1371,12 +1357,6 @@
     "2fc3a861-9311-45ca-ae38-a445fce124d2",
     "3d2435fb-6378-49fe-a51d-e87b2acd8c80",
     "064db746-b63b-43db-8bf3-bffa706231b2",
-    "579247ec-5b8a-472e-bcb6-3e024b1a3564",
-    "a4431508-a30c-430e-a50d-86f479d3fe98",
-    "10aa6375-5d6a-4091-bb55-e0322cd02e49",
-    "ea775253-49d0-4ed3-b61d-b95637b22a14",
-    "0ab8a800-8ba6-4fe1-9b37-6bb77d04047f",
-    "d2a4ee3f-42cc-4d35-b1c0-7062fce93a50",
     "c418bfb3-8f04-402d-95bc-ba0ae00f18d6",
     "f79acc7f-362d-4f94-8d88-fcb435e33b12",
     "24fa125d-82fa-4b02-888f-390a9c63f1b5",
@@ -1400,14 +1380,20 @@
     "9d4a53fa-0138-49c2-aa32-b0160c1c3d17",
     "4844b5ae-cfad-4282-92e9-d58dae3b6445",
     "78b2a53e-ee70-4c31-8746-1f752c9a8b92",
-    "6fdfa45a-54d2-427e-9510-d0cbbbc63997",
-    "3eadf28d-4c41-4582-afff-c8441fa5470a",
     "2a6d10bc-9c1e-4420-ae90-e9ba997eea5f",
-    "99b412e6-33d6-4baf-87f9-25502bc99057",
     "b824d4a8-95d2-4112-8d63-f7df26c184ee",
     "6d7a72bc-53f5-48f2-aec5-bd7ec3328925",
     "d9d65047-bb99-4e66-80ce-dd8f8e86c067",
-    "10795865-5525-41fc-8bf7-0e8d6983b214"
+    "ea775253-49d0-4ed3-b61d-b95637b22a14",
+    "6fdfa45a-54d2-427e-9510-d0cbbbc63997",
+    "579247ec-5b8a-472e-bcb6-3e024b1a3564",
+    "99b412e6-33d6-4baf-87f9-25502bc99057",
+    "0ab8a800-8ba6-4fe1-9b37-6bb77d04047f",
+    "3eadf28d-4c41-4582-afff-c8441fa5470a",
+    "10aa6375-5d6a-4091-bb55-e0322cd02e49",
+    "a4431508-a30c-430e-a50d-86f479d3fe98",
+    "10795865-5525-41fc-8bf7-0e8d6983b214",
+    "d2a4ee3f-42cc-4d35-b1c0-7062fce93a50"
   ],
   "camera": {
     "color": [