weixudong
2020-12-05 24527952cd17dce067a4a6614f855ac3d1e53a64
Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
4 files modified
52 ■■■■■ changed files
Assets/Resources/UI/Final/InputNamePanel.prefab 15 ●●●●● patch | view | raw | blame | history
Assets/Scripts/Common/HttpHelper.cs 2 ●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 33 ●●●●● patch | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/InputNamePanel.cs 2 ●●● patch | view | raw | blame | history
Assets/Resources/UI/Final/InputNamePanel.prefab
@@ -809,7 +809,6 @@
  - component: {fileID: 782696593662192048}
  - component: {fileID: 4675913836427628535}
  - component: {fileID: 2535417964849910066}
  - component: {fileID: 984994368023438221}
  m_Layer: 5
  m_Name: InputNamePanel
  m_TagString: Untagged
@@ -892,18 +891,6 @@
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 9efa7b34981e898499d8440084c4f107, type: 3}
  m_Name:
  m_EditorClassIdentifier:
--- !u!114 &984994368023438221
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7591771015771946116}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: df3eec02e7d604a4e939062292e3b425, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!1 &8180591722339033992
@@ -1003,7 +990,7 @@
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
  m_IsActive: 0
--- !u!224 &5031825275060926510
RectTransform:
  m_ObjectHideFlags: 0
Assets/Scripts/Common/HttpHelper.cs
@@ -47,7 +47,7 @@
        {
            request = UnityWebRequest.Post(url, form);
        }
        request.timeout = 10;//超时判断
        yield return request.SendWebRequest();
        if (request.isHttpError || request.isNetworkError)
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -232,30 +232,35 @@
            towerTargetter.alignment = affectorAlignment;
            towerTargetter.acquiredTarget += OnAcquiredTarget;
            // towerTargetter.lostTarget += OnLostTarget;
            GetAudioEnum();
            myTower = transform.parent.GetComponent<TowerLevel>();
            GetAudioEnum();
        }
        private AudioEnum audioEnum;//当前音乐的种类
        void GetAudioEnum()
        {
            if (transform.parent.name.StartsWith("GrowUpTower"))
            //小怪身上也有这个脚本,塔的名字做了更改,所以判断条件需要变成transform.parent.parent
            if (transform.parent.parent != null)
            {
                //火元素
                audioEnum = AudioEnum.FireTAttack;
                if (transform.parent.parent.name.StartsWith("GrowUpTower"))
                {
                    //火元素
                    audioEnum = AudioEnum.FireTAttack;
                }
                else if (transform.parent.parent.name.StartsWith("BlinkTower"))
                {
                    //木元素
                    audioEnum = AudioEnum.WoodTAttack;
                }
                else if (transform.parent.parent.name.StartsWith("CopyCatTower"))
                {
                    //水元素
                    audioEnum = AudioEnum.WaterTAttack;
                }
            }
            else if (transform.parent.name.StartsWith("BlinkTower"))
            {
                //木元素
                audioEnum = AudioEnum.WoodTAttack;
            }
            else if (transform.parent.name.StartsWith("CopyCatTower"))
            {
                //水元素
                audioEnum = AudioEnum.WaterTAttack;
            }
        }
        void OnDestroy()
Assets/Scripts/UI/FinalPanel/InputNamePanel.cs
@@ -15,7 +15,7 @@
    {
        input = transform.Find("InputFieldName").GetComponent<InputField>();
        transform.Find("OKBtn").GetComponent<Button>().onClick.AddListener(OnClickOKBtn);
        transform.Find("ResetNameBtn").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
        //transform.Find("ResetNameBtn").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
    }
    public void Init(Action<string> ac)