Merge branch 'dev'

ShutovKS · Mar 3, 2024 · d20ea0f · d20ea0f
2 parents ebf090d + 6518c3b
commit d20ea0f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 61 deletions.
diff --git a/src/Tool - builds manager/Assets/Plugins/BuildsManager/Editor/Window/BuildManagerWindow.cs b/src/Tool - builds manager/Assets/Plugins/BuildsManager/Editor/Window/BuildManagerWindow.cs
@@ -143,7 +143,7 @@ private static void DrawBuildDataList()
 
                     settingsBuild.target = (BuildTarget)EditorGUILayout.EnumPopup("Build Target", settingsBuild.target);
                     settingsBuild.options = (BuildOptions)EditorGUILayout.EnumFlagsField("Build Options", settingsBuild.options);
-                    DrawAddonsUsed(ref settingsBuild);
+                    DrawAddonsUsed(settingsBuild);
 
                     EditorGUILayout.BeginHorizontal();
                     GUILayout.FlexibleSpace();
@@ -177,7 +177,7 @@ private static void DrawBuildDataList()
 
             return;
 
-            static void DrawAddonsUsed(ref BuildData buildData)
+            static void DrawAddonsUsed(BuildData buildData)
             {
                 if (Settings == null || Settings.addonsUsedData == null || Settings.addonsUsedData.addonsUsed == null)
                 {

diff --git a/src/Tool - builds manager/Assets/Plugins/BuildsManager/Settings/AddonsUsedData.asset b/src/Tool - builds manager/Assets/Plugins/BuildsManager/Settings/AddonsUsedData.asset
@@ -12,14 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cde2bbb25a0e415a9dbdc33eacfa3717, type: 3}
   m_Name: AddonsUsedData
   m_EditorClassIdentifier: 
-  addonsUsed:
-  - name: YandexGame
-    defines:
-    - 1
-    - 2
-    - 3
-  - name: Yandex
-    defines:
-    - 1
-    - 2
-    - 3
+  addonsUsed: []
diff --git a/src/Tool - builds manager/Assets/Plugins/BuildsManager/Settings/GeneralBuildData.asset b/src/Tool - builds manager/Assets/Plugins/BuildsManager/Settings/GeneralBuildData.asset
@@ -12,62 +12,32 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cd64825da9934520a1f6d6df79b5f006, type: 3}
   m_Name: GeneralBuildData
   m_EditorClassIdentifier: 
-  isReleaseBuild: 1
+  isReleaseBuild: 0
   builds:
   - isEnabled: 1
-    isCompress: 0
+    isCompress: 1
     buildPath: Builds/Tool_-_builds_manager_0.1_Windows64/Tool_-_builds_manager_0.1/Tool_-_builds_manager.exe
-    addonsUsed:
-    - isUsed: 0
-      name: YandexGame
-      defines:
-      - 1
-      - 2
-      - 3
-    - isUsed: 1
-      name: Yandex
-      defines:
-      - 1
-      - 2
-      - 3
+    addonsUsed: []
     options: 0
     target: 19
-  - isEnabled: 0
+  - isEnabled: 1
     isCompress: 0
     buildPath: Builds/Tool_-_builds_manager_0.1_Android/Tool_-_builds_manager_0.1/Tool_-_builds_manager.apk
-    addonsUsed:
-    - isUsed: 0
-      name: YandexGame
-      defines:
-      - 1
-      - 2
-      - 3
-    - isUsed: 0
-      name: Yandex
-      defines:
-      - 1
-      - 2
-      - 3
+    addonsUsed: []
     options: 0
     target: 13
-  - isEnabled: 0
+  - isEnabled: 1
     isCompress: 1
-    buildPath: Builds/Tool_-_builds_manager_0.1_Windows32/Tool_-_builds_manager_0.1/Tool_-_builds_manager.exe
-    addonsUsed:
-    - isUsed: 1
-      name: YandexGame
-      defines:
-      - 1
-      - 2
-      - 3
-    - isUsed: 1
-      name: Yandex
-      defines:
-      - 1
-      - 2
-      - 3
+    buildPath: Builds/Tool_-_builds_manager_0.1_WebGL/Tool_-_builds_manager_0.1/Tool_-_builds_manager
+    addonsUsed: []
+    options: 0
+    target: 20
+  - isEnabled: 1
+    isCompress: 0
+    buildPath: Builds/Tool_-_builds_manager_0.1_Linux/Tool_-_builds_manager_0.1/Tool_-_builds_managerx86_64
+    addonsUsed: []
     options: 0
-    target: 5
+    target: 24
   addonsUsedData: {fileID: 11400000, guid: 9b668bd4d2fee31499434e75a22ea616, type: 2}
   generalScriptingDefineSymbols: 
   outputRoot: Builds/

diff --git a/src/Tool - builds manager/ProjectSettings/ProjectSettings.asset b/src/Tool - builds manager/ProjectSettings/ProjectSettings.asset
@@ -844,15 +844,18 @@ PlayerSettings:
   scriptingDefineSymbols:
     Android: 
     PS4: 
-    Standalone: 1;2;3;1;2;3
+    Standalone: 
+    WebGL: 
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend:
-    Android: 0
+    Android: 1
     Standalone: 1
+    WebGL: 1
   il2cppCompilerConfiguration:
-    Android: 0
+    Android: 2
     Standalone: 2
+    WebGL: 2
   il2cppCodeGeneration: {}
   il2cppStacktraceInformation: {}
   managedStrippingLevel: