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

art_wzw

2018-08-16 2f716a76b9882275a96232b045ceb5a17a6673c9

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

 Effects/UI/E_fuyinta/Aniamtion/Effect_FuYinTa_Tai_01.anim

File was renamed from Effects/UI/E_fuyinta/Aniamtion/Effect_FuYinTa_Tai_02.anim
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_FuYinTa_Tai_02
  m_Name: Effect_FuYinTa_Tai_01
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0

 Effects/UI/E_fuyinta/Aniamtion/Effect_FuYinTa_Tai_01.anim.meta

 Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.anim

copy from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_road_02_ani_fx.anim
copy to Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.anim
File was copied from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_road_02_ani_fx.anim
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_road_02_ani_fx
  m_Name: Effect_JingJie_Tai_boss
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0
@@ -21,27 +21,27 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.5
        value: 0.5411765
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.6
        time: 1
        value: 0.5411765
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.5
        time: 2
        value: 0.5411765
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.r
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  - curve:
@@ -49,27 +49,27 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.3
        value: 0.13725491
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.2
        time: 1
        value: 0.13725491
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.3
        time: 2
        value: 0.13725491
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.g
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  - curve:
@@ -77,27 +77,27 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.2
        value: 0.8980392
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.2
        time: 1
        value: 0.8980392
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.2
        time: 2
        value: 0.8980392
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.b
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  - curve:
@@ -105,31 +105,31 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.6
        value: 0.7647059
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0.4117059
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        time: 1
        value: 0.353
        inSlope: -0.4117059
        outSlope: 0.4117059
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        time: 2
        value: 0.7647059
        inSlope: 0.4117059
        outSlope: -0.4117059
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.a
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  m_PPtrCurves: []
  m_SampleRate: 60
  m_SampleRate: 30
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
@@ -137,28 +137,28 @@
  m_ClipBindingConstant:
    genericBindings:
    - serializedVersion: 2
      path: 1614516369
      attribute: 1090582214
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 1614516369
      attribute: 1359017670
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 1614516369
      path: 1545816865
      attribute: 1895888582
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 1614516369
      path: 1545816865
      attribute: 1090582214
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 1545816865
      attribute: 1359017670
      script: {fileID: 0}
      typeID: 23
      customType: 22
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 1545816865
      attribute: 1627453126
      script: {fileID: 0}
      typeID: 23
@@ -170,7 +170,7 @@
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
    m_StopTime: 1.3333334
    m_StopTime: 2
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -191,27 +191,27 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.5
        value: 0.5411765
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.6
        time: 1
        value: 0.5411765
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.5
        time: 2
        value: 0.5411765
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.r
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  - curve:
@@ -219,27 +219,27 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.3
        value: 0.13725491
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.2
        time: 1
        value: 0.13725491
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.3
        time: 2
        value: 0.13725491
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.g
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  - curve:
@@ -247,27 +247,27 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.2
        value: 0.8980392
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.2
        time: 1
        value: 0.8980392
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.2
        time: 2
        value: 0.8980392
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.b
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  - curve:
@@ -275,27 +275,27 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.6
        value: 0.7647059
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        outSlope: -0.4117059
        tangentMode: 69
      - serializedVersion: 2
        time: 0.6666667
        value: 0.3
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        time: 1
        value: 0.353
        inSlope: -0.4117059
        outSlope: 0.4117059
        tangentMode: 69
      - serializedVersion: 2
        time: 1.3333334
        value: 0.6
        inSlope: 0
        outSlope: 0
        tangentMode: 136
        time: 2
        value: 0.7647059
        inSlope: 0.4117059
        outSlope: -0.4117059
        tangentMode: 69
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: material._TintColor.a
    path: Jyzd_road_02_fx
    path: yun
    classID: 23
    script: {fileID: 0}
  m_EulerEditorCurves: []

 Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.anim.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 90f3b30a343165743bdd459f0b7dc17f
timeCreated: 1527738560
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 7400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.controller

copy from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller
copy to Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.controller
File was copied from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller
@@ -5,13 +5,13 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_00_ani_fx
  m_Name: Effect_JingJie_Tai_boss
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
    m_StateMachine: {fileID: 1107667842112774548}
    m_StateMachine: {fileID: 1107082183762930004}
    m_Mask: {fileID: 0}
    m_Motions: []
    m_Behaviours: []
