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

atr_ljf

2018-08-16 292ac52714165c3cc1a76fbf24a2b95ad9578d1b

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/Aniamtion/Effect_JingJie_Tai_zhujue_02.anim

@@ -107,7 +107,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.7647059
        value: 0.4479983
        inSlope: 0
        outSlope: 0
        tangentMode: 69
@@ -171,7 +171,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.9529412
        value: 0.4673226
        inSlope: 0
        outSlope: 0
        tangentMode: 69
@@ -235,7 +235,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.9529412
        value: 0.3899033
        inSlope: 0
        outSlope: 0
        tangentMode: 69
@@ -299,7 +299,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.303
        value: 0.08482984
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -519,7 +519,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.7647059
        value: 0.4479983
        inSlope: 0
        outSlope: 0
        tangentMode: 69
@@ -583,7 +583,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.9529412
        value: 0.4673226
        inSlope: 0
        outSlope: 0
        tangentMode: 69
@@ -647,7 +647,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.9529412
        value: 0.3899033
        inSlope: 0
        outSlope: 0
        tangentMode: 69
@@ -843,7 +843,7 @@
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 0.303
        value: 0.08482984
        inSlope: 0
        outSlope: 0
        tangentMode: 136

 Effects/UI/E_fuyinta/Effect_JingJie_Tai_boss.prefab

Diff too large

 Effects/UI/E_fuyinta/Effect_JingJie_Tai_zhujue.prefab

@@ -146,7 +146,7 @@
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1296402305698850}
  m_LocalRotation: {x: -0.61808103, y: 0.4525483, z: 0.37973312, w: 0.5186316}
  m_LocalRotation: {x: 0.42611045, y: 0.63659567, z: 0.5341672, w: -0.3575491}
  m_LocalPosition: {x: -0.000015258789, y: -122.99999, z: -179}
  m_LocalScale: {x: 121.99438, y: 121.99446, z: 344.02744}
  m_Children: []
@@ -159,7 +159,7 @@
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1863637478711244}
  m_LocalRotation: {x: -0.61808103, y: -0.4525483, z: -0.37973312, w: 0.5186316}
  m_LocalRotation: {x: 0.42611045, y: -0.63659567, z: -0.5341672, w: -0.3575491}
  m_LocalPosition: {x: 0, y: -123, z: -179}
  m_LocalScale: {x: 179.68376, y: 179.68376, z: 208.0944}
  m_Children: []
@@ -403,7 +403,7 @@
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 152, y: -97}
  m_AnchoredPosition: {x: -13.994549, y: -96.96223}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224713201811074570

 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

 Effects/UI/E_jingjie/Aniamtion/Effect_jingjie_guochangyun_01.anim

Diff too large

 Effects/UI/E_jingjie/Effect_jingjie_guochangyun.prefab

Diff too large

 Effects/UI/E_jingjie/Material/Effect_jingjie_08.mat

copy from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_08.mat
File was copied from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: 03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: Effect_jingjie_08
  m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,10 +39,14 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: e1edb8012f904c645a9af6dda24442c5, type: 3}
        m_Texture: {fileID: 2800000, guid: 69b8e0a113861a745af61a614a1fecdc, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _NoiseTex:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
@@ -67,6 +71,8 @@
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _RollTimeX: 0
    - _RollTimeY: 1.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
@@ -75,4 +81,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 0.06341912, g: 0.19506824, b: 0.50735295, a: 0.266}
    - _TintColor: {r: 1, g: 0.4851926, b: 0.20588237, a: 0.697}

 Effects/UI/E_jingjie/Material/Effect_jingjie_08.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_08.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: d7bc4e8da4d0b8546815ae472dc9c0d6
timeCreated: 1525313563
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_jingjie/Material/Effect_jingjie_09.mat

copy from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_09.mat
File was copied from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: 03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: Effect_jingjie_09
  m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,10 +39,14 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: e1edb8012f904c645a9af6dda24442c5, type: 3}
        m_Texture: {fileID: 2800000, guid: 0b229188a620f1d40b01db45714ebd75, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _NoiseTex:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
@@ -67,6 +71,8 @@
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _RollTimeX: 0
    - _RollTimeY: 1.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
@@ -75,4 +81,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 0.06341912, g: 0.19506824, b: 0.50735295, a: 0.266}
    - _TintColor: {r: 0.8897059, g: 0.46136567, b: 0.22896844, a: 0.697}

 Effects/UI/E_jingjie/Material/Effect_jingjie_09.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_09.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: c31a0a7f6a21f9e4fa6a387bde0d5397
timeCreated: 1525313563
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_jingjie/Material/Effect_jingjie_10.mat

copy from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_10.mat
File was copied from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: 03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: Effect_jingjie_10
  m_Shader: {fileID: 4800000, guid: 779454293b3b2364cb1c5370833ad5e8, 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: e1edb8012f904c645a9af6dda24442c5, type: 3}
        m_Texture: {fileID: 2800000, guid: a4e148d87a6cd8340b3388707f192fe9, 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.06341912, g: 0.19506824, b: 0.50735295, a: 0.266}
    - _TintColor: {r: 0.45588237, g: 0.45588237, b: 0.45588237, a: 0.572}

 Effects/UI/E_jingjie/Material/Effect_jingjie_10.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_10.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: 5313db679d4b8194bbad1b6f087340c7
