wangguan
2020-12-17 dcbbe82ceca921e73e1789ae87ea8ac6a59c7bff
增加技能特效
4 files modified
137 ■■■■■ changed files
Assets/00000/package/Materials/Object_036.mat 2 ●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Object_039.mat 2 ●●● patch | view | raw | blame | history
Assets/Prefabs/UI/Endless/Energy.prefab 124 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 9 ●●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Object_036.mat
@@ -20,7 +20,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 3a9c88a2223e7a341964ace97e6aec02, type: 3}
        m_Texture: {fileID: 2800000, guid: a67fa4e3f0b7086499ad172d8a083d7f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
Assets/00000/package/Materials/Object_039.mat
@@ -20,7 +20,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 1c34d8a1de6a6da408fae5fa526b97c0, type: 3}
        m_Texture: {fileID: 2800000, guid: 5cc5fa307ebbb7e409a4bd6adcf2407b, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
Assets/Prefabs/UI/Endless/Energy.prefab
@@ -130,8 +130,9 @@
  - {fileID: 9149158087180956820}
  - {fileID: 7675384370951959148}
  - {fileID: 1601561953590493166}
  - {fileID: 5769365057982938342}
  - {fileID: 2852732232758538960}
  - {fileID: 5769365057982938342}
  - {fileID: 4081107454225396487}
  - {fileID: 1229591115306338502}
  m_Father: {fileID: 573987700737003514}
  m_RootOrder: 0
@@ -575,7 +576,7 @@
  m_LocalScale: {x: 1.4, y: 1.4, z: 1}
  m_Children: []
  m_Father: {fileID: 2245660995521503250}
  m_RootOrder: 6
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
@@ -738,6 +739,121 @@
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!1001 &1686608653397591835
PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 2245660995521503250}
    m_Modifications:
    - target: {fileID: 779759227532459688, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 1301871034731117957, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalPosition.y
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_RootOrder
      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 5760679434611394543, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_Name
      value: Effect_UI_JiNengTuBiao_03
      objectReference: {fileID: 0}
    - target: {fileID: 5760679434611394543, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 6946364723161781365, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 8082333923366032818, guid: ef2dad6d8015ab24f84f48e31f60fb12,
        type: 3}
      propertyPath: playOnAwake
      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: ef2dad6d8015ab24f84f48e31f60fb12, type: 3}
--- !u!4 &4081107454225396487 stripped
Transform:
  m_CorrespondingSourceObject: {fileID: 3443855382027482140, guid: ef2dad6d8015ab24f84f48e31f60fb12,
    type: 3}
  m_PrefabInstance: {fileID: 1686608653397591835}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &5410636901338817931
PrefabInstance:
  m_ObjectHideFlags: 0
@@ -845,7 +961,7 @@
    - target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
        type: 3}
      propertyPath: m_RootOrder
      value: 5
      value: 4
      objectReference: {fileID: 0}
    - target: {fileID: 7818391072442849115, guid: 5591b24d709da864d8fa54fb582b837f,
        type: 3}
@@ -940,7 +1056,7 @@
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_RootOrder
      value: 4
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -150,9 +150,11 @@
        skillPS1 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao/03").gameObject;
        skillPS2 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_02/03").gameObject;
        skillPS3 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_03/03 (8)").gameObject;
        skillPS1.SetActive(false);
        skillPS2.SetActive(false);
        skillPS3.SetActive(false);
        transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(false);
        transform.Find("Panel/SwitchSpeed").gameObject.SetActive(false);
@@ -498,7 +500,7 @@
    private Color disColor = new Color(1.0f, 1.0f, 1.0f, 0);
    private Text fireSkillLevelText;
    private Image fireSkillBgImg;
    private GameObject skillPS1, skillPS2;
    private GameObject skillPS1, skillPS2, skillPS3;
    /// <summary>
    /// 点击火技能
@@ -558,7 +560,7 @@
                }
                if (!skillPS1.activeSelf) skillPS1.SetActive(true);
                if (!skillPS2.activeSelf) skillPS2.SetActive(true);
                if (skillPS3.activeSelf) skillPS3.SetActive(false);
                //skillPS1.Play();
                //skillPS2.Play();
            }
@@ -571,6 +573,8 @@
                }
                if (skillPS1.activeSelf) skillPS1.SetActive(false);
                if (!skillPS2.activeSelf) skillPS2.SetActive(true);
                if (!skillPS3.activeSelf) skillPS3.SetActive(true);
                //if (skillPS1.isPlaying) skillPS1.Stop();
                //if (!skillPS2.isPlaying) skillPS2.Play();
            }
@@ -584,6 +588,7 @@
            }
            if (skillPS1.activeSelf) skillPS1.SetActive(false);
            if (skillPS2.activeSelf) skillPS2.SetActive(false);
            if (skillPS3.activeSelf) skillPS3.SetActive(false);
            // if (skillPS1.isPlaying) skillPS1.Stop();
            // if (skillPS2.isPlaying) skillPS2.Stop();