1

1

assets/scripts/platform/PlatformBrowser.ts

@@ -26,7 +26,6 @@ class PlatformBrowser {
                 pauseAll: () => {
                     settingData.data.soundFx = false;
                     settingData.data.bgMusic = false;
-                    settingData.saveToCache();
                     audioMgr.stop(Constants.audios.BGM);
 
                 },
@@ -34,7 +33,6 @@ class PlatformBrowser {
                     settingData.data.soundFx = true;
                     settingData.data.bgMusic = true;
                     audioMgr.play(Constants.audios.BGM,true);
-                    settingData.saveToCache();
                 }
             },
             GameManager: {

profiles/v2/packages/scene.json

@@ -1319,8 +1319,13 @@
     },
     "10795865-5525-41fc-8bf7-0e8d6983b214": {
       "position": {
+<<<<<<< HEAD
         "x": 636.8554219633918,
         "y": 1025.7816718953334,
+=======
+        "x": 781.7413022253235,
+        "y": 257.38568583187987,
+>>>>>>> a7d2256 (1)
         "z": 5000
       },
       "rotation": {
@@ -1335,12 +1340,21 @@
         "z": 0
       },
       "contentRect": {
+<<<<<<< HEAD
         "x": -1858.938355871912,
         "y": -1198.1488551400537,
         "width": 1120,
         "height": 998
       },
       "scale": 0.2243775126668154
+=======
+        "x": -405.40581517963153,
+        "y": -934.0012427066641,
+        "width": 1120,
+        "height": 1124
+      },
+      "scale": 0.4717191254476803
+>>>>>>> a7d2256 (1)
     }
   },
   "camera-uuids": [