timeCreated: 1522754797
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_jingjie/Material/Effect_jingjie_11.mat

copy from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_11.mat
File was copied from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: 03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: Effect_jingjie_11
  m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,10 +39,14 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: e1edb8012f904c645a9af6dda24442c5, type: 3}
        m_Texture: {fileID: 2800000, guid: bc104f1fde70f3a4db77cb6ce078e14e, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _NoiseTex:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
@@ -67,6 +71,8 @@
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _RollTimeX: 0
    - _RollTimeY: 1.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
@@ -75,4 +81,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 0.06341912, g: 0.19506824, b: 0.50735295, a: 0.266}
    - _TintColor: {r: 0.8897059, g: 0.46136567, b: 0.22896844, a: 0.697}

 Effects/UI/E_jingjie/Material/Effect_jingjie_11.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_11.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: 5626f3d40d40d5846af482bb6672d114
timeCreated: 1525313563
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_jingjie/Material/Effect_jingjie_12.mat

copy from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_02.mat
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_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: Effect_jingjie_12
  m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
@@ -39,10 +39,14 @@
        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: 0b43398247a58f449910592297cddf4b, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0.15, y: 0.35}
    - _MetallicGlossMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
    - _NoiseTex:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
@@ -67,6 +71,8 @@
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _RollTimeX: 0
    - _RollTimeY: 1.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
@@ -75,4 +81,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.8897059, g: 0.46136567, b: 0.22896844, a: 0.697}

 Effects/UI/E_jingjie/Material/Effect_jingjie_12.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_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: 78e0c0402840b9542af5d0b272578365
timeCreated: 1525313563
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_jingjie/Material/Effect_jingjie_13.mat

copy from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_13.mat
File was copied from Maps/Model/Map007_Jyzk/Effect/Materials/03.mat
@@ -6,8 +6,8 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: 03
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_Name: Effect_jingjie_13
  m_Shader: {fileID: 4800000, guid: 779454293b3b2364cb1c5370833ad5e8, 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: e1edb8012f904c645a9af6dda24442c5, type: 3}
        m_Texture: {fileID: 2800000, guid: a4e148d87a6cd8340b3388707f192fe9, 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.06341912, g: 0.19506824, b: 0.50735295, a: 0.266}
    - _TintColor: {r: 0.42647058, g: 0.42647058, b: 0.42647058, a: 0.422}

 Effects/UI/E_jingjie/Material/Effect_jingjie_13.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Effects/UI/E_jingjie/Material/Effect_jingjie_13.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: 8666286135a7f7948bd8d80839d0bbea
timeCreated: 1522754797
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Effects/UI/E_jingjie/Model/Effect_jingjie_04.FBX

Binary files differ

 Effects/UI/E_jingjie/Model/Effect_jingjie_04.FBX.meta

copy from Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX.meta
copy to Effects/UI/E_jingjie/Model/Effect_jingjie_04.FBX.meta
File was copied from Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: e31f47e981c426645b96c8c30854e764
timeCreated: 1518332929
licenseType: Free
guid: e7dcb28a8504feb429126ec5c85016a0
timeCreated: 1484209408
licenseType: Pro
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
@@ -9,7 +9,9 @@
    400000: //RootNode
    2300000: //RootNode
    3300000: //RootNode
    4300000: Xmhj_shrub_07
    4300000: moxing_yxc_09
    7400000: Take 001
    9500000: //RootNode
  materials:
    importMaterials: 0
    materialName: 0
@@ -37,15 +39,15 @@
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +55,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0
@@ -72,9 +74,9 @@
    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
    skeletonHasParents: 0
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 0
  animationType: 2
  humanoidOversampling: 1
  additionalBone: 0
  userData: 

 Effects/UI/E_jingjie/Texture/05.tga

Binary files differ

 Effects/UI/E_jingjie/Texture/05.tga.meta

copy from Maps/A_Map_TongYong/Texture/14.png.meta
copy to Effects/UI/E_jingjie/Texture/05.tga.meta
File was copied from Maps/A_Map_TongYong/Texture/14.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
guid: ea0b9eb23a130ce4088651312556c6bc
timeCreated: 1526635855
licenseType: Pro
guid: 69b8e0a113861a745af61a614a1fecdc
timeCreated: 1469589282
licenseType: Free
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
@@ -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

 Effects/UI/E_jingjie/Texture/06.png

 Effects/UI/E_jingjie/Texture/06.png.meta

copy from Maps/A_Map_TongYong/Texture/14.png.meta
copy to Effects/UI/E_jingjie/Texture/06.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: 0b229188a620f1d40b01db45714ebd75
timeCreated: 1530611173
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

 Effects/UI/E_jingjie/Texture/07.tga

Binary files differ

 Effects/UI/E_jingjie/Texture/07.tga.meta

New file
@@ -0,0 +1,58 @@
fileFormatVersion: 2
guid: 0b43398247a58f449910592297cddf4b
timeCreated: 1489494008
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 2
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
    linearTexture: 0
    correctGamma: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  grayScaleToAlpha: 0
  generateCubemap: 0
  cubemapConvolution: 0
  cubemapConvolutionSteps: 7
  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
  textureFormat: -1
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
    aniso: -1
    mipBias: -1
    wrapMode: 1
  nPOTScale: 1
  lightmap: 0
  rGBM: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: -1
  buildTargetSettings: []
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
  spritePackingTag: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/E_jingjie/Texture/08.tga

