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

art_yxc

2018-09-10 b7acff250dbfe774a2c4b43383d8e6e56c5789b1

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

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 4a5b22c36c196074682be1dace3d372e
folderAsset: yes
timeCreated: 1536305231
licenseType: Free
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154/Animation.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: bf032bdbe98bdc94fa715b6da9d82dac
folderAsset: yes
timeCreated: 1536305448
licenseType: Free
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154/Animation/Boss_Cx_Lqrz_M153.controller

New file
@@ -0,0 +1,67 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Boss_Cx_Lqrz_M153
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
    m_StateMachine: {fileID: 1107714269453399232}
    m_Mask: {fileID: 0}
    m_Motions: []
    m_Behaviours: []
    m_BlendingMode: 0
    m_SyncedLayerIndex: -1
    m_DefaultWeight: 0
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1102 &1102422507535183636
AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Boss_Cx_Lqrz_M154
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_WriteDefaultValues: 1
  m_Mirror: 0
  m_SpeedParameterActive: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_Motion: {fileID: 7400000, guid: 98aa16bd81e28d642aad87e5e8bec8a5, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
--- !u!1107 &1107714269453399232
AnimatorStateMachine:
  serializedVersion: 5
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Base Layer
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 1102422507535183636}
    m_Position: {x: 276, y: 48, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
  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: 1102422507535183636}

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154/Animation/Boss_Cx_Lqrz_M153.controller.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: d3fcfb82f6b30554a92134321e13fcde
timeCreated: 1536305448
licenseType: Free
NativeFormatImporter:
  mainObjectFileID: 9100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154/Animation/Boss_Cx_Lqrz_M154.anim

New file
@@ -0,0 +1,531 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Boss_Cx_Lqrz_M154
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0
  m_UseHighQualityCurve: 1
  m_RotationCurves: []
  m_CompressedRotationCurves: []
  m_EulerCurves:
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: {x: -6.6730003, y: -179.73502, z: -0.23}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
      - serializedVersion: 2
        time: 2
        value: {x: 1.4350001, y: -181.28099, z: -0.22900002}
        inSlope: {x: 0, y: 0, z: 0.0015584216}
        outSlope: {x: 0, y: 0, z: 0.0015584216}
        tangentMode: 0
      - serializedVersion: 2
        time: 2.5666666
        value: {x: -2.6620002, y: -172.70001, z: 0.35900003}
        inSlope: {x: 0, y: 0, z: 0.272}
        outSlope: {x: 0, y: 0, z: 0.272}
        tangentMode: 0
      - serializedVersion: 2
        time: 3.5
        value: {x: -2.6460001, y: -174.901, z: 0.46100003}
        inSlope: {x: 0.04571438, y: -5.647125, z: 0}
        outSlope: {x: 0.04571438, y: -5.647125, z: 0}
        tangentMode: 0
      - serializedVersion: 2
        time: 3.9666667
        value: {x: 3.551, y: -180.60599, z: -0.36400002}
        inSlope: {x: 0, y: 0, z: -0.25894746}
        outSlope: {x: 0, y: 0, z: -0.25894746}
        tangentMode: 0
      - serializedVersion: 2
        time: 5.4
        value: {x: -2.25, y: -176.184, z: -0.48700002}
        inSlope: {x: 0, y: 0, z: -0.10933334}
        outSlope: {x: 0, y: 0, z: -0.10933334}
        tangentMode: 0
      - serializedVersion: 2
        time: 8.466666
        value: {x: 3.4160001, y: -188.00099, z: -1.274}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    path: Camera
  m_PositionCurves:
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: {x: -0.02, y: 2.33, z: 1.18}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
      - serializedVersion: 2
        time: 1
        value: {x: 0.08, y: 5.64, z: -3.76}
        inSlope: {x: 0, y: 2.46, z: 0}
        outSlope: {x: 0, y: 2.46, z: 0}
        tangentMode: 0
      - serializedVersion: 2
        time: 2
        value: {x: 0.03, y: 7.25, z: -3.54}
        inSlope: {x: 0, y: 0, z: 0.56170225}
        outSlope: {x: 0, y: 0, z: 0.56170225}
        tangentMode: 0
      - serializedVersion: 2
        time: 2.5666666
        value: {x: 1.63, y: 4.41, z: 2.21}
        inSlope: {x: 1.3333335, y: 0, z: 0}
        outSlope: {x: 1.3333335, y: 0, z: 0}
        tangentMode: 0
      - serializedVersion: 2
        time: 3.5
        value: {x: 2.13, y: 4.52, z: 1.54}
        inSlope: {x: 0, y: 0.31428608, z: 0}
        outSlope: {x: 0, y: 0.31428608, z: 0}
        tangentMode: 0
      - serializedVersion: 2
        time: 3.9666667
        value: {x: 0.14, y: 6.65, z: 7.46}
        inSlope: {x: -0.56842124, y: 0, z: 0}
        outSlope: {x: -0.56842124, y: 0, z: 0}
        tangentMode: 0
      - serializedVersion: 2
        time: 5.4
        value: {x: -0.13, y: 1.5, z: 6}
        inSlope: {x: -0.14222224, y: 0, z: -0.77333343}
        outSlope: {x: -0.14222224, y: 0, z: -0.77333343}
        tangentMode: 0
      - serializedVersion: 2
        time: 8.466666
        value: {x: -0.5, y: 2.04, z: 3.98}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    path: Camera
  m_ScaleCurves: []
  m_FloatCurves: []
  m_PPtrCurves: []
  m_SampleRate: 30
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
    m_Extent: {x: 0, y: 0, z: 0}
  m_ClipBindingConstant:
    genericBindings:
    - serializedVersion: 2
      path: 1018227507
      attribute: 1
      script: {fileID: 0}
      typeID: 4
      customType: 0
      isPPtrCurve: 0
    - serializedVersion: 2
      path: 1018227507
      attribute: 4
      script: {fileID: 0}
      typeID: 4
      customType: 14
      isPPtrCurve: 0
    pptrCurveMapping: []
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
    m_StopTime: 8.466666
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
    m_LoopTime: 0
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
    m_LoopBlendPositionXZ: 0
    m_KeepOriginalOrientation: 0
    m_KeepOriginalPositionY: 1
    m_KeepOriginalPositionXZ: 0
    m_HeightFromFeet: 0
    m_Mirror: 0
  m_EditorCurves:
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: -0.02
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 0.08
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2
        value: 0.03
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2.5666666
        value: 1.63
        inSlope: 1.3333335
        outSlope: 1.3333335
        tangentMode: 136
      - serializedVersion: 2
        time: 3.5
        value: 2.13
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 3.9666667
        value: 0.14
        inSlope: -0.56842124
        outSlope: -0.56842124
        tangentMode: 136
      - serializedVersion: 2
        time: 5.4
        value: -0.13
        inSlope: -0.14222224
        outSlope: -0.14222224
        tangentMode: 136
      - serializedVersion: 2
        time: 8.466666
        value: -0.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalPosition.x
    path: Camera
    classID: 4
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 2.33
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: 5.64
        inSlope: 2.46
        outSlope: 2.46
        tangentMode: 136
      - serializedVersion: 2
        time: 2
        value: 7.25
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2.5666666
        value: 4.41
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 3.5
        value: 4.52
        inSlope: 0.31428608
        outSlope: 0.31428608
        tangentMode: 136
      - serializedVersion: 2
        time: 3.9666667
        value: 6.65
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 5.4
        value: 1.5
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 8.466666
        value: 2.04
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalPosition.y
    path: Camera
    classID: 4
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: 1.18
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 1
        value: -3.76
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2
        value: -3.54
        inSlope: 0.56170225
        outSlope: 0.56170225
        tangentMode: 136
      - serializedVersion: 2
        time: 2.5666666
        value: 2.21
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 3.5
        value: 1.54
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 3.9666667
        value: 7.46
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 5.4
        value: 6
        inSlope: -0.77333343
        outSlope: -0.77333343
        tangentMode: 136
      - serializedVersion: 2
        time: 8.466666
        value: 3.98
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalPosition.z
    path: Camera
    classID: 4
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: -6.6730003
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2
        value: 1.4350001
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2.5666666
        value: -2.6620002
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 3.5
        value: -2.6460001
        inSlope: 0.04571438
        outSlope: 0.04571438
        tangentMode: 136
      - serializedVersion: 2
        time: 3.9666667
        value: 3.551
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 5.4
        value: -2.25
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 8.466666
        value: 3.4160001
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: localEulerAnglesRaw.x
    path: Camera
    classID: 4
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: -179.73502
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2
        value: -181.28099
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2.5666666
        value: -172.70001
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 3.5
        value: -174.901
        inSlope: -5.647125
        outSlope: -5.647125
        tangentMode: 136
      - serializedVersion: 2
        time: 3.9666667
        value: -180.60599
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 5.4
        value: -176.184
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 8.466666
        value: -188.00099
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: localEulerAnglesRaw.y
    path: Camera
    classID: 4
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
      - serializedVersion: 2
        time: 0
        value: -0.23
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 2
        value: -0.22900002
        inSlope: 0.0015584216
        outSlope: 0.0015584216
        tangentMode: 136
      - serializedVersion: 2
        time: 2.5666666
        value: 0.35900003
        inSlope: 0.272
        outSlope: 0.272
        tangentMode: 136
      - serializedVersion: 2
        time: 3.5
        value: 0.46100003
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      - serializedVersion: 2
        time: 3.9666667
        value: -0.36400002
        inSlope: -0.25894746
        outSlope: -0.25894746
        tangentMode: 136
      - serializedVersion: 2
        time: 5.4
        value: -0.48700002
        inSlope: -0.10933334
        outSlope: -0.10933334
        tangentMode: 136
      - serializedVersion: 2
        time: 8.466666
        value: -1.274
        inSlope: 0
        outSlope: 0
        tangentMode: 136
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: localEulerAnglesRaw.z
    path: Camera
    classID: 4
    script: {fileID: 0}
  m_EulerEditorCurves:
  - curve:
      serializedVersion: 2
      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.x
    path: Camera
    classID: 4
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.y
    path: Camera
    classID: 4
    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.z
    path: Camera
    classID: 4
    script: {fileID: 0}
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
  m_GenerateMotionCurves: 0
  m_Events: []

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154/Animation/Boss_Cx_Lqrz_M154.anim.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 98aa16bd81e28d642aad87e5e8bec8a5
timeCreated: 1536305448
licenseType: Free
NativeFormatImporter:
  mainObjectFileID: 7400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154/Boss_Cx_Lqrz.unity

