wangguan
2020-12-08 3d13f2e8a23602aedb8adf5d2d02e377a330a61b
修复火塔攻击特效
修改结算面板BUG
6 files modified
34063 ■■■■■ changed files
Assets/Prefabs/Towers/Fire/Projectile.prefab 34036 ●●●●● patch | view | raw | blame | history
Assets/Resources/UI/Final/FinalPanel.prefab 2 ●●● patch | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs 4 ●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Projectiles/ContactDestroyer.cs 2 ●●●●● patch | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalHttp.cs 5 ●●●● patch | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanel.cs 14 ●●●● patch | view | raw | blame | history
Assets/Prefabs/Towers/Fire/Projectile.prefab
Diff too large
Assets/Resources/UI/Final/FinalPanel.prefab
@@ -4074,7 +4074,7 @@
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7768128128048353543}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalPosition: {x: 0, y: 0, z: -1450}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4379579164978002596}
Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
@@ -162,11 +162,13 @@
            m_Fired = true;
            m_CollidersIgnoring.Clear();
            // 因为炮弹没有模型,本身就是一个带碰撞体的粒子特效
            ParticleSystem ps = GetComponent<ParticleSystem>();
            if (ps == null)
                ps = transform.GetChild(0).GetComponent<ParticleSystem>();
            if (ps == null)
                ps = transform.GetChild(0).GetChild(0).GetComponent<ParticleSystem>();
            ps?.Play();
            if (fired != null)
Assets/Scripts/TowerDefense/Towers/Projectiles/ContactDestroyer.cs
@@ -90,6 +90,8 @@
            ParticleSystem ps = gameObject.GetComponent<ParticleSystem>();
            if (ps == null)
                ps = gameObject.transform.GetChild(0).GetComponent<ParticleSystem>();
            if (ps == null)
                ps = transform.GetChild(0).GetChild(0).GetComponent<ParticleSystem>();
            ps?.Stop();
            Poolable.TryPool(gameObject);
        }
Assets/Scripts/UI/FinalPanel/FinalHttp.cs
@@ -68,6 +68,7 @@
        }, HttpHelper.DownloadHanlderType.kHttpTEXT);
    }
    string playerPrefs_NickName = "GemBattlePlayerNickName";
    private void LoadPostTxt(string value)
    {
@@ -75,7 +76,9 @@
        loginData = JsonMapper.ToObject(value);
        if (loginData["error"].ToString() != "0")
        {
            Debug.Log("失败了");
            Debug.LogError("失败了,这里是否需要重置名字???");
            //PlayerPrefs.SetString(playerPrefs_NickName, "");
            callBack?.Invoke(null, 0, null);
        }
        else if (loginData["msg"].ToString() == "OK")
        {
Assets/Scripts/UI/FinalPanel/FinalPanel.cs
@@ -272,16 +272,16 @@
            scrollerCanvasGroup.alpha = 1;
            Debug.Log("开始展示排行榜");
        }
        itemCanvasGroup.alpha = 1;
        float duration = 0.1f;
        for (int i = 0; i < playPSItem.Count; i++)
        {
            playPSItem[i].PlayDoTween(duration);
            yield return new WaitForSeconds(duration);
        }
        if (playPSItem.Count > 0)
        {
            itemCanvasGroup.alpha = 1;
            float duration = 0.1f;
            for (int i = 0; i < playPSItem.Count; i++)
            {
                playPSItem[i].PlayDoTween(duration);
                yield return new WaitForSeconds(duration);
            }
            image_HScore.SetActive(true);
            goonFade = true;
            ShowGoOnText();