Binary files differ

 Effects/UI/E_jingjie/Texture/08.tga.meta

copy from Maps/A_Map_TongYong/Texture/14.png.meta
copy to Effects/UI/E_jingjie/Texture/08.tga.meta
File was copied from Maps/A_Map_TongYong/Texture/14.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
guid: ea0b9eb23a130ce4088651312556c6bc
timeCreated: 1526635855
guid: f7420ba97cef0e6408a2b6e4c2fbe953
timeCreated: 1484290164
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
@@ -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

 Effects/UI/E_jingjie/Texture/Effect_jingjie_04.png

 Effects/UI/E_jingjie/Texture/Effect_jingjie_04.png.meta

copy from Maps/A_Map_TongYong/Texture/14.png.meta
copy to Effects/UI/E_jingjie/Texture/Effect_jingjie_04.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: bc104f1fde70f3a4db77cb6ce078e14e
timeCreated: 1534321012
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/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/Map007_Jyzk/Mesh/Jyzd_tile_00.FBX

Binary files differ

 Maps/Model/Map007_Jyzk/Mesh/Jyzd_tile_01.FBX

Binary files differ

 Maps/Model/Map007_Jyzk/Mesh/Jyzd_tile_02.FBX

Binary files differ

 Maps/Model/Map007_Jyzk/Mesh/Jyzd_tile_03.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_bridge_00.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_platform_04.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_platform_05.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_00.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_01.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_02.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_03.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_03.FBX.meta

@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_04.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_04.FBX.meta

File was renamed from Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e31f47e981c426645b96c8c30854e764
timeCreated: 1518332929
guid: dadccbe0a28adb644b28b6fe17f57c3f
timeCreated: 1534304912
licenseType: Free
ModelImporter:
  serializedVersion: 19
@@ -9,7 +9,7 @@
    400000: //RootNode
    2300000: //RootNode
    3300000: //RootNode
    4300000: Xmhj_shrub_07
    4300000: Xmhj_shrub_04
  materials:
    importMaterials: 0
    materialName: 0
@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_05.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_05.FBX.meta

@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 1
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_06.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_06.FBX.meta

copy from Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX.meta
copy to Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_06.FBX.meta
File was copied from Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e31f47e981c426645b96c8c30854e764
timeCreated: 1518332929
guid: ed754e18696097b4bb306134b39d675e
timeCreated: 1534322006
licenseType: Free
ModelImporter:
  serializedVersion: 19
@@ -9,7 +9,7 @@
    400000: //RootNode
    2300000: //RootNode
    3300000: //RootNode
    4300000: Xmhj_shrub_07
    4300000: Xmhj_shrub_06
  materials:
    importMaterials: 0
    materialName: 0
@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_00.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_00.FBX.meta

@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_01.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_01.FBX.meta

@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_02.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_02.FBX.meta

@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_03.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_03.FBX.meta

copy from Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX.meta
copy to Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_03.FBX.meta
File was copied from Maps/Model/Map008_Xmhj/Mesh/Xmhj_shrub_07.FBX.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e31f47e981c426645b96c8c30854e764
timeCreated: 1518332929
guid: 91481705ec2442d4abb984a290414e35
timeCreated: 1534318765
licenseType: Free
ModelImporter:
  serializedVersion: 19
@@ -9,7 +9,7 @@
    400000: //RootNode
    2300000: //RootNode
    3300000: //RootNode
    4300000: Xmhj_shrub_07
    4300000: Xmhj_tree_03
  materials:
    importMaterials: 0
    materialName: 0
@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_04.FBX

Binary files differ

 Maps/Model/Map008_Xmhj/Mesh/Xmhj_tree_04.FBX.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 099fcf9f60f8b3349b2b762747751950
timeCreated: 1506067982
timeCreated: 1534319507
licenseType: Free
ModelImporter:
  serializedVersion: 19
@@ -33,19 +33,19 @@
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 1
    meshCompression: 3
    addColliders: 0
    importBlendShapes: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    optimizeMeshForGPU: 0
    keepQuads: 0
    weldVertices: 1
    weldVertices: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
@@ -53,7 +53,7 @@
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    normalImportMode: 2
    tangentImportMode: 2
  importAnimation: 0
  copyAvatar: 0

 Maps/Model/Map008_Xmhj/textures/Xmhj_tree_00.tga

Binary files differ

 Maps/Model/Map101_Dtzz/Effect/Effect.prefab

Diff too large

 Maps/Model/Map101_Dtzz/Effect/Effect.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 57ce19873a3a01043ba95745561e3f51
timeCreated: 1502692668
timeCreated: 1534327330
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Maps/Model/Map101_Dtzz/Effect/Material/WuTi_0007.mat