@@ -21,13 +21,13 @@
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1102 &1102968359950347114
--- !u!1102 &1102137435293687068
AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_00_ani_fx
  m_Name: Effect_JingJie_Tai_boss
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
@@ -39,12 +39,12 @@
  m_SpeedParameterActive: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_Motion: {fileID: 7400000, guid: 89e54d03915cdf4439ba08ce7e4e0ba0, type: 2}
  m_Motion: {fileID: 7400000, guid: 90f3b30a343165743bdd459f0b7dc17f, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
--- !u!1107 &1107667842112774548
--- !u!1107 &1107082183762930004
AnimatorStateMachine:
  serializedVersion: 5
  m_ObjectHideFlags: 1
@@ -53,7 +53,7 @@
  m_Name: Base Layer
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 1102968359950347114}
    m_State: {fileID: 1102137435293687068}
    m_Position: {x: 200, y: 0, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
@@ -64,4 +64,4 @@
  m_EntryPosition: {x: 50, y: 120, z: 0}
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 1102968359950347114}
  m_DefaultState: {fileID: 1102137435293687068}

 Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.controller.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 3bdca3e97873a14429901f43f36d09b6
timeCreated: 1534391821
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 9100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/E_fuyinta/Effect_JingJie_Tai_boss.prefab

Diff too large

 Effects/UI/E_fuyinta/Material/11.mat

copy from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_02.mat
copy to Effects/UI/E_fuyinta/Material/11.mat
File was copied from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_02.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_Bfhl_02
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: 11
  m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: f1cb312e2d3e4bc408702abadd3696b7, type: 3}
        m_Texture: {fileID: 2800000, guid: 0abfc5e3ad9182c49b81123ac1bf6ea5, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@@ -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.5, g: 0.5, b: 0.5, a: 0.5}
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.841}

 Effects/UI/E_fuyinta/Material/11.mat.meta

File was renamed from Maps/A_Map_TongYong/Material/14.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 6b6c7f3ec939d0e4b96b803d6622dd6e
timeCreated: 1496719646
guid: 48b3983735809f344a1a8a0d7f762a13
timeCreated: 1534392132
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_fuyinta/Material/12.mat

copy from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_02.mat
copy to Effects/UI/E_fuyinta/Material/12.mat
File was copied from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_02.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_Bfhl_02
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: 11
  m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: f1cb312e2d3e4bc408702abadd3696b7, type: 3}
        m_Texture: {fileID: 2800000, guid: 0abfc5e3ad9182c49b81123ac1bf6ea5, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@@ -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.5, g: 0.5, b: 0.5, a: 0.5}
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.841}

 Effects/UI/E_fuyinta/Material/12.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Effects/UI/E_fuyinta/Material/12.mat.meta
File was copied from Maps/A_Map_TongYong/Material/14.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 6b6c7f3ec939d0e4b96b803d6622dd6e
timeCreated: 1496719646
guid: 99114d5e6f8ff88428b0a74818cb8ca0
timeCreated: 1534392132
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_fuyinta/Texture/09.png

 Effects/UI/E_fuyinta/Texture/09.png.meta

copy from Maps/A_Map_TongYong/Texture/14.png.meta
copy to Effects/UI/E_fuyinta/Texture/09.png.meta
File was copied from Maps/A_Map_TongYong/Texture/14.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
guid: ea0b9eb23a130ce4088651312556c6bc
timeCreated: 1526635855
guid: 0abfc5e3ad9182c49b81123ac1bf6ea5
timeCreated: 1534392098
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    enableMipMap: 1
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
@@ -42,7 +42,7 @@
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
  alphaUsage: 1
  alphaIsTransparency: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
@@ -51,25 +51,9 @@
  textureFormatSet: 0
  platformSettings:
  - buildTarget: DefaultTexturePlatform
    maxTextureSize: 64
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 2
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Standalone
    maxTextureSize: 64
    textureFormat: -1
    textureCompression: 2
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Android
    maxTextureSize: 64
    textureFormat: -1
    textureCompression: 2
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0

 Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab

File was deleted

 Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta

File was deleted

 Maps/A_Map_TongYong/Material/14.mat

File was deleted

 Maps/A_Map_TongYong/Texture/14.png

Binary files differ

 Maps/Model/Map005_Bfhl/Effect/Material/02.mat

File was renamed from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_02.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_Bfhl_02
  m_Name: 02
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map005_Bfhl/Effect/Material/02.mat.meta

 Maps/Model/Map005_Bfhl/Effect/Material/03.mat

File was renamed from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_03.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_Bfhl_03
  m_Name: 03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map005_Bfhl/Effect/Material/03.mat.meta

 Maps/Model/Map005_Bfhl/Effect/Material/04.mat

File was renamed from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_04.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_Bfhl_04
  m_Name: 04
  m_Shader: {fileID: 4800000, guid: 2cb8b07796bbb29469fdeb295ba9a3d6, type: 3}
  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
  m_LightmapFlags: 5

 Maps/Model/Map005_Bfhl/Effect/Material/04.mat.meta

 Maps/Model/Map005_Bfhl/Effect/Material/05.mat

