Added BG music.

CSaratakij · Apr 23, 2018 · 0d93acb · 0d93acb
1 parent 264a1f4
commit 0d93acb
Show file tree

Hide file tree

Showing 29 changed files with 246 additions and 26 deletions.
diff --git a/RTS_TBS/Assembly-CSharp.csproj b/RTS_TBS/Assembly-CSharp.csproj
@@ -72,6 +72,7 @@
      <Compile Include="Assets\Scripts\UI\View\GameWinnerView.cs" />
      <Compile Include="Assets\Scripts\UI\View\InGamePanelView.cs" />
      <Compile Include="Assets\Scripts\UI\View\PanelInfoView.cs" />
+     <Compile Include="Assets\Scripts\Utils\MarkSingleton.cs" />
      <Compile Include="Assets\Scripts\Utils\Timer.cs" />
  <Reference Include="Vuforia.UnityExtensions.Editor">
  <HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/VuforiaSupport/Managed/Editor/Vuforia.UnityExtensions.Editor.dll</HintPath>

diff --git a/RTS_TBS/Assets/Audio.meta b/RTS_TBS/Assets/Audio.meta
diff --git a/RTS_TBS/Assets/Audio/Bensound-Retro-Soul.mp3 b/RTS_TBS/Assets/Audio/Bensound-Retro-Soul.mp3
diff --git a/RTS_TBS/Assets/Audio/Bensound-Retro-Soul.mp3.meta b/RTS_TBS/Assets/Audio/Bensound-Retro-Soul.mp3.meta
diff --git a/RTS_TBS/Assets/Scenes/level.unity b/RTS_TBS/Assets/Scenes/level.unity
@@ -511,6 +511,34 @@ MonoBehaviour:
     type: 2}
   m_PrefabInternal: {fileID: 997154574}
   m_Script: {fileID: 11500000, guid: d13e39367cc9aa3408353f9ba06dbdd7, type: 3}
+--- !u!1 &646645972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 646645973}
+  m_Layer: 0
+  m_Name: '--- Audio ---'
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &646645973
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 646645972}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 137.58406, y: 258.542, z: 11.686101}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 26
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &647474993
 GameObject:
   m_ObjectHideFlags: 0
@@ -928,6 +956,127 @@ MonoBehaviour:
     type: 2}
   m_PrefabInternal: {fileID: 1689913158}
   m_Script: {fileID: 11500000, guid: 894c00a2da7ef964399c7787c9475e70, type: 3}
+--- !u!1 &1354951197
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1354951198}
+  - component: {fileID: 1354951199}
+  - component: {fileID: 1354951200}
+  m_Layer: 0
+  m_Name: Music
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1354951198
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1354951197}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 27
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &1354951199
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1354951197}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 3e7f881d276c8c94f8dadb9904d99e3d, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+--- !u!114 &1354951200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1354951197}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15fb700c579c76b469e2969460e46ffd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &1367798190 stripped
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 114355806524905510, guid: b03ca4d6523d54548abdaacf1c05fa59,

diff --git a/RTS_TBS/Assets/Scripts/Utils/MarkSingleton.cs b/RTS_TBS/Assets/Scripts/Utils/MarkSingleton.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace LD41
+{
+    public class MarkSingleton : MonoBehaviour
+    {
+        public static GameObject instance = null;
+
+        void Awake()
+        {
+            if (instance == null) {
+                instance = gameObject;
+                DontDestroyOnLoad(gameObject);
+            }
+            else {
+                Destroy(gameObject);
+            }
+        }
+    }
+}
diff --git a/RTS_TBS/Assets/Scripts/Utils/MarkSingleton.cs.meta b/RTS_TBS/Assets/Scripts/Utils/MarkSingleton.cs.meta
diff --git a/RTS_TBS/Library/CurrentMaximizeLayout.dwlt b/RTS_TBS/Library/CurrentMaximizeLayout.dwlt
@@ -19,10 +19,10 @@ MonoBehaviour:
     y: 30
     width: 1366
     height: 645
-  m_MinSize: {x: 681, y: 321}
-  m_MaxSize: {x: 12006, y: 8021}
+  m_MinSize: {x: 679, y: 321}
+  m_MaxSize: {x: 12004, y: 8021}
   vertical: 1
-  controlID: 50569
+  controlID: 51970
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -121,10 +121,10 @@ MonoBehaviour:
     y: 0
     width: 1366
     height: 645
-  m_MinSize: {x: 681, y: 321}
-  m_MaxSize: {x: 12006, y: 8021}
+  m_MinSize: {x: 679, y: 321}
+  m_MaxSize: {x: 12004, y: 8021}
   vertical: 0