New file
Diff too large

 Effects/UI/Boss_Xiu/Boss_Cx_Lqrz_M154/Boss_Cx_Lqrz.unity.meta

New file
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 81e11b99070ec36468d7456cd02d3ce1
timeCreated: 1536305231
licenseType: Free
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/Boss_Xiu/Boss_Cx_mqrz_M154.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: ff2b089f63e58cd4caebd2552312eca1
folderAsset: yes
timeCreated: 1536305253
licenseType: Free
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Effects/UI/Boss_Xiu/Boss_Cx_mqrz_M154/Map112_Mqzd.unity

New file
Diff too large

 Effects/UI/Boss_Xiu/Boss_Cx_mqrz_M154/Map112_Mqzd.unity.meta

New file
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2625864497d0d9d4392786cfe6b1957c
timeCreated: 1536305253
licenseType: Free
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Role/M154/M154@Open.FBX

Binary files differ

 Role/M154/M154@Open.FBX.meta

@@ -115,6 +115,7 @@
    400106: //RootNode
    7400000: Take 001
    9500000: //RootNode
    11100000: //RootNode
  materials:
    importMaterials: 1
    materialName: 0
@@ -176,10 +177,10 @@
    rootMotionBoneName: 
    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    hasExtraRoot: 1
    skeletonHasParents: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 2
  animationType: 1
  humanoidOversampling: 1
  additionalBone: 0
  userData: