art_lxj
2018-09-12 ac08d79489b05db0d10e2683c3dab48e19d82c03
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
14个文件已修改
11个文件已删除
407 ■■■■ 已修改文件
Maps/Model/Map012_Fmzd/Effect.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Effect/Animation.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Effect/Material.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Effect/Mesh.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Effect/Texture.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Terrain.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Terrain/Material.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Terrain/Mesh.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Terrain/Texture.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Texture.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Prefab/Map012_Fmzd.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Scenes/Map012_Fmzd/LightingData.asset 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Materials.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Materials/zq11.mat 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Materials/zq11.mat.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Materials/zq11.png 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Materials/zq11.png.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11.FBX 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11.FBX.meta 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11@Idle.FBX 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11@Idle.FBX.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11@Idle2.FBX 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11@Idle2.FBX.meta 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11@Run.FBX 补丁 | 查看 | 原始文档 | blame | 历史
Role/Zq11/Zq11@Run.FBX.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map012_Fmzd/Effect.meta
File was deleted
Maps/Model/Map012_Fmzd/Effect/Animation.meta
File was deleted
Maps/Model/Map012_Fmzd/Effect/Material.meta
File was deleted
Maps/Model/Map012_Fmzd/Effect/Mesh.meta
File was deleted
Maps/Model/Map012_Fmzd/Effect/Texture.meta
File was deleted
Maps/Model/Map012_Fmzd/Terrain.meta
File was deleted
Maps/Model/Map012_Fmzd/Terrain/Material.meta
File was deleted
Maps/Model/Map012_Fmzd/Terrain/Mesh.meta
File was deleted
Maps/Model/Map012_Fmzd/Terrain/Texture.meta
File was deleted
Maps/Model/Map012_Fmzd/Texture.meta
File was deleted
Maps/Prefab/Map012_Fmzd.meta
File was deleted
Maps/Scenes/Map012_Fmzd/LightingData.asset
Binary files differ
Role/Zq11/Materials.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: b86c5f5168222734d8473025249d2f01
folderAsset: yes
timeCreated: 1536735060
timeCreated: 1536742706
licenseType: Pro
DefaultImporter:
  userData: 