-  controlID: 50570
+  controlID: 51971
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -179,9 +179,9 @@ MonoBehaviour:
   m_PersistentViewDataDictionary: {fileID: 0}
   m_TreeViewState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 4abe0100
-    m_LastClickedID: 114250
-    m_ExpandedIDs: b24ff3ff4850f3ff7252f3ff2e75f3ffcc75f3fff677f3ff8c72f4ff2273f4ff4c75f4ffe4f8f9ffee34faff8e35faffb637faffd0f9fffff6faffff82fbffff88fbffff9efbffff000000000c2b000042be000064be000092be000064bf0000f2bf000024c0000062c0000070c00000e08a0100aa8c0100dc8c01002a8d010000bc0100ccbc0100c0bd0100cabd01003cbe01004abe0100
+    m_SelectedIDs: e0c8ebff
+    m_LastClickedID: -1324832
+    m_ExpandedIDs: 8cd6ebff22d7ebff4cd9ebffb24ff3ff4850f3ff7252f3ff2e75f3ffcc75f3fff677f3ff8c72f4ff2273f4ff4c75f4ffe4f8f9ffee34faff8e35faffb637faffd0f9fffff6faffff82fbffff88fbffff9efbffff000000000c2b000042be000064be000092be000064bf0000f2bf000024c0000062c0000070c00000e08a0100aa8c0100dc8c01002a8d010000bc0100ccbc0100c0bd0100cabd01003cbe01004abe0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -227,7 +227,7 @@ MonoBehaviour:
   m_MinSize: {x: 204, y: 321}
   m_MaxSize: {x: 4004, y: 8021}
   vertical: 1
-  controlID: 50515
+  controlID: 51972
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -255,7 +255,7 @@ MonoBehaviour:
   - {fileID: 9}
   - {fileID: 10}
   m_Selected: 1
-  m_LastSelected: 0
+  m_LastSelected: 2
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -284,14 +284,14 @@ MonoBehaviour:
     height: 473
   m_PersistentViewDataDictionary: {fileID: 0}
   m_SceneLighting: 1
-  lastFramingTime: 72312.89396180848
+  lastFramingTime: 73749.64315548538
   m_2DMode: 1
   m_isRotationLocked: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 137.58406, y: 258.542, z: 11.686101}
+    m_Target: {x: 0, y: 0, z: 0}
     speed: 2
-    m_Value: {x: 137.58406, y: 258.542, z: 11.686101}
+    m_Value: {x: 0, y: 0, z: 0}
   m_RenderMode: 0
   m_ValidateTrueMetals: 0
   m_SceneViewState:
@@ -319,9 +319,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 368.37634
+    m_Target: 22
     speed: 2
-    m_Value: 368.37634
+    m_Value: 22
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -372,18 +372,18 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SearchArea: 0
     m_Folders:
-    - Assets/Sprites/UI
+    - Assets/Scripts/Utils
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Sprites/UI
+  - Assets/Scripts/Utils
   m_LastFoldersGridSize: 16
   m_LastProjectPath: C:\Users\CSaratakij\Desktop\@GitRepository\RTS_TBS\RTS_TBS
   m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 124}
-    m_SelectedIDs: b2be0100
-    m_LastClickedID: 114354
+    scrollPos: {x: 0, y: 95}
+    m_SelectedIDs: 3a2a0000
+    m_LastClickedID: 10810
     m_ExpandedIDs: 000000005c2900006e2900008e290000ca290000042a0000162a0000502a000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -437,8 +437,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: c0bd0100
-    m_LastClickedInstanceID: 114112
+    m_SelectedInstanceIDs: e0c8ebff
+    m_LastClickedInstanceID: -1324832
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
@@ -665,8 +665,8 @@ MonoBehaviour:
     y: 0
     width: 277
     height: 645
-  m_MinSize: {x: 277, y: 71}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}

diff --git a/RTS_TBS/Library/EditorUserBuildSettings.asset b/RTS_TBS/Library/EditorUserBuildSettings.asset
diff --git a/RTS_TBS/Library/LastBuild.buildreport b/RTS_TBS/Library/LastBuild.buildreport
diff --git a/RTS_TBS/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll b/RTS_TBS/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll
diff --git a/RTS_TBS/Library/PlayerDataCache/Data/globalgamemanagers b/RTS_TBS/Library/PlayerDataCache/Data/globalgamemanagers
diff --git a/RTS_TBS/Library/PlayerDataCache/Data/globalgamemanagers.assets b/RTS_TBS/Library/PlayerDataCache/Data/globalgamemanagers.assets
diff --git a/RTS_TBS/Library/PlayerDataCache/Data/level0 b/RTS_TBS/Library/PlayerDataCache/Data/level0
diff --git a/RTS_TBS/Library/PlayerDataCache/Data/sharedassets0.assets b/RTS_TBS/Library/PlayerDataCache/Data/sharedassets0.assets
diff --git a/RTS_TBS/Library/PlayerDataCache/Data/sharedassets0.assets.resS b/RTS_TBS/Library/PlayerDataCache/Data/sharedassets0.assets.resS
diff --git a/RTS_TBS/Library/PlayerDataCache/Data/sharedassets0.resource b/RTS_TBS/Library/PlayerDataCache/Data/sharedassets0.resource
diff --git a/RTS_TBS/Library/PlayerDataCache/ScriptLayoutHashes.txt b/RTS_TBS/Library/PlayerDataCache/ScriptLayoutHashes.txt
@@ -219,7 +219,7 @@ c2275a8bfbb9f9942cad75ecdfded41d UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.Spa
 45f3431f0103c41611e8d4eec3d439df UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingRenderer
 9de3a22eca9aefadba2d10d5987cefe3 UnityEngine.SpatialTracking.dll:UnityEngine.SpatialTracking.TrackedPoseDriver
 6174d5ad096d06fb99853d648ebbf512 Assembly-CSharp.dll:LD41.Timer
-f9f9a538886ea439d79fad37cfa8a821 Assembly-CSharp.dll:LD41.CurrentTurnActorView
+2ca7905b3fad42b2638237d89a61abd8 Assembly-CSharp.dll:LD41.CurrentTurnActorView
 26215f135eeb48d8fa1189498c107f6c Vuforia.UnityExtensions.dll:Vuforia.AnchorBehaviour
 0561521e336e270e6e5a9c61387cb838 Vuforia.UnityExtensions.dll:Vuforia.AnchorInputListenerBehaviour
 2e0fd93f459db951da0e2e94e2e33fb7 Vuforia.UnityExtensions.dll:Vuforia.AnchorStageBehaviour
@@ -294,3 +294,4 @@ d2a2bd333db22f480a8589e167314ecc Vuforia.UnityExtensions.dll:Vuforia.UserDefined
 480775240792f82bf863fba7e4a87a38 Assembly-CSharp.dll:LD41.BeamController
 05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:LD41.Global
 f7640315ec92a12d676a3a684af275db Assembly-CSharp.dll:LD41.GameWinnerView
+05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:LD41.MarkSingleton
diff --git a/RTS_TBS/Library/ScriptAssemblies/Assembly-CSharp.dll b/RTS_TBS/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/RTS_TBS/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/RTS_TBS/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/RTS_TBS/Library/assetDatabase3 b/RTS_TBS/Library/assetDatabase3
diff --git a/RTS_TBS/Library/metadata/00/00000000000000004000000000000000 b/RTS_TBS/Library/metadata/00/00000000000000004000000000000000
diff --git a/RTS_TBS/Library/metadata/15/15fb700c579c76b469e2969460e46ffd b/RTS_TBS/Library/metadata/15/15fb700c579c76b469e2969460e46ffd
diff --git a/RTS_TBS/Library/metadata/15/15fb700c579c76b469e2969460e46ffd.info b/RTS_TBS/Library/metadata/15/15fb700c579c76b469e2969460e46ffd.info
diff --git a/RTS_TBS/Library/metadata/3e/3e7f881d276c8c94f8dadb9904d99e3d b/RTS_TBS/Library/metadata/3e/3e7f881d276c8c94f8dadb9904d99e3d
diff --git a/RTS_TBS/Library/metadata/3e/3e7f881d276c8c94f8dadb9904d99e3d.info b/RTS_TBS/Library/metadata/3e/3e7f881d276c8c94f8dadb9904d99e3d.info
diff --git a/RTS_TBS/Library/metadata/3e/3e7f881d276c8c94f8dadb9904d99e3d.resource b/RTS_TBS/Library/metadata/3e/3e7f881d276c8c94f8dadb9904d99e3d.resource
diff --git a/RTS_TBS/Library/metadata/6d/6d840c0ac0eba0b4a94cdbf796fe2280 b/RTS_TBS/Library/metadata/6d/6d840c0ac0eba0b4a94cdbf796fe2280
diff --git a/RTS_TBS/Library/metadata/6d/6d840c0ac0eba0b4a94cdbf796fe2280.info b/RTS_TBS/Library/metadata/6d/6d840c0ac0eba0b4a94cdbf796fe2280.info