Conflicts: playable/Assets/Lachlan_jump_work.unitymaster
@ -0,0 +1,127 @@ | |||||
fileFormatVersion: 2 | |||||
guid: 971b971310a3d5a48941c88f65fde32c | |||||
ModelImporter: | |||||
serializedVersion: 16 | |||||
fileIDToRecycleName: | |||||
100000: //RootNode | |||||
100002: pCube1 | |||||
100004: pTorus1 | |||||
100006: pTorus10 | |||||
100008: pTorus11 | |||||
100010: pTorus12 | |||||
100012: pTorus13 | |||||
100014: pTorus2 | |||||
100016: pTorus3 | |||||
100018: pTorus4 | |||||
100020: pTorus5 | |||||
100022: pTorus6 | |||||
100024: pTorus8 | |||||
100026: pTorus9 | |||||
400000: //RootNode | |||||
400002: pCube1 | |||||
400004: pTorus1 | |||||
400006: pTorus10 | |||||
400008: pTorus11 | |||||
400010: pTorus12 | |||||
400012: pTorus13 | |||||
400014: pTorus2 | |||||
400016: pTorus3 | |||||
400018: pTorus4 | |||||
400020: pTorus5 | |||||
400022: pTorus6 | |||||
400024: pTorus8 | |||||
400026: pTorus9 | |||||
2300000: pCube1 | |||||
2300002: pTorus1 | |||||
2300004: pTorus10 | |||||
2300006: pTorus11 | |||||
2300008: pTorus12 | |||||
2300010: pTorus13 | |||||
2300012: pTorus2 | |||||
2300014: pTorus3 | |||||
2300016: pTorus4 | |||||
2300018: pTorus5 | |||||
2300020: pTorus6 | |||||
2300022: pTorus8 | |||||
2300024: pTorus9 | |||||
3300000: pCube1 | |||||
3300002: pTorus1 | |||||
3300004: pTorus10 | |||||
3300006: pTorus11 | |||||
3300008: pTorus12 | |||||
3300010: pTorus13 | |||||
3300012: pTorus2 | |||||
3300014: pTorus3 | |||||
3300016: pTorus4 | |||||
3300018: pTorus5 | |||||
3300020: pTorus6 | |||||
3300022: pTorus8 | |||||
3300024: pTorus9 | |||||
4300000: pCube1 | |||||
4300002: pTorus1 | |||||
4300004: pTorus2 | |||||
4300006: pTorus3 | |||||
4300008: pTorus4 | |||||
4300010: pTorus5 | |||||
4300012: pTorus6 | |||||
4300014: pTorus8 | |||||
4300016: pTorus9 | |||||
4300018: pTorus10 | |||||
4300020: pTorus11 | |||||
4300022: pTorus12 | |||||
4300024: pTorus13 | |||||
9500000: //RootNode | |||||
materials: | |||||
importMaterials: 1 | |||||
materialName: 0 | |||||
materialSearch: 1 | |||||
animations: | |||||
legacyGenerateAnimations: 4 | |||||
bakeSimulation: 0 | |||||
optimizeGameObjects: 0 | |||||
motionNodeName: | |||||
animationCompression: 1 | |||||
animationRotationError: .5 | |||||
animationPositionError: .5 | |||||
animationScaleError: .5 | |||||
animationWrapMode: 0 | |||||
extraExposedTransformPaths: [] | |||||
clipAnimations: [] | |||||
isReadable: 1 | |||||
meshes: | |||||
lODScreenPercentages: [] | |||||
globalScale: .00999999978 | |||||
meshCompression: 0 | |||||
addColliders: 0 | |||||
importBlendShapes: 1 | |||||
swapUVChannels: 0 | |||||
generateSecondaryUV: 0 | |||||
useFileUnits: 1 | |||||
optimizeMeshForGPU: 1 | |||||
weldVertices: 1 | |||||
secondaryUVAngleDistortion: 8 | |||||
secondaryUVAreaDistortion: 15.000001 | |||||
secondaryUVHardAngle: 88 | |||||
secondaryUVPackMargin: 4 | |||||
tangentSpace: | |||||
normalSmoothAngle: 60 | |||||
splitTangentsAcrossUV: 1 | |||||
normalImportMode: 0 | |||||
tangentImportMode: 1 | |||||
importAnimation: 1 | |||||
copyAvatar: 0 | |||||
humanDescription: | |||||
human: [] | |||||
skeleton: [] | |||||
armTwist: .5 | |||||
foreArmTwist: .5 | |||||
upperLegTwist: .5 | |||||
legTwist: .5 | |||||
armStretch: .0500000007 | |||||
legStretch: .0500000007 | |||||
feetSpacing: 0 | |||||
rootMotionBoneName: | |||||
lastHumanDescriptionAvatarSource: {instanceID: 0} | |||||
animationType: 2 | |||||
additionalBone: 0 | |||||
userData: |
@ -0,0 +1,4 @@ | |||||
fileFormatVersion: 2 | |||||
guid: 9ebb4742b86788f4caf050f4ca0da6d5 | |||||
NativeFormatImporter: | |||||
userData: |
@ -0,0 +1,4 @@ | |||||
fileFormatVersion: 2 | |||||
guid: e76e0432773883a4da6f6485421dcf6c | |||||
NativeFormatImporter: | |||||
userData: |
@ -0,0 +1,4 @@ | |||||
fileFormatVersion: 2 | |||||
guid: 1db1afd426530bd4e87153c18874b847 | |||||
NativeFormatImporter: | |||||
userData: |
@ -0,0 +1,5 @@ | |||||
fileFormatVersion: 2 | |||||
guid: 4d3d543634e75884f959acd325cff7b1 | |||||
folderAsset: yes | |||||
DefaultImporter: | |||||
userData: |
@ -0,0 +1,39 @@ | |||||
Shader "Custom/ItemGlow" { | |||||
Properties { | |||||
_ColorTint("Color Tint", Color) = (1,1,1,1) | |||||
_MainTex ("Base (RGB)", 2D) = "white" {} | |||||
_BumpMap("Normal Map", 2D) = "bump" {} | |||||
_RimColor("Rim Color", Color) = (1,1,1,1) | |||||
_RimPower("Rim Power", Range(1.0,6.0)) = 3.0 | |||||
} | |||||
SubShader { | |||||
Tags { "RenderType"="Opaque" } | |||||
CGPROGRAM | |||||
#pragma surface surf Lambert | |||||
struct Input { | |||||
float4 color : Color; | |||||
float2 uv_MainTex; | |||||
float2 uv_BumpMap; | |||||
float3 viewDir; | |||||
}; | |||||
float4 _ColorTint; | |||||
sampler2D _MainTex; | |||||
sampler2D _BumpMap; | |||||
float4 _RimColor; | |||||
float _RimPower; | |||||
void surf (Input IN, inout SurfaceOutput o) { | |||||
IN.color = _ColorTint; | |||||
o.Albedo = tex2D (_MainTex, IN.uv_MainTex).rgb * IN.color; | |||||
o.Normal = UnpackNormal (tex2D(_BumpMap, IN.uv_BumpMap)); | |||||
half rim = 1.0 -saturate(dot(normalize(IN.viewDir), o.Normal)); | |||||
o.Emission= _RimColor.rgb * pow(rim, _RimPower); | |||||
} | |||||
ENDCG | |||||
} | |||||
FallBack "Diffuse" | |||||
} |
@ -0,0 +1,5 @@ | |||||
fileFormatVersion: 2 | |||||
guid: 3e01bd612472b904da7cb37b7d5132c3 | |||||
ShaderImporter: | |||||
defaultTextures: [] | |||||
userData: |
@ -0,0 +1,81 @@ | |||||
fileFormatVersion: 2 | |||||
guid: 2fe0df14f112e8a498555e637472ed56 | |||||
ModelImporter: | |||||
serializedVersion: 16 | |||||
fileIDToRecycleName: | |||||
100000: //RootNode | |||||
100002: pCube1 | |||||
100004: pCube2 | |||||
100006: pCylinder1 | |||||
100008: side1 | |||||
100010: locator1 | |||||
400000: //RootNode | |||||
400002: pCube1 | |||||
400004: pCube2 | |||||
400006: pCylinder1 | |||||
400008: side1 | |||||
400010: locator1 | |||||
2300000: pCube1 | |||||
2300002: pCube2 | |||||
2300004: pCylinder1 | |||||
3300000: pCube1 | |||||
3300002: pCube2 | |||||
3300004: pCylinder1 | |||||
4300000: pCylinder1 | |||||
4300002: pCube1 | |||||
4300004: pCube2 | |||||
9500000: //RootNode | |||||
materials: | |||||
importMaterials: 1 | |||||
materialName: 0 | |||||
materialSearch: 1 | |||||
animations: | |||||
legacyGenerateAnimations: 4 | |||||
bakeSimulation: 0 | |||||
optimizeGameObjects: 0 | |||||
motionNodeName: | |||||
animationCompression: 1 | |||||
animationRotationError: .5 | |||||
animationPositionError: .5 | |||||
animationScaleError: .5 | |||||
animationWrapMode: 0 | |||||
extraExposedTransformPaths: [] | |||||
clipAnimations: [] | |||||
isReadable: 1 | |||||
meshes: | |||||
lODScreenPercentages: [] | |||||
globalScale: .00999999978 | |||||
meshCompression: 0 | |||||
addColliders: 0 | |||||
importBlendShapes: 1 | |||||
swapUVChannels: 0 | |||||
generateSecondaryUV: 0 | |||||
useFileUnits: 1 | |||||
optimizeMeshForGPU: 1 | |||||
weldVertices: 1 | |||||
secondaryUVAngleDistortion: 8 | |||||
secondaryUVAreaDistortion: 15.000001 | |||||
secondaryUVHardAngle: 88 | |||||
secondaryUVPackMargin: 4 | |||||
tangentSpace: | |||||
normalSmoothAngle: 60 | |||||
splitTangentsAcrossUV: 1 | |||||
normalImportMode: 0 | |||||
tangentImportMode: 1 | |||||
importAnimation: 1 | |||||
copyAvatar: 0 | |||||
humanDescription: | |||||
human: [] | |||||
skeleton: [] | |||||
armTwist: .5 | |||||
foreArmTwist: .5 | |||||
upperLegTwist: .5 | |||||
legTwist: .5 | |||||
armStretch: .0500000007 | |||||
legStretch: .0500000007 | |||||
feetSpacing: 0 | |||||
rootMotionBoneName: | |||||
lastHumanDescriptionAvatarSource: {instanceID: 0} | |||||
animationType: 2 | |||||
additionalBone: 0 | |||||
userData: |