Merge branch 'master' of https://github.com/Unity-Technologies/animation-rigging-workshop-siggraph2019

5 年前 · afb76921
--- a/Assets/TestNinja/Content/Characters/Ninja/Animations/Navigation/ninja_run.fbx.meta
+++ b/Assets/TestNinja/Content/Characters/Ninja/Animations/Navigation/ninja_run.fbx.meta
 fileFormatVersion: 2
 guid: 5a4121531c3abbb4bb4ebf81defe4463
 ModelImporter:
-  serializedVersion: 23
-  fileIDToRecycleName:
-    100000: Chest
-    100002: Head
-    100004: Head_null
-    100006: Hips
-    100008: joint1
-    100010: LeftElbow
-    100012: LeftFoot
-    100014: LeftHand
-    100016: LeftHandGrip
-    100018: LeftIndexDistal
-    100020: LeftIndexDistalEnd
-    100022: LeftIndexIntermediate
-    100024: LeftIndexProximal
-    100026: LeftKnee
-    100028: LeftLowerArm
-    100030: LeftLowerArmTwist1
-    100032: LeftLowerArmTwist2
-    100034: LeftLowerArmTwist3
-    100036: LeftLowerLeg
-    100038: LeftMiddleDistal
-    100040: LeftMiddleDistalEnd
-    100042: LeftMiddleIntermediate
-    100044: LeftMiddleProximal
-    100046: LeftPinkyDistal
-    100048: LeftPinkyDistalEnd
-    100050: LeftPinkyIntermediate
-    100052: LeftPinkyProximal
-    100054: LeftRingDistal
-    100056: LeftRingDistalEnd
-    100058: LeftRingIntermediate
-    100060: LeftRingProximal
-    100062: LeftShoulder
-    100064: LeftThumbDistal
-    100066: LeftThumbDistalEnd
-    100068: LeftThumbIntermediate
-    100070: LeftThumbProximal2
-    100072: LeftToes
-    100074: LeftToesEnd
-    100076: LeftUpperArm
-    100078: LeftUpperArmTwist1
-    100080: LeftUpperArmTwist2
-    100082: LeftUpperArmTwist3
-    100084: LeftUpperLeg
-    100086: LeftUpperLegTwist1
-    100088: LeftUpperLegTwist2
-    100090: LeftUpperLegTwist3
-    100092: Neck
-    100094: //RootNode
-    100096: RightElbow
-    100098: RightFoot
-    100100: RightHand
-    100102: RightHandGrip
-    100104: RightIndexDistal
-    100106: RightIndexDistalEnd
-    100108: RightIndexIntermediate
-    100110: RightIndexProximal
-    100112: RightLowerArm
-    100114: RightLowerArmTwist1
-    100116: RightLowerArmTwist2
-    100118: RightLowerArmTwist3
-    100120: RightLowerLeg
-    100122: RightMiddleDistal
-    100124: RightMiddleDistalEnd
-    100126: RightMiddleIntermediate
-    100128: RightMiddleProximal
-    100130: RightPinkyDistal
-    100132: RightPinkyDistalEnd
-    100134: RightPinkyIntermediate
-    100136: RightPinkyProximal
-    100138: RightRingDistal
-    100140: RightRingDistalEnd
-    100142: RightRingIntermediate
-    100144: RightRingProximal
-    100146: RightShoulder
-    100148: RightThumbDistal
-    100150: RightThumbDistalEnd
-    100152: RightThumbIntermediate
-    100154: RightThumbProximal2
-    100156: RightToes
-    100158: RightToesEnd
-    100160: RightUpperArm
-    100162: RightUpperArmTwist1
-    100164: RightUpperArmTwist2
-    100166: RightUpperArmTwist3
-    100168: RightUpperLeg
-    100170: RightUpperLegTwist1
-    100172: RightUpperLegTwist2
-    100174: RightUpperLegTwist3
-    100176: Root
-    100178: Spine
-    100180: UpperChest
-    400000: Chest
-    400002: Head
-    400004: Head_null
-    400006: Hips
-    400008: joint1
-    400010: LeftElbow
-    400012: LeftFoot
-    400014: LeftHand
-    400016: LeftHandGrip
-    400018: LeftIndexDistal
-    400020: LeftIndexDistalEnd
-    400022: LeftIndexIntermediate
-    400024: LeftIndexProximal
-    400026: LeftKnee
-    400028: LeftLowerArm
-    400030: LeftLowerArmTwist1
-    400032: LeftLowerArmTwist2
-    400034: LeftLowerArmTwist3
-    400036: LeftLowerLeg
-    400038: LeftMiddleDistal
-    400040: LeftMiddleDistalEnd
-    400042: LeftMiddleIntermediate
-    400044: LeftMiddleProximal
-    400046: LeftPinkyDistal
-    400048: LeftPinkyDistalEnd
-    400050: LeftPinkyIntermediate
-    400052: LeftPinkyProximal
-    400054: LeftRingDistal
-    400056: LeftRingDistalEnd
-    400058: LeftRingIntermediate
-    400060: LeftRingProximal
-    400062: LeftShoulder
-    400064: LeftThumbDistal
-    400066: LeftThumbDistalEnd
-    400068: LeftThumbIntermediate
-    400070: LeftThumbProximal2
-    400072: LeftToes
-    400074: LeftToesEnd
-    400076: LeftUpperArm
-    400078: LeftUpperArmTwist1
-    400080: LeftUpperArmTwist2
-    400082: LeftUpperArmTwist3
-    400084: LeftUpperLeg
-    400086: LeftUpperLegTwist1
-    400088: LeftUpperLegTwist2
-    400090: LeftUpperLegTwist3
-    400092: Neck
-    400094: //RootNode
-    400096: RightElbow
-    400098: RightFoot
-    400100: RightHand
-    400102: RightHandGrip
-    400104: RightIndexDistal
-    400106: RightIndexDistalEnd
-    400108: RightIndexIntermediate
-    400110: RightIndexProximal
-    400112: RightLowerArm
-    400114: RightLowerArmTwist1
-    400116: RightLowerArmTwist2
-    400118: RightLowerArmTwist3
-    400120: RightLowerLeg
-    400122: RightMiddleDistal
-    400124: RightMiddleDistalEnd
-    400126: RightMiddleIntermediate
-    400128: RightMiddleProximal
-    400130: RightPinkyDistal
-    400132: RightPinkyDistalEnd
-    400134: RightPinkyIntermediate
-    400136: RightPinkyProximal
-    400138: RightRingDistal
-    400140: RightRingDistalEnd
-    400142: RightRingIntermediate
-    400144: RightRingProximal
-    400146: RightShoulder
-    400148: RightThumbDistal
-    400150: RightThumbDistalEnd
-    400152: RightThumbIntermediate
-    400154: RightThumbProximal2
-    400156: RightToes
-    400158: RightToesEnd
-    400160: RightUpperArm
-    400162: RightUpperArmTwist1
-    400164: RightUpperArmTwist2
-    400166: RightUpperArmTwist3
-    400168: RightUpperLeg
-    400170: RightUpperLegTwist1
-    400172: RightUpperLegTwist2
-    400174: RightUpperLegTwist3
-    400176: Root
-    400178: Spine
-    400180: UpperChest
-    7400000: ninja_run
-    9500000: //RootNode
+  serializedVersion: 26
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: Chest
+  - first:
+      1: 100002
+    second: Head
+  - first:
+      1: 100004
+    second: Head_null
+  - first:
+      1: 100006
+    second: Hips
+  - first:
+      1: 100008
+    second: joint1
+  - first:
+      1: 100010
+    second: LeftElbow
+  - first:
+      1: 100012
+    second: LeftFoot
+  - first:
+      1: 100014
+    second: LeftHand
+  - first:
+      1: 100016
+    second: LeftHandGrip
+  - first:
+      1: 100018
+    second: LeftIndexDistal
+  - first:
+      1: 100020
+    second: LeftIndexDistalEnd
+  - first:
+      1: 100022
+    second: LeftIndexIntermediate
+  - first:
+      1: 100024
+    second: LeftIndexProximal
+  - first:
+      1: 100026
+    second: LeftKnee
+  - first:
+      1: 100028
+    second: LeftLowerArm
+  - first:
+      1: 100030
+    second: LeftLowerArmTwist1
+  - first:
+      1: 100032
+    second: LeftLowerArmTwist2
+  - first:
+      1: 100034
+    second: LeftLowerArmTwist3
+  - first:
+      1: 100036
+    second: LeftLowerLeg
+  - first:
+      1: 100038
+    second: LeftMiddleDistal
+  - first:
+      1: 100040
+    second: LeftMiddleDistalEnd
+  - first:
+      1: 100042
+    second: LeftMiddleIntermediate
+  - first:
+      1: 100044
+    second: LeftMiddleProximal
+  - first:
+      1: 100046
+    second: LeftPinkyDistal
+  - first:
+      1: 100048
+    second: LeftPinkyDistalEnd
+  - first:
+      1: 100050
+    second: LeftPinkyIntermediate
+  - first:
+      1: 100052
+    second: LeftPinkyProximal
+  - first:
+      1: 100054
+    second: LeftRingDistal
+  - first:
+      1: 100056
+    second: LeftRingDistalEnd
+  - first:
+      1: 100058
+    second: LeftRingIntermediate
+  - first:
+      1: 100060
+    second: LeftRingProximal
+  - first:
+      1: 100062
+    second: LeftShoulder
+  - first:
+      1: 100064
+    second: LeftThumbDistal
+  - first:
+      1: 100066
+    second: LeftThumbDistalEnd
+  - first:
+      1: 100068
+    second: LeftThumbIntermediate
+  - first:
+      1: 100070
+    second: LeftThumbProximal2
+  - first:
+      1: 100072
+    second: LeftToes
+  - first:
+      1: 100074
+    second: LeftToesEnd
+  - first:
+      1: 100076
+    second: LeftUpperArm
+  - first:
+      1: 100078
+    second: LeftUpperArmTwist1
+  - first:
+      1: 100080
+    second: LeftUpperArmTwist2
+  - first:
+      1: 100082
+    second: LeftUpperArmTwist3
+  - first:
+      1: 100084
+    second: LeftUpperLeg
+  - first:
+      1: 100086
+    second: LeftUpperLegTwist1
+  - first:
+      1: 100088
+    second: LeftUpperLegTwist2
+  - first:
+      1: 100090
+    second: LeftUpperLegTwist3
+  - first:
+      1: 100092
+    second: Neck
+  - first:
+      1: 100094
+    second: //RootNode
+  - first:
+      1: 100096
+    second: RightElbow
+  - first:
+      1: 100098
+    second: RightFoot
+  - first:
+      1: 100100
+    second: RightHand
+  - first:
+      1: 100102
+    second: RightHandGrip
+  - first:
+      1: 100104
+    second: RightIndexDistal
+  - first:
+      1: 100106
+    second: RightIndexDistalEnd
+  - first:
+      1: 100108
+    second: RightIndexIntermediate
+  - first:
+      1: 100110
+    second: RightIndexProximal
+  - first:
+      1: 100112
+    second: RightLowerArm
+  - first:
+      1: 100114
+    second: RightLowerArmTwist1
+  - first:
+      1: 100116
+    second: RightLowerArmTwist2
+  - first:
+      1: 100118
+    second: RightLowerArmTwist3
+  - first:
+      1: 100120
+    second: RightLowerLeg
+  - first:
+      1: 100122
+    second: RightMiddleDistal
+  - first:
+      1: 100124
+    second: RightMiddleDistalEnd
+  - first:
+      1: 100126
+    second: RightMiddleIntermediate
+  - first:
+      1: 100128
+    second: RightMiddleProximal
+  - first:
+      1: 100130
+    second: RightPinkyDistal
+  - first:
+      1: 100132
+    second: RightPinkyDistalEnd
+  - first:
+      1: 100134
+    second: RightPinkyIntermediate
+  - first:
+      1: 100136
+    second: RightPinkyProximal
+  - first:
+      1: 100138
+    second: RightRingDistal
+  - first:
+      1: 100140
+    second: RightRingDistalEnd
+  - first:
+      1: 100142
+    second: RightRingIntermediate
+  - first:
+      1: 100144
+    second: RightRingProximal
+  - first:
+      1: 100146
+    second: RightShoulder
+  - first:
+      1: 100148
+    second: RightThumbDistal
+  - first:
+      1: 100150
+    second: RightThumbDistalEnd
+  - first:
+      1: 100152
+    second: RightThumbIntermediate
+  - first:
+      1: 100154
+    second: RightThumbProximal2
+  - first:
+      1: 100156
+    second: RightToes
+  - first:
+      1: 100158
+    second: RightToesEnd
+  - first:
+      1: 100160
+    second: RightUpperArm
+  - first:
+      1: 100162
+    second: RightUpperArmTwist1
+  - first:
+      1: 100164
+    second: RightUpperArmTwist2
+  - first:
+      1: 100166
+    second: RightUpperArmTwist3
+  - first:
+      1: 100168
+    second: RightUpperLeg
+  - first:
+      1: 100170
+    second: RightUpperLegTwist1
+  - first:
+      1: 100172
+    second: RightUpperLegTwist2
+  - first:
+      1: 100174
+    second: RightUpperLegTwist3
+  - first:
+      1: 100176
+    second: Root
+  - first:
+      1: 100178
+    second: Spine
+  - first:
+      1: 100180
+    second: UpperChest
+  - first:
+      4: 400000
+    second: Chest
+  - first:
+      4: 400002
+    second: Head
+  - first:
+      4: 400004
+    second: Head_null
+  - first:
+      4: 400006
+    second: Hips
+  - first:
+      4: 400008
+    second: joint1
+  - first:
+      4: 400010
+    second: LeftElbow
+  - first:
+      4: 400012
+    second: LeftFoot
+  - first:
+      4: 400014
+    second: LeftHand
+  - first:
+      4: 400016
+    second: LeftHandGrip
+  - first:
+      4: 400018
+    second: LeftIndexDistal
+  - first:
+      4: 400020
+    second: LeftIndexDistalEnd
+  - first:
+      4: 400022
+    second: LeftIndexIntermediate
+  - first:
+      4: 400024
+    second: LeftIndexProximal
+  - first:
+      4: 400026
+    second: LeftKnee
+  - first:
+      4: 400028
+    second: LeftLowerArm
+  - first:
+      4: 400030
+    second: LeftLowerArmTwist1
+  - first:
+      4: 400032
+    second: LeftLowerArmTwist2
+  - first:
+      4: 400034
+    second: LeftLowerArmTwist3
+  - first:
+      4: 400036
+    second: LeftLowerLeg
+  - first:
+      4: 400038
+    second: LeftMiddleDistal
+  - first:
+      4: 400040
+    second: LeftMiddleDistalEnd
+  - first:
+      4: 400042
+    second: LeftMiddleIntermediate
+  - first:
+      4: 400044
+    second: LeftMiddleProximal
+  - first:
+      4: 400046
+    second: LeftPinkyDistal
+  - first:
+      4: 400048
+    second: LeftPinkyDistalEnd
+  - first:
+      4: 400050
+    second: LeftPinkyIntermediate
+  - first:
+      4: 400052
+    second: LeftPinkyProximal
+  - first:
+      4: 400054
+    second: LeftRingDistal
+  - first:
+      4: 400056
+    second: LeftRingDistalEnd
+  - first:
+      4: 400058
+    second: LeftRingIntermediate
+  - first:
+      4: 400060
+    second: LeftRingProximal
+  - first:
+      4: 400062
+    second: LeftShoulder
+  - first:
+      4: 400064
+    second: LeftThumbDistal
+  - first:
+      4: 400066
+    second: LeftThumbDistalEnd
+  - first:
+      4: 400068
+    second: LeftThumbIntermediate
+  - first:
+      4: 400070
+    second: LeftThumbProximal2
+  - first:
+      4: 400072
+    second: LeftToes
+  - first:
+      4: 400074
+    second: LeftToesEnd
+  - first:
+      4: 400076
+    second: LeftUpperArm
+  - first:
+      4: 400078
+    second: LeftUpperArmTwist1
+  - first:
+      4: 400080
+    second: LeftUpperArmTwist2
+  - first:
+      4: 400082
+    second: LeftUpperArmTwist3
+  - first:
+      4: 400084
+    second: LeftUpperLeg
+  - first:
+      4: 400086
+    second: LeftUpperLegTwist1
+  - first:
+      4: 400088
+    second: LeftUpperLegTwist2
+  - first:
+      4: 400090
+    second: LeftUpperLegTwist3
+  - first:
+      4: 400092
+    second: Neck
+  - first:
+      4: 400094
+    second: //RootNode
+  - first:
+      4: 400096
+    second: RightElbow
+  - first:
+      4: 400098
+    second: RightFoot
+  - first:
+      4: 400100
+    second: RightHand
+  - first:
+      4: 400102
+    second: RightHandGrip
+  - first:
+      4: 400104
+    second: RightIndexDistal
+  - first:
+      4: 400106
+    second: RightIndexDistalEnd
+  - first:
+      4: 400108
+    second: RightIndexIntermediate
+  - first:
+      4: 400110
+    second: RightIndexProximal
+  - first:
+      4: 400112
+    second: RightLowerArm
+  - first:
+      4: 400114
+    second: RightLowerArmTwist1
+  - first:
+      4: 400116
+    second: RightLowerArmTwist2
+  - first:
+      4: 400118
+    second: RightLowerArmTwist3
+  - first:
+      4: 400120
+    second: RightLowerLeg
+  - first:
+      4: 400122
+    second: RightMiddleDistal
+  - first:
+      4: 400124
+    second: RightMiddleDistalEnd
+  - first:
+      4: 400126
+    second: RightMiddleIntermediate
+  - first:
+      4: 400128
+    second: RightMiddleProximal
+  - first:
+      4: 400130
+    second: RightPinkyDistal
+  - first:
+      4: 400132
+    second: RightPinkyDistalEnd
+  - first:
+      4: 400134
+    second: RightPinkyIntermediate
+  - first:
+      4: 400136
+    second: RightPinkyProximal
+  - first:
+      4: 400138
+    second: RightRingDistal
+  - first:
+      4: 400140
+    second: RightRingDistalEnd
+  - first:
+      4: 400142
+    second: RightRingIntermediate
+  - first:
+      4: 400144
+    second: RightRingProximal
+  - first:
+      4: 400146
+    second: RightShoulder
+  - first:
+      4: 400148
+    second: RightThumbDistal
+  - first:
+      4: 400150
+    second: RightThumbDistalEnd
+  - first:
+      4: 400152
+    second: RightThumbIntermediate
+  - first:
+      4: 400154
+    second: RightThumbProximal2
+  - first:
+      4: 400156
+    second: RightToes
+  - first:
+      4: 400158
+    second: RightToesEnd
+  - first:
+      4: 400160
+    second: RightUpperArm
+  - first:
+      4: 400162
+    second: RightUpperArmTwist1
+  - first:
+      4: 400164
+    second: RightUpperArmTwist2
+  - first:
+      4: 400166
+    second: RightUpperArmTwist3
+  - first:
+      4: 400168
+    second: RightUpperLeg
+  - first:
+      4: 400170
+    second: RightUpperLegTwist1
+  - first:
+      4: 400172
+    second: RightUpperLegTwist2
+  - first:
+      4: 400174
+    second: RightUpperLegTwist3
+  - first:
+      4: 400176
+    second: Root
+  - first:
+      4: 400178
+    second: Spine
+  - first:
+      4: 400180
+    second: UpperChest
+  - first:
+      74: 7400000
+    second: ninja_run
+  - first:
+      95: 9500000
+    second: //RootNode
  externalObjects: {}
  materials:
    importMaterials: 1
    - serializedVersion: 16
      name: ninja_run
      takeName: Take 001