File was renamed from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_05.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_Bfhl_05
  m_Name: 05
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map005_Bfhl/Effect/Material/05.mat.meta

 Maps/Model/Map005_Bfhl/Effect/Model/01.FBX

Binary files differ

 Maps/Model/Map005_Bfhl/Effect/Model/01.FBX.meta

 Maps/Model/Map005_Bfhl/Effect/Model/02.FBX

Binary files differ

 Maps/Model/Map005_Bfhl/Effect/Model/02.FBX.meta

 Maps/Model/Map005_Bfhl/Effect/Model/03.FBX

Binary files differ

 Maps/Model/Map005_Bfhl/Effect/Model/03.FBX.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/01.anim

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_02_ani_fx.anim
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_02_ani_fx
  m_Name: 01
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0

 Maps/Model/Map007_Jyzk/Effect/Animation/01.anim.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/01.controller

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_02_ani_fx.controller
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_02_ani_fx
  m_Name: 01
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:

 Maps/Model/Map007_Jyzk/Effect/Animation/01.controller.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/02.anim

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.anim
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_00_ani_fx
  m_Name: 02
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0

 Maps/Model/Map007_Jyzk/Effect/Animation/02.anim.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/02.controller

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_00_ani_fx
  m_Name: 02
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:

 Maps/Model/Map007_Jyzk/Effect/Animation/02.controller.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/03.anim

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_road_02_ani_fx.anim
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_road_02_ani_fx
  m_Name: 03
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0

 Maps/Model/Map007_Jyzk/Effect/Animation/03.anim.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/03.controller

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_road_02.controller
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_road_02
  m_Name: 03
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:

 Maps/Model/Map007_Jyzk/Effect/Animation/03.controller.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/04.controller

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Effect_00.controller
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_00
  m_Name: 04
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:

 Maps/Model/Map007_Jyzk/Effect/Animation/04.controller.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/05.anim

File was renamed from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_KaiChang.anim
@@ -5,7 +5,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_KaiChang
  m_Name: 05
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0

 Maps/Model/Map007_Jyzk/Effect/Animation/05.anim.meta

 Maps/Model/Map007_Jyzk/Effect/Animation/Effect_Jyzk_yxc_01.anim

New file
Diff too large

 Maps/Model/Map007_Jyzk/Effect/Animation/Effect_Jyzk_yxc_01.anim.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 00ec24d81283e4744b7ec5b317750eba
timeCreated: 1534388360
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 7400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Maps/Model/Map007_Jyzk/Effect/Animation/Effect_Jyzk_yxc_01.controller

copy from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller
copy to Maps/Model/Map007_Jyzk/Effect/Animation/Effect_Jyzk_yxc_01.controller
File was copied from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller
@@ -5,13 +5,13 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_00_ani_fx
  m_Name: Effect_Jyzk_yxc_01
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
    m_StateMachine: {fileID: 1107667842112774548}
    m_StateMachine: {fileID: 1107435070063458330}
    m_Mask: {fileID: 0}
    m_Motions: []
    m_Behaviours: []
@@ -21,13 +21,13 @@
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1102 &1102968359950347114
--- !u!1102 &1102866325299565040
AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Jyzd_magma_00_ani_fx
  m_Name: Effect_Jyzk_yxc_01
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
@@ -39,12 +39,12 @@
  m_SpeedParameterActive: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_Motion: {fileID: 7400000, guid: 89e54d03915cdf4439ba08ce7e4e0ba0, type: 2}
  m_Motion: {fileID: 7400000, guid: 00ec24d81283e4744b7ec5b317750eba, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
--- !u!1107 &1107667842112774548
--- !u!1107 &1107435070063458330
AnimatorStateMachine:
  serializedVersion: 5
  m_ObjectHideFlags: 1
@@ -53,7 +53,7 @@
  m_Name: Base Layer
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 1102968359950347114}
    m_State: {fileID: 1102866325299565040}
    m_Position: {x: 200, y: 0, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
@@ -64,4 +64,4 @@
  m_EntryPosition: {x: 50, y: 120, z: 0}
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 1102968359950347114}
  m_DefaultState: {fileID: 1102866325299565040}

 Maps/Model/Map007_Jyzk/Effect/Animation/Effect_Jyzk_yxc_01.controller.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: d92482c27a5a22a47a54b80f567b01a1
timeCreated: 1534388360
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 9100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Maps/Model/Map007_Jyzk/Effect/Effect.prefab

Diff too large

 Maps/Model/Map007_Jyzk/Effect/Effect.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 600f910f051f4864cbbf992dd14d46e9
timeCreated: 1532746475
timeCreated: 1534389863
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_15.mat

File was renamed from Maps/Model/Map007_Jyzk/Effect/Materials/02.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: 02
  m_Name: Effect_Juzk_15
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
  m_LightmapFlags: 4

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_15.mat.meta

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_16.mat

File was renamed from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: 03
  m_Name: Effect_Juzk_16
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

 Maps/Model/Map007_Jyzk/Effect/Materials/Effect_Juzk_16.mat.meta

 Maps/Model/Map108_Xjmj/Effect/Effect.prefab

Diff too large

 Maps/Model/Map108_Xjmj/Effect/Effect.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: c980aa7b18a3cc146978e54f309d96fc
timeCreated: 1505389282
timeCreated: 1534390799
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Maps/Model/Map108_Xjmj/Effect/Material/Xjmj_water_01.mat

@@ -47,7 +47,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 2def4301225145443983c3c5d0f4cf2a, type: 3}
        m_Texture: {fileID: 2800000, guid: b9c4256a5795c0643994e5b56e94e916, type: 3}
        m_Scale: {x: 16, y: 8}
        m_Offset: {x: 0, y: 0}
    - _MaskTex:

 Maps/Model/Map108_Xjmj/Effect/Texture/02.png

 Maps/Model/Map108_Xjmj/Effect/Texture/02.png.meta

File was renamed from Maps/A_Map_TongYong/Texture/14.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ea0b9eb23a130ce4088651312556c6bc
timeCreated: 1526635855
guid: b9c4256a5795c0643994e5b56e94e916
timeCreated: 1526635828
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
@@ -42,7 +42,7 @@
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
  alphaUsage: 1
  alphaIsTransparency: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
@@ -51,25 +51,9 @@
  textureFormatSet: 0
  platformSettings:
  - buildTarget: DefaultTexturePlatform
    maxTextureSize: 64
    maxTextureSize: 2048
    textureFormat: -1
    textureCompression: 2
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Standalone
    maxTextureSize: 64
    textureFormat: -1
    textureCompression: 2
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
  - buildTarget: Android
    maxTextureSize: 64
    textureFormat: -1
    textureCompression: 2
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0

 Maps/Model/Map209_Zmsl_1/Effect/Effect.prefab

Diff too large

 Maps/Model/Map209_Zmsl_1/Effect/Effect.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 1cc6ece2c69d1b642adf1e358eec937b
timeCreated: 1515415445
timeCreated: 1534391292
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Maps/Scenes/Map108_Xjmj.unity

@@ -1499,53 +1499,11 @@
Transform:
  m_PrefabParentObject: {fileID: 400000, guid: 7da0847815fac0b459b8af29ba8819f4, type: 3}
  m_PrefabInternal: {fileID: 149356645}
--- !u!1001 &152183070
Prefab:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 1267600800}
    m_Modifications:
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalPosition.x
      value: 0.1
      objectReference: {fileID: 0}
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalPosition.z
      value: 0.03
      objectReference: {fileID: 0}
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.x
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.y
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_RootOrder
      value: 5
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
  m_IsPrefabParent: 0
--- !u!4 &152183071 stripped
Transform:
  m_PrefabParentObject: {fileID: 4196504451388086, guid: c980aa7b18a3cc146978e54f309d96fc,
  m_PrefabParentObject: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc,
    type: 2}
  m_PrefabInternal: {fileID: 152183070}
  m_PrefabInternal: {fileID: 1904776565}
--- !u!1001 &155675728
Prefab:
  m_ObjectHideFlags: 0
@@ -14496,6 +14454,48 @@
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: b8ef7bfd9f4eeff4c88c0edd56b55832, type: 2}
  m_IsPrefabParent: 0
--- !u!1001 &1904776565
Prefab:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 1267600800}
    m_Modifications:
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalPosition.x
      value: 0.1
      objectReference: {fileID: 0}
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalPosition.z
      value: 0.03
      objectReference: {fileID: 0}
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.x
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.y
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4774053221379784, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
      propertyPath: m_RootOrder
      value: 5
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: c980aa7b18a3cc146978e54f309d96fc, type: 2}
  m_IsPrefabParent: 0
--- !u!4 &1909344912 stripped
Transform:
  m_PrefabParentObject: {fileID: 4795225268368444, guid: c86f53d2c1715b8448fc40a036bd6e26,

 Role/N004/N004@Idle2.FBX

Binary files differ

 Role/N018/N018@Idle2.FBX

Binary files differ