copy from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_03.mat
copy to Maps/Model/Map101_Dtzz/Effect/Material/WuTi_0007.mat
File was copied from Maps/Model/Map005_Bfhl/Effect/Material/Effect_Bfhl_03.mat
@@ -6,9 +6,9 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Effect_Bfhl_03
  m_Name: WuTi_0007
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_ShaderKeywords: _FUCK_PANNER_ON
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@@ -18,6 +18,10 @@
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
    - _BaseTex:
        m_Texture: {fileID: 2800000, guid: 756eb30efb351ad40addd726a79096e3, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@@ -39,7 +43,11 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 0f449b57248feeb47ab56f52f717cf4b, type: 3}
        m_Texture: {fileID: 2800000, guid: 95f35a022c9c2104990a7b1176480810, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MaskT:
        m_Texture: {fileID: 2800000, guid: 756eb30efb351ad40addd726a79096e3, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@@ -56,9 +64,13 @@
        m_Offset: {x: 0, y: 0}
    m_Floats:
    - _BumpScale: 1
    - _Color1_ChannelG_Bri: 1
    - _Color1_ChannelR_Bri: 1
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _Fresnel_slider: 2
    - _Fuck_panner: 1
    - _GlossMapScale: 1
    - _Glossiness: 0.5
    - _GlossyReflections: 1
@@ -66,13 +78,24 @@
    - _Metallic: 0
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Panner_Bri: 2
    - _Panner_Tile_X: 1
    - _Panner_Tile_Y: 1
    - _Parallax: 0.02
    - _Shine_Fre_G: 2
    - _Shine_Fre_R: 2
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _T3_Panner_X: 0.1
    - _T3_Panner_Y: 0.1
    - _UVSec: 0
    - _ZWrite: 1
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _Color1_ChannelG: {r: 0, g: 0.7103448, b: 1, a: 1}
    - _Color1_ChannelR: {r: 1, g: 0.0147059, b: 0.0147059, a: 0.6588235}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Fresnel_color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
    - _Panner_Color: {r: 1, g: 1, b: 1, a: 1}
    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

 Maps/Model/Map101_Dtzz/Effect/Material/WuTi_0007.mat.meta

copy from Maps/A_Map_TongYong/Material/14.mat.meta
copy to Maps/Model/Map101_Dtzz/Effect/Material/WuTi_0007.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: 99396200db14096469c49f822138815f
timeCreated: 1502762819
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000

 Maps/Model/Map101_Dtzz/Effect/Texture/01.png

 Maps/Model/Map101_Dtzz/Effect/Texture/01.png.meta

copy from Maps/A_Map_TongYong/Texture/14.png.meta
copy to Maps/Model/Map101_Dtzz/Effect/Texture/01.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: 95f35a022c9c2104990a7b1176480810
timeCreated: 1534327256
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/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/Prefab/Map008_Xmhj/Xmhj_shrub_03.prefab

@@ -26,7 +26,7 @@
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 4294967287
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4527813445313978
Transform:
@@ -48,13 +48,13 @@
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1465593240125504}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 66bc91b948739ff418ed2226d1696016, type: 2}
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Maps/Prefab/Map008_Xmhj/Xmhj_shrub_04.prefab

New file
@@ -0,0 +1,82 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
  m_ObjectHideFlags: 1
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications: []
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 1548220176847100}
  m_IsPrefabParent: 1
--- !u!1 &1548220176847100
GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 5
  m_Component:
  - component: {fileID: 4369298724349448}
  - component: {fileID: 33312616609302566}
  - component: {fileID: 23527543297208310}
  m_Layer: 0
  m_Name: Xmhj_shrub_04
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4369298724349448
Transform:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1548220176847100}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23527543297208310
MeshRenderer:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1548220176847100}
  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_StaticBatchRoot: {fileID: 0}
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &33312616609302566
MeshFilter:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1548220176847100}
  m_Mesh: {fileID: 4300000, guid: dadccbe0a28adb644b28b6fe17f57c3f, type: 3}

 Maps/Prefab/Map008_Xmhj/Xmhj_shrub_04.prefab.meta

copy from Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta
copy to Maps/Prefab/Map008_Xmhj/Xmhj_shrub_04.prefab.meta
File was copied from Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 98f2de4b09a0e7243aad1a28d2f04233
timeCreated: 1534300875
licenseType: Pro
guid: bcfe809028da5cc46bdd5d7a2294bfbf
timeCreated: 1534313211
licenseType: Free
NativeFormatImporter:
  mainObjectFileID: 100100000
  userData: 

 Maps/Prefab/Map008_Xmhj/Xmhj_shrub_05.prefab

@@ -26,7 +26,7 @@
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 4294967287
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4221111079648098
Transform:
@@ -48,13 +48,13 @@
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1373521417216128}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 66bc91b948739ff418ed2226d1696016, type: 2}
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Maps/Prefab/Map008_Xmhj/Xmhj_shrub_06.prefab

New file
@@ -0,0 +1,82 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
  m_ObjectHideFlags: 1
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications: []
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 1692500822294954}
  m_IsPrefabParent: 1
--- !u!1 &1692500822294954
GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 5
  m_Component:
  - component: {fileID: 4604159627477216}
  - component: {fileID: 33179965992126554}
  - component: {fileID: 23883604260194298}
  m_Layer: 0
  m_Name: Xmhj_shrub_06
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4604159627477216
Transform:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1692500822294954}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23883604260194298
MeshRenderer:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1692500822294954}
  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_StaticBatchRoot: {fileID: 0}
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &33179965992126554
MeshFilter:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1692500822294954}
  m_Mesh: {fileID: 4300000, guid: ed754e18696097b4bb306134b39d675e, type: 3}

 Maps/Prefab/Map008_Xmhj/Xmhj_shrub_06.prefab.meta