+      internalID: 7400000
      firstFrame: 176
      lastFrame: 193
      wrapMode: 0
    meshCompression: 0
    addColliders: 0
    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
    useFileUnits: 1
-    optimizeMeshForGPU: 1
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
    indexFormat: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
-    previousCalculatedGlobalScale: 0.01
-    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    blendShapeNormalImportMode: 1
    normalSmoothingSource: 0
+  referencedClips: []
-    serializedVersion: 2
+    serializedVersion: 3
    human: []
    skeleton:
    - name: ninja_run(Clone)
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
-    rootMotionBoneName: Root
+    globalScale: 1
+    rootMotionBoneName: 
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
--- a/Assets/TestNinja/Content/Characters/Ninja/Animations/Navigation/ninja_walk.fbx.meta
+++ b/Assets/TestNinja/Content/Characters/Ninja/Animations/Navigation/ninja_walk.fbx.meta
 fileFormatVersion: 2
 guid: e2a20afd2aed838429ae0ec9fd915aad
 ModelImporter:
-  serializedVersion: 23
-  fileIDToRecycleName:
-    100000: Chest
-    100002: Head
-    100004: Head_null
-    100006: Hips
-    100008: joint1
-    100010: LeftElbow
-    100012: LeftFoot
-    100014: LeftHand
-    100016: LeftHandGrip
-    100018: LeftIndexDistal
-    100020: LeftIndexDistalEnd
-    100022: LeftIndexIntermediate
-    100024: LeftIndexProximal
-    100026: LeftKnee
-    100028: LeftLowerArm
-    100030: LeftLowerArmTwist1
-    100032: LeftLowerArmTwist2
-    100034: LeftLowerArmTwist3
-    100036: LeftLowerLeg
-    100038: LeftMiddleDistal
-    100040: LeftMiddleDistalEnd
-    100042: LeftMiddleIntermediate
-    100044: LeftMiddleProximal
-    100046: LeftPinkyDistal
-    100048: LeftPinkyDistalEnd
-    100050: LeftPinkyIntermediate
-    100052: LeftPinkyProximal
-    100054: LeftRingDistal
-    100056: LeftRingDistalEnd
-    100058: LeftRingIntermediate
-    100060: LeftRingProximal
-    100062: LeftShoulder
-    100064: LeftThumbDistal
-    100066: LeftThumbDistalEnd
-    100068: LeftThumbIntermediate
-    100070: LeftThumbProximal2
-    100072: LeftToes
-    100074: LeftToesEnd
-    100076: LeftUpperArm
-    100078: LeftUpperArmTwist1
-    100080: LeftUpperArmTwist2
-    100082: LeftUpperArmTwist3
-    100084: LeftUpperLeg
-    100086: LeftUpperLegTwist1
-    100088: LeftUpperLegTwist2
-    100090: LeftUpperLegTwist3
-    100092: Neck
-    100094: //RootNode
-    100096: RightElbow
-    100098: RightFoot
-    100100: RightHand
-    100102: RightHandGrip
-    100104: RightIndexDistal
-    100106: RightIndexDistalEnd
-    100108: RightIndexIntermediate
-    100110: RightIndexProximal
-    100112: RightLowerArm
-    100114: RightLowerArmTwist1
-    100116: RightLowerArmTwist2
-    100118: RightLowerArmTwist3
-    100120: RightLowerLeg
-    100122: RightMiddleDistal
-    100124: RightMiddleDistalEnd
-    100126: RightMiddleIntermediate
-    100128: RightMiddleProximal
-    100130: RightPinkyDistal
-    100132: RightPinkyDistalEnd
-    100134: RightPinkyIntermediate
-    100136: RightPinkyProximal
-    100138: RightRingDistal
-    100140: RightRingDistalEnd
-    100142: RightRingIntermediate
-    100144: RightRingProximal
-    100146: RightShoulder
-    100148: RightThumbDistal
-    100150: RightThumbDistalEnd
-    100152: RightThumbIntermediate
-    100154: RightThumbProximal2
-    100156: RightToes
-    100158: RightToesEnd
-    100160: RightUpperArm
-    100162: RightUpperArmTwist1
-    100164: RightUpperArmTwist2
-    100166: RightUpperArmTwist3
-    100168: RightUpperLeg
-    100170: RightUpperLegTwist1
-    100172: RightUpperLegTwist2
-    100174: RightUpperLegTwist3
-    100176: Root
-    100178: Spine
-    100180: UpperChest
-    400000: Chest
-    400002: Head
-    400004: Head_null
-    400006: Hips
-    400008: joint1
-    400010: LeftElbow
-    400012: LeftFoot
-    400014: LeftHand
-    400016: LeftHandGrip
-    400018: LeftIndexDistal
-    400020: LeftIndexDistalEnd
-    400022: LeftIndexIntermediate
-    400024: LeftIndexProximal
-    400026: LeftKnee
-    400028: LeftLowerArm
-    400030: LeftLowerArmTwist1
-    400032: LeftLowerArmTwist2
-    400034: LeftLowerArmTwist3
-    400036: LeftLowerLeg
-    400038: LeftMiddleDistal
-    400040: LeftMiddleDistalEnd
-    400042: LeftMiddleIntermediate
-    400044: LeftMiddleProximal
-    400046: LeftPinkyDistal
-    400048: LeftPinkyDistalEnd
-    400050: LeftPinkyIntermediate
-    400052: LeftPinkyProximal
-    400054: LeftRingDistal
-    400056: LeftRingDistalEnd
-    400058: LeftRingIntermediate
-    400060: LeftRingProximal
-    400062: LeftShoulder
-    400064: LeftThumbDistal
-    400066: LeftThumbDistalEnd
-    400068: LeftThumbIntermediate
-    400070: LeftThumbProximal2
-    400072: LeftToes
-    400074: LeftToesEnd
-    400076: LeftUpperArm
-    400078: LeftUpperArmTwist1
-    400080: LeftUpperArmTwist2
-    400082: LeftUpperArmTwist3
-    400084: LeftUpperLeg
-    400086: LeftUpperLegTwist1
-    400088: LeftUpperLegTwist2
-    400090: LeftUpperLegTwist3
-    400092: Neck
-    400094: //RootNode
-    400096: RightElbow
-    400098: RightFoot
-    400100: RightHand
-    400102: RightHandGrip
-    400104: RightIndexDistal
-    400106: RightIndexDistalEnd
-    400108: RightIndexIntermediate
-    400110: RightIndexProximal
-    400112: RightLowerArm
-    400114: RightLowerArmTwist1
-    400116: RightLowerArmTwist2
-    400118: RightLowerArmTwist3
-    400120: RightLowerLeg
-    400122: RightMiddleDistal
-    400124: RightMiddleDistalEnd
-    400126: RightMiddleIntermediate
-    400128: RightMiddleProximal
-    400130: RightPinkyDistal
-    400132: RightPinkyDistalEnd
-    400134: RightPinkyIntermediate
-    400136: RightPinkyProximal
-    400138: RightRingDistal
-    400140: RightRingDistalEnd
-    400142: RightRingIntermediate
-    400144: RightRingProximal
-    400146: RightShoulder
-    400148: RightThumbDistal
-    400150: RightThumbDistalEnd
-    400152: RightThumbIntermediate
-    400154: RightThumbProximal2
-    400156: RightToes
-    400158: RightToesEnd
-    400160: RightUpperArm
-    400162: RightUpperArmTwist1
-    400164: RightUpperArmTwist2
-    400166: RightUpperArmTwist3
-    400168: RightUpperLeg
-    400170: RightUpperLegTwist1
-    400172: RightUpperLegTwist2
-    400174: RightUpperLegTwist3
-    400176: Root
-    400178: Spine
-    400180: UpperChest
-    7400000: ninja_walk
-    9500000: //RootNode
+  serializedVersion: 26
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: Chest
+  - first:
+      1: 100002
+    second: Head
+  - first:
+      1: 100004
+    second: Head_null
+  - first:
+      1: 100006
+    second: Hips
+  - first:
+      1: 100008
+    second: joint1
+  - first:
+      1: 100010
+    second: LeftElbow
+  - first:
+      1: 100012
+    second: LeftFoot
+  - first:
+      1: 100014
+    second: LeftHand
+  - first:
+      1: 100016
+    second: LeftHandGrip
+  - first:
+      1: 100018
+    second: LeftIndexDistal
+  - first:
+      1: 100020
+    second: LeftIndexDistalEnd
+  - first:
+      1: 100022
+    second: LeftIndexIntermediate
+  - first:
+      1: 100024
+    second: LeftIndexProximal
+  - first:
+      1: 100026
+    second: LeftKnee
+  - first:
+      1: 100028
+    second: LeftLowerArm
+  - first:
+      1: 100030
+    second: LeftLowerArmTwist1
+  - first:
+      1: 100032
+    second: LeftLowerArmTwist2
+  - first:
+      1: 100034
+    second: LeftLowerArmTwist3
+  - first:
+      1: 100036
+    second: LeftLowerLeg
+  - first:
+      1: 100038
+    second: LeftMiddleDistal
+  - first:
+      1: 100040
+    second: LeftMiddleDistalEnd
+  - first:
+      1: 100042
+    second: LeftMiddleIntermediate
+  - first:
+      1: 100044
+    second: LeftMiddleProximal
+  - first:
+      1: 100046
+    second: LeftPinkyDistal
+  - first:
+      1: 100048
+    second: LeftPinkyDistalEnd
+  - first:
+      1: 100050
+    second: LeftPinkyIntermediate
+  - first:
+      1: 100052
+    second: LeftPinkyProximal
+  - first:
+      1: 100054
+    second: LeftRingDistal
+  - first:
+      1: 100056
+    second: LeftRingDistalEnd
+  - first:
+      1: 100058
+    second: LeftRingIntermediate
+  - first:
+      1: 100060
+    second: LeftRingProximal
+  - first:
+      1: 100062
+    second: LeftShoulder
+  - first:
+      1: 100064
+    second: LeftThumbDistal
+  - first:
+      1: 100066
+    second: LeftThumbDistalEnd
+  - first:
+      1: 100068
+    second: LeftThumbIntermediate
+  - first:
+      1: 100070
+    second: LeftThumbProximal2
+  - first:
+      1: 100072
+    second: LeftToes
+  - first:
+      1: 100074
+    second: LeftToesEnd
+  - first:
+      1: 100076
+    second: LeftUpperArm
+  - first:
+      1: 100078
+    second: LeftUpperArmTwist1
+  - first:
+      1: 100080
+    second: LeftUpperArmTwist2
+  - first:
+      1: 100082
+    second: LeftUpperArmTwist3
+  - first:
+      1: 100084
+    second: LeftUpperLeg
+  - first:
+      1: 100086
+    second: LeftUpperLegTwist1
+  - first:
+      1: 100088
+    second: LeftUpperLegTwist2
+  - first:
+      1: 100090
+    second: LeftUpperLegTwist3
+  - first:
+      1: 100092
+    second: Neck
+  - first:
+      1: 100094
+    second: //RootNode
+  - first:
+      1: 100096
+    second: RightElbow
+  - first:
+      1: 100098
+    second: RightFoot
+  - first:
+      1: 100100
+    second: RightHand
+  - first:
+      1: 100102
+    second: RightHandGrip
+  - first:
+      1: 100104
+    second: RightIndexDistal
+  - first:
+      1: 100106
+    second: RightIndexDistalEnd
+  - first:
+      1: 100108
+    second: RightIndexIntermediate
+  - first:
+      1: 100110
+    second: RightIndexProximal
+  - first:
+      1: 100112
+    second: RightLowerArm
+  - first:
+      1: 100114
+    second: RightLowerArmTwist1
+  - first:
+      1: 100116
+    second: RightLowerArmTwist2
+  - first:
+      1: 100118
+    second: RightLowerArmTwist3
+  - first:
+      1: 100120
+    second: RightLowerLeg
+  - first:
+      1: 100122
+    second: RightMiddleDistal
+  - first:
+      1: 100124
+    second: RightMiddleDistalEnd
+  - first:
+      1: 100126
+    second: RightMiddleIntermediate
+  - first:
+      1: 100128
+    second: RightMiddleProximal
+  - first:
+      1: 100130
+    second: RightPinkyDistal
+  - first:
+      1: 100132
+    second: RightPinkyDistalEnd
+  - first:
+      1: 100134
+    second: RightPinkyIntermediate
+  - first:
+      1: 100136
+    second: RightPinkyProximal
+  - first:
+      1: 100138
+    second: RightRingDistal
+  - first:
+      1: 100140
+    second: RightRingDistalEnd
+  - first:
+      1: 100142
+    second: RightRingIntermediate
+  - first:
+      1: 100144
+    second: RightRingProximal
+  - first:
+      1: 100146
+    second: RightShoulder
+  - first:
+      1: 100148
+    second: RightThumbDistal
+  - first:
+      1: 100150
+    second: RightThumbDistalEnd
+  - first:
+      1: 100152
+    second: RightThumbIntermediate
+  - first:
+      1: 100154
+    second: RightThumbProximal2
+  - first:
+      1: 100156
+    second: RightToes
+  - first:
+      1: 100158
+    second: RightToesEnd
+  - first:
+      1: 100160
+    second: RightUpperArm
+  - first:
+      1: 100162
+    second: RightUpperArmTwist1
+  - first:
+      1: 100164
+    second: RightUpperArmTwist2
+  - first:
+      1: 100166
+    second: RightUpperArmTwist3
+  - first:
+      1: 100168
+    second: RightUpperLeg
+  - first:
+      1: 100170
+    second: RightUpperLegTwist1
+  - first:
+      1: 100172
+    second: RightUpperLegTwist2
+  - first:
+      1: 100174
+    second: RightUpperLegTwist3
+  - first:
+      1: 100176
+    second: Root
+  - first:
+      1: 100178
+    second: Spine
+  - first:
+      1: 100180
+    second: UpperChest
+  - first:
+      4: 400000
+    second: Chest
+  - first:
+      4: 400002
+    second: Head
+  - first:
+      4: 400004
+    second: Head_null
+  - first:
+      4: 400006
+    second: Hips
+  - first:
+      4: 400008
+    second: joint1
+  - first:
+      4: 400010
+    second: LeftElbow
+  - first:
+      4: 400012
+    second: LeftFoot
+  - first:
+      4: 400014
+    second: LeftHand
+  - first:
+      4: 400016
+    second: LeftHandGrip
+  - first:
+      4: 400018
+    second: LeftIndexDistal
+  - first:
+      4: 400020
+    second: LeftIndexDistalEnd
+  - first:
+      4: 400022
+    second: LeftIndexIntermediate
+  - first:
+      4: 400024
+    second: LeftIndexProximal
+  - first:
+      4: 400026
+    second: LeftKnee
+  - first:
+      4: 400028
+    second: LeftLowerArm
+  - first:
+      4: 400030
+    second: LeftLowerArmTwist1
+  - first:
+      4: 400032
+    second: LeftLowerArmTwist2
+  - first:
+      4: 400034
+    second: LeftLowerArmTwist3
+  - first:
+      4: 400036
+    second: LeftLowerLeg
+  - first:
+      4: 400038
+    second: LeftMiddleDistal
+  - first:
+      4: 400040
+    second: LeftMiddleDistalEnd
+  - first:
+      4: 400042
+    second: LeftMiddleIntermediate
+  - first:
+      4: 400044
+    second: LeftMiddleProximal
+  - first:
+      4: 400046
+    second: LeftPinkyDistal
+  - first:
+      4: 400048
+    second: LeftPinkyDistalEnd
+  - first:
+      4: 400050
+    second: LeftPinkyIntermediate
+  - first:
+      4: 400052
+    second: LeftPinkyProximal
+  - first:
+      4: 400054
+    second: LeftRingDistal
+  - first:
+      4: 400056
+    second: LeftRingDistalEnd
+  - first:
+      4: 400058
+    second: LeftRingIntermediate
+  - first:
+      4: 400060
+    second: LeftRingProximal
+  - first:
+      4: 400062
+    second: LeftShoulder
+  - first:
+      4: 400064
+    second: LeftThumbDistal
+  - first:
+      4: 400066
+    second: LeftThumbDistalEnd
+  - first:
+      4: 400068
+    second: LeftThumbIntermediate
+  - first:
+      4: 400070
+    second: LeftThumbProximal2
+  - first:
+      4: 400072
+    second: LeftToes
+  - first:
+      4: 400074
+    second: LeftToesEnd
+  - first:
+      4: 400076
+    second: LeftUpperArm
+  - first:
+      4: 400078
+    second: LeftUpperArmTwist1
+  - first:
+      4: 400080
+    second: LeftUpperArmTwist2
+  - first:
+      4: 400082
+    second: LeftUpperArmTwist3
+  - first:
+      4: 400084
+    second: LeftUpperLeg
+  - first:
+      4: 400086
+    second: LeftUpperLegTwist1
+  - first:
+      4: 400088
+    second: LeftUpperLegTwist2
+  - first:
+      4: 400090
+    second: LeftUpperLegTwist3
+  - first:
+      4: 400092
+    second: Neck
+  - first:
+      4: 400094
+    second: //RootNode
+  - first:
+      4: 400096
+    second: RightElbow
+  - first:
+      4: 400098
+    second: RightFoot
+  - first:
+      4: 400100
+    second: RightHand
+  - first:
+      4: 400102
+    second: RightHandGrip
+  - first:
+      4: 400104
+    second: RightIndexDistal
+  - first:
+      4: 400106
+    second: RightIndexDistalEnd
+  - first:
+      4: 400108
+    second: RightIndexIntermediate
+  - first:
+      4: 400110
+    second: RightIndexProximal
+  - first:
+      4: 400112
+    second: RightLowerArm
+  - first:
+      4: 400114
+    second: RightLowerArmTwist1
+  - first:
+      4: 400116
+    second: RightLowerArmTwist2
+  - first:
+      4: 400118
+    second: RightLowerArmTwist3
+  - first:
+      4: 400120
+    second: RightLowerLeg
+  - first:
+      4: 400122
+    second: RightMiddleDistal
+  - first:
+      4: 400124
+    second: RightMiddleDistalEnd
+  - first:
+      4: 400126
+    second: RightMiddleIntermediate
+  - first:
+      4: 400128
+    second: RightMiddleProximal
+  - first:
+      4: 400130
+    second: RightPinkyDistal
+  - first:
+      4: 400132
+    second: RightPinkyDistalEnd
+  - first:
+      4: 400134
+    second: RightPinkyIntermediate
+  - first:
+      4: 400136
+    second: RightPinkyProximal
+  - first:
+      4: 400138
+    second: RightRingDistal
+  - first:
+      4: 400140
+    second: RightRingDistalEnd
+  - first:
+      4: 400142
+    second: RightRingIntermediate
+  - first:
+      4: 400144
+    second: RightRingProximal
+  - first:
+      4: 400146
+    second: RightShoulder
+  - first:
+      4: 400148
+    second: RightThumbDistal
+  - first:
+      4: 400150
+    second: RightThumbDistalEnd
+  - first:
+      4: 400152
+    second: RightThumbIntermediate
+  - first:
+      4: 400154
+    second: RightThumbProximal2
+  - first:
+      4: 400156
+    second: RightToes
+  - first:
+      4: 400158
+    second: RightToesEnd
+  - first:
+      4: 400160
+    second: RightUpperArm
+  - first:
+      4: 400162
+    second: RightUpperArmTwist1
+  - first:
+      4: 400164
+    second: RightUpperArmTwist2
+  - first:
+      4: 400166
+    second: RightUpperArmTwist3
+  - first:
+      4: 400168
+    second: RightUpperLeg
+  - first:
+      4: 400170
+    second: RightUpperLegTwist1
+  - first:
+      4: 400172
+    second: RightUpperLegTwist2
+  - first:
+      4: 400174
+    second: RightUpperLegTwist3
+  - first:
+      4: 400176
+    second: Root
+  - first:
+      4: 400178
+    second: Spine
+  - first:
+      4: 400180
+    second: UpperChest
+  - first:
+      74: 7400000
+    second: ninja_walk
+  - first:
+      95: 9500000
+    second: //RootNode
  externalObjects: {}
  materials:
    importMaterials: 1
    - serializedVersion: 16
      name: ninja_walk
      takeName: Take 001
