diff --git a/Assets/DC/Materials/02 - Def6456546ault.mat b/Assets/DC/Materials/02 - Def6456546ault.mat index bb72e7a3..8bf09600 100644 --- a/Assets/DC/Materials/02 - Def6456546ault.mat +++ b/Assets/DC/Materials/02 - Def6456546ault.mat @@ -24,11 +24,12 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque @@ -99,19 +100,30 @@ Material: - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - - _Cull: 2 + - _Cull: 0 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 - _DstBlend: 0 - _DstBlendAlpha: 0 + - _EmissionEnabled: 0 - _EnvironmentReflections: 1 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0.14142135 - _GlossyReflections: 1 + - _LightingEnabled: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 @@ -120,6 +132,9 @@ Material: - _ReceiveShadows: 1 - _Smoothness: 0.14142135 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 @@ -128,8 +143,10 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.79073066, g: 0.79073066, b: 0.79073066, a: 1} - - _Color: {r: 0.79073066, g: 0.79073066, b: 0.79073066, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/DC/新尧金地广场地形(内).FBX b/Assets/DC/新尧金地广场地形(内).FBX new file mode 100644 index 00000000..3e0dda70 Binary files /dev/null and b/Assets/DC/新尧金地广场地形(内).FBX differ diff --git a/Assets/DC/新尧金地广场地形(内).FBX.meta b/Assets/DC/新尧金地广场地形(内).FBX.meta new file mode 100644 index 00000000..18742995 --- /dev/null +++ b/Assets/DC/新尧金地广场地形(内).FBX.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 6b64ad841dc301243a3d265862f502ef +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 1 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + 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 + importPhysicalCameras: 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 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DC/新尧金地广场地形(内).prefab b/Assets/DC/新尧金地广场地形(内).prefab new file mode 100644 index 00000000..bff546cb --- /dev/null +++ b/Assets/DC/新尧金地广场地形(内).prefab @@ -0,0 +1,201 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4360160315636105896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6956967369043974779} + m_Layer: 0 + m_Name: "\u65B0\u5C27\u91D1\u5730\u5E7F\u573A\u5730\u5F62(\u5185\uFF09" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6956967369043974779 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4360160315636105896} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.72124594, z: -0, w: -0.69267917} + m_LocalPosition: {x: 37.07, y: 0, z: -9.98} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 670615981749553342} + - {fileID: 3899573555621200913} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: -267.685, z: 0} +--- !u!1 &4538591664255580108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3899573555621200913} + - component: {fileID: 3632060791217476444} + - component: {fileID: 682064676414999686} + m_Layer: 0 + m_Name: "\u5BF9\u8C61003" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3899573555621200913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4538591664255580108} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -10.512289, y: 0, z: -38.259388} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6956967369043974779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3632060791217476444 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4538591664255580108} + m_Mesh: {fileID: 8775619837978819758, guid: 6b64ad841dc301243a3d265862f502ef, type: 3} +--- !u!23 &682064676414999686 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4538591664255580108} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 14543afded304754c83e0de382bf7890, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5098609357892179904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 670615981749553342} + - component: {fileID: 7338716089773202250} + - component: {fileID: 4278052242039781940} + m_Layer: 0 + m_Name: Line001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &670615981749553342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5098609357892179904} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -10.512289, y: 0, z: -38.259388} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6956967369043974779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7338716089773202250 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5098609357892179904} + m_Mesh: {fileID: -7553716758358721678, guid: 6b64ad841dc301243a3d265862f502ef, type: 3} +--- !u!23 &4278052242039781940 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5098609357892179904} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 61a6671aa8b2b47488cb7cc618819e89, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/DC/新尧金地广场地形(内).prefab.meta b/Assets/DC/新尧金地广场地形(内).prefab.meta new file mode 100644 index 00000000..389a4d5d --- /dev/null +++ b/Assets/DC/新尧金地广场地形(内).prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 226542e494957924fbf9f54a6d58c421 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DC/新尧金地广场地形(外).FBX b/Assets/DC/新尧金地广场地形(外).FBX new file mode 100644 index 00000000..9111877f Binary files /dev/null and b/Assets/DC/新尧金地广场地形(外).FBX differ diff --git a/Assets/DC/新尧金地广场地形(外).FBX.meta b/Assets/DC/新尧金地广场地形(外).FBX.meta new file mode 100644 index 00000000..73e4f493 --- /dev/null +++ b/Assets/DC/新尧金地广场地形(外).FBX.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 80ea0a8805d32e84db92e99b59a82d55 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 1 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + 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 + importPhysicalCameras: 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 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DC/新尧金地广场地形(外).prefab b/Assets/DC/新尧金地广场地形(外).prefab new file mode 100644 index 00000000..661611ff --- /dev/null +++ b/Assets/DC/新尧金地广场地形(外).prefab @@ -0,0 +1,201 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &137828236971549931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4053508515191785016} + - component: {fileID: 7670308804124838638} + - component: {fileID: 6643555828758109611} + m_Layer: 0 + m_Name: "\u56FE\u5F62001" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4053508515191785016 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137828236971549931} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.56608033, y: -0.81967807, z: 1.4988791} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 406372629196962824} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7670308804124838638 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137828236971549931} + m_Mesh: {fileID: -7209279339441760943, guid: 80ea0a8805d32e84db92e99b59a82d55, type: 3} +--- !u!23 &6643555828758109611 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137828236971549931} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 14543afded304754c83e0de382bf7890, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4276360392068394081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6702557003717491995} + - component: {fileID: 3728219588291761028} + - component: {fileID: 1410566646745807464} + m_Layer: 0 + m_Name: "\u5BF9\u8C61004" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6702557003717491995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4276360392068394081} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.56608033, y: -0.81967807, z: 1.4988791} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 406372629196962824} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3728219588291761028 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4276360392068394081} + m_Mesh: {fileID: 153525437758066605, guid: 80ea0a8805d32e84db92e99b59a82d55, type: 3} +--- !u!23 &1410566646745807464 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4276360392068394081} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 61a6671aa8b2b47488cb7cc618819e89, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5612536812751856568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 406372629196962824} + m_Layer: 0 + m_Name: "\u65B0\u5C27\u91D1\u5730\u5E7F\u573A\u5730\u5F62(\u5916\uFF09" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &406372629196962824 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5612536812751856568} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.4534049, z: -0, w: 0.8913046} + m_LocalPosition: {x: -6.82, y: -0.0040010065, z: 3.62} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4053508515191785016} + - {fileID: 6702557003717491995} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 53.925, z: 0} diff --git a/Assets/DC/新尧金地广场地形(外).prefab.meta b/Assets/DC/新尧金地广场地形(外).prefab.meta new file mode 100644 index 00000000..fb2976df --- /dev/null +++ b/Assets/DC/新尧金地广场地形(外).prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 299c0b11d08da2649855f34513c83102 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Alice/Materials/white.mat b/Assets/_Alice/Materials/white.mat new file mode 100644 index 00000000..9c3a32c5 --- /dev/null +++ b/Assets/_Alice/Materials/white.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: white + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &476601698728444247 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/_Alice/Materials/white.mat.meta b/Assets/_Alice/Materials/white.mat.meta new file mode 100644 index 00000000..05e2e1d1 --- /dev/null +++ b/Assets/_Alice/Materials/white.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02600c9012acf2b4f837cc5c905279fd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Alice/Scenes/GongSi1Lou.unity b/Assets/_Alice/Scenes/GongSi1Lou.unity index 1d72cc2d..8ee1a343 100644 --- a/Assets/_Alice/Scenes/GongSi1Lou.unity +++ b/Assets/_Alice/Scenes/GongSi1Lou.unity @@ -5181,12 +5181,12 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.y - value: 0.16023153 + value: 0.16 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.z - value: 2.32 + value: 4.37 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -9062,6 +9062,74 @@ MonoBehaviour: soundPlayedCustomEvent: willCleanUpDelegatesAfterStop: 1 frames: 178 +--- !u!1001 &780981627 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalPosition.z + value: 5.54 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 3350917443075895265, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8974173482434486718, guid: fc0b8bcaa10c1aa4499a22056e293362, + type: 3} + propertyPath: m_Name + value: "\u697C\u4E0B\u5927\u5385" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fc0b8bcaa10c1aa4499a22056e293362, type: 3} --- !u!1 &781852568 GameObject: m_ObjectHideFlags: 0 @@ -235483,3 +235551,4 @@ SceneRoots: - {fileID: 1152711581} - {fileID: 867168164} - {fileID: 928594070} + - {fileID: 780981627} diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.meta b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.meta new file mode 100644 index 00000000..6c1a0365 --- /dev/null +++ b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15672f76142f8b642ac998f98cd5330e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity index 64b10fcf..db092624 100644 --- a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity +++ b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity @@ -121,7 +121,7 @@ NavMeshSettings: preserveTilesOutsideBounds: 0 debug: m_Flags: 0 - m_NavMeshData: {fileID: 23800000, guid: f6d002ff30ba52942bff4350ddbeca1a, type: 2} + m_NavMeshData: {fileID: 23800000, guid: 5a515ac572703644bbcdcdd71f7140f0, type: 2} --- !u!1 &33928608 GameObject: m_ObjectHideFlags: 0 @@ -604,6 +604,50 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &99084108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 99084110} + - component: {fileID: 99084109} + m_Layer: 0 + m_Name: DragonLi.Core.CoroutineTaskManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &99084109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 99084108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 425191793, guid: facef7cf2886a2746ae681f37ff16ae4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &99084110 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 99084108} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &123141974 GameObject: m_ObjectHideFlags: 0 @@ -3262,74 +3306,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 295210475} m_PrefabAsset: {fileID: 0} ---- !u!1001 &296021427 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalPosition.x - value: -6.82 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.0040010065 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalPosition.z - value: 3.62 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.8913046 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.4534049 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 53.925 - objectReference: {fileID: 0} - - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5612536812751856568, guid: 299c0b11d08da2649855f34513c83102, - type: 3} - propertyPath: m_Name - value: "\u65B0\u5C27\u91D1\u5730\u5E7F\u573A\u5730\u5F62(\u5916\uFF09" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 299c0b11d08da2649855f34513c83102, type: 3} --- !u!1 &298358989 GameObject: m_ObjectHideFlags: 0 @@ -4705,6 +4681,79 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1001 &389437575 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalPosition.x + value: -6.82 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.0040010065 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalPosition.z + value: 3.62 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8913046 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.4534049 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 53.925 + objectReference: {fileID: 0} + - target: {fileID: 406372629196962824, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5612536812751856568, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_Name + value: "\u65B0\u5C27\u91D1\u5730\u5E7F\u573A\u5730\u5F62(\u5916\uFF09" + objectReference: {fileID: 0} + - target: {fileID: 5612536812751856568, guid: 299c0b11d08da2649855f34513c83102, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 299c0b11d08da2649855f34513c83102, type: 3} --- !u!1 &391906199 GameObject: m_ObjectHideFlags: 0 @@ -4763,7 +4812,7 @@ MonoBehaviour: startDoorPos: {fileID: 927482900} self: {fileID: 0} Version: 1.0.1 - place: 13 + place: 17 --- !u!1 &399455311 GameObject: m_ObjectHideFlags: 0 @@ -5245,7 +5294,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.x - value: 0.36 + value: 5.76 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -5255,27 +5304,27 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.z - value: 6.37 + value: 5.37 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.8894164 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalRotation.x - value: 0.00000006657903 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.45709798 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -5285,7 +5334,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 54.4 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -6023,13 +6072,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 478776999} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.33999968, y: 0, z: 6.4399996} + m_LocalRotation: {x: -0, y: 0.48876357, z: -0, w: 0.8724164} + m_LocalPosition: {x: 5.63, y: 0, z: 5.18} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 58.519, z: 0} --- !u!1 &481179229 GameObject: m_ObjectHideFlags: 0 @@ -9230,7 +9279,7 @@ Transform: m_GameObject: {fileID: 764906051} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.28, y: 1, z: 7.38} + m_LocalPosition: {x: 5.42, y: 1, z: 5.26} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -11382,7 +11431,7 @@ Transform: m_GameObject: {fileID: 950611025} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.49, y: 0.071, z: -1.68} + m_LocalPosition: {x: -10.23, y: 0.071, z: -1.366} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 m_Children: @@ -11454,8 +11503,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.5493314, y: 1.3430109, z: 0.4485035} - m_Center: {x: -0.012568725, y: 0.6119841, z: -0.06976196} + m_Size: {x: 0.5493314, y: 1.3430109, z: 1.019761} + m_Center: {x: -0.012568723, y: 0.6119841, z: -0.2759677} --- !u!54 &950611029 Rigidbody: m_ObjectHideFlags: 0 @@ -15812,7 +15861,7 @@ Transform: m_GameObject: {fileID: 1314912466} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.71, y: 0.28033283, z: -2.31} + m_LocalPosition: {x: -10.45, y: 0.28033283, z: -1.84} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 m_Children: @@ -16406,7 +16455,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369771485} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalRotation: {x: -0, y: -0.9991532, z: -0, w: 0.041144844} m_LocalPosition: {x: -3.25, y: 0, z: 3.74} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -16414,7 +16463,7 @@ Transform: - {fileID: 950611026} - {fileID: 1314912467} m_Father: {fileID: 471696836} - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -175.284, z: 0} --- !u!114 &1369771487 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19312,6 +19361,21 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.19 + objectReference: {fileID: 0} + - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.47 + objectReference: {fileID: 0} - target: {fileID: 2862628159654608868, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags @@ -19445,7 +19509,7 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: 0.099999666 + value: 4.25 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19455,12 +19519,12 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: 7.1899996 + value: 3.77 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 0.45787397 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19470,7 +19534,7 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalRotation.y - value: -1 + value: -0.88901716 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19485,7 +19549,7 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -180 + value: -125.5 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19517,6 +19581,16 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.46 + objectReference: {fileID: 0} + - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.z + value: -3.23 + objectReference: {fileID: 0} - target: {fileID: 7885725076255202891, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags @@ -23778,14 +23852,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805181727} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -0.1, y: 0, z: 6.13} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_LocalRotation: {x: -0, y: -0.9061008, z: -0, w: 0.42306194} + m_LocalPosition: {x: 4.98, y: 0, z: 4.81} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2095954437} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -129.944, z: 0} --- !u!1 &1808285826 GameObject: m_ObjectHideFlags: 0 @@ -26743,8 +26817,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063580696} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -1.66, y: 0, z: 3.115} + m_LocalRotation: {x: -0, y: 0.99937314, z: -0, w: -0.035403155} + m_LocalPosition: {x: 0.54, y: 0, z: 4.7} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 m_Children: @@ -26755,7 +26829,7 @@ Transform: - {fileID: 2578744698916540409} - {fileID: 1254836193} m_Father: {fileID: 471696836} - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 184.058, z: 0} --- !u!1 &2084682775 GameObject: m_ObjectHideFlags: 0 @@ -220998,4 +221072,5 @@ SceneRoots: - {fileID: 1808285830} - {fileID: 764906055} - {fileID: 927482900} - - {fileID: 296021427} + - {fileID: 389437575} + - {fileID: 99084110} diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang/NavMesh.asset b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang/NavMesh.asset new file mode 100644 index 00000000..2da9cb2c Binary files /dev/null and b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang/NavMesh.asset differ diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang/NavMesh.asset.meta b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang/NavMesh.asset.meta new file mode 100644 index 00000000..f4bbd604 --- /dev/null +++ b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang/NavMesh.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a515ac572703644bbcdcdd71f7140f0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.meta b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.meta new file mode 100644 index 00000000..846392a8 --- /dev/null +++ b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 729f67767b5c312438f08b93bf1ca502 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.unity b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.unity index 20f685a1..53c8122e 100644 --- a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.unity +++ b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.unity @@ -121,7 +121,7 @@ NavMeshSettings: preserveTilesOutsideBounds: 0 debug: m_Flags: 0 - m_NavMeshData: {fileID: 23800000, guid: f6d002ff30ba52942bff4350ddbeca1a, type: 2} + m_NavMeshData: {fileID: 23800000, guid: ecbea8639475d3347ad5e57d7fc58afd, type: 2} --- !u!1 &33928608 GameObject: m_ObjectHideFlags: 0 @@ -3833,6 +3833,11 @@ PrefabInstance: propertyPath: m_Name value: "\u65B0\u5C27\u91D1\u5730\u5E7F\u573A\u5730\u5F62(\u5185\uFF09" objectReference: {fileID: 0} + - target: {fileID: 4360160315636105896, guid: 226542e494957924fbf9f54a6d58c421, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6956967369043974779, guid: 226542e494957924fbf9f54a6d58c421, type: 3} propertyPath: m_LocalPosition.x @@ -5245,7 +5250,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.x - value: 0.36 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -5255,7 +5260,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.z - value: 6.37 + value: -1.21 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -6024,8 +6029,8 @@ Transform: m_GameObject: {fileID: 478776999} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.33999968, y: 0, z: 6.4399996} - m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_LocalPosition: {x: -0.49, y: 0, z: -1.24} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} @@ -9230,7 +9235,7 @@ Transform: m_GameObject: {fileID: 764906051} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.28, y: 1, z: 7.38} + m_LocalPosition: {x: -0.25, y: 1, z: -1.82} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -11382,8 +11387,8 @@ Transform: m_GameObject: {fileID: 950611025} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.49, y: 0.071, z: -1.68} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_LocalPosition: {x: -1.015, y: 0.071, z: 5.32} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7783502450230717370} @@ -11454,8 +11459,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.5493314, y: 1.3430109, z: 0.4485035} - m_Center: {x: -0.012568725, y: 0.6119841, z: -0.06976196} + m_Size: {x: 0.5493314, y: 1.3430109, z: 0.86984867} + m_Center: {x: -0.012568726, y: 0.6119841, z: -0.054991655} --- !u!54 &950611029 Rigidbody: m_ObjectHideFlags: 0 @@ -15812,8 +15817,8 @@ Transform: m_GameObject: {fileID: 1314912466} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.71, y: 0.28033283, z: -2.31} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_LocalPosition: {x: -1.2120001, y: 0.28033283, z: 5.029} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1756595206} @@ -16406,15 +16411,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369771485} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -3.25, y: 0, z: 3.74} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.38, y: 0, z: -6.24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 950611026} - {fileID: 1314912467} m_Father: {fileID: 471696836} - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1369771487 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19312,6 +19317,21 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.z + value: -3.84 + objectReference: {fileID: 0} - target: {fileID: 2862628159654608868, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags @@ -19377,6 +19397,16 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 4739361030178029374, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.15 + objectReference: {fileID: 0} + - target: {fileID: 4739361030178029374, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.z + value: -3.67 + objectReference: {fileID: 0} - target: {fileID: 4741766977610483380, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags @@ -19415,12 +19445,52 @@ PrefabInstance: - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: 1.52 + value: -0.84 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.16 objectReference: {fileID: 0} - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: 3.5 + value: 1.46 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.0344937 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.706765 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.705767 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.034444854 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.008 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 174.412 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90.081 objectReference: {fileID: 0} - target: {fileID: 6114747558210478331, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19445,7 +19515,7 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: 0.099999666 + value: -0.98 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19455,27 +19525,27 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: 7.1899996 + value: 0.03 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: -0.99995536 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalRotation.y - value: -1 + value: -0.009449915 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19485,7 +19555,7 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -180 + value: -358.917 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19517,6 +19587,16 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.27 + objectReference: {fileID: 0} + - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.61 + objectReference: {fileID: 0} - target: {fileID: 7885725076255202891, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags @@ -23778,14 +23858,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805181727} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -0.1, y: 0, z: 6.13} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.54, y: 0, z: -1.15} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2095954437} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1808285826 GameObject: m_ObjectHideFlags: 0 @@ -26743,8 +26823,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063580696} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -1.66, y: 0, z: 3.115} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -2.874, y: 0, z: 1.009} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 m_Children: @@ -26755,7 +26835,7 @@ Transform: - {fileID: 2578744698916540409} - {fileID: 1254836193} m_Father: {fileID: 471696836} - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &2084682775 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei/NavMesh.asset b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei/NavMesh.asset new file mode 100644 index 00000000..fd086a2a Binary files /dev/null and b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei/NavMesh.asset differ diff --git a/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei/NavMesh.asset.meta b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei/NavMesh.asset.meta new file mode 100644 index 00000000..262a894c --- /dev/null +++ b/Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei/NavMesh.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecbea8639475d3347ad5e57d7fc58afd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Alice/Scripts/Base/GameLocal.cs b/Assets/_Alice/Scripts/Base/GameLocal.cs index 9df75192..7a5f3778 100644 --- a/Assets/_Alice/Scripts/Base/GameLocal.cs +++ b/Assets/_Alice/Scripts/Base/GameLocal.cs @@ -86,7 +86,7 @@ public class GameLocal : MonoBehaviour }); authInfo.deviceSn = GetSn(); authInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + ""; - authInfo.shop = 0; + authInfo.shop = 17; #if !UNITY_EDITOR && UNITY_ANDROID && PICO authInfo.shop = (int)place; if (place == Place.Yangzhou_Hanjiang_TansuoZhongxin_wai) diff --git a/Assets/_Alice/Scripts/Item/TaskBox.cs b/Assets/_Alice/Scripts/Item/TaskBox.cs index 766fac69..f38779e1 100644 --- a/Assets/_Alice/Scripts/Item/TaskBox.cs +++ b/Assets/_Alice/Scripts/Item/TaskBox.cs @@ -119,7 +119,10 @@ public class TaskBox : MonoBehaviour } public Vector3 spawnCenter = Vector3.zero; // 生成中心点(相对于Spawner的本地坐标) - private Vector3 spawnRange = new Vector3(3f, 1f, 3f); // 在 X/Y/Z 方向的随机范围 + //private Vector3 spawnRange = new Vector3(3f, 1f, 3f); // 在 X/Y/Z 方向的随机范围 + + //修改南京栖霞尧化门金地广场场景 + private Vector3 spawnRange = new Vector3(1.5f, 1f, 2f); //内 ////修改山东济南槐荫晟芙桐场景 //private Vector3 spawnRange = new Vector3(1f, 0.5f, 1f);//内 //private Vector3 spawnRange = new Vector3(2f, 1f, 2f);//外 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 80ebd3d6..51520f46 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,7 @@ EditorBuildSettings: - enabled: 0 path: Assets/_Alice/Scenes/LiaoningAnshan.unity guid: 386c4ddb7d0780541b37f2d5d06be8af - - enabled: 1 + - enabled: 0 path: Assets/_Alice/Scenes/AnhuiWuhuGuanwei.unity guid: ebc679f5cce1b454ebb5c7e69ba003b1 - enabled: 0 @@ -50,6 +50,12 @@ EditorBuildSettings: - enabled: 0 path: Assets/_Alice/Scenes/HenanXinzhengShuanghudadaoLonghujinyicheng.unity guid: 55be093a7a7c2194487b60020de6b6ea + - enabled: 0 + path: Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity + guid: 84b2110a4914aad43b05d3e29a26f768 + - enabled: 1 + path: Assets/_Alice/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei.unity + guid: eb1bfc646ded37e4dbcc4413763a3b7a m_configObjects: Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e8128267..178aef61 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: pineappletech - productName: "\u7231\u4E3D\u4E1D\u7684\u821E\u4F1A" + productName: "\u7231\u4E3D\u4E1D\u7684\u821E\u4F1A_\u5185" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -163,7 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.pineappletech.aliceball.anhuiwuhuguanwei + Android: com.pineappletech.aliceball.nanjingqixiayaohuamenjindiguangchangnei Standalone: com.DefaultCompany.com.unity.template.ar buildNumber: Standalone: 0