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

art_wzw

2018-08-30 6fdf4ab6cdc24f71ab17a57d1fb3213b1aeeef86

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

 Role/B_Cw01/B_Cw01@Dead.FBX

Binary files differ

 Role/B_Cw01/B_Cw01@Dead.FBX.meta

New file
@@ -0,0 +1,139 @@
fileFormatVersion: 2
guid: f2dc22321739ca44eb59aabbd7f03353
timeCreated: 1535619746
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: //RootNode
    100002: Bip001
    100004: Bip001 Head
    100006: Bip001 L Calf
    100008: Bip001 L Clavicle
    100010: Bip001 L Foot
    100012: Bip001 L Forearm
    100014: Bip001 L Hand
    100016: Bip001 L Thigh
    100018: Bip001 L UpperArm
    100020: Bip001 Neck
    100022: Bip001 Pelvis
    100024: Bip001 Prop1
    100026: Bip001 R Calf
    100028: Bip001 R Clavicle
    100030: Bip001 R Foot
    100032: Bip001 R Forearm
    100034: Bip001 R Hand
    100036: Bip001 R Thigh
    100038: Bip001 R UpperArm
    100040: Bip001 Spine
    100042: Bone001
    100044: Bone002
    100046: Bone003
    100048: Bone004
    100050: Bone005
    100052: Bone006
    100054: Bone007
    100056: Bone008
    100058: Dummy001
    400000: //RootNode
    400002: Bip001
    400004: Bip001 Head
    400006: Bip001 L Calf
    400008: Bip001 L Clavicle
    400010: Bip001 L Foot
    400012: Bip001 L Forearm
    400014: Bip001 L Hand
    400016: Bip001 L Thigh
    400018: Bip001 L UpperArm
    400020: Bip001 Neck
    400022: Bip001 Pelvis
    400024: Bip001 Prop1
    400026: Bip001 R Calf
    400028: Bip001 R Clavicle
    400030: Bip001 R Foot
    400032: Bip001 R Forearm
    400034: Bip001 R Hand
    400036: Bip001 R Thigh
    400038: Bip001 R UpperArm
    400040: Bip001 Spine
    400042: Bone001
    400044: Bone002
    400046: Bone003
    400048: Bone004
    400050: Bone005
    400052: Bone006
    400054: Bone007
    400056: Bone008
    400058: Dummy001
    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/B_Cw01/B_Cw01@Hit.FBX

Binary files differ

 Role/B_Cw01/B_Cw01@Hit.FBX.meta

New file
@@ -0,0 +1,139 @@
fileFormatVersion: 2
guid: 84c2c21430107da40805f712dfa2ae78
timeCreated: 1535619746
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: //RootNode
    100002: Bip001
    100004: Bip001 Head
    100006: Bip001 L Calf
    100008: Bip001 L Clavicle
    100010: Bip001 L Foot
    100012: Bip001 L Forearm
    100014: Bip001 L Hand
    100016: Bip001 L Thigh
    100018: Bip001 L UpperArm
    100020: Bip001 Neck
    100022: Bip001 Pelvis
    100024: Bip001 Prop1
    100026: Bip001 R Calf
    100028: Bip001 R Clavicle
    100030: Bip001 R Foot
    100032: Bip001 R Forearm
    100034: Bip001 R Hand
    100036: Bip001 R Thigh
    100038: Bip001 R UpperArm
    100040: Bip001 Spine
    100042: Bone001
    100044: Bone002
    100046: Bone003
    100048: Bone004
    100050: Bone005
    100052: Bone006
    100054: Bone007
    100056: Bone008
    100058: Dummy001
    400000: //RootNode
    400002: Bip001
    400004: Bip001 Head
    400006: Bip001 L Calf
    400008: Bip001 L Clavicle
    400010: Bip001 L Foot
    400012: Bip001 L Forearm
    400014: Bip001 L Hand
    400016: Bip001 L Thigh
    400018: Bip001 L UpperArm
    400020: Bip001 Neck
    400022: Bip001 Pelvis
    400024: Bip001 Prop1
    400026: Bip001 R Calf
    400028: Bip001 R Clavicle
    400030: Bip001 R Foot
    400032: Bip001 R Forearm
    400034: Bip001 R Hand
    400036: Bip001 R Thigh
    400038: Bip001 R UpperArm
    400040: Bip001 Spine
    400042: Bone001
    400044: Bone002
    400046: Bone003
    400048: Bone004
    400050: Bone005
    400052: Bone006
    400054: Bone007
    400056: Bone008
    400058: Dummy001
    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/B_Cw16/B_Cw16@Idle.FBX

Binary files differ

 Role/B_Cw16/B_Cw16@Idle.FBX.meta

@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c7bc905de14e8cb438289f5a7c3185e3
timeCreated: 1535450920
licenseType: Pro
timeCreated: 1535610448
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:

 Role/B_Cw16/B_Cw16@Idle2.FBX

Binary files differ

 Role/B_Cw16/B_Cw16@Idle2.FBX.meta

New file
@@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: 611347b0873c4f847996b03166ed3b61
timeCreated: 1535610352
licenseType: Free
ModelImporter:
  serializedVersion: 19
  fileIDToRecycleName:
    100000: //RootNode
    100002: Bip001
    100004: Bip001 Head
    100006: Bip001 L Calf
    100008: Bip001 L Clavicle
    100010: Bip001 L Finger0
    100012: Bip001 L Foot
    100014: Bip001 L Forearm
    100016: Bip001 L Hand
    100018: Bip001 L Thigh
    100020: Bip001 L UpperArm
    100022: Bip001 Neck
    100024: Bip001 Pelvis
    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: Bone001
    100046: Bone002
    100048: Bone003
    100050: Bone004
    100052: Bone004(mirrored)
    100054: Bone005
    100056: Bone005(mirrored)
    100058: Bone006
    100060: Bone006(mirrored)
    100062: Bone007
    100064: Bone007(mirrored)
    100066: Dummy001
    400000: //RootNode
    400002: Bip001
    400004: Bip001 Head
    400006: Bip001 L Calf
    400008: Bip001 L Clavicle
    400010: Bip001 L Finger0
    400012: Bip001 L Foot
    400014: Bip001 L Forearm
    400016: Bip001 L Hand
    400018: Bip001 L Thigh
    400020: Bip001 L UpperArm
    400022: Bip001 Neck
    400024: Bip001 Pelvis
    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: Bone001
    400046: Bone002
    400048: Bone003
    400050: Bone004
    400052: Bone004(mirrored)
    400054: Bone005
    400056: Bone005(mirrored)
    400058: Bone006
    400060: Bone006(mirrored)
    400062: Bone007
    400064: Bone007(mirrored)
    400066: Dummy001
    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/M110/M110.FBX

Binary files differ

 Role/M110/M110.FBX.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 1ce111579883ff541948f28274f0b269
timeCreated: 1511776356
timeCreated: 1535617751
licenseType: Free
ModelImporter:
  serializedVersion: 19