diff --git a/Assets/ArtRes/Animation/教师(带伸手动画).controller b/Assets/ArtRes/Animation/教师(带伸手动画).controller new file mode 100644 index 0000000..84326af --- /dev/null +++ b/Assets/ArtRes/Animation/教师(带伸手动画).controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8108725917897274150 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -2418284421514328816} + m_Position: {x: 390, y: 50, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 90, y: 140, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -2418284421514328816} +--- !u!1102 &-2418284421514328816 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Take 001 + 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_TimeParameterActive: 0 + m_Motion: {fileID: 1827226128182048838, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u6559\u5E08\uFF08\u5E26\u4F38\u624B\u52A8\u753B\uFF09" + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8108725917897274150} + 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} diff --git a/Assets/ArtRes/Animation/教师(带伸手动画).controller.meta b/Assets/ArtRes/Animation/教师(带伸手动画).controller.meta new file mode 100644 index 0000000..4ddd9f6 --- /dev/null +++ b/Assets/ArtRes/Animation/教师(带伸手动画).controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19170da8a18c5904a83b80ec455d0204 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/教师(带伸手动画).fbm.meta b/Assets/Models/教师.fbm.meta similarity index 77% rename from Assets/Models/教师(带伸手动画).fbm.meta rename to Assets/Models/教师.fbm.meta index 16df18f..80ff994 100644 --- a/Assets/Models/教师(带伸手动画).fbm.meta +++ b/Assets/Models/教师.fbm.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f1a95bf6d4905da42b48e22a86489e38 +guid: ddbb29091d40c68449bf116d5de44ec6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Models/教师(带伸手动画).fbm/fa.tga b/Assets/Models/教师.fbm/fa.tga similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/fa.tga rename to Assets/Models/教师.fbm/fa.tga diff --git a/Assets/Models/教师(带伸手动画).fbm/fa.tga.meta b/Assets/Models/教师.fbm/fa.tga.meta similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/fa.tga.meta rename to Assets/Models/教师.fbm/fa.tga.meta diff --git a/Assets/Models/教师(带伸手动画).fbm/fa_n.jpg b/Assets/Models/教师.fbm/fa_n.jpg similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/fa_n.jpg rename to Assets/Models/教师.fbm/fa_n.jpg diff --git a/Assets/Models/教师(带伸手动画).fbm/fa_n.jpg.meta b/Assets/Models/教师.fbm/fa_n.jpg.meta similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/fa_n.jpg.meta rename to Assets/Models/教师.fbm/fa_n.jpg.meta diff --git a/Assets/Models/教师(带伸手动画).fbm/uv.jpg b/Assets/Models/教师.fbm/uv.jpg similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/uv.jpg rename to Assets/Models/教师.fbm/uv.jpg diff --git a/Assets/Models/教师(带伸手动画).fbm/uv.jpg.meta b/Assets/Models/教师.fbm/uv.jpg.meta similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/uv.jpg.meta rename to Assets/Models/教师.fbm/uv.jpg.meta diff --git a/Assets/Models/教师(带伸手动画).fbm/uv_n.jpg b/Assets/Models/教师.fbm/uv_n.jpg similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/uv_n.jpg rename to Assets/Models/教师.fbm/uv_n.jpg diff --git a/Assets/Models/教师(带伸手动画).fbm/uv_n.jpg.meta b/Assets/Models/教师.fbm/uv_n.jpg.meta similarity index 100% rename from Assets/Models/教师(带伸手动画).fbm/uv_n.jpg.meta rename to Assets/Models/教师.fbm/uv_n.jpg.meta diff --git a/Assets/Models/教师(伸手动画).fbx b/Assets/Models/教师(伸手动画).fbx new file mode 100644 index 0000000..fc1514f Binary files /dev/null and b/Assets/Models/教师(伸手动画).fbx differ diff --git a/Assets/Models/教师(伸手动画).fbx.meta b/Assets/Models/教师(伸手动画).fbx.meta new file mode 100644 index 0000000..fb26e84 --- /dev/null +++ b/Assets/Models/教师(伸手动画).fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 3c4efde06dda5f2459a3fecf3471ae17 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/教师(带伸手动画).fbx b/Assets/Models/教师(带伸手动画).fbx deleted file mode 100644 index 902a9ef..0000000 Binary files a/Assets/Models/教师(带伸手动画).fbx and /dev/null differ diff --git a/Assets/Models/教师(待机动画).fbx b/Assets/Models/教师(待机动画).fbx new file mode 100644 index 0000000..d81ba21 Binary files /dev/null and b/Assets/Models/教师(待机动画).fbx differ diff --git a/Assets/Models/教师(带伸手动画).fbx.meta b/Assets/Models/教师(待机动画).fbx.meta similarity index 98% rename from Assets/Models/教师(带伸手动画).fbx.meta rename to Assets/Models/教师(待机动画).fbx.meta index 2b429c8..0e95e9a 100644 --- a/Assets/Models/教师(带伸手动画).fbx.meta +++ b/Assets/Models/教师(待机动画).fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 61f2e702b0539e24fbb6214a8b00d1c9 +guid: 7b9fb3597fb5dc04faa55be08321ef65 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] diff --git a/Assets/Scenes/TestScenes/LiveScene-Test.unity b/Assets/Scenes/TestScenes/LiveScene-Test.unity index bcf5d5c..a0ae751 100644 --- a/Assets/Scenes/TestScenes/LiveScene-Test.unity +++ b/Assets/Scenes/TestScenes/LiveScene-Test.unity @@ -23,9 +23,9 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 + m_AmbientIntensity: 1.15 m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SubtractiveShadowColor: {r: 0.9622642, g: 0.9539029, b: 0.9395693, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: e2f3d7f569772ed449488663577dc7a7, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -33,12 +33,12 @@ RenderSettings: m_HaloTexture: {fileID: 0} m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 + m_DefaultReflectionResolution: 256 m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.20464736, g: 0.26801568, b: 0.30485883, a: 1} + m_Sun: {fileID: 482758754} + m_IndirectSpecularColor: {r: 0.20464769, g: 0.268016, b: 0.30485913, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -303,65 +303,102 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &515038138 -PrefabInstance: +--- !u!1 &482758753 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalPosition.x - value: 7.14 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalPosition.y - value: 2.19 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalPosition.z - value: -139.15 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} - propertyPath: m_Name - value: "\u6559\u5E08\uFF08\u5E26\u4F38\u624B\u52A8\u753B\uFF09" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 482758755} + - component: {fileID: 482758754} + m_Layer: 0 + m_Name: Directional Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &482758754 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482758753} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &482758755 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482758753} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 7.1327467, y: 4.6804514, z: -129.39088} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &530964177 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8109040287526821490, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} @@ -393,7 +430,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} propertyPath: m_LocalPosition.x @@ -458,6 +495,63 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1764.4271, y: 0.00015628338, z: 1506.3827} m_Center: {x: 189.43243, y: 1.0300586, z: -83.80817} +--- !u!1001 &1847977107 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalPosition.x + value: 7.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalPosition.y + value: 2.189 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalPosition.z + value: -140.62 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} + propertyPath: m_Name + value: "\u6559\u5E08\uFF08\u5F85\u673A\u52A8\u753B\uFF09" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3} --- !u!1 &1993064896 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TestScenes/TestScene1.unity b/Assets/Scenes/TestScenes/TestScene1.unity index 83236c4..ed945cd 100644 --- a/Assets/Scenes/TestScenes/TestScene1.unity +++ b/Assets/Scenes/TestScenes/TestScene1.unity @@ -4075,6 +4075,100 @@ Transform: m_Father: {fileID: 2073573053} m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1307363146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1307363148} + - component: {fileID: 1307363147} + m_Layer: 0 + m_Name: Directional Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1307363147 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307363146} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1307363148 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307363146} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 8.126286, y: 7.95, z: -135.96} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1315637060 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 258a6a0..317965e 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,13 +9,16 @@ EditorUserSettings: value: 5754060550000c5e59580a2348270d44434e1b782a7b7633747e1e30e4b5616b flags: 0 RecentlyUsedSceneGuid-1: - value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-2: - value: 01070d5f560c5e0d5f0f5c7240735b4444164a2c2e7a7f3579784e63e4b06d61 + value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f flags: 0 RecentlyUsedSceneGuid-3: value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a +<<<<<<< HEAD + flags: 0 +======= flags: 0 RecentlyUsedSceneGuid-4: value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a @@ -23,6 +26,7 @@ EditorUserSettings: RecentlyUsedSceneGuid-5: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 +>>>>>>> 6798c5c18edb4652934f59b9691ebd340c98ceba vcSharedLogLevel: value: 0d5e400f0650 flags: 0