File was renamed from Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 98f2de4b09a0e7243aad1a28d2f04233
timeCreated: 1534300875
licenseType: Pro
guid: 2ab9ad1d48e70744fa38a1b726b7625e
timeCreated: 1534322050
licenseType: Free
NativeFormatImporter:
  mainObjectFileID: 100100000
  userData: 

 Maps/Prefab/Map008_Xmhj/Xmhj_tree_00.prefab

@@ -26,7 +26,7 @@
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 4294967287
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4344468082435466
Transform:
@@ -48,13 +48,13 @@
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1251740480534156}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 66bc91b948739ff418ed2226d1696016, type: 2}
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Maps/Prefab/Map008_Xmhj/Xmhj_tree_01.prefab

@@ -26,7 +26,7 @@
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 4294967287
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4478970991295546
Transform:
@@ -48,13 +48,13 @@
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1382992377234236}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 66bc91b948739ff418ed2226d1696016, type: 2}
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Maps/Prefab/Map008_Xmhj/Xmhj_tree_02.prefab

@@ -26,7 +26,7 @@
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 4294967287
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4318212920991620
Transform:
@@ -48,13 +48,13 @@
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1286838741696098}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: 66bc91b948739ff418ed2226d1696016, type: 2}
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0

 Maps/Prefab/Map008_Xmhj/Xmhj_tree_03.prefab

New file
@@ -0,0 +1,82 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
  m_ObjectHideFlags: 1
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications: []
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 1007333504498042}
  m_IsPrefabParent: 1
--- !u!1 &1007333504498042
GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 5
  m_Component:
  - component: {fileID: 4176086785843992}
  - component: {fileID: 33855173420858250}
  - component: {fileID: 23590368824805838}
  m_Layer: 0
  m_Name: Xmhj_tree_03
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4176086785843992
Transform:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1007333504498042}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23590368824805838
MeshRenderer:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1007333504498042}
  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_StaticBatchRoot: {fileID: 0}
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &33855173420858250
MeshFilter:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1007333504498042}
  m_Mesh: {fileID: 4300000, guid: 91481705ec2442d4abb984a290414e35, type: 3}

 Maps/Prefab/Map008_Xmhj/Xmhj_tree_03.prefab.meta

copy from Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta
copy to Maps/Prefab/Map008_Xmhj/Xmhj_tree_03.prefab.meta
File was copied from Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 98f2de4b09a0e7243aad1a28d2f04233
timeCreated: 1534300875
licenseType: Pro
guid: f84c9ee679ba82c48b1a7e5ac3e9150c
timeCreated: 1534318808
licenseType: Free
NativeFormatImporter:
  mainObjectFileID: 100100000
  userData: 

 Maps/Prefab/Map008_Xmhj/Xmhj_tree_04.prefab

New file
@@ -0,0 +1,82 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
  m_ObjectHideFlags: 1
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications: []
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 1256863538973336}
  m_IsPrefabParent: 1
--- !u!1 &1256863538973336
GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 5
  m_Component:
  - component: {fileID: 4657038371440480}
  - component: {fileID: 33048890221319020}
  - component: {fileID: 23928515199877698}
  m_Layer: 0
  m_Name: Xmhj_tree_04
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &4657038371440480
Transform:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1256863538973336}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23928515199877698
MeshRenderer:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1256863538973336}
  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 0
  m_Materials:
  - {fileID: 2100000, guid: e32fa2321a66c684f804337f9f57f142, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_StaticBatchRoot: {fileID: 0}
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &33048890221319020
MeshFilter:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1256863538973336}
  m_Mesh: {fileID: 4300000, guid: 099fcf9f60f8b3349b2b762747751950, type: 3}

 Maps/Prefab/Map008_Xmhj/Xmhj_tree_04.prefab.meta

copy from Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta
copy to Maps/Prefab/Map008_Xmhj/Xmhj_tree_04.prefab.meta
File was copied from Maps/A_Map_TongYong/Effect_Map_SuiXie.prefab.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 98f2de4b09a0e7243aad1a28d2f04233
timeCreated: 1534300875
licenseType: Pro
guid: 724cf3e762494384885be574c83ebec9
timeCreated: 1534319554
licenseType: Free
NativeFormatImporter:
  mainObjectFileID: 100100000
  userData: 

 Maps/Scenes/Map008_Xmhj.unity

Diff too large

 Maps/Scenes/Map101_Dtzz.unity

@@ -78,15 +78,17 @@
    m_PVRDirectSampleCount: 32
    m_PVRSampleCount: 500
    m_PVRBounces: 2
    m_PVRFiltering: 0
    m_PVRFilterTypeDirect: 0
    m_PVRFilterTypeIndirect: 0
    m_PVRFilterTypeAO: 0
    m_PVRFilteringMode: 1
    m_PVRCulling: 1
    m_PVRFilteringGaussRadiusDirect: 1
    m_PVRFilteringGaussRadiusIndirect: 5
    m_PVRFilteringGaussRadiusAO: 2
    m_PVRFilteringAtrousColorSigma: 1
    m_PVRFilteringAtrousNormalSigma: 1
    m_PVRFilteringAtrousPositionSigma: 1
    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
    m_PVRFilteringAtrousPositionSigmaIndirect: 2
    m_PVRFilteringAtrousPositionSigmaAO: 1
  m_LightingDataAsset: {fileID: 112000002, guid: bdd7379d6e25a384ea42cf2e638ceecc,
    type: 2}
  m_ShadowMaskMode: 0
