Merge branch 'DGJ' of ssh://192.168.3.110:3397/JH/pointcloud into DGJ

Assets/Script/AudioManager.cs

@@ -440,7 +440,7 @@ public class AudioManager : MonoSingleton<AudioManager>
 
     void Awake()
     {
-      //  DontDestroyOnLoad(this.gameObject);
+        //  DontDestroyOnLoad(this.gameObject);
         //Instance = this;
         //sceses_BJList = Resources.LoadAll("Sounds/BJSounds");//自动加载文件夹下的声音
 
@@ -451,7 +451,7 @@ public class AudioManager : MonoSingleton<AudioManager>
 
         audioMusic.loop = true;
         audioMusic.playOnAwake = false;
-     
+
 
 
         MusicVolume = bjSoundVolume;
@@ -467,7 +467,7 @@ public class AudioManager : MonoSingleton<AudioManager>
 
     private void Start()
     {
-       // StartCoroutine(MusicPlay());
+        // StartCoroutine(MusicPlay());
     }
 
     IEnumerator MusicPlay()
@@ -484,10 +484,10 @@ public class AudioManager : MonoSingleton<AudioManager>
         audioLanguage.clip = null;
         if (clip == null)
         {
-          
+
             return;
         }
-     
+
         if (isLoop == false)
         {
             audioMusic.loop = false;
@@ -515,6 +515,10 @@ public class AudioManager : MonoSingleton<AudioManager>
     {
         audioMusic.clip = null;
         audioMusic.Stop();
+        audioLanguage.clip = null;
+        audioLanguage.Stop();
+        audioSound.clip = null;
+        audioSound.Stop();
     }
 
     /// <summary>

Assets/StreamingAssets/projectInfo.json

@@ -16,8 +16,8 @@
 				"T": 1,
 				"TH": 1,
 				"TL": 2,
-				"X": 2.0199999999999996,
-				"Y": 1.68,
+				"X": 4.482373,
+				"Y": 1.851614,
 				"Z": 1.2
 			}, {
 				"T": 0,
@@ -185,8 +185,8 @@
 				"T": 1,
 				"TH": 1,
 				"TL": 2,
-				"X": 2.0199999999999996,
-				"Y": 1.68,
+				"X": 4.482373,
+				"Y": 1.851614,
 				"Z": 1.2
 			}]
 		}]