- Prototype ver.2.0

Фікси
4 years ago · 1f62e2457c
17 changed files with 131 additions and 8 deletions
--- a/Assets/Prototype/Core/Core.dll
+++ b/Assets/Prototype/Core/Core.dll
--- a/Assets/Prototype/Core/CoreEditor.dll
+++ b/Assets/Prototype/Core/CoreEditor.dll
--- a/Assets_DLL/Core/Audio/AudioController2D.cs
+++ b/Assets_DLL/Core/Audio/AudioController2D.cs
@ -78,6 +78,8 @@ namespace Core.Audio
            {
                _musicSource.clip = _musicAndSounds[name];
                _musicSource.loop = isLoop;
+
+                _musicSource.gameObject.SetActive(true);
                _musicSource.Play();

                return _musicAndSounds[name].length;
@ -108,6 +110,8 @@ namespace Core.Audio
            {
                playSource.clip = _musicAndSounds[name];
                playSource.loop = isLoop;
+
+                playSource.gameObject.SetActive(true);
                playSource.Play();

                return _musicAndSounds[name].length;
@ -143,6 +147,8 @@ namespace Core.Audio
                if (_voicesDictionary[LocalizationManager.CurrentLanguage].ContainsKey(name))
                {
                    playSource.clip = _voicesDictionary[LocalizationManager.CurrentLanguage][name];
+
+                    playSource.gameObject.SetActive(true);
                    playSource.Play();

                    return _voicesDictionary[LocalizationManager.CurrentLanguage][name].length;
--- a/Assets_DLL/Core/Audio/AudioController3D.cs
+++ b/Assets_DLL/Core/Audio/AudioController3D.cs
@ -76,6 +76,8 @@ namespace Core.Audio
                playSource.spatialBlend = 1f;
                playSource.rolloffMode = AudioRolloffMode.Custom;
                playSource.SetCustomCurve(AudioSourceCurveType.CustomRolloff, AnimationCurve.Linear(0f, 1f, 1f, 0f));
+
+                playSource.gameObject.SetActive(true);
                playSource.Play();

                return _musicAndSounds[name].length;
@ -122,6 +124,8 @@ namespace Core.Audio
                    playSource.spatialBlend = 1f;
                    playSource.rolloffMode = AudioRolloffMode.Custom;
                    playSource.SetCustomCurve(AudioSourceCurveType.CustomRolloff, AnimationCurve.Linear(0f, 1f, 1f, 0f));
+
+                    playSource.gameObject.SetActive(true);
                    playSource.Play();

                    return _voicesDictionary[LocalizationManager.CurrentLanguage][name].length;
--- a/Assets_DLL/Core/Audio/PlayAudioFile.cs
+++ b/Assets_DLL/Core/Audio/PlayAudioFile.cs
@ -21,7 +21,7 @@ namespace Core.Audio

        public enum PlayType
        {
-            OnStart = 0,
+            OnActivate = 0,
            OnClickButton = 1,
            OnClickCollider = 2,
            OnPlayParticle = 3,
@ -29,7 +29,7 @@ namespace Core.Audio

        [SerializeField] private SourceType _sourceType = SourceType.Flat;
        [SerializeField] private AudioFileType _audioFileType = AudioFileType.Music;
-        [SerializeField] private PlayType _playType = PlayType.OnStart;
+        [SerializeField] private PlayType _playType = PlayType.OnActivate;
        [SerializeField] private float _startDelay = 0f;
        [SerializeField] private bool _loop = false;
        [SerializeField] private float _minDistance = 0f;
@ -51,13 +51,23 @@ namespace Core.Audio
                _particleSystem = GetComponentInChildren<ParticleSystem>();
        }

+        private void OnEnable()
+        {
+            switch (_playType)
+            {
+                case PlayType.OnActivate:
+                    StartCoroutine(CallPlay());
+                    return;
+            }
+        }
+
        private IEnumerator Start()
        {
            while (true)
            {
                switch (_playType)
                {
-                    case PlayType.OnStart:
+                    case PlayType.OnActivate:
                        StartCoroutine(CallPlay());
                        yield break;

--- a/Assets_DLL/Core/Core.csproj
+++ b/Assets_DLL/Core/Core.csproj
@ -6,9 +6,11 @@

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <OutputPath>C:\Users\Seraph\Desktop\Prototype\Assets_DLL\Build\</OutputPath>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
    <DebugType>none</DebugType>
    <DebugSymbols>false</DebugSymbols>
+    <DocumentationFile></DocumentationFile>
+    <DefineConstants>TRACE</DefineConstants>
  </PropertyGroup>

  <ItemGroup>
--- a/Assets_DLL/Core/Core.xml
+++ b/Assets_DLL/Core/Core.xml
@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Core</name>
+    </assembly>
+    <members>
+    </members>
+</doc>
--- a/Assets_DLL/Core/obj/Debug/netstandard2.0/Core.dll
+++ b/Assets_DLL/Core/obj/Debug/netstandard2.0/Core.dll
--- a/Assets_DLL/CoreEditor/CoreEditor.csproj
+++ b/Assets_DLL/CoreEditor/CoreEditor.csproj
@ -7,8 +7,10 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <OutputPath>C:\Users\Seraph\Desktop\Prototype\Assets_DLL\Build\</OutputPath>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <DebugType>none</DebugType>
-    <DebugSymbols>false</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <DocumentationFile></DocumentationFile>
+    <PlatformTarget>x64</PlatformTarget>
  </PropertyGroup>

  <ItemGroup>
--- a/Assets_DLL/CoreEditor/CoreEditor.xml
+++ b/Assets_DLL/CoreEditor/CoreEditor.xml
@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>CoreEditor</name>
+    </assembly>
+    <members>
+    </members>
+</doc>
--- a/Assets_DLL/CoreEditor/obj/CoreEditor.csproj.nuget.dgspec.json
+++ b/Assets_DLL/CoreEditor/obj/CoreEditor.csproj.nuget.dgspec.json
@ -24,6 +24,67 @@
          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
          "https://api.nuget.org/v3/index.json": {}
        },
+        "frameworks": {
+          "netstandard2.0": {
+            "targetAlias": "netstandard2.0",
+            "projectReferences": {
+              "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\Core.csproj": {
+                "projectPath": "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\Core.csproj"
+              }
+            }
+          }
+        },
+        "warningProperties": {
+          "warnAsError": [
+            "NU1605"
+          ]
+        }
+      },
+      "frameworks": {
+        "netstandard2.0": {
+          "targetAlias": "netstandard2.0",
+          "dependencies": {
+            "NETStandard.Library": {
+              "suppressParent": "All",
+              "target": "Package",
+              "version": "[2.0.3, )",
+              "autoReferenced": true
+            }
+          },
+          "imports": [
+            "net461",
+            "net462",
+            "net47",
+            "net471",
+            "net472",
+            "net48"
+          ],
+          "assetTargetFallback": true,
+          "warn": true,
+          "runtimeIdentifierGraphPath": "c:\\program files\\dotnet\\sdk\\5.0.404\\RuntimeIdentifierGraph.json"
+        }
+      }
+    },
+    "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\Core.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\Core.csproj",
+        "projectName": "Core",
+        "projectPath": "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\Core.csproj",
+        "packagesPath": "C:\\Users\\Seraph\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\obj\\",
+        "projectStyle": "PackageReference",
+        "configFilePaths": [
+          "C:\\Users\\Seraph\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+        ],
+        "originalTargetFrameworks": [
+          "netstandard2.0"
+        ],
+        "sources": {
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+          "https://api.nuget.org/v3/index.json": {}
+        },
        "frameworks": {
          "netstandard2.0": {
            "targetAlias": "netstandard2.0",
--- a/Assets_DLL/CoreEditor/obj/Debug/netstandard2.0/CoreEditor.csproj.AssemblyReference.cache
+++ b/Assets_DLL/CoreEditor/obj/Debug/netstandard2.0/CoreEditor.csproj.AssemblyReference.cache
--- a/Assets_DLL/CoreEditor/obj/Debug/netstandard2.0/CoreEditor.csproj.FileListAbsolute.txt
+++ b/Assets_DLL/CoreEditor/obj/Debug/netstandard2.0/CoreEditor.csproj.FileListAbsolute.txt
@ -7,3 +7,5 @@ C:\Users\Seraph\Desktop\Prototype\Assets_DLL\CoreEditor\obj\Debug\netstandard2.0
 C:\Users\Seraph\Desktop\Prototype\Assets_DLL\CoreEditor\obj\Debug\netstandard2.0\CoreEditor.csproj.CoreCompileInputs.cache
 C:\Users\Seraph\Desktop\Prototype\Assets_DLL\CoreEditor\obj\Debug\netstandard2.0\CoreEditor.csproj.CopyComplete
 C:\Users\Seraph\Desktop\Prototype\Assets_DLL\CoreEditor\obj\Debug\netstandard2.0\CoreEditor.dll
+C:\Users\Seraph\Desktop\Prototype\Assets_DLL\Build\netstandard2.0\CoreEditor.pdb
+C:\Users\Seraph\Desktop\Prototype\Assets_DLL\CoreEditor\obj\Debug\netstandard2.0\CoreEditor.pdb
--- a/Assets_DLL/CoreEditor/obj/Debug/netstandard2.0/CoreEditor.dll
+++ b/Assets_DLL/CoreEditor/obj/Debug/netstandard2.0/CoreEditor.dll
--- a/Assets_DLL/CoreEditor/obj/project.assets.json
+++ b/Assets_DLL/CoreEditor/obj/project.assets.json
@ -25,6 +25,16 @@
        "build": {
          "build/netstandard2.0/NETStandard.Library.targets": {}
        }
+      },
+      "Core/1.0.0": {
+        "type": "project",
+        "framework": ".NETStandard,Version=v2.0",
+        "compile": {
+          "bin/placeholder/Core.dll": {}
+        },
+        "runtime": {
+          "bin/placeholder/Core.dll": {}
+        }
      }
    }
  },
@ -172,10 +182,16 @@
        "netstandard.library.2.0.3.nupkg.sha512",
        "netstandard.library.nuspec"
      ]
+    },
+    "Core/1.0.0": {
+      "type": "project",
+      "path": "../Core/Core.csproj",
+      "msbuildProject": "../Core/Core.csproj"
    }
  },
  "projectFileDependencyGroups": {
    ".NETStandard,Version=v2.0": [
+      "Core >= 1.0.0",
      "NETStandard.Library >= 2.0.3"
    ]
  },
@ -205,7 +221,11 @@
      "frameworks": {
        "netstandard2.0": {
          "targetAlias": "netstandard2.0",
-          "projectReferences": {}
+          "projectReferences": {
+            "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\Core.csproj": {
+              "projectPath": "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\Core\\Core.csproj"
+            }
+          }
        }
      },
      "warningProperties": {
--- a/Assets_DLL/CoreEditor/obj/project.nuget.cache
+++ b/Assets_DLL/CoreEditor/obj/project.nuget.cache
@ -1,6 +1,6 @@
 {
  "version": 2,
-  "dgSpecHash": "uzXWsU/BEJvCRmjWWM6TZjTxNu+Z6tQFk8xjQC2Bz+y3D/HGlBvlPGCLzPoOr1ASW2YZi5rmPP/euqHv5CY+wA==",
+  "dgSpecHash": "qkhVuOlYEkmi2DHHRuNMcqs1P4fYmJt3cqFX3P/k5v4drA4rQrEghTaCrhMF/yOC3iYsVvnOva+Ai9WkMlaKTQ==",
  "success": true,
  "projectFilePath": "C:\\Users\\Seraph\\Desktop\\Prototype\\Assets_DLL\\CoreEditor\\CoreEditor.csproj",
  "expectedPackageFiles": [
--- a/Builds/Core_2.0.unitypackage
+++ b/Builds/Core_2.0.unitypackage