@@ -593,79 +595,6 @@
  m_UseColorTemperature: 0
  m_ShadowRadius: 0
  m_ShadowAngle: 0
--- !u!1 &191735099
GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 1971481106172376, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  serializedVersion: 5
  m_Component:
  - component: {fileID: 191735100}
  - component: {fileID: 191735102}
  - component: {fileID: 191735101}
  m_Layer: 0
  m_Name: 4_clound (2)
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &191735100
Transform:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 4840519574831138, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 191735099}
  m_LocalRotation: {x: 0.5143442, y: 0.5285471, z: -0.3603679, w: -0.57115936}
  m_LocalPosition: {x: 3.85, y: 3.34, z: 16.63}
  m_LocalScale: {x: -0.10215005, y: 52.425934, z: 82.7102}
  m_Children: []
  m_Father: {fileID: 737913318}
  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: -11.923, y: -455.15, z: 77.536}
--- !u!23 &191735101
MeshRenderer:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 23062906521033364, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 191735099}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_Materials:
  - {fileID: 2100000, guid: cad4b90e3d114f34c8968041671f18fd, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_StaticBatchRoot: {fileID: 0}
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &191735102
MeshFilter:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 33031092546278996, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 191735099}
  m_Mesh: {fileID: 4300000, guid: 85de84e0059b87748afc0e1bec1f5b2c, type: 3}
--- !u!1001 &193224876
Prefab:
  m_ObjectHideFlags: 0
