diff --git a/Assets/GameAssets/Prefebs/江宁营业厅/江宁营业厅.prefab b/Assets/GameAssets/Prefebs/江宁营业厅/江宁营业厅.prefab index e2d9362c..5cc94059 100644 --- a/Assets/GameAssets/Prefebs/江宁营业厅/江宁营业厅.prefab +++ b/Assets/GameAssets/Prefebs/江宁营业厅/江宁营业厅.prefab @@ -578,7 +578,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188002548307939761} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 1.115, y: 0.53, z: -1.72} + m_LocalPosition: {x: 1.334, y: 1.06, z: -1.72} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896643989867258} @@ -1140,7 +1140,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2357138184815482487} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.839, y: 0.53, z: 3.233} + m_LocalPosition: {x: -0.839, y: 1.06, z: 3.012} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896642947648268} @@ -1317,7 +1317,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2882476833712231207} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -5.118, y: 0.53, z: 6.427} + m_LocalPosition: {x: -5.043, y: 1.06, z: 6.427} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896644060305212} @@ -1348,7 +1348,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3167381856778321264} m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: -2.839, y: 0.53, z: 5.066} + m_LocalPosition: {x: -2.419, y: 1, z: 5.516} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896643977650631} @@ -1966,7 +1966,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5387889482083715776} m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: -1.354, y: 0.53, z: 4.838} + m_LocalPosition: {x: -1.354, y: 1.06, z: 4.838} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896644221487237} @@ -1997,7 +1997,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5390835976702836333} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 2.43, y: 0.53, z: -1.72} + m_LocalPosition: {x: 2.43, y: 1.06, z: -1.72} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896642992646682} @@ -2103,7 +2103,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5558190173045068959} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 3.602, y: 0.53, z: -1.688} + m_LocalPosition: {x: 3.727, y: 1.06, z: -1.688} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896643468664970} @@ -2134,7 +2134,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5836482159895616651} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -3.825, y: 0.53, z: 6.395} + m_LocalPosition: {x: -3.819, y: 1.06, z: 6.395} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896644882505292} @@ -5548,7 +5548,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6885151017475883229} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.187, y: 0.53, z: 1.751} + m_LocalPosition: {x: -1.187, y: 1.06, z: 1.751} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896644209204963} @@ -5661,7 +5661,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7463885846481328031} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -6.198, y: 0.53, z: 6.397} + m_LocalPosition: {x: -6.198, y: 1.06, z: 6.397} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5921896642866545307} @@ -8234,11 +8234,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.z - value: -0.0359537 + value: -0.029953659 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalRotation.w @@ -11170,7 +11170,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2e88d45146501a544b29599237505209, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2e88d45146501a544b29599237505209, type: 3} propertyPath: m_LocalPosition.z @@ -11376,7 +11376,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.z @@ -11392,11 +11392,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalRotation.y - value: 0.4999998 + value: 0.49999982 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalRotation.z - value: 0.4999998 + value: 0.49999982 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12044,11 +12044,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.z - value: -0.1075744 + value: -0.032574594 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalRotation.w @@ -12388,15 +12388,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.x - value: 0.55731505 + value: -0.05786779 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.z - value: 0.010717958 + value: -0.010495071 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalRotation.w @@ -12520,15 +12520,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.x - value: 0.00034974518 + value: 0.0003497638 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.z - value: -0.17640854 + value: 0.042591456 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalRotation.w @@ -14714,15 +14714,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2e88d45146501a544b29599237505209, type: 3} propertyPath: m_LocalPosition.x - value: 0.00012324752 + value: 0.00012326149 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2e88d45146501a544b29599237505209, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2e88d45146501a544b29599237505209, type: 3} propertyPath: m_LocalPosition.z - value: -0.13213946 + value: -0.0071394453 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2e88d45146501a544b29599237505209, type: 3} propertyPath: m_LocalRotation.w @@ -16442,7 +16442,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.z @@ -16974,11 +16974,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 312176f48ef93cf4f9f3da6f820adadf, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 312176f48ef93cf4f9f3da6f820adadf, type: 3} propertyPath: m_LocalPosition.z - value: -0.24652314 + value: -0.025523186 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 312176f48ef93cf4f9f3da6f820adadf, type: 3} propertyPath: m_LocalRotation.w @@ -17040,7 +17040,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.y - value: -0.53 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 90b7132442de2ef4f9269782db8176b0, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.meta b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.meta deleted file mode 100644 index c554f67f..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 907f7a6328c4b9241a608e150bdb7c99 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity index 629e50c5..6aa9a7fc 100644 --- a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity +++ b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity @@ -635861,6 +635861,8 @@ MonoBehaviour: firstPath: {fileID: 7482749633331142765} globalpath: {fileID: 7482749631596421109} mainCamera: {fileID: 1195741018845190183} + isAddY: 1 + PosYValue: 2 singleCam: {fileID: 2867371436731032290} CurentSingleObj: {fileID: 0} CurentSinglePage: {fileID: 1926564804195563137} @@ -636240,7 +636242,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 0} - targetOffset: {x: 0.41, y: -0.75, z: 0.09} + targetOffset: {x: 0.41, y: -0.34, z: 0.09} initdistance: 2 maxDistance: 5 minDistance: 2.6 @@ -636254,7 +636256,6 @@ MonoBehaviour: autoRotate: 1 autoRotateSpeed: 0.1 currentDistance: 2 - go: {fileID: 0} --- !u!222 &3301378409600673895 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity.meta b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity.meta index db3429d0..3e74963c 100644 --- a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity.meta +++ b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 092a0a3edf45cb84cbfdc24bbe775a73 +guid: 79c015d184898e54d848fb9d23b44382 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/LightingData.asset b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/LightingData.asset deleted file mode 100644 index 0e12cef4..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/LightingData.asset and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/LightingData.asset.meta b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/LightingData.asset.meta deleted file mode 100644 index 95636283..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5672b62674382a847a61295c701affde -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 112000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-0.exr b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-0.exr deleted file mode 100644 index 4af887fe..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-0.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-0.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-0.exr.meta deleted file mode 100644 index 6f9e0c9c..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-0.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 889c1cdec6ad96145832e9812ba8a7ad -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-1.exr b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-1.exr deleted file mode 100644 index f6c92d1a..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-1.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-1.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-1.exr.meta deleted file mode 100644 index 06a9b19f..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京大厂供电营业厅/国网南京大厂营业厅/ReflectionProbe-1.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 47cf9a32b21433e48a78a5da91dcda5f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅.meta b/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅.meta deleted file mode 100644 index a0b3ed7e..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c5b4fad276125c9469777cd52f8c0ccc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/LightingData.asset b/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/LightingData.asset deleted file mode 100644 index c146e12f..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/LightingData.asset and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/LightingData.asset.meta b/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/LightingData.asset.meta deleted file mode 100644 index 86f375f4..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 74ccad41ac05c3d40a0d92ae134d1f86 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 112000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-0.exr b/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-0.exr deleted file mode 100644 index c1005519..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-0.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-0.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-0.exr.meta deleted file mode 100644 index 4ba1cd26..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-0.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: b2d0f1a11c9e04c40ad86537072943f8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-1.exr b/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-1.exr deleted file mode 100644 index f6c92d1a..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-1.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-1.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-1.exr.meta deleted file mode 100644 index c04e8199..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京栖霞供电营业厅/国网南京栖霞供电营业厅/ReflectionProbe-1.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 48200efde1788764995311e657533f91 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/LightingData.asset b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/LightingData.asset deleted file mode 100644 index 08f6bd2a..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/LightingData.asset and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/LightingData.asset.meta b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/LightingData.asset.meta deleted file mode 100644 index 2a3f8fbf..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cacdf518f4755c14da335039bc06bcd5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 112000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-0.exr b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-0.exr deleted file mode 100644 index 47914ea3..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-0.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-0.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-0.exr.meta deleted file mode 100644 index 20459265..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-0.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 7b1d196e39d3f6e4cbab95efad328723 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-1.exr b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-1.exr deleted file mode 100644 index f6c92d1a..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-1.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-1.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-1.exr.meta deleted file mode 100644 index 4fa3f25d..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/ReflectionProbe-1.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 243878cbeb1d5de4f86b40feb1d40798 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/国网南京江北供电营业厅.unity.meta b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/国网南京江北供电营业厅.unity.meta index b815af09..85d93518 100644 --- a/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/国网南京江北供电营业厅.unity.meta +++ b/Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/国网南京江北供电营业厅.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b65c237f0405a5546af807d39480b44b +guid: 8d1ffb144116ce8499401353195cdc49 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GameAssets/Scenes/南京/国网南京江宁供电营业厅/江宁应天大道营业厅.unity b/Assets/GameAssets/Scenes/南京/国网南京江宁供电营业厅/江宁应天大道营业厅.unity index fb229bf0..e3059756 100644 --- a/Assets/GameAssets/Scenes/南京/国网南京江宁供电营业厅/江宁应天大道营业厅.unity +++ b/Assets/GameAssets/Scenes/南京/国网南京江宁供电营业厅/江宁应天大道营业厅.unity @@ -246631,21 +246631,6 @@ MonoBehaviour: modelType: 0 deviceType: 8 expType: 0 ---- !u!114 &691289287 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 691289281} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} - m_Name: - m_EditorClassIdentifier: - modelType: 0 - deviceType: 0 - expType: 0 --- !u!114 &691289288 MonoBehaviour: m_ObjectHideFlags: 0 @@ -716921,6 +716906,7 @@ MonoBehaviour: firstPath: {fileID: 7482749633331142765} globalpath: {fileID: 7482749631596421109} mainCamera: {fileID: 1195741018845190183} + isAddY: 0 singleCam: {fileID: 2867371436731032290} CurentSingleObj: {fileID: 0} CurentSinglePage: {fileID: 1926564804195563137} @@ -717300,7 +717286,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 0} - targetOffset: {x: 0.41, y: -0.75, z: 0.09} + targetOffset: {x: 0.56, y: 0.06, z: 0.09} initdistance: 2 maxDistance: 5 minDistance: 2.6 @@ -717314,7 +717300,6 @@ MonoBehaviour: autoRotate: 1 autoRotateSpeed: 0.1 currentDistance: 2 - go: {fileID: 0} --- !u!222 &3301378409600673895 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅.meta b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅.meta deleted file mode 100644 index b89c0a12..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0ca1510efa606214c9d19d2fc529d1f7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅.unity.meta b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅.unity.meta index 73eba543..aa5a2a85 100644 --- a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅.unity.meta +++ b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1672677c6bf6c7f4a8c454aa1eb869c4 +guid: 99b14f5f5542eb740be721d8f0e48445 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/LightingData.asset b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/LightingData.asset deleted file mode 100644 index 79e2dd8a..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/LightingData.asset and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/LightingData.asset.meta b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/LightingData.asset.meta deleted file mode 100644 index 23e14eba..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7d51350fe4245d24097afae44221bf83 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 112000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-0.exr b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-0.exr deleted file mode 100644 index 1de8192a..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-0.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-0.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-0.exr.meta deleted file mode 100644 index 4c506fc9..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-0.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: b915836cfa4471e4caa54a64da288742 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-1.exr b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-1.exr deleted file mode 100644 index f6c92d1a..00000000 Binary files a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-1.exr and /dev/null differ diff --git a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-1.exr.meta b/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-1.exr.meta deleted file mode 100644 index 63c31096..00000000 --- a/Assets/GameAssets/Scenes/南京/国网南京高淳供电营业厅/国网南京高淳供电营业厅/ReflectionProbe-1.exr.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: dffae913a29dc0145ac1cf5a59a1963c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Scripts/Function/DeviceClick.cs b/Assets/Resources/Scripts/Function/DeviceClick.cs index 701f30f9..2c21e018 100644 --- a/Assets/Resources/Scripts/Function/DeviceClick.cs +++ b/Assets/Resources/Scripts/Function/DeviceClick.cs @@ -7,16 +7,16 @@ using UnityEngine.XR; public class DeviceClick : MonoBehaviour { - //豸 + //设备编号 public int index; - //豸 + //设备类型 public DeviceType deviceType; - //Ƿ廯չʾ + //是否允许单体化展示 public bool isSingle = false; private GameObject warmIcon; - //ͷǷ񾯸 + //摄像头是否警告 private bool isCamWarm; public bool _isCamWarm { get { return isCamWarm; @@ -48,12 +48,12 @@ public class DeviceClick : MonoBehaviour { if (EventSystem.current.IsPointerOverGameObject()) { - Debug.Log("UI"); + Debug.Log("鼠标在UI上"); return; } ViewCenter(); - //ͷ + //摄像头弹窗 if (deviceType == DeviceType.SheXiangTou) { Main.intance.m_htmlPanel.CallFunction("showCarema"); @@ -61,9 +61,9 @@ public class DeviceClick : MonoBehaviour } if (!isSingle) return; - //˸3رո + //开启高亮，闪烁3秒后关闭高亮 LightFlashOn(); - Invoke("LightFlahOff", 3); + Invoke("LightFlahOff", 6); if (deviceType != DeviceType.GongPai) ShowSingle(); @@ -71,40 +71,48 @@ public class DeviceClick : MonoBehaviour } /// - /// ӽǾ + /// 视角居中 /// void ViewCenter() { Debug.Log("model" + transform.name); - //ȡģĵλãģͷ*3X᷽ǰ + //获取模型中心点位置（加上模型方向*3）X轴方向朝前 Vector3 playerPos = transform.position + transform.right * 3; - //豸 + //相机面向设备 Quaternion angle = Quaternion.LookRotation(-transform.right); + if (Main.intance.isAddY) + { + playerPos = new Vector3(playerPos.x, playerPos.y+0.5f, playerPos.z); + } + else + { + playerPos = new Vector3(playerPos.x, playerPos.y, playerPos.z); + } Debug.Log("pos" + playerPos + ";angle" + angle); //Main.intance.mainCamera.GetComponent().CameraMoveTarget(playerPos, angle); Main.intance.CameraMoveTarget(playerPos, angle); } /// - /// 廯չʾ + /// 单体化展示 /// void ShowSingle() { if (deviceType != DeviceType.SheXiangTou) { - //豸ͲΪͷʱʾ豸Ϣ(豸ID) + //当设备类型不为摄像头时，显示设备信息弹窗(传入设备ID) Main.intance.m_htmlPanel.CallFunction("clickShowDetails", deviceType.GetHashCode()-1); } - //һ廯 + //将上一个单体化物体隐藏 if (Main.intance.CurentSingleObj != null) { Main.intance.singleCam.GetComponent().ChangeObjLayer(Main.intance.CurentSingleObj, "Default"); } - //ʾ廯չʾҳ + //显示单体化展示页面 Main.intance.CurentSinglePage.SetActive(true); - //ǰΪ廯360۲ + //将当前物体设置为单体化360观察的物体 Main.intance.CurentSingleObj = gameObject; //Main.intance.singleCam.GetComponent().SetTarget(transform.GetComponent().bounds.center); Main.intance.singleCam.GetComponent().SetTarget(transform); @@ -113,13 +121,13 @@ public class DeviceClick : MonoBehaviour } /// - /// ײ + /// 在自身添加碰撞体 /// /// public void AddGameObjectCollider() { - //ȡСΧ + //获取物体的最小包围盒 Bounds itemBound = GetLocalBounds(gameObject); if (!gameObject.GetComponent()) @@ -131,7 +139,7 @@ public class DeviceClick : MonoBehaviour } /// - /// öСΧ + /// 获得对象的最小包围盒 /// public static Bounds GetLocalBounds(GameObject target) { @@ -151,7 +159,7 @@ public class DeviceClick : MonoBehaviour /// - /// ͷIcon + /// 添加摄像头警告Icon /// void AddWarmIcon() { GameObject obj = Resources.Load(ResourcePath._camWarn3DIcon); @@ -165,7 +173,7 @@ public class DeviceClick : MonoBehaviour } /// - /// Ƴͷ + /// 移除摄像头警告 /// void RemovWarmIcon() { @@ -173,7 +181,7 @@ public class DeviceClick : MonoBehaviour Destroy(warmIcon); } /// - /// + /// 开启高亮 /// void LightFlashOn() { @@ -181,14 +189,14 @@ public class DeviceClick : MonoBehaviour } /// - /// رո + /// 关闭高亮 /// void LightFlahOff() { LightFlash(false); } /// - /// ˸ + /// 高亮闪烁两下 /// /// void LightFlash(bool on) diff --git a/Assets/Resources/Scripts/Main.cs b/Assets/Resources/Scripts/Main.cs index b69117ce..d3d79f6f 100644 --- a/Assets/Resources/Scripts/Main.cs +++ b/Assets/Resources/Scripts/Main.cs @@ -22,6 +22,14 @@ public class Main : UIBase //public Transform mainView; //漫游速度 private float _speed = 1.5f; + /// + /// 是否需要修改相机定位视角的高度 + /// + public bool isAddY=false; + /// + /// 需要修改的高度 + /// + public int PosYValue; //public GameObject _player; public static Main intance; //public GameObject Icon3D;//异常Icon