diff --git a/Assets/ScenesPX/MainBuilding.prefab b/Assets/ScenesPX/MainBuilding.prefab index c576c27..b840637 100644 --- a/Assets/ScenesPX/MainBuilding.prefab +++ b/Assets/ScenesPX/MainBuilding.prefab @@ -118400,13 +118400,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3380439287992437234} serializedVersion: 2 - m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2202.931, y: 6.7999268, z: -2933.1016} + m_LocalRotation: {x: -0.70540774, y: -0.048098225, z: -0.048089832, w: 0.7055309} + m_LocalPosition: {x: -2203.01, y: 7.38, z: -2933.1016} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1421115202832827565} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -89.99, y: -7.8, z: 0} --- !u!33 &239135529487925822 MeshFilter: m_ObjectHideFlags: 0 @@ -200631,119 +200631,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -2286188457597986069, guid: c5943012ee103bb48940930612eb2df5, type: 3} ---- !u!1 &5910420001441832800 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1226813651219975852} - - component: {fileID: 7802587220411625354} - - component: {fileID: 1487524462579820488} - - component: {fileID: 4394681554896076029} - m_Layer: 0 - m_Name: ZYJQ_CJ - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1226813651219975852 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5910420001441832800} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2628.5, y: -1306.6962, z: -43.5833} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8629351999800469772} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7802587220411625354 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5910420001441832800} - m_Mesh: {fileID: -3174248901611231459, guid: b176043a53248c049b795247e71c3baa, type: 3} ---- !u!23 &1487524462579820488 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5910420001441832800} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: bc59545ab42fb45409b132364f3c200e, type: 2} - - {fileID: 2100000, guid: dbdd31e0bf7ccbe48969355edb745ae5, type: 2} - - {fileID: 2100000, guid: a2f45330cf04edb44b2dc779642fcaa7, type: 2} - - {fileID: 2100000, guid: 4f84288678f6eca4a8b7d5c2db097ba8, type: 2} - - {fileID: 2100000, guid: 0b7e3b9c5d07c274a9b9b9149933be4f, 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!64 &4394681554896076029 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5910420001441832800} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -3174248901611231459, guid: b176043a53248c049b795247e71c3baa, type: 3} --- !u!1 &5911415881806880034 GameObject: m_ObjectHideFlags: 0 @@ -240192,7 +240079,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8165317878662442998} - - {fileID: 1226813651219975852} + - {fileID: 4373891463115984216} - {fileID: 5930431801873990573} - {fileID: 5222251774428070825} - {fileID: 72224103417703720} @@ -318933,3 +318820,65 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -4310600458368874653, guid: b176043a53248c049b795247e71c3baa, type: 3} +--- !u!1001 &4267607469017606835 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8629351999800469772} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalPosition.x + value: 2628.4985 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalPosition.y + value: -1306.7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalPosition.z + value: -43.26 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + propertyPath: m_Name + value: ZYJQ_CJ + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} +--- !u!4 &4373891463115984216 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9484d4161b4b2bf4d803001d1a232afa, type: 3} + m_PrefabInstance: {fileID: 4267607469017606835} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Settings/Mobile_RPAsset.asset b/Assets/Settings/Mobile_RPAsset.asset index 0fdefd1..08a0815 100644 --- a/Assets/Settings/Mobile_RPAsset.asset +++ b/Assets/Settings/Mobile_RPAsset.asset @@ -78,11 +78,11 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 1 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 m_GPUResidentDrawerMode: 0 - m_UseLegacyLightmaps: 0 m_SmallMeshScreenPercentage: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 @@ -100,23 +100,24 @@ MonoBehaviour: m_Keys: [] m_Values: m_PrefilteringModeMainLightShadows: 3 - m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLight: 0 m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilterXRKeywords: 1 - m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeForwardPlus: 2 m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeScreenSpaceOcclusion: 0 m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 1 - m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthHigh: 1 - m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOInterleaved: 1 m_PrefilterSSAOBlueNoise: 1 m_PrefilterSSAOSampleCountLow: 1 - m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountMedium: 1 m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 diff --git a/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ b/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ index f86b221..9ab39ef 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ and b/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ differ diff --git a/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ.manifest b/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ.manifest index 9bdc9e5..ebe551c 100644 --- a/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXZYJQ/PXZYJQ.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 3047665690 +CRC: 87656488 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding index cdca67c..acecc9b 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding and b/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding differ diff --git a/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding.manifest b/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding.manifest index ecf78f0..c549670 100644 --- a/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXZYJQ/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 1044180544 +CRC: 2082394524 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 8f9f685da6bcbfd7d1a16e23cfa3bbf5 + Hash: d2580b1f368dcb8640abf35b18707248 TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: fa27bfa8e4be26ae9f59630f89ed09b9 + Hash: aeadff4da41b23210cec6fbe4c871355 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ index 90d6ec0..0b63c3e 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ and b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ.manifest b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ.manifest index 95486b5..8a5eb36 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/PXZYJQ.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 1799557588 +CRC: 2961082999 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding index 2d25d77..7c8f961 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding and b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding.manifest b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding.manifest index d2dc613..80ebfdf 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXZYJQ/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.17f1c1 -CRC: 3875252531 +CRC: 1846724522 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 602713c0da414159029a033ccb7a9391 + Hash: e9f2be615f7f47808ab8fecaa4638703 TypeTreeHash: serializedVersion: 2 Hash: 8c543a89a1a0e1fba358decc0d14ae8c IncrementalBuildHash: serializedVersion: 2 - Hash: bebec82edd266791d1a1c4c4150d9feb + Hash: fa0255a341989b90707ead1c9d65964f HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ZYJQ_CJ.FBX b/Assets/ZYJQ_CJ.FBX new file mode 100644 index 0000000..09aa57e Binary files /dev/null and b/Assets/ZYJQ_CJ.FBX differ diff --git a/Assets/ZYJQ_CJ.FBX.meta b/Assets/ZYJQ_CJ.FBX.meta new file mode 100644 index 0000000..3aeffb8 --- /dev/null +++ b/Assets/ZYJQ_CJ.FBX.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 9484d4161b4b2bf4d803001d1a232afa +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + 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/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx index 4ee613b..298ff97 100644 Binary files a/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx and b/Assets/ZhenHaiLiaHua/Scenes/SatelliteMap.fbx differ