diff --git a/Assets/Resources/Sound FX.meta b/Assets/Resources/Sound FX.meta new file mode 100644 index 0000000..b980a18 --- /dev/null +++ b/Assets/Resources/Sound FX.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: cf01d449ccb60f04790d3734c449a9f8 +folderAsset: yes +timeCreated: 1492943063 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sound FX/106125__j1987__clickselect3.wav b/Assets/Resources/Sound FX/106125__j1987__clickselect3.wav new file mode 100644 index 0000000..8a1f908 Binary files /dev/null and b/Assets/Resources/Sound FX/106125__j1987__clickselect3.wav differ diff --git a/Assets/Resources/Sound FX/106125__j1987__clickselect3.wav.meta b/Assets/Resources/Sound FX/106125__j1987__clickselect3.wav.meta new file mode 100644 index 0000000..595c730 --- /dev/null +++ b/Assets/Resources/Sound FX/106125__j1987__clickselect3.wav.meta @@ -0,0 +1,29 @@ +fileFormatVersion: 2 +guid: f1711fdef0455884f94cded1266dffdd +timeCreated: 1492943938 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Menu/Main.unity b/Assets/Scenes/Menu/Main.unity index e18a4ff..d22fc77 100644 --- a/Assets/Scenes/Menu/Main.unity +++ b/Assets/Scenes/Menu/Main.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 7 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -25,7 +25,6 @@ RenderSettings: m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -42,7 +41,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 7 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -54,7 +53,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 4 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -67,27 +66,13 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 + m_DirectLightInLightProbes: 1 m_FinalGather: 0 m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 - m_MixedBakeMode: 1 - m_BakeBackend: 0 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVRFiltering: 0 - m_PVRFilteringMode: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_RuntimeCPUUsage: 25 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -104,8 +89,6 @@ NavMeshSettings: minRegionArea: 2 manualCellSize: 0 cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &185799011 @@ -454,6 +437,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 984656194} + m_MethodName: Test + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &376394326 @@ -567,6 +561,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 984656194} + m_MethodName: Test + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &396728289 @@ -698,6 +703,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 984656194} + m_MethodName: Test + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &450201664 @@ -715,8 +731,8 @@ GameObject: m_Component: - component: {fileID: 453190094} - component: {fileID: 453190097} - - component: {fileID: 453190095} - component: {fileID: 453190096} + - component: {fileID: 453190098} m_Layer: 5 m_Name: Single m_TagString: Untagged @@ -743,7 +759,31 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &453190095 +--- !u!114 &453190096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 453190093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 +--- !u!222 &453190097 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 453190093} +--- !u!114 &453190098 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -793,32 +833,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 984656194} + m_MethodName: Test + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &453190096 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 453190093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 ---- !u!222 &453190097 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 453190093} --- !u!1 &454453290 GameObject: m_ObjectHideFlags: 0 @@ -895,8 +922,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1030851283} - m_MethodName: LoadMultiplayGame + - m_Target: {fileID: 11500000, guid: de02093ec4bed044ab2323b5f1ce16cf, type: 3} + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 984656194} + m_MethodName: Test m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -964,7 +1002,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.15545501, y: 0.13928568} m_AnchorMax: {x: 0.7325921, y: 0.5221429} - m_AnchoredPosition: {x: 0.0000038146973, y: 0.0000009536743} + m_AnchoredPosition: {x: 0.0000038146973, y: 0.0000019073486} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &486073821 @@ -1114,7 +1152,7 @@ RectTransform: - {fileID: 1952535757} - {fileID: 1803176440} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1165,7 +1203,7 @@ Canvas: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 791692697} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 @@ -1174,7 +1212,6 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1235,8 +1272,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1030851283} - m_MethodName: Quit + - m_Target: {fileID: 11500000, guid: de02093ec4bed044ab2323b5f1ce16cf, type: 3} + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 984656194} + m_MethodName: Test m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1438,7 +1486,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &931867432 GameObject: @@ -1733,6 +1781,129 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 979313661} +--- !u!1 &984656193 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 984656196} + - component: {fileID: 984656195} + - component: {fileID: 984656194} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &984656194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 984656193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: de02093ec4bed044ab2323b5f1ce16cf, type: 3} + m_Name: + m_EditorClassIdentifier: + soundSource: {fileID: 984656195} + hitMusic: {fileID: 8300000, guid: f1711fdef0455884f94cded1266dffdd, type: 3} +--- !u!82 &984656195 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 984656193} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f1711fdef0455884f94cded1266dffdd, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + 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!4 &984656196 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 984656193} + 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: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1030851277 GameObject: m_ObjectHideFlags: 0 @@ -1805,8 +1976,6 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 - m_AllowMSAA: 1 - m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 @@ -1838,6 +2007,7 @@ MonoBehaviour: tooltipNickname: {fileID: 1952535760} inputNickname: {fileID: 979313663} metaServerIp: {fileID: 1803176441} + audioMusic: {fileID: 984656195} --- !u!114 &1030851284 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1956,7 +2126,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.021319257, y: 0.25404012} m_AnchorMax: {x: 0.44924352, y: 0.34} - m_AnchoredPosition: {x: 0.000011444092, y: -0.0000076293945} + m_AnchoredPosition: {x: 0.000015258789, y: -0.0000076293945} m_SizeDelta: {x: 0.000022888184, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1803176441 @@ -2219,7 +2389,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2067215053 GameObject: diff --git a/Assets/src/GUI/BattleGui.cs b/Assets/src/GUI/BattleGui.cs index c9c9f47..4ddf6c1 100644 --- a/Assets/src/GUI/BattleGui.cs +++ b/Assets/src/GUI/BattleGui.cs @@ -67,9 +67,6 @@ public void SubscribeOnEvents(PlayerModelHero model, Func randomPositio joystick.FingerLiftedEvent += controller => model.HandlerOnStopMove(); respawnWindow.ButtonRespawn.onClick.AddListener(delegate { - // TODO: set count gold respawn received from server - //if (!playerModelBase.SpendGold(0)) - // return; model.PlayerCore.IsAlive = true; model.StopAllCoroutines(); model.RespawnInstantly(randomPosition()); diff --git a/Assets/src/GUI/Menu/Menu.cs b/Assets/src/GUI/Menu/Menu.cs index 0e6d6ca..dbb3115 100644 --- a/Assets/src/GUI/Menu/Menu.cs +++ b/Assets/src/GUI/Menu/Menu.cs @@ -14,7 +14,9 @@ public class Menu : MonoBehaviour [SerializeField] private CanvasGroup tooltipNickname; [SerializeField] private InputField inputNickname; [SerializeField] private Text metaServerIp; - + + [SerializeField] private AudioSource audioMusic; + public void Start() { Screen.orientation = ScreenOrientation.Landscape; @@ -31,13 +33,20 @@ public void LoadSingleGame() if (string.IsNullOrEmpty(inputNickname.text)) { ShowNoNameAlert(); - } + } else { - LoadingScreen.instance.ProgressTo(1); + StartCoroutine(LoadLevelWithAudio()); } } + private IEnumerator LoadLevelWithAudio() + { + audioMusic.Play(); + yield return new WaitForSeconds(0.3f); + LoadingScreen.instance.ProgressTo(1); + } + [UsedImplicitly] public void LoadMultiplayGame() { diff --git a/Assets/src/Music.meta b/Assets/src/Music.meta new file mode 100644 index 0000000..3f8f021 --- /dev/null +++ b/Assets/src/Music.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 3edab4be387889746b25acb39d6edd06 +folderAsset: yes +timeCreated: 1492948355 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/src/Music/Music.cs b/Assets/src/Music/Music.cs new file mode 100644 index 0000000..c34d623 --- /dev/null +++ b/Assets/src/Music/Music.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Music : MonoBehaviour { + [SerializeField] private AudioSource soundSource; + [SerializeField] private AudioClip hitMusic; + + + void Start () {} + + public void Test() + { + print("hello test"); + soundSource.PlayOneShot(hitMusic); + } + + + + +} diff --git a/Assets/src/Music/Music.cs.meta b/Assets/src/Music/Music.cs.meta new file mode 100644 index 0000000..f1b8e03 --- /dev/null +++ b/Assets/src/Music/Music.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: de02093ec4bed044ab2323b5f1ce16cf +timeCreated: 1492946739 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: