Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/...

art_dzg

2018-08-18 5177b5c1af49b9edd5b8e257e693467b3d225839

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/master

 Effects/Common/Yun/Material/01.mat

copy from Effects/Skill/Zs00/Pg/Material/Zs_pg_fx_001_alpha.mat
copy to Effects/Common/Yun/Material/01.mat
File was copied from Effects/Skill/Zs00/Pg/Material/Zs_pg_fx_001_alpha.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Zs_pg_fx_001_alpha
  m_Name: 01
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: f01e41ec1662b6b428088241b1fdf7af, type: 3}
        m_Texture: {fileID: 2800000, guid: f52ccc8e3c66e2243b1909e4cead5f69, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:

 Effects/Common/Yun/Material/01.mat.meta

File was renamed from Effects/Skill/Zs00/Pg/Material/Skill2_fx_002_new 19.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 4a321775e6d60f94baa6197c60665d97
timeCreated: 1508998553
guid: 10a14ea517049d94fa741c0541ab0f4e
timeCreated: 1534584844
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/Common/Yun/Texture/01.png

 Effects/Common/Yun/Texture/01.png.meta

File was renamed from Effects/Skill/Zs00/Pg/Texture/Zs_fx_Pg_002.tga.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7241f5d5be1074c44b5c398aefcd031e
timeCreated: 1526636248
guid: f52ccc8e3c66e2243b1909e4cead5f69
timeCreated: 1526635867
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}

 Effects/Common/Yun/Yun_fx_001.prefab

@@ -277,7 +277,7 @@
  m_GameObject: {fileID: 1582107241523716}
  m_LocalRotation: {x: -0.7039992, y: 0.06622052, z: 0.06622052, w: 0.7039992}
  m_LocalPosition: {x: -0.0040027997, y: 0.076999344, z: -0.087999955}
  m_LocalScale: {x: 0.85297596, y: 1.247487, z: 0.6072605}
  m_LocalScale: {x: 0.852976, y: 1.247487, z: 0.6072605}
  m_Children: []
  m_Father: {fileID: 4868017974159132}
  m_RootOrder: 2
@@ -288,7 +288,7 @@
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1735192504804702}
  m_LocalRotation: {x: -6.0507155e-15, y: -0.9993754, z: -5.3290705e-15, w: 0.035340406}
  m_LocalRotation: {x: -6.0507155e-15, y: -0.9993754, z: -5.3290705e-15, w: 0.03534041}
  m_LocalPosition: {x: -0.0019969065, y: 0.09400018, z: -0.018}
  m_LocalScale: {x: 0.7963358, y: 0.7697572, z: 0.9944346}
  m_Children: []
@@ -302,7 +302,7 @@
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1261820784086338}
  m_LocalRotation: {x: -0.000000021855694, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0.13000074, z: -0.47900018}
  m_LocalPosition: {x: 0, y: 0.13000074, z: -0.47900015}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 4868017974159132}
@@ -315,8 +315,8 @@
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1179172958764296}
  m_LocalRotation: {x: -0.74098533, y: 0.16289154, z: -0.65086305, w: 0.02800811}
  m_LocalPosition: {x: -0.019996313, y: 0.094000176, z: -0.11799975}
  m_LocalScale: {x: 1.1131073, y: 0.81437874, z: 0.87112075}
  m_LocalPosition: {x: -0.019996312, y: 0.094000176, z: -0.11799975}
  m_LocalScale: {x: 1.1131073, y: 0.81437874, z: 0.8711207}
  m_Children: []
  m_Father: {fileID: 4868017974159132}
  m_RootOrder: 5
@@ -411,7 +411,7 @@
  m_GameObject: {fileID: 1031994146414906}
  m_LocalRotation: {x: -0.70181113, y: 0.08637835, z: 0.08637833, w: 0.70181113}
  m_LocalPosition: {x: 0.027003445, y: 0.039999332, z: 0.064000145}
  m_LocalScale: {x: 0.94646645, y: 1.4030894, z: 0.57252026}
  m_LocalScale: {x: 0.9464665, y: 1.4030894, z: 0.57252026}
  m_Children: []
  m_Father: {fileID: 4868017974159132}
  m_RootOrder: 7
@@ -478,7 +478,7 @@
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -510,7 +510,7 @@
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -542,7 +542,7 @@
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -574,7 +574,7 @@
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -695,7 +695,7 @@
      m_RotationOrder: 0
    colorGradient:
      serializedVersion: 2
      key0: {r: 0.9264706, g: 0.96957403, b: 1, a: 0.14509805}
      key0: {r: 0.9264706, g: 0.969574, b: 1, a: 0.14509805}
      key1: {r: 0.09558821, g: 0.47606483, b: 1, a: 0.9529412}
      key2: {r: 0.4261662, g: 0.09558821, b: 1, a: 0.27450982}
      key3: {r: 0, g: 0, b: 0, a: 0}
@@ -4571,7 +4571,7 @@
          outSlope: 2.1965494
          tangentMode: 0
        - serializedVersion: 2
          time: 0.21623097
          time: 0.21623096
          value: 0.93495584
          inSlope: 0.19571751
          outSlope: 0.19571751
@@ -7048,7 +7048,7 @@
  moveWithTransform: 1
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 2
  randomSeed: 35807702
  randomSeed: 2064422143
  InitialModule:
    serializedVersion: 3
    enabled: 1
@@ -13305,7 +13305,7 @@
  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 2
  randomSeed: 1253108342
  randomSeed: 1561111697
  InitialModule:
    serializedVersion: 3
    enabled: 1
@@ -16394,8 +16394,8 @@
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -16496,8 +16496,8 @@
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 0}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Effects/Common/Yun/Yun_shock.prefab

@@ -187,7 +187,7 @@
  moveWithTransform: 0
  moveWithCustomTransform: {fileID: 0}
  scalingMode: 1
  randomSeed: -1711950888
  randomSeed: -294937028
  InitialModule:
    serializedVersion: 3
    enabled: 1
@@ -847,7 +847,7 @@
          outSlope: 2.1965494
          tangentMode: 0
        - serializedVersion: 2
          time: 0.21623097
          time: 0.21623096
          value: 0.93495584
          inSlope: 0.19571751
          outSlope: 0.19571751
@@ -6412,8 +6412,8 @@
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 178f26c0cb5887c42a2e6152f49f5b3a, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  - {fileID: 2100000, guid: 10a14ea517049d94fa741c0541ab0f4e, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Effects/Skill/Zs00/Pg/Animation/Attack4_Dl_Zt2.anim

@@ -40,88 +40,6 @@
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.x
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 1
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.y
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.z
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0
        inSlope: 4.1433206
        outSlope: 4.1433206
        tangentMode: 0
      - serializedVersion: 2
        time: 1.2
        value: 0.8
        inSlope: 0.17496769
        outSlope: 0.17496769
        tangentMode: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.w
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 2
        inSlope: 0
        outSlope: 0
@@ -194,9 +112,9 @@
        tangentMode: 0
      - serializedVersion: 2
        time: 0.8333333
        value: -0.18258667
        inSlope: -1.7983383
        outSlope: -1.7983383
        value: -0.18258668
        inSlope: -1.7983384
        outSlope: -1.7983384
        tangentMode: 0
      - serializedVersion: 2
        time: 1.2
@@ -387,112 +305,6 @@
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 1
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.r
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0.49472615
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.93333334
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.g
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0.2205882
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.93333334
        value: 0.1
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 0.2
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.b
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0
        inSlope: 6.871142
        outSlope: 6.871142
        tangentMode: 0
      - serializedVersion: 2
        time: 0.8
        value: 0.33333334
        inSlope: 1.3333335
        outSlope: 1.3333335
        tangentMode: 136
      - serializedVersion: 2
        time: 0.93333334
        value: 0.4
        inSlope: 0
        outSlope: -0.43521303
        tangentMode: 1
      - serializedVersion: 2
        time: 1.2
        value: 0
        inSlope: -0.29118386
        outSlope: -0.29118386
        tangentMode: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.a
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.7
        value: 0
        inSlope: Infinity
@@ -571,34 +383,6 @@
      m_RotationOrder: 4
    attribute: m_IsActive
    path: Bg_glow1
    classID: 1
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.7
        value: 0
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
      - serializedVersion: 2
        time: 0.73333335
        value: 1
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
      - serializedVersion: 2
        time: 1.2
        value: 0
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_IsActive
    path: 2_/2P_4_wave4
    classID: 1
    script: {fileID: 0}
  - curve:
@@ -757,13 +541,6 @@
      customType: 0
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 914802057
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 4204073425
      attribute: 377931145
      script: {fileID: 0}
@@ -799,27 +576,6 @@
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 1359017670
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 1627453126
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 1895888582
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 1467812587
      attribute: 2086281974
      script: {fileID: 0}
@@ -835,13 +591,6 @@
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2509918784
      attribute: 2086281974
      script: {fileID: 0}
      typeID: 1
      customType: 0
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 2086281974
      script: {fileID: 0}
      typeID: 1
@@ -883,27 +632,6 @@
      customType: 0
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 109495689
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 377931145
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 646366601
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 4204073425
      attribute: 109495689
      script: {fileID: 0}
@@ -919,13 +647,6 @@
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 4204073425
      attribute: 1090582214
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 2706815740
      attribute: 1090582214
      script: {fileID: 0}
      typeID: 23
@@ -953,88 +674,6 @@
    m_HeightFromFeet: 0
    m_Mirror: 0
  m_EditorCurves:
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.x
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 1
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.y
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.z
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0
        inSlope: 4.1433206
        outSlope: 4.1433206
        tangentMode: 0
      - serializedVersion: 2
        time: 1.2
        value: 0.8
        inSlope: 0.17496769
        outSlope: 0.17496769
        tangentMode: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._MainTex_ST.w
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
@@ -1112,9 +751,9 @@
        tangentMode: 0
      - serializedVersion: 2
        time: 0.8333333
        value: -0.18258667
        inSlope: -1.7983383
        outSlope: -1.7983383
        value: -0.18258668
        inSlope: -1.7983384
        outSlope: -1.7983384
        tangentMode: 0
      - serializedVersion: 2
        time: 1.2
@@ -1305,112 +944,6 @@
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 1
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.r
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0.49472615
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.93333334
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.g
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0.2205882
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 0.93333334
        value: 0.1
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1.2
        value: 0.2
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.b
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.73333335
        value: 0
        inSlope: 6.871142
        outSlope: 6.871142
        tangentMode: 0
      - serializedVersion: 2
        time: 0.8
        value: 0.33333334
        inSlope: 1.3333335
        outSlope: 1.3333335
        tangentMode: 136
      - serializedVersion: 2
        time: 0.93333334
        value: 0.4
        inSlope: 0
        outSlope: -0.43521303
        tangentMode: 1
      - serializedVersion: 2
        time: 1.2
        value: 0
        inSlope: -0.29118386
        outSlope: -0.29118386
        tangentMode: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.a
    path: 2_/2P_4_wave4
    classID: 23
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.76666665
        value: 0.6
        inSlope: 0
@@ -1549,34 +1082,6 @@
      m_RotationOrder: 4
    attribute: m_IsActive
    path: Bg_glow1
    classID: 1
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0.7
        value: 0
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
      - serializedVersion: 2
        time: 0.73333335
        value: 1
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
      - serializedVersion: 2
        time: 1.2
        value: 0
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_IsActive
    path: 2_/2P_4_wave4
    classID: 1
    script: {fileID: 0}
  - curve:

 Effects/Skill/Zs00/Pg/Attack01.prefab

Diff too large

 Effects/Skill/Zs00/Pg/Attack01.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 40ff2470e1b00c14c9724d12b416f567
timeCreated: 1510191835
timeCreated: 1534584191
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Effects/Skill/Zs00/Pg/Attack02.prefab

Diff too large

 Effects/Skill/Zs00/Pg/Attack02.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 406f05ae73b82e74fa3e8b0d34307593
timeCreated: 1510196695
timeCreated: 1534584199
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Effects/Skill/Zs00/Pg/Attack03.prefab

Diff too large

 Effects/Skill/Zs00/Pg/Attack03.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d96d1c8115d59ec498e35abebf7da7eb
timeCreated: 1510214682
timeCreated: 1534584201
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Effects/Skill/Zs00/Pg/Attack04.prefab

Diff too large

 Effects/Skill/Zs00/Pg/Attack04.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bb98fa5f5d600654a80f94a404ab8825
timeCreated: 1510218814
timeCreated: 1534584203
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Effects/Skill/Zs00/Pg/Attack04_DL.prefab

Diff too large

 Effects/Skill/Zs00/Pg/Attack04_DL.prefab.meta

@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 1dcdca3c255c938438b424c0ba1a76c1
timeCreated: 1511438462
licenseType: Free
timeCreated: 1534584206
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000
  userData: 

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_01.mat

File was renamed from Effects/Skill/Zs00/Pg/Material/Zs_pg_fx_001_add.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Zs_pg_fx_001_add
  m_Name: A_Effect_ZsPg_01
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_01.mat.meta

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_02.mat

File was renamed from Effects/Skill/Zs00/Pg/Material/Zs_pg_fx_001_alpha.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Zs_pg_fx_001_alpha
  m_Name: A_Effect_ZsPg_02
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_02.mat.meta

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_03.mat

File was renamed from Effects/Skill/Zs00/Pg/Material/Attack_fx_016.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Attack_fx_016
  m_Name: A_Effect_ZsPg_03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
  m_LightmapFlags: 4

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_03.mat.meta

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_04.mat

File was renamed from Effects/Skill/Zs00/Pg/Material/WenLi_0086_alpha 3.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: WenLi_0086_alpha 3
  m_Name: A_Effect_ZsPg_04
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 041cfeb8837898749b1e268886a80c59, type: 3}
        m_Texture: {fileID: 2800000, guid: 05836d114d4fbef4fa21cc04a2e09d95, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_04.mat.meta

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_05.mat

File was renamed from Effects/Skill/Zs00/Pg/Material/Attack_fx_011.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Attack_fx_011
  m_Name: A_Effect_ZsPg_05
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
  m_LightmapFlags: 4

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_05.mat.meta

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_06.mat

File was renamed from Effects/Skill/Zs00/Pg/Texture/Materials/XuLie_1003.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: XuLie_1003
  m_Name: A_Effect_ZsPg_06
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Effects/Skill/Zs00/Pg/Material/A_Effect_ZsPg_06.mat.meta

 Effects/Skill/Zs00/Pg/Material/Attack_fx_009.mat

File was deleted

 Effects/Skill/Zs00/Pg/Material/Attack_fx_009.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Material/Attack_fx_015.mat

File was deleted

 Effects/Skill/Zs00/Pg/Material/Attack_fx_015.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Material/Attack_fx_017.mat

File was deleted

 Effects/Skill/Zs00/Pg/Material/Attack_fx_017.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Material/Jyzd_glow_00_fx 3.mat

File was deleted

 Effects/Skill/Zs00/Pg/Material/Jyzd_glow_00_fx 3.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Material/Skill1_fx_010_alpha 2.mat

File was deleted

 Effects/Skill/Zs00/Pg/Material/Skill1_fx_010_alpha 2.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Material/Skill2_fx_002_new 19.mat

File was deleted

 Effects/Skill/Zs00/Pg/Materials.meta

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Skill12_005.mat

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Skill12_005.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Materials/WenLi_0020.mat

File was deleted

 Effects/Skill/Zs00/Pg/Materials/WenLi_0020.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_001_add.mat

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_001_add.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_001_alpha 1.mat

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_001_alpha 1.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_001_alpha.mat

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_001_alpha.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_002-.mat

File was deleted

 Effects/Skill/Zs00/Pg/Materials/Zs_fx_Pg_002-.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Model/A_Effect_ZsPg_01.FBX

Binary files differ

 Effects/Skill/Zs00/Pg/Model/A_Effect_ZsPg_01.FBX.meta

 Effects/Skill/Zs00/Pg/Model/A_Effect_ZsPg_02.FBX

Binary files differ

 Effects/Skill/Zs00/Pg/Model/A_Effect_ZsPg_02.FBX.meta

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_01.png

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_01.png.meta

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_02.png

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_02.png.meta

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_03.tga

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_03.tga.meta

File was renamed from Effects/Skill/Zs00/Skill2_2/Model/A_Zs02_skill2_03.fbm/daoguang_0204.tga.meta
@@ -1,15 +1,15 @@
fileFormatVersion: 2
guid: 217647af81f7dfc4881a3d2010ee41b1
timeCreated: 1533198569
guid: 05836d114d4fbef4fa21cc04a2e09d95
timeCreated: 1479799749
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4
  serializedVersion: 2
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
    sRGBTexture: 1
    linearTexture: 0
    correctGamma: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapFadeDistanceStart: 1
@@ -21,18 +21,21 @@
    normalMapFilter: 0
  isReadable: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  generateCubemap: 0
  cubemapConvolution: 0
  cubemapConvolutionSteps: 7
  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
  textureFormat: 1
  textureFormat: -1
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
    aniso: -1
    mipBias: -1
    wrapMode: -1
    wrapMode: 0
  nPOTScale: 1
  lightmap: 0
  rGBM: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
@@ -41,23 +44,10 @@
  spritePivot: {x: 0.5, y: 0.5}
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  textureType: -1
  buildTargetSettings: []
  spriteSheet:
    serializedVersion: 2
    sprites: []

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_04.png

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_04.png.meta

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_05.png

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_05.png.meta

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_06.png

 Effects/Skill/Zs00/Pg/Texture/A_Effect_ZsPg_06.png.meta

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_001.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_001.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_002.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_002.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_004.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_004.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_006_0.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_006_0.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_008_0.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Attack_fx_008_0.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/DiLie_1006.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/DiLie_1006.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/DiLie_1007.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/DiLie_1007.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Guang_1011.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Guang_1011.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Guang_1015.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Guang_1015.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Guang_Dg_1001.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Guang_Dg_1001.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/DiLie_1005.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/DiLie_1005.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1011.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1011.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1012.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1012.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1015.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1015.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1016.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_1016.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_Dg_1001.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_Dg_1001.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_Dg_1002.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/Guang_Dg_1002.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/XuLie_1001.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/XuLie_1001.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/ss_00080.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/ss_00080.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/ss_00081.mat

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Materials/ss_00081.mat.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_005_2_0.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_005_2_0.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_Pg_001.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_Pg_001.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_Pg_002.tga

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_Skill1_0011.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_Skill1_0011.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_Skill1_0012_0.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/Zs_fx_Skill1_0012_0.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/i_liuguang017_1774.tga

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/i_liuguang017_1774.tga.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/l_daoguang009_2530.tga

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/l_daoguang009_2530.tga.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/ss_00080.png

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/ss_00080.png.meta

File was deleted

 Effects/Skill/Zs00/Pg/Texture/trail_05_1_128.tga

Binary files differ

 Effects/Skill/Zs00/Pg/Texture/trail_05_1_128.tga.meta

File was deleted

 Effects/Skill/Zs00/Skill2_2/Model/A_Zs02_skill2_03.fbm.meta

File was deleted

 Effects/Skill/Zs00/Skill2_2/Model/A_Zs02_skill2_03.fbm/daoguang_0204.tga

Binary files differ