Role/Zq11/Materials/zq11.mat
@@ -39,7 +39,7 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 977da7a9f0914224a9517a198cd28068, type: 3}
        m_Texture: {fileID: 2800000, guid: ce4ec200d8b0f3643b1e24fdb8a3e2cf, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
Role/Zq11/Materials/zq11.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 324b24a932dbe794687b8660c8d5e53d
timeCreated: 1536737042
timeCreated: 1536742706
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000
Role/Zq11/Materials/zq11.png

Role/Zq11/Materials/zq11.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 977da7a9f0914224a9517a198cd28068
timeCreated: 1536737040
guid: ce4ec200d8b0f3643b1e24fdb8a3e2cf
timeCreated: 1536742706
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}
Role/Zq11/Zq11.FBX
Binary files differ
Role/Zq11/Zq11.FBX.meta
@@ -1,84 +1,114 @@
fileFormatVersion: 2
guid: c6f46e4431aea6b49b9128b5f18123ee
timeCreated: 1536737070
timeCreated: 1536742835
licenseType: Pro
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: Bip001
    100002: Bip001 Head
    100004: Bip001 L Calf
    100006: Bip001 L Foot
    100008: Bip001 L HorseLink
    100010: Bip001 L Thigh
    100012: Bip001 L Toe0
    100014: Bip001 Neck
    100016: Bip001 Pelvis
    100018: Bip001 R Calf
    100020: Bip001 R Foot
    100022: Bip001 R HorseLink
    100024: Bip001 R Thigh
    100026: Bip001 R Toe0
    100028: Bip001 Spine
    100030: Bone001
    100032: Bone002
    100034: Bone003
    100036: Bone004
    100038: Bone005
    100040: Bone006
    100042: Bone006(mirrored)
    100044: Bone007
    100046: Bone007(mirrored)
    100048: Bone008
    100050: Bone008(mirrored)
    100052: Bone009
    100054: Bone010
    100056: Bone011
    100058: Bone_Mount
    100060: Dummy001
    100062: Dummy002
    100064: Dummy003
    100066: Dummy004
    100068: Dummy005
    100070: //RootNode
    100072: Zq11
    100004: Bip001 HeadNub
    100006: Bip001 L Calf
    100008: Bip001 L Clavicle
    100010: Bip001 L Finger0
    100012: Bip001 L Finger0Nub
    100014: Bip001 L Foot
    100016: Bip001 L Forearm
    100018: Bip001 L Hand
    100020: Bip001 L HorseLink
    100022: Bip001 L Thigh
    100024: Bip001 L Toe0
    100026: Bip001 L Toe0Nub
    100028: Bip001 L UpperArm
    100030: Bip001 Neck
    100032: Bip001 Pelvis
    100034: Bip001 R Calf
    100036: Bip001 R Clavicle
    100038: Bip001 R Finger0
    100040: Bip001 R Finger0Nub
    100042: Bip001 R Foot
    100044: Bip001 R Forearm
    100046: Bip001 R Hand
    100048: Bip001 R HorseLink
    100050: Bip001 R Thigh
    100052: Bip001 R Toe0
    100054: Bip001 R Toe0Nub
    100056: Bip001 R UpperArm
    100058: Bip001 Spine
    100060: Bone001
    100062: Bone002
    100064: Bone003
    100066: Bone004
    100068: Bone005
    100070: Bone006
    100072: Bone006(mirrored)
    100074: Bone007
    100076: Bone007(mirrored)
    100078: Bone008
    100080: Bone008(mirrored)
    100082: Bone009
    100084: Bone010
    100086: Bone011
    100088: Bone_Mount
    100090: Dummy001
    100092: Dummy002
    100094: Dummy003
    100096: Dummy004
    100098: Dummy005
    100100: Zq11
    100102: //RootNode
    400000: Bip001
    400002: Bip001 Head
    400004: Bip001 L Calf
    400006: Bip001 L Foot
    400008: Bip001 L HorseLink
    400010: Bip001 L Thigh
    400012: Bip001 L Toe0
    400014: Bip001 Neck
    400016: Bip001 Pelvis
    400018: Bip001 R Calf
    400020: Bip001 R Foot
    400022: Bip001 R HorseLink
    400024: Bip001 R Thigh
    400026: Bip001 R Toe0
    400028: Bip001 Spine
    400030: Bone001
    400032: Bone002
    400034: Bone003
    400036: Bone004
    400038: Bone005
    400040: Bone006
    400042: Bone006(mirrored)
    400044: Bone007
    400046: Bone007(mirrored)
    400048: Bone008
    400050: Bone008(mirrored)
    400052: Bone009
    400054: Bone010
    400056: Bone011
    400058: Bone_Mount
    400060: Dummy001
    400062: Dummy002
    400064: Dummy003
    400066: Dummy004
    400068: Dummy005
    400070: //RootNode
    400072: Zq11
    400004: Bip001 HeadNub
    400006: Bip001 L Calf
    400008: Bip001 L Clavicle
    400010: Bip001 L Finger0
    400012: Bip001 L Finger0Nub
    400014: Bip001 L Foot
    400016: Bip001 L Forearm
    400018: Bip001 L Hand
    400020: Bip001 L HorseLink
    400022: Bip001 L Thigh
    400024: Bip001 L Toe0
    400026: Bip001 L Toe0Nub
    400028: Bip001 L UpperArm
    400030: Bip001 Neck
    400032: Bip001 Pelvis
    400034: Bip001 R Calf
    400036: Bip001 R Clavicle
    400038: Bip001 R Finger0
    400040: Bip001 R Finger0Nub
    400042: Bip001 R Foot
    400044: Bip001 R Forearm
    400046: Bip001 R Hand
    400048: Bip001 R HorseLink
    400050: Bip001 R Thigh
    400052: Bip001 R Toe0
    400054: Bip001 R Toe0Nub
    400056: Bip001 R UpperArm
    400058: Bip001 Spine
    400060: Bone001
    400062: Bone002
    400064: Bone003
    400066: Bone004
    400068: Bone005
    400070: Bone006
    400072: Bone006(mirrored)
    400074: Bone007
    400076: Bone007(mirrored)
    400078: Bone008
    400080: Bone008(mirrored)
    400082: Bone009
    400084: Bone010
    400086: Bone011
    400088: Bone_Mount
    400090: Dummy001
    400092: Dummy002
    400094: Dummy003
    400096: Dummy004
    400098: Dummy005
    400100: Zq11
    400102: //RootNode
    4300000: Zq11
    9500000: //RootNode
    13700000: Zq11
@@ -108,7 +138,7 @@
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    globalScale: 0.7
    meshCompression: 0
    addColliders: 0
    importBlendShapes: 1
Role/Zq11/Zq11@Idle.FBX
Binary files differ
Role/Zq11/Zq11@Idle.FBX.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 68ce23b84d6dd69438afa193333b182e
timeCreated: 1536737041
timeCreated: 1536742706
licenseType: Pro
ModelImporter:
  serializedVersion: 19
@@ -217,7 +217,7 @@
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    globalScale: 0.7
    meshCompression: 0
    addColliders: 0
    importBlendShapes: 1
Role/Zq11/Zq11@Idle2.FBX
Binary files differ
Role/Zq11/Zq11@Idle2.FBX.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ddb66a6f917808e4bb3e6660d96fa846
timeCreated: 1536737041
timeCreated: 1536742706
licenseType: Pro
ModelImporter:
  serializedVersion: 19
@@ -80,7 +80,7 @@
    400070: Zq11
    400072: //RootNode
    4300000: Zq11
    7400000: Idle2
    7400000: Take 001
    9500000: //RootNode
    13700000: Zq11
  materials:
@@ -105,119 +105,11 @@
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
    clipAnimations:
    - serializedVersion: 16
      name: Idle2
      takeName: Take 001
      firstFrame: 0
      lastFrame: 60
      wrapMode: 0
      orientationOffsetY: 0
      level: 0
      cycleOffset: 0
      loop: 0
      hasAdditiveReferencePose: 0
      loopTime: 0
      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: Dummy002
        weight: 1
      - path: Dummy002/Bip001
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf/Bip001
          L HorseLink
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf/Bip001
          L HorseLink/Bip001 L Foot
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf/Bip001
          L HorseLink/Bip001 L Foot/Bip001 L Toe0
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Neck
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Neck/Bip001 Head
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Neck/Bip001 Head/Bone001
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Neck/Bip001 Head/Bone002
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Neck/Bip001 Head/Dummy001
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf/Bip001
          R HorseLink
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf/Bip001
          R HorseLink/Bip001 R Foot
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf/Bip001
          R HorseLink/Bip001 R Foot/Bip001 R Toe0
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bone006
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bone006/Bone007
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bone006/Bone007/Bone008
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bone006(mirrored)
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bone006(mirrored)/Bone007(mirrored)
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bip001 Spine/Bone006(mirrored)/Bone007(mirrored)/Bone008(mirrored)
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bone003
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bone003/Bone004
        weight: 1
      - path: Dummy002/Bip001/Bip001 Pelvis/Bone003/Bone004/Bone005
        weight: 1
      - path: Dummy002/Bone_Mount
        weight: 1
      - path: Dummy002/Dummy003
        weight: 1
      - path: Dummy002/Dummy003/Bone009
        weight: 1
      - path: Dummy002/Dummy004
        weight: 1
      - path: Dummy002/Dummy004/Bone010
        weight: 1
      - path: Dummy002/Dummy005
        weight: 1
      - path: Dummy002/Dummy005/Bone011
        weight: 1
      - path: Zq11
        weight: 1
      maskType: 3
      maskSource: {instanceID: 0}
      additiveReferencePoseFrame: 0
    clipAnimations: []
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    globalScale: 0.7
    meshCompression: 0
    addColliders: 0
    importBlendShapes: 1
Role/Zq11/Zq11@Run.FBX
Binary files differ
Role/Zq11/Zq11@Run.FBX.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 14096721a3354714cac5c4a7b7fc00b5
timeCreated: 1536737040
timeCreated: 1536742706
licenseType: Pro
ModelImporter:
  serializedVersion: 19
@@ -217,7 +217,7 @@
    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
    globalScale: 0.7
    meshCompression: 0
    addColliders: 0
    importBlendShapes: 1