Commit cd97eeeb authored by 神楽坂玲奈's avatar 神楽坂玲奈

upgrade to 2018.2

parent 12ade584
...@@ -64,7 +64,7 @@ public class MegaBook : MonoBehaviour ...@@ -64,7 +64,7 @@ public class MegaBook : MonoBehaviour
if ( bookalpha > 100.0f ) if ( bookalpha > 100.0f )
bookalpha = 100.0f; bookalpha = 100.0f;
if ( front.transform.GetChildCount() > 0 ) if ( front.transform.childCount > 0 )
{ {
Transform child = front.transform.GetChild(0); Transform child = front.transform.GetChild(0);
if ( child != null ) if ( child != null )
...@@ -75,7 +75,7 @@ public class MegaBook : MonoBehaviour ...@@ -75,7 +75,7 @@ public class MegaBook : MonoBehaviour
} }
} }
if ( back.transform.GetChildCount() > 0 ) if ( back.transform.childCount > 0 )
{ {
Transform child = back.transform.GetChild(0); Transform child = back.transform.GetChild(0);
if ( child != null ) if ( child != null )
......
...@@ -215,7 +215,7 @@ public class MegaGrab : MonoBehaviour ...@@ -215,7 +215,7 @@ public class MegaGrab : MonoBehaviour
float xo = x + xa; float xo = x + xa;
float yo = y + ya; float yo = y + ya;
SrcCamera.projectionMatrix = CalcProjectionMatrix(mleft, mright, mbottom, mtop, SrcCamera.near, SrcCamera.far, xo, yo); SrcCamera.projectionMatrix = CalcProjectionMatrix(mleft, mright, mbottom, mtop, SrcCamera.nearClipPlane, SrcCamera.farClipPlane, xo, yo);
SrcCamera.Render(); SrcCamera.Render();
...@@ -271,7 +271,7 @@ public class MegaGrab : MonoBehaviour ...@@ -271,7 +271,7 @@ public class MegaGrab : MonoBehaviour
float xo = x + xa; float xo = x + xa;
float yo = y + ya; float yo = y + ya;
SrcCamera.projectionMatrix = CalcProjectionMatrix(mleft, mright, mbottom, mtop, SrcCamera.near, SrcCamera.far, xo, yo); SrcCamera.projectionMatrix = CalcProjectionMatrix(mleft, mright, mbottom, mtop, SrcCamera.nearClipPlane, SrcCamera.farClipPlane, xo, yo);
SrcCamera.Render(); SrcCamera.Render();
......
...@@ -87,6 +87,6 @@ public class UISnapshotPointEditor : Editor ...@@ -87,6 +87,6 @@ public class UISnapshotPointEditor : Editor
if (go == null) return null; if (go == null) return null;
// Actual prefab // Actual prefab
return PrefabUtility.GetPrefabParent(go) as GameObject; return PrefabUtility.GetCorrespondingObjectFromSource(go) as GameObject;
} }
} }
fileFormatVersion: 2 fileFormatVersion: 2
guid: 38d405c119fcc7c4e83d4a478a40ff2f guid: 38d405c119fcc7c4e83d4a478a40ff2f
PluginImporter: PluginImporter:
serializedVersion: 1 externalObjects: {}
serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
isPreloaded: 0 isPreloaded: 0
isOverridable: 0
platformData: platformData:
- first:
Any: Any:
second:
enabled: 0 enabled: 0
settings: {} settings: {}
Editor: - first:
Editor: Editor
second:
enabled: 1 enabled: 1
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4ad02dc83da735c4e8d945332b9202f6 guid: 4ad02dc83da735c4e8d945332b9202f6
PluginImporter: PluginImporter:
serializedVersion: 1 externalObjects: {}
serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
isPreloaded: 0 isPreloaded: 0
isOverridable: 0
platformData: platformData:
- first:
Any: Any:
second:
enabled: 0 enabled: 0
settings: {} settings: {}
Editor: - first:
Editor: Editor
second:
enabled: 1 enabled: 1
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
fileFormatVersion: 2 fileFormatVersion: 2
guid: 02fff229d2825ed4aa890d36c2b3dcea guid: 02fff229d2825ed4aa890d36c2b3dcea
timeCreated: 1486533642
licenseType: Pro
PluginImporter: PluginImporter:
serializedVersion: 1 externalObjects: {}
serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
isPreloaded: 0 isPreloaded: 0
isOverridable: 0
platformData: platformData:
- first:
Any: Any:
second:
enabled: 0 enabled: 0
settings: {} settings: {}
Editor: - first:
Editor: Editor
second:
enabled: 1 enabled: 1
settings: settings:
DefaultValueInitialized: true DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
...@@ -607,7 +607,7 @@ namespace TMPro ...@@ -607,7 +607,7 @@ namespace TMPro
// Check if event applies to this current object // Check if event applies to this current object
if (obj == gameObject || UnityEditor.PrefabUtility.GetPrefabParent(gameObject) == obj) if (obj == gameObject || UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(gameObject) == obj)
{ {
//Debug.Log("Assigning new Base Material " + newMaterial.name + " to replace " + currentMaterial.name); //Debug.Log("Assigning new Base Material " + newMaterial.name + " to replace " + currentMaterial.name);
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 450a160c7951f80478d52807e29c3cac guid: 450a160c7951f80478d52807e29c3cac
ModelImporter: ModelImporter:
serializedVersion: 18 serializedVersion: 23
fileIDToRecycleName: fileIDToRecycleName:
100000: //RootNode 100000: //RootNode
400000: //RootNode 400000: //RootNode
...@@ -10,64 +10,90 @@ ModelImporter: ...@@ -10,64 +10,90 @@ ModelImporter:
4300000: Cone001 4300000: Cone001
4300002: Arrow 4300002: Arrow
11100000: //RootNode 11100000: //RootNode
2186277476908879412: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: No Name
second: {fileID: 2100000, guid: 3b7adb9cb097fc94ea1724bbc0a2496d, type: 2}
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
materialLocation: 0
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1 animationCompression: 1
animationRotationError: .5 animationRotationError: 0.5
animationPositionError: .5 animationPositionError: 0.5
animationScaleError: .5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: [] clipAnimations: []
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: .100000001 globalScale: 0.1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0
importLights: 0
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
preserveHierarchy: 0
indexFormat: 1
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 0 useFileScale: 0
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 1 tangentImportMode: 4
normalCalculationMode: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2
human: [] human: []
skeleton: [] skeleton: []
armTwist: .5 armTwist: 0.5
foreArmTwist: .5 foreArmTwist: 0.5
upperLegTwist: .5 upperLegTwist: 0.5
legTwist: .5 legTwist: 0.5
armStretch: .0500000007 armStretch: 0.05
legStretch: .0500000007 legStretch: 0.05
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 1 animationType: 1
humanoidOversampling: 1
additionalBone: 1 additionalBone: 1
userData: userData:
assetBundleName: assetBundleName:
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: c3a24d20e49504a439e3f2a113763906 guid: c3a24d20e49504a439e3f2a113763906
timeCreated: 1480605856
licenseType: Pro
ModelImporter: ModelImporter:
serializedVersion: 18 serializedVersion: 23
fileIDToRecycleName: fileIDToRecycleName:
100000: Group35331 100000: Group35331
100002: //RootNode 100002: //RootNode
...@@ -13,64 +11,90 @@ ModelImporter: ...@@ -13,64 +11,90 @@ ModelImporter:
3300000: Group35331 3300000: Group35331
4300000: Group35331 4300000: Group35331
11100000: //RootNode 11100000: //RootNode
2186277476908879412: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Group35331Mat
second: {fileID: 2100000, guid: ffd06084c6af6054085e5710348e794b, type: 2}
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
materialLocation: 0
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1 animationCompression: 1
animationRotationError: .5 animationRotationError: 0.5
animationPositionError: .5 animationPositionError: 0.5
animationScaleError: .5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: [] clipAnimations: []
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: .100000001 globalScale: 0.1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0
importLights: 0
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
preserveHierarchy: 0
indexFormat: 1
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 0 useFileScale: 0
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 1 tangentImportMode: 4
normalCalculationMode: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2
human: [] human: []
skeleton: [] skeleton: []
armTwist: .5 armTwist: 0.5
foreArmTwist: .5 foreArmTwist: 0.5
upperLegTwist: .5 upperLegTwist: 0.5
legTwist: .5 legTwist: 0.5
armStretch: .0500000007 armStretch: 0.05
legStretch: .0500000007 legStretch: 0.05
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 1 animationType: 1
humanoidOversampling: 1
additionalBone: 1 additionalBone: 1
userData: userData:
assetBundleName: assetBundleName:
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: c33a5f3e4d6aaee47857d43097d6447a guid: c33a5f3e4d6aaee47857d43097d6447a
timeCreated: 1480605856
licenseType: Pro
ModelImporter: ModelImporter:
serializedVersion: 18 serializedVersion: 23
fileIDToRecycleName: fileIDToRecycleName:
100000: Group64449 100000: Group64449
100002: //RootNode 100002: //RootNode
...@@ -13,64 +11,90 @@ ModelImporter: ...@@ -13,64 +11,90 @@ ModelImporter:
3300000: Group64449 3300000: Group64449
4300000: Group64449 4300000: Group64449
11100000: //RootNode 11100000: //RootNode
2186277476908879412: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Group64449Mat
second: {fileID: 2100000, guid: e5e6491e4bceac64eb1ced59177a94e9, type: 2}
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
materialLocation: 0
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1 animationCompression: 1
animationRotationError: .5 animationRotationError: 0.5
animationPositionError: .5 animationPositionError: 0.5
animationScaleError: .5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: [] clipAnimations: []
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: .100000001 globalScale: 0.1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0
importLights: 0
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
preserveHierarchy: 0
indexFormat: 1
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 0 useFileScale: 0
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 1 tangentImportMode: 4
normalCalculationMode: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2
human: [] human: []
skeleton: [] skeleton: []
armTwist: .5 armTwist: 0.5
foreArmTwist: .5 foreArmTwist: 0.5
upperLegTwist: .5 upperLegTwist: 0.5
legTwist: .5 legTwist: 0.5
armStretch: .0500000007 armStretch: 0.05
legStretch: .0500000007 legStretch: 0.05
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 1 animationType: 1
humanoidOversampling: 1
additionalBone: 1 additionalBone: 1
userData: userData:
assetBundleName: assetBundleName:
......
...@@ -359,7 +359,7 @@ public class HighlightingEffect : MonoBehaviour ...@@ -359,7 +359,7 @@ public class HighlightingEffect : MonoBehaviour
shaderCamera.cullingMask = layerMask; shaderCamera.cullingMask = layerMask;
shaderCamera.rect = new Rect(0f, 0f, 1f, 1f); shaderCamera.rect = new Rect(0f, 0f, 1f, 1f);
shaderCamera.renderingPath = RenderingPath.VertexLit; shaderCamera.renderingPath = RenderingPath.VertexLit;
shaderCamera.hdr = false; shaderCamera.allowHDR = false;
shaderCamera.useOcclusionCulling = false; shaderCamera.useOcclusionCulling = false;
shaderCamera.backgroundColor = new Color(0f, 0f, 0f, 0f); shaderCamera.backgroundColor = new Color(0f, 0f, 0f, 0f);
shaderCamera.clearFlags = CameraClearFlags.SolidColor; shaderCamera.clearFlags = CameraClearFlags.SolidColor;
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1386491679 &1
PresetManager:
m_ObjectHideFlags: 0
m_DefaultList: []
m_EditorVersion: 2017.4.40f1 m_EditorVersion: 2018.2.20f1
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