diff --git a/Assets/ScenesPX/MainBuilding.prefab b/Assets/ScenesPX/MainBuilding.prefab index e542a0a..57ff68a 100644 --- a/Assets/ScenesPX/MainBuilding.prefab +++ b/Assets/ScenesPX/MainBuilding.prefab @@ -3006,15 +3006,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} propertyPath: m_LocalPosition.x - value: -1722.6052 + value: -1722.2009 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} propertyPath: m_LocalPosition.y - value: 44.899998 + value: 44.2375 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} propertyPath: m_LocalPosition.z - value: -2328.1663 + value: -2325.875 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} propertyPath: m_LocalRotation.w @@ -3051,343 +3051,13 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7224781717466488120, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 3382236439838503011} - - targetCorrespondingSourceObject: {fileID: -39425648059399993, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 3091463717569103414} - - targetCorrespondingSourceObject: {fileID: -8898904925593576912, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 2277105047962467009} - - targetCorrespondingSourceObject: {fileID: -8185707613518862016, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 7986713319704214568} - - targetCorrespondingSourceObject: {fileID: -2137239646495916016, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 4010209197481905923} - - targetCorrespondingSourceObject: {fileID: 5738601475477082794, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 8713927881161235700} - - targetCorrespondingSourceObject: {fileID: -2407903755339911460, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 6653349023898418417} - - targetCorrespondingSourceObject: {fileID: -313223106919135942, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 4068863957007921840} - - targetCorrespondingSourceObject: {fileID: -4310554625353162214, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 8932646375079364278} - - targetCorrespondingSourceObject: {fileID: -4075244061419295345, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 1056960440894828028} - - targetCorrespondingSourceObject: {fileID: 3815147016575067790, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - insertIndex: -1 - addedObject: {fileID: 543981860765599279} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &480862978825122120 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2407903755339911460, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &6653349023898418417 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 480862978825122120} - 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: 5975246534496642418, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &1700862837124713790 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5738601475477082794, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &8713927881161235700 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1700862837124713790} - 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: -3961516192817396927, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &2023492228639047054 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -4310554625353162214, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &8932646375079364278 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023492228639047054} - 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: -1897528847643415706, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &2254303402554454555 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -4075244061419295345, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1056960440894828028 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2254303402554454555} - 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: -8832767411962499247, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &2566492275761175214 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -313223106919135942, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &4068863957007921840 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2566492275761175214} - 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: -3247590562675959435, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &2831313406919843667 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -39425648059399993, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &3091463717569103414 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2831313406919843667} - 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: -7807004930271928315, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &4210806017607966596 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2137239646495916016, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &4010209197481905923 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4210806017607966596} - 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: 5762150820493514287, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &4357974464595542700 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7224781717466488120, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &3382236439838503011 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4357974464595542700} - 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: 7301164249819100169, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &6223887091380270804 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -8185707613518862016, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &7986713319704214568 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6223887091380270804} - 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: 6255713925462279581, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} ---- !u!1 &6681524355557885348 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -8898904925593576912, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &2277105047962467009 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6681524355557885348} - 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: -4979144183357820452, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} --- !u!4 &6896013111570872447 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} m_PrefabInstance: {fileID: 6357171851875278740} m_PrefabAsset: {fileID: 0} ---- !u!1 &7839405625262635290 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3815147016575067790, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} - m_PrefabInstance: {fileID: 6357171851875278740} - m_PrefabAsset: {fileID: 0} ---- !u!64 &543981860765599279 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7839405625262635290} - 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: 2337750945123569898, guid: 1457e761cbbf91845b9df7aadfe51390, type: 3} --- !u!1001 &7300729228913083713 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY b/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY index c24758e..0ce4996 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY and b/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY differ diff --git a/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY.manifest b/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY.manifest index bb8f460..a77b193 100644 --- a/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXCJY/PXCJY.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 4112018516 +CRC: 2557993278 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding b/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding index 18855c0..0c80c44 100644 Binary files a/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding and b/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding differ diff --git a/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding.manifest b/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding.manifest index cd6c871..3cce4fc 100644 --- a/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding.manifest +++ b/Assets/StreamingAssets/AssetBundles/PXCJY/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 3126815585 +CRC: 1230003296 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 7fafd14c4b4392bd5ae99370b54e1d44 + Hash: c606d50cdfe1c1d65d645b4200932d99 TypeTreeHash: serializedVersion: 2 Hash: 3e4898902a241424dacad96dafc48830 IncrementalBuildHash: serializedVersion: 2 - Hash: e92c2d5999a463d7e9ba67c8aeb7bb0e + Hash: ad85fd0b056b1a33d9fe1bd120321a45 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY b/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY index e2a7888..101b9a0 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY and b/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY.manifest b/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY.manifest index 8f654d6..8e5c502 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXCJY/PXCJY.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 1787841025 +CRC: 2202818347 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding b/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding index f6a410a..c0c6d69 100644 Binary files a/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding and b/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding differ diff --git a/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding.manifest b/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding.manifest index 8bfedf7..ad0407f 100644 --- a/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding.manifest +++ b/Assets/StreamingAssets/WebAssetBundles/PXCJY/mainbuilding.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.0.13f1 -CRC: 3533142629 +CRC: 1511113693 Hashes: AssetFileHash: serializedVersion: 2 - Hash: d2a88ee0bb5269329dee06a398af27a4 + Hash: 484606f9fa7ec851680c11bfac499e03 TypeTreeHash: serializedVersion: 2 Hash: 3e4898902a241424dacad96dafc48830 IncrementalBuildHash: serializedVersion: 2 - Hash: 1d11e612cca8f296b09d234e541ae605 + Hash: 6eb965e94092143ee88787dd1a275f88 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_JiaZi.fbx b/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_JiaZi.fbx index b548bc1..59b4bb5 100644 Binary files a/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_JiaZi.fbx and b/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_JiaZi.fbx differ diff --git a/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_PingTai.fbx b/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_PingTai.fbx index 36b98c7..e7319c7 100644 Binary files a/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_PingTai.fbx and b/Assets/ZhenHaiLiaHua/4#DistillationUnit/Models/CJY_PingTai.fbx differ