@@ -673,129 +602,37 @@
  m_Modification:
    m_TransformParent: {fileID: 1990555794}
    m_Modifications:
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.x
      value: -6.9100018
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.z
      value: -7.100003
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalRotation.x
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalRotation.y
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalRotation.z
      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
    - target: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_RootOrder
      value: 12
      objectReference: {fileID: 0}
    - target: {fileID: 1399986034633718, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1699171243123090, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1105080772524572, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1333672096264808, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1292907404857898, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1952707803991656, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1109763531626670, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1043235858044512, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 1854150681857844, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4901668529089858, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalScale.x
      value: 0.60510975
      objectReference: {fileID: 0}
    - target: {fileID: 4901668529089858, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalScale.y
      value: 0.28069478
      objectReference: {fileID: 0}
    - target: {fileID: 1586591266562760, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4707549248810162, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.x
      value: -7.9
      objectReference: {fileID: 0}
    - target: {fileID: 4707549248810162, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.y
      value: 0.0083
      objectReference: {fileID: 0}
    - target: {fileID: 4707549248810162, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.z
      value: -0.0343
      objectReference: {fileID: 0}
    - target: {fileID: 4091789057187978, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.x
      value: -0.52
      objectReference: {fileID: 0}
    - target: {fileID: 4091789057187978, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.z
      value: -0.1158
      objectReference: {fileID: 0}
    - target: {fileID: 4091789057187978, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.y
      value: 0.02
      objectReference: {fileID: 0}
    - target: {fileID: 4044544304365190, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.x
      value: 23.54
      objectReference: {fileID: 0}
    - target: {fileID: 4044544304365190, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalPosition.z
      value: 11.95
      objectReference: {fileID: 0}
    - target: {fileID: 1799186847666932, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalScale.x
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
      propertyPath: m_LocalScale.z
      value: 1
      value: 6
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: 57ce19873a3a01043ba95745561e3f51, type: 2}
@@ -2582,11 +2419,6 @@
  m_UseColorTemperature: 0
  m_ShadowRadius: 0
  m_ShadowAngle: 0
--- !u!4 &737913318 stripped
Transform:
  m_PrefabParentObject: {fileID: 4139856139203758, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 193224876}
--- !u!1 &742068705
GameObject:
  m_ObjectHideFlags: 0
@@ -5040,79 +4872,6 @@
  m_UseColorTemperature: 0
  m_ShadowRadius: 0
  m_ShadowAngle: 0
--- !u!1 &1449401866
GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 1971481106172376, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  serializedVersion: 5
  m_Component:
  - component: {fileID: 1449401867}
  - component: {fileID: 1449401869}
  - component: {fileID: 1449401868}
  m_Layer: 0
  m_Name: 4_clound (1)
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &1449401867
Transform:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 4840519574831138, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1449401866}
  m_LocalRotation: {x: -0.22252545, y: -0.42331868, z: -0.5872796, w: -0.6529828}
  m_LocalPosition: {x: 25.48, y: 4.05, z: 20.91}
  m_LocalScale: {x: -0.10215003, y: 52.42591, z: 82.710144}
  m_Children: []
  m_Father: {fileID: 737913318}
  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: -11.923, y: -303.678, z: 77.536}
--- !u!23 &1449401868
MeshRenderer:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 23062906521033364, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1449401866}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_MotionVectors: 1
  m_LightProbeUsage: 0
  m_ReflectionProbeUsage: 1
  m_Materials:
  - {fileID: 2100000, guid: cad4b90e3d114f34c8968041671f18fd, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_StaticBatchRoot: {fileID: 0}
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &1449401869
MeshFilter:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 33031092546278996, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1449401866}
  m_Mesh: {fileID: 4300000, guid: 85de84e0059b87748afc0e1bec1f5b2c, type: 3}
--- !u!1 &1469171481
GameObject:
  m_ObjectHideFlags: 0
@@ -5180,7 +4939,7 @@
  m_ShadowAngle: 0
--- !u!4 &1477944746 stripped
Transform:
  m_PrefabParentObject: {fileID: 4627059437500274, guid: 57ce19873a3a01043ba95745561e3f51,
  m_PrefabParentObject: {fileID: 4966256545313364, guid: 57ce19873a3a01043ba95745561e3f51,
    type: 2}
  m_PrefabInternal: {fileID: 193224876}
--- !u!1 &1531026754

 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/M130/M130@Idle2.FBX

Binary files differ

 Role/M130/M130@Idle2.FBX.meta

New file
@@ -0,0 +1,251 @@
fileFormatVersion: 2
guid: f7d59c172f1af524c9fb50f80c251438
timeCreated: 1534322533
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: Bip001
    100002: Bip001 Head
    100004: Bip001 L Calf
    100006: Bip001 L Clavicle
    100008: Bip001 L Foot
    100010: Bip001 L Forearm
    100012: Bip001 L Hand
    100014: Bip001 L Thigh
    100016: Bip001 L Toe0
    100018: Bip001 L UpperArm
    100020: Bip001 Neck
    100022: Bip001 Pelvis
    100024: Bip001 R Calf
    100026: Bip001 R Clavicle
    100028: Bip001 R Foot
    100030: Bip001 R Forearm
    100032: Bip001 R Hand
    100034: Bip001 R Thigh
    100036: Bip001 R Toe0
    100038: Bip001 R UpperArm
    100040: Bip001 Spine
    100042: Bip001 Spine1
    100044: Bone001
    100046: Bone002
    100048: Bone003
    100050: Bone004
    100052: Bone005
    100054: Bone006
    100056: Bone006(mirrored)
    100058: Bone007
    100060: Bone008
    100062: Bone009
    100064: //RootNode
    400000: Bip001
    400002: Bip001 Head
    400004: Bip001 L Calf
    400006: Bip001 L Clavicle
    400008: Bip001 L Foot
    400010: Bip001 L Forearm
    400012: Bip001 L Hand
    400014: Bip001 L Thigh
    400016: Bip001 L Toe0
    400018: Bip001 L UpperArm
    400020: Bip001 Neck
    400022: Bip001 Pelvis
    400024: Bip001 R Calf
    400026: Bip001 R Clavicle
    400028: Bip001 R Foot
    400030: Bip001 R Forearm
    400032: Bip001 R Hand
    400034: Bip001 R Thigh
    400036: Bip001 R Toe0
    400038: Bip001 R UpperArm
    400040: Bip001 Spine
    400042: Bip001 Spine1
    400044: Bone001
    400046: Bone002
    400048: Bone003
    400050: Bone004
    400052: Bone005
    400054: Bone006
    400056: Bone006(mirrored)
    400058: Bone007
    400060: Bone008
    400062: Bone009
    400064: //RootNode
    7400000: Idle2
    9500000: //RootNode
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 0
    motionNodeName: 
    rigImportErrors: 
    rigImportWarnings: 
    animationImportErrors: 
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations:
    - serializedVersion: 16
      name: Idle2
      takeName: Take 001
      firstFrame: 0
      lastFrame: 65
      wrapMode: 0
      orientationOffsetY: 0
      level: 0
      cycleOffset: 0
      loop: 0
      hasAdditiveReferencePose: 0
      loopTime: 1
      loopBlend: 0
      loopBlendOrientation: 0
      loopBlendPositionY: 0
      loopBlendPositionXZ: 0
      keepOriginalOrientation: 0
      keepOriginalPositionY: 1
      keepOriginalPositionXZ: 0
      heightFromFeet: 0
      mirror: 0
      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
      curves: []
      events: []
      transformMask:
      - path: 
        weight: 1
      - path: Bip001
        weight: 1
      - path: Bip001/Bip001 Pelvis
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf/Bip001
          L Foot
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf/Bip001
          L Foot/Bip001 L Toe0
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf/Bip001
          R Foot
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf/Bip001
          R Foot/Bip001 R Toe0
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/Bone005
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/Bone006
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/Bone006(mirrored)
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
          Clavicle
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
          Clavicle/Bip001 L UpperArm
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
          Clavicle/Bip001 L UpperArm/Bip001 L Forearm
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
          Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
          Clavicle
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
          Clavicle/Bip001 R UpperArm
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
          Clavicle/Bip001 R UpperArm/Bip001 R Forearm
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
          Clavicle/Bip001 R UpperArm/Bip001 R Forearm/Bip001 R Hand
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bone007
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bone007/Bone008
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bone007/Bone008/Bone009
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bone001
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bone001/Bone002
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bone001/Bone002/Bone003
        weight: 1
      - path: Bip001/Bip001 Pelvis/Bone001/Bone002/Bone003/Bone004
        weight: 1
      maskType: 3
      maskSource: {instanceID: 0}
      additiveReferencePoseFrame: 0
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 0
    addColliders: 0
    importBlendShapes: 1
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 3
  importAnimation: 1
  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: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 2
  humanoidOversampling: 1
  additionalBone: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Role/M130/M130@Ui.FBX

Binary files differ

 Role/M130/M130@Ui.FBX.meta

New file
@@ -0,0 +1,145 @@
fileFormatVersion: 2
guid: 0ec47f5bad49bca44a881e9b43c7af36
timeCreated: 1534322533
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: Bip001
    100002: Bip001 Head
    100004: Bip001 L Calf
    100006: Bip001 L Clavicle
    100008: Bip001 L Foot
    100010: Bip001 L Forearm
    100012: Bip001 L Hand
    100014: Bip001 L Thigh
    100016: Bip001 L Toe0
    100018: Bip001 L UpperArm
    100020: Bip001 Neck
    100022: Bip001 Pelvis
    100024: Bip001 R Calf
    100026: Bip001 R Clavicle
    100028: Bip001 R Foot
    100030: Bip001 R Forearm
    100032: Bip001 R Hand
    100034: Bip001 R Thigh
    100036: Bip001 R Toe0
    100038: Bip001 R UpperArm
    100040: Bip001 Spine
    100042: Bip001 Spine1
    100044: Bone001
    100046: Bone002
    100048: Bone003
    100050: Bone004
    100052: Bone005
    100054: Bone006
    100056: Bone006(mirrored)
    100058: Bone007
    100060: Bone008
    100062: Bone009
    100064: //RootNode
    400000: Bip001
    400002: Bip001 Head
    400004: Bip001 L Calf
    400006: Bip001 L Clavicle
    400008: Bip001 L Foot
    400010: Bip001 L Forearm
    400012: Bip001 L Hand
    400014: Bip001 L Thigh
    400016: Bip001 L Toe0
    400018: Bip001 L UpperArm
    400020: Bip001 Neck
    400022: Bip001 Pelvis
    400024: Bip001 R Calf
    400026: Bip001 R Clavicle
    400028: Bip001 R Foot
    400030: Bip001 R Forearm
    400032: Bip001 R Hand
    400034: Bip001 R Thigh
    400036: Bip001 R Toe0
    400038: Bip001 R UpperArm
    400040: Bip001 Spine
    400042: Bip001 Spine1
    400044: Bone001
    400046: Bone002
    400048: Bone003
    400050: Bone004
    400052: Bone005
    400054: Bone006
    400056: Bone006(mirrored)
    400058: Bone007
    400060: Bone008
    400062: Bone009
    400064: //RootNode
    7400000: Take 001
    9500000: //RootNode
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 0
    motionNodeName: 
    rigImportErrors: 
    rigImportWarnings: 
    animationImportErrors: 
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 0
    addColliders: 0
    importBlendShapes: 1
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 3
  importAnimation: 1
  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: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 2
  humanoidOversampling: 1
  additionalBone: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Role/M136/M136@Ui.FBX

Binary files differ

 Role/M136/M136@Ui.FBX.meta

New file
@@ -0,0 +1,131 @@
fileFormatVersion: 2
guid: 69a366e8ba72a03488247b2dd40fb454
timeCreated: 1534322981
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: Bip001
    100002: Bip001 L Calf
    100004: Bip001 L Clavicle
    100006: Bip001 L Finger0
    100008: Bip001 L Foot
    100010: Bip001 L Forearm
    100012: Bip001 L Hand
    100014: Bip001 L Thigh
    100016: Bip001 L UpperArm
    100018: Bip001 Neck
    100020: Bip001 Pelvis
    100022: Bip001 Prop1
    100024: Bip001 Prop2
    100026: Bip001 R Calf
    100028: Bip001 R Clavicle
    100030: Bip001 R Finger0
    100032: Bip001 R Foot
    100034: Bip001 R Forearm
    100036: Bip001 R Hand
    100038: Bip001 R Thigh
    100040: Bip001 R UpperArm
    100042: Bip001 Spine
    100044: Bip001 Spine1
    100046: Dummy001
    100048: Dummy002
    100050: //RootNode
    400000: Bip001
    400002: Bip001 L Calf
    400004: Bip001 L Clavicle
    400006: Bip001 L Finger0
    400008: Bip001 L Foot
    400010: Bip001 L Forearm
    400012: Bip001 L Hand
    400014: Bip001 L Thigh
    400016: Bip001 L UpperArm
    400018: Bip001 Neck
    400020: Bip001 Pelvis
    400022: Bip001 Prop1
    400024: Bip001 Prop2
    400026: Bip001 R Calf
    400028: Bip001 R Clavicle
    400030: Bip001 R Finger0
    400032: Bip001 R Foot
    400034: Bip001 R Forearm
    400036: Bip001 R Hand
    400038: Bip001 R Thigh
    400040: Bip001 R UpperArm
    400042: Bip001 Spine
    400044: Bip001 Spine1
    400046: Dummy001
    400048: Dummy002
    400050: //RootNode
    7400000: Take 001
    9500000: //RootNode
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 0
    motionNodeName: 
    rigImportErrors: 
    rigImportWarnings: 
    animationImportErrors: 
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations: []
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 0
    addColliders: 0
    importBlendShapes: 1
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 3
  importAnimation: 1
  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: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 2
  humanoidOversampling: 1
  additionalBone: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: