art_yxc
2018-08-14 9469492430954f66919d4c50a0d451a28dd4119c
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
2 文件已复制
4个文件已修改
4个文件已添加
75个文件已删除
4 文件已重命名
40616 ■■■■■ 已修改文件
Effects/BossBuff/WuDi/Effect_bossbuff_wudi.prefab 9963 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Effect_bossbuff_wudi.prefab.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_01.mat 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Materials/fangsheguang_00192.mat 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Materials/fangsheguang_00192.mat.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Materials/glow_3232.mat 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Materials/glow_3232.mat.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Model/plane_004.FBX 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Model/plane_004.FBX.meta 166 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_01.tga.meta 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Texture/fangsheguang_00192.png 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Texture/fangsheguang_00192.png.meta 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Texture/glow_003232.png 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Texture/glow_003232.png.meta 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.anim 2369 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.anim.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.controller 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.controller.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.anim 2153 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.anim.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.controller 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.controller.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.anim 2369 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.anim.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.controller 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.controller.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Effect_bossbuff_fangyuzhao.prefab 566 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Effect_bossbuff_fangyuzhao.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_beidong.prefab 566 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_beidong.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_didang.prefab 566 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_didang.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Materials.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_01.mat 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_02.mat 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_02.mat.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_03.mat 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_03.mat.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Model.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Model/Effect_bossbuff_fangyuzhao_01.FBX 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Model/Effect_bossbuff_fangyuzhao_01.FBX.meta 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Texture.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_01.png 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_01.png.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_02.png 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_03.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_03.tga.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu.prefab 3411 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu_m.prefab 3411 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu_m.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Effect_buff_kuangbao.prefab 3411 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Effect_buff_kuangbao.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Materials.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_01.mat 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_01.mat.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_02.mat 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_02.mat.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Model.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Model/Effect_bossbuff_gongsu_01.FBX 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Model/Effect_bossbuff_gongsu_01.FBX.meta 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Texture.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_01.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_01.tga.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_02.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_02.tga.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_03.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_03.tga.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Effect_bossbuff_wudi.prefab 9728 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Effect_bossbuff_wudi.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Materials.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_01.mat 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_01.mat.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_02.mat 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_02.mat.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_03.mat 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_03.mat.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Texture.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_01.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_01.tga.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_02.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_02.tga.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_03.tga 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_03.tga.meta 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/WuDi/Effect_bossbuff_wudi.prefab
Diff too large
Effects/BossBuff/WuDi/Effect_bossbuff_wudi.prefab.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 772991bc846a875438dbb22b3b8f1f27
timeCreated: 1523255195
guid: a2650c9ce9340bd40be91eae5659bffd
timeCreated: 1534216492
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000
Effects/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_01.mat
@@ -7,7 +7,7 @@
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_bossbuff_wudi_01
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -75,4 +75,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 0.99264705, g: 0.51384085, b: 0.14597753, a: 0.278}
    - _TintColor: {r: 0.99264705, g: 0.51384085, b: 0.14597753, a: 0.316}
Effects/BossBuff/WuDi/Materials/fangsheguang_00192.mat
New file
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
  serializedVersion: 6
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: fangsheguang_00192
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 8666eac29847a03468e3dfe89ac180bb, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
    - _InvFade: 1
    m_Colors:
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Effects/BossBuff/WuDi/Materials/fangsheguang_00192.mat.meta
File was renamed from Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_01.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9edd0f5a330d6b34fbfad9a773caae11
timeCreated: 1523252730
guid: c9490fdb9fee10e4982b974b0ca074a2
timeCreated: 1534213898
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000
Effects/BossBuff/WuDi/Materials/glow_3232.mat
New file
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
  serializedVersion: 6
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: glow_3232
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: f467afc0e743a9c4eafedf7225842d6f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
    - _InvFade: 1
    m_Colors:
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
Effects/BossBuff/WuDi/Materials/glow_3232.mat.meta
copy from Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_01.mat.meta copy to Effects/BossBuff/WuDi/Materials/glow_3232.mat.meta
File was copied from Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_01.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9edd0f5a330d6b34fbfad9a773caae11
timeCreated: 1523252730
guid: 0348fb6952b321b42a62cb88da180577
timeCreated: 1534213198
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000
Effects/BossBuff/WuDi/Model/plane_004.FBX
Binary files differ
Effects/BossBuff/WuDi/Model/plane_004.FBX.meta
File was renamed from Effects/BossSkill/BossBuff/FangYuZhao/Model/Effect_bossbuff_fangyuzhao_02.FBX.meta
@@ -1,83 +1,83 @@
fileFormatVersion: 2
guid: 0cf71b33bea808b46972fead8549f328
timeCreated: 1479890121
licenseType: Pro
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
    2300000: //RootNode
    3300000: //RootNode
    4300000: Plane001
    9500000: //RootNode
  materials:
    importMaterials: 0
    materialName: 0
    materialSearch: 1
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 1
    motionNodeName:
    rigImportErrors:
    rigImportWarnings:
    animationImportErrors:
    animationImportWarnings:
    animationRetargetingWarnings:
    animationDoRetargetingWarnings: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0
  humanDescription:
    serializedVersion: 2
    human: []
    skeleton: []
    armTwist: 0.5
    foreArmTwist: 0.5
    upperLegTwist: 0.5
    legTwist: 0.5
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName:
    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 0
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 2
  humanoidOversampling: 1
  additionalBone: 0
  userData:
  assetBundleName:
  assetBundleVariant:
