wangguan
2020-11-18 982c3bd90d05fff58de0911630e9e127d2513d10
音效BUG
6 files modified
43 ■■■■■ changed files
Assets/Prefabs/UI/Endless/BottomCanvas.prefab 6 ●●●● patch | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless2D.unity 10 ●●●●● patch | view | raw | blame | history
Assets/Scenes/LoadingScene.unity 2 ●●● patch | view | raw | blame | history
Assets/Scripts/Guide/GuidePanel.cs 2 ●●● patch | view | raw | blame | history
Assets/Scripts/Manager/ManagerRoot.cs 21 ●●●●● patch | view | raw | blame | history
Assets/Scripts/Music/AudioSourceManager.cs 2 ●●● patch | view | raw | blame | history
Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -509,8 +509,8 @@
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0.5}
  m_AnchorMax: {x: 0, y: 0.5}
  m_AnchoredPosition: {x: 136.13, y: 0}
  m_SizeDelta: {x: 118.25601, y: 92.502655}
  m_AnchoredPosition: {x: 128.5, y: -7.8757}
  m_SizeDelta: {x: 102.997986, y: 76.75131}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4623057511285327657
CanvasRenderer:
@@ -4937,7 +4937,7 @@
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 121, y: 119}
  m_AnchoredPosition: {x: 92.51, y: 119}
  m_SizeDelta: {x: 180, y: 40}
  m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4623057513073301100
Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -4072,6 +4072,11 @@
  m_Modification:
    m_TransformParent: {fileID: 1340671931}
    m_Modifications:
    - target: {fileID: 4623057512524248738, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -0.000091552734
      objectReference: {fileID: 0}
    - target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_Name
@@ -4187,6 +4192,11 @@
      propertyPath: m_Camera
      value: 
      objectReference: {fileID: 1340671930}
    - target: {fileID: 4623057513073301098, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 92.51001
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 29da21b318f42054db30c52123aa4dbf, type: 3}
--- !u!1 &898016331
Assets/Scenes/LoadingScene.unity
@@ -213,7 +213,7 @@
  - component: {fileID: 205049505}
  - component: {fileID: 205049504}
  m_Layer: 0
  m_Name: ManagerRoot
  m_Name: Root
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
Assets/Scripts/Guide/GuidePanel.cs
@@ -71,7 +71,7 @@
        RectTransform canvasUI = transform.parent.parent.GetComponent<RectTransform>();
        float tmpOffect = tmpTs.anchoredPosition.y - (canvasUI.sizeDelta.y * 0.5f);
        towerBuyBtnPos = new Vector2(215, tmpOffect);
        towerBuyBtnPos = new Vector2(tmpTs.anchoredPosition.x, tmpOffect);
        tipsUI = transform.Find("Tips").gameObject;
        tipsUI.transform.SetAsLastSibling();//把tips放在最下面
Assets/Scripts/Manager/ManagerRoot.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Core.Utilities;
using Protobuf;
using UnityEngine;
@@ -9,16 +10,20 @@
    public class ManagerRoot : MonoBehaviour
    {
        //private bool canChangeScene = false;
        public void Awake()
        void Awake()
        {
            gameObject.AddComponent<DoNotDestory>();
            gameObject.AddComponent<MasterSocket>();
            gameObject.AddComponent<TDAA_SDKManager>();
            gameObject.AddComponent<AudioSourceManager>();
            GameObject root = GameObject.Find("ManagerRoot");
            if (root == null)
            {
                root = new GameObject("ManagerRoot");
                root.AddComponent<DoNotDestory>();
                root.AddComponent<MasterSocket>();
                root.AddComponent<TDAA_SDKManager>();
                root.AddComponent<AudioSourceManager>();
            gameObject.AddComponent<ErrorLogOnGUIMyTools>();
                root.AddComponent<ErrorLogOnGUIMyTools>();
            }
            //gameObject.AddComponent<JsonDataReader>();
        }
Assets/Scripts/Music/AudioSourceManager.cs
@@ -161,9 +161,9 @@
            tmpAudioSource.clip = null;
            tmpAudioSource.clip = au;
            tmpAudioSource.loop = true;
            tmpAudioSource.volume = volume;
        }
        tmpAudioSource.Play();
        tmpAudioSource.volume = volume;
    }
    /// <summary>