+      internalID: 7400000
      firstFrame: 74
      lastFrame: 107
      wrapMode: 0
    meshCompression: 0
    addColliders: 0
    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
    useFileUnits: 1
-    optimizeMeshForGPU: 1
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
    indexFormat: 0
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
-    previousCalculatedGlobalScale: 0.01
-    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    blendShapeNormalImportMode: 1
    normalSmoothingSource: 0
+  referencedClips: []
-    serializedVersion: 2
+    serializedVersion: 3
    human: []
    skeleton:
    - name: ninja_walk(Clone)
    armStretch: 0.05
    legStretch: 0.05
    feetSpacing: 0
-    rootMotionBoneName: Root
+    globalScale: 1
+    rootMotionBoneName: 
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
--- a/Assets/TestNinja/Content/Characters/Ninja/Textures/ninja_normals.png.meta
+++ b/Assets/TestNinja/Content/Characters/Ninja/Textures/ninja_normals.png.meta
 fileFormatVersion: 2
 guid: 03c39246d90bc4646b3793edf6b1d78a
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
-  serializedVersion: 6
+  serializedVersion: 10
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
-  - serializedVersion: 2
+  - serializedVersion: 3
-    maxTextureSize: 8192
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    overridden: 0
    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
-    maxTextureSize: 8192
+    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    overridden: 0
    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
    buildTarget: iPhone
    maxTextureSize: 8192
    resizeAlgorithm: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 8192
    resizeAlgorithm: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
    buildTarget: Windows Store Apps
    maxTextureSize: 8192
    resizeAlgorithm: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
  spriteSheet:
    serializedVersion: 2
    sprites: []
    spriteID: 
+    internalID: 0
+    secondaryTextures: []
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/TestNinja/Content/Characters/Ninja/Animations/Navigation/.working/.mayaSwatches/ninja_idle.ma.swatches
+++ b/Assets/TestNinja/Content/Characters/Ninja/Animations/Navigation/.working/.mayaSwatches/ninja_idle.ma.swatches