fileFormatVersion: 2
guid: 1451b25a488c63743afd06331bca9680
timeCreated: 1449640988
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
    2300000: //RootNode
    3300000: //RootNode
    4300000: Plane001
    9500000: //RootNode
  materials:
    importMaterials: 0
    materialName: 0
    materialSearch: 1
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 1
    motionNodeName:
    rigImportErrors:
    rigImportWarnings:
    animationImportErrors:
    animationImportWarnings:
    animationRetargetingWarnings:
    animationDoRetargetingWarnings: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0
  humanDescription:
    serializedVersion: 2
    human: []
    skeleton: []
    armTwist: 0.5
    foreArmTwist: 0.5
    upperLegTwist: 0.5
    legTwist: 0.5
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName:
    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 0
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 2
  humanoidOversampling: 1
  additionalBone: 0
  userData:
  assetBundleName:
  assetBundleVariant:
Effects/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_01.tga.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
guid: df80b3bef1c533b409f2be5cf5880096
timeCreated: 1526636207
guid: e545eebc99713014f9f08f8d3a00373a
timeCreated: 1534216968
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    enableMipMap: 1
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
@@ -24,7 +24,7 @@
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: -1
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
Effects/BossBuff/WuDi/Texture/fangsheguang_00192.png
Effects/BossBuff/WuDi/Texture/fangsheguang_00192.png.meta
File was renamed from Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_02.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
guid: 03a45b97fb2593e44a3118ab6b434deb
timeCreated: 1526635538
guid: 8666eac29847a03468e3dfe89ac180bb
timeCreated: 1534213888
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    enableMipMap: 1
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
Effects/BossBuff/WuDi/Texture/glow_003232.png
Effects/BossBuff/WuDi/Texture/glow_003232.png.meta
copy from Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_02.png.meta copy to Effects/BossBuff/WuDi/Texture/glow_003232.png.meta
File was copied from Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_02.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
guid: 03a45b97fb2593e44a3118ab6b434deb
timeCreated: 1526635538
guid: f467afc0e743a9c4eafedf7225842d6f
timeCreated: 1534213195
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    enableMipMap: 1
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
Effects/BossSkill/BossBuff.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.anim
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.anim.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.controller
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_bossbuff_fangyuzhao_01.controller.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.anim
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.anim.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.controller
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_beidong.controller.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.anim
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.anim.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.controller
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Animation/Effect_buff_didang.controller.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Effect_bossbuff_fangyuzhao.prefab
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Effect_bossbuff_fangyuzhao.prefab.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_beidong.prefab
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_beidong.prefab.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_didang.prefab
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Effect_buff_didang.prefab.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Materials.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_01.mat
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_02.mat
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_02.mat.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_03.mat
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Materials/Effect_bossbuff_fangyuzhao_03.mat.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Model.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Model/Effect_bossbuff_fangyuzhao_01.FBX
Binary files differ
Effects/BossSkill/BossBuff/FangYuZhao/Model/Effect_bossbuff_fangyuzhao_01.FBX.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Texture.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_01.png
Binary files differ
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_01.png.meta
File was deleted
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_02.png
Binary files differ
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_03.tga
Binary files differ
Effects/BossSkill/BossBuff/FangYuZhao/Texture/Effect_bossbuff_fangyuzhao_03.tga.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu.prefab
File was deleted
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu.prefab.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu_m.prefab
File was deleted
Effects/BossSkill/BossBuff/GongSu/Effect_bossbuff_gongsu_m.prefab.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Effect_buff_kuangbao.prefab
File was deleted
Effects/BossSkill/BossBuff/GongSu/Effect_buff_kuangbao.prefab.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Materials.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_01.mat
File was deleted
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_01.mat.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_02.mat
File was deleted
Effects/BossSkill/BossBuff/GongSu/Materials/Effect_bossbuff_gongsu_02.mat.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Model.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Model/Effect_bossbuff_gongsu_01.FBX
Binary files differ
Effects/BossSkill/BossBuff/GongSu/Model/Effect_bossbuff_gongsu_01.FBX.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Texture.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_01.tga
Binary files differ
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_01.tga.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_02.tga
Binary files differ
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_02.tga.meta
File was deleted
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_03.tga
Binary files differ
Effects/BossSkill/BossBuff/GongSu/Texture/Effect_bossbuff_gongsu_03.tga.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Effect_bossbuff_wudi.prefab
File was deleted
Effects/BossSkill/BossBuff/WuDi/Effect_bossbuff_wudi.prefab.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Materials.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_01.mat
File was deleted
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_01.mat.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_02.mat
File was deleted
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_02.mat.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_03.mat
File was deleted
Effects/BossSkill/BossBuff/WuDi/Materials/Effect_bossbuff_wudi_03.mat.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Texture.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_01.tga
Binary files differ
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_01.tga.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_02.tga
Binary files differ
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_02.tga.meta
File was deleted
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_03.tga
Binary files differ
Effects/BossSkill/BossBuff/WuDi/Texture/Effect_bossbuff_wudi_03.tga.meta
File was deleted