Commit 0c9e9902 authored by 梁璟强's avatar 梁璟强

无修改

parent f1b75835
fileFormatVersion: 2
guid: c1b99225ae7eaa0448b2c70f6fca3595
timeCreated: 1508676048
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 30675ba835b412042a54b458053453cd
timeCreated: 1508676582
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
......@@ -559,7 +559,7 @@ namespace HutongGames.PlayMakerEditor
var rect = GUILayoutUtility.GetLastRect();
EditorGUIUtility.AddCursorRect(rect, MouseCursor.Link);
if (Event.current.type == EventType.mouseDown && rect.Contains(Event.current.mousePosition))
if (Event.current.type == EventType.MouseDown && rect.Contains(Event.current.mousePosition))
{
func(userData);
GUIUtility.ExitGUI();
......@@ -573,7 +573,7 @@ namespace HutongGames.PlayMakerEditor
GUI.Box(backButtonRect, backButton, GUIStyle.none);
EditorGUIUtility.AddCursorRect(backButtonRect, MouseCursor.Link);
if (Event.current.type == EventType.mouseDown && backButtonRect.Contains(Event.current.mousePosition))
if (Event.current.type == EventType.MouseDown && backButtonRect.Contains(Event.current.mousePosition))
{
GotoPage(toPage);
GUIUtility.ExitGUI();
......
fileFormatVersion: 2
guid: 41d34532da2b3ce468a17b3ab0bb0ed7
timeCreated: 1515724292
licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9d26d3f3b8ea0e944a1df72bca40a713
timeCreated: 1508677751
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -3,47 +3,21 @@ guid: 1e6064201aec772479ee7b12e4d43b45
timeCreated: 1504594521
licenseType: Pro
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
useLegacyImporter: 0
quality: 0.5
isColorLinear: 0
originalWidth: 1280
originalHeight: 720
frameRange: 0
startFrame: -1
endFrame: -1
frameCount: 2292
frameRate: 29.970029830932617
colorSpace: 0
deinterlace: 0
sourceFileSize: 20398084
encodeAlpha: 0
sourceHasAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
sourceAudioChannelCount: 0200
sourceAudioSampleRate: 80bb0000
targetSettings: {}
output:
format: 1
settings:
enableTranscoding: 0
codec: 0
resizeFormat: 0
aspectRatio: 0
customWidth: 1280
customHeight: 720
bitrateMode: 2
spatialQuality: 2
encodedWidth: 1280
encodedHeight: 720
encodedStartFrame: 0
encodedEndFrame: 2292
streamedResource:
source:
offset: 0
size: 20398084
userData:
assetBundleName:
assetBundleVariant:
......@@ -3,7 +3,7 @@ guid: 19776d9c8c96e8c49a4f8c51b5b1dc6b
timeCreated: 1503988083
licenseType: Pro
ModelImporter:
serializedVersion: 21
serializedVersion: 22
fileIDToRecycleName:
100000: //RootNode
100002: mixamorig:Head
......@@ -143,10 +143,12 @@ ModelImporter:
400134: mixamorig:Spine2
7400000: fist_pump
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
......@@ -159,6 +161,7 @@ ModelImporter:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
......@@ -178,7 +181,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
......
fileFormatVersion: 2
guid: a2c6fcb4d90aeae4ab4a9fcedb0dde8f
timeCreated: 1508678185
licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d4bd3aaa15d9700428106981be2cce16
timeCreated: 1508679915
licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: fd87eb522e33caa4a93cf2b8c3ed8bd1
timeCreated: 1508678878
licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -3,7 +3,7 @@ guid: 9ad254c799201d348b5cb292fd1734f0
timeCreated: 1503988110
licenseType: Pro
ModelImporter:
serializedVersion: 21
serializedVersion: 22
fileIDToRecycleName:
100000: mixamorig:Head
100002: mixamorig:HeadTop_End
......@@ -143,10 +143,12 @@ ModelImporter:
400134: //RootNode
7400000: waving
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
......@@ -159,6 +161,7 @@ ModelImporter:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
......@@ -178,7 +181,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
......
......@@ -3,7 +3,7 @@ guid: ae617e9d226a56e49a794e9e637c8a90
timeCreated: 1503988111
licenseType: Pro
ModelImporter:
serializedVersion: 21
serializedVersion: 22
fileIDToRecycleName:
100000: mixamorig:Head
100002: mixamorig:HeadTop_End
......@@ -143,10 +143,12 @@ ModelImporter:
400134: //RootNode
7400000: mixamo.com
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
......@@ -159,6 +161,7 @@ ModelImporter:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
......@@ -166,7 +169,35 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: mixamo.com
takeName: mixamo.com
firstFrame: 0
lastFrame: 142
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
......
......@@ -3,7 +3,7 @@ guid: 300adc8930f8dc64392b1650707ddb93
timeCreated: 1503988100
licenseType: Pro
ModelImporter:
serializedVersion: 21
serializedVersion: 22
fileIDToRecycleName:
100000: mixamorig:Head
100002: mixamorig:HeadTop_End
......@@ -143,10 +143,12 @@ ModelImporter:
400134: //RootNode
7400000: mixamo.com
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
......@@ -159,6 +161,7 @@ ModelImporter:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
......@@ -166,7 +169,35 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: mixamo.com
takeName: mixamo.com
firstFrame: 0
lastFrame: 44
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
......
......@@ -3,7 +3,7 @@ guid: 30ad8daeb75282545b64ec50e09962cd
timeCreated: 1504165033
licenseType: Pro
ModelImporter:
serializedVersion: 21
serializedVersion: 22
fileIDToRecycleName:
100000: Head
100002: HeadTop_End
......@@ -139,10 +139,12 @@ ModelImporter:
400130: //RootNode
7400000: xiexie
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
......@@ -155,6 +157,7 @@ ModelImporter:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
......@@ -174,7 +177,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
......
......@@ -3,7 +3,7 @@ guid: 0343d1f480a2ac041b11b7dfae36b8ba
timeCreated: 1504165032
licenseType: Pro
ModelImporter:
serializedVersion: 21
serializedVersion: 22
fileIDToRecycleName:
100000: Head
100002: HeadTop_End
......@@ -139,10 +139,12 @@ ModelImporter:
400130: //RootNode
7400000: mixamo.com
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
......@@ -155,6 +157,7 @@ ModelImporter:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
......@@ -162,7 +165,35 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
clipAnimations:
- serializedVersion: 16
name: mixamo.com
takeName: mixamo.com
firstFrame: 0
lastFrame: 139
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
......
......@@ -611,7 +611,7 @@ In doubt, do not use this and get in touch with us to learn more before you work
if(rowsArea!=null && rowIndex<rowsArea.Length && Event.current.type == EventType.repaint)
if(rowsArea!=null && rowIndex<rowsArea.Length && Event.current.type == EventType.Repaint)
{
rowsArea[rowIndex] = GUILayoutUtility.GetLastRect();
}
......@@ -884,7 +884,7 @@ In doubt, do not use this and get in touch with us to learn more before you work
OnGUI_BottomPanel();
// User click on a row.
if (Event.current.type == EventType.mouseDown && mouseOverRowIndex!=-1)
if (Event.current.type == EventType.MouseDown && mouseOverRowIndex!=-1)
{
SelectedIndex = -1;
......@@ -2202,7 +2202,7 @@ In doubt, do not use this and get in touch with us to learn more before you work
if(rowsArea!=null && rowIndex<rowsArea.Length && Event.current.type == EventType.repaint)
if(rowsArea!=null && rowIndex<rowsArea.Length && Event.current.type == EventType.Repaint)
{
rowsArea[rowIndex] = GUILayoutUtility.GetLastRect();
}
......
fileFormatVersion: 2
guid: 5cd52b60772b52d468652a813dc6c18a
timeCreated: 1509004986
licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
m_EditorVersion: 2017.2.0b9
m_EditorVersion: 2017.3.1f1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment