diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity index e0294ff..db11234 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity +++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity @@ -1591,6 +1591,21 @@ PrefabInstance: propertyPath: m_Name value: "\u7701\u7EA7\u5149\u5708" objectReference: {fileID: 0} + - target: {fileID: 5622683323770682249, guid: fdfc2253043af1744a949284405a665e, + type: 3} + propertyPath: m_LocalScale.x + value: 9.75 + objectReference: {fileID: 0} + - target: {fileID: 5622683323770682249, guid: fdfc2253043af1744a949284405a665e, + type: 3} + propertyPath: m_LocalScale.y + value: 9.75 + objectReference: {fileID: 0} + - target: {fileID: 5622683323770682249, guid: fdfc2253043af1744a949284405a665e, + type: 3} + propertyPath: m_LocalScale.z + value: 9.75 + objectReference: {fileID: 0} - target: {fileID: 6869573283504274101, guid: fdfc2253043af1744a949284405a665e, type: 3} propertyPath: m_LocalPosition.x @@ -1646,74 +1661,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fdfc2253043af1744a949284405a665e, type: 3} ---- !u!1001 &1547242063 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 9edbcaa8141bbb84ba634401b9f0a795, - type: 3} - propertyPath: m_Name - value: "\u805A\u5408" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9edbcaa8141bbb84ba634401b9f0a795, type: 3} --- !u!1 &1564124712 GameObject: m_ObjectHideFlags: 0 @@ -9992,6 +9939,74 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -2596099941554588538, guid: b16821147ecd671449621c2d8bfef6ef, type: 3} +--- !u!1001 &7357295060014949443 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1654332587361230620, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_Name + value: "\u805A\u5408" + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2143306696619230630, guid: 829e85930f128ba4d8392c39a2d680d4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 829e85930f128ba4d8392c39a2d680d4, type: 3} --- !u!1 &7391386979276786477 GameObject: m_ObjectHideFlags: 0 @@ -14219,5 +14234,5 @@ SceneRoots: - {fileID: 1328387724} - {fileID: 982446487} - {fileID: 1784251329} - - {fileID: 1547242063} + - {fileID: 7357295060014949443} - {fileID: 1498786627} diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合.mat b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合.mat index 33be255..be87ab2 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合.mat +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合.mat @@ -53,7 +53,7 @@ Material: - _Tex_2_int: 1 m_Colors: - _CarLineCol: {r: 13.949348, g: 95.87451, b: 0, a: 0} - - _CarLineCol1: {r: 0.59803605, g: 38.07503, b: 0, a: 0} + - _CarLineCol1: {r: 0.7529398, g: 47.937256, b: 0, a: 0} - _CarLineCol2: {r: 0.06592148, g: 5.3403134, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!114 &1822878740006072389 diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合1.mat b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合1.mat new file mode 100644 index 0000000..a156ae8 --- /dev/null +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合1.mat @@ -0,0 +1,71 @@ +%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: "\u805A\u54081" + m_Shader: {fileID: -6465566751694194690, guid: 2b3817b7dbbfa1448a8ff4d009536f0b, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _CarLineTex_1: + m_Texture: {fileID: 2800000, guid: 7807b4d3e89bca045afcabf7bdf1ca3b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CarLineTex_2: + m_Texture: {fileID: 2800000, guid: 7807b4d3e89bca045afcabf7bdf1ca3b, type: 3} + 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: + - _CarLineSpeed: 0.5 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Tex_1_int: 1 + - _Tex_2_int: 1 + m_Colors: + - _CarLineCol: {r: 13.949348, g: 95.87451, b: 0, a: 0} + - _CarLineCol1: {r: 2.5268898, g: 0, b: 47.937256, a: 0} + - _CarLineCol2: {r: 6.4490285, g: 0, b: 38.07503, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &1822878740006072389 +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/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合1.mat.meta b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合1.mat.meta new file mode 100644 index 0000000..8e5feee --- /dev/null +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11c8d3ce034db8c4780ad2fa215bac1d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合2.mat b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合2.mat new file mode 100644 index 0000000..cd282d8 --- /dev/null +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合2.mat @@ -0,0 +1,71 @@ +%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: "\u805A\u54082" + m_Shader: {fileID: -6465566751694194690, guid: 2b3817b7dbbfa1448a8ff4d009536f0b, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _CarLineTex_1: + m_Texture: {fileID: 2800000, guid: 7807b4d3e89bca045afcabf7bdf1ca3b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CarLineTex_2: + m_Texture: {fileID: 2800000, guid: 7807b4d3e89bca045afcabf7bdf1ca3b, type: 3} + 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: + - _CarLineSpeed: 0.5 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Tex_1_int: 1 + - _Tex_2_int: 1 + m_Colors: + - _CarLineCol: {r: 13.949348, g: 95.87451, b: 0, a: 0} + - _CarLineCol1: {r: 47.937256, g: 6.034643, b: 0, a: 0} + - _CarLineCol2: {r: 0.06592148, g: 5.3403134, b: 0, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &1822878740006072389 +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/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合2.mat.meta b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合2.mat.meta new file mode 100644 index 0000000..f1bfe26 --- /dev/null +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/聚合2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45482cfe7f51816488f4a4fb83877d55 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Prefab/聚合.prefab b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Prefab/聚合.prefab new file mode 100644 index 0000000..c7bc708 --- /dev/null +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Prefab/聚合.prefab @@ -0,0 +1,120 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1888195066913743437 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -9125654517126614128, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 45482cfe7f51816488f4a4fb83877d55, type: 2} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8560541790278382534, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 45482cfe7f51816488f4a4fb83877d55, type: 2} + - target: {fileID: -6515009269704191556, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 11c8d3ce034db8c4780ad2fa215bac1d, type: 2} + - target: {fileID: -5761648684759528499, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 45482cfe7f51816488f4a4fb83877d55, type: 2} + - target: {fileID: 118576754605227884, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 45482cfe7f51816488f4a4fb83877d55, type: 2} + - target: {fileID: 919132149155446097, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Name + value: "\u805A\u5408" + objectReference: {fileID: 0} + - target: {fileID: 2621213698874551428, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 45482cfe7f51816488f4a4fb83877d55, type: 2} + - target: {fileID: 4258634184264257107, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 11c8d3ce034db8c4780ad2fa215bac1d, type: 2} + - target: {fileID: 5226979056350305143, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 11c8d3ce034db8c4780ad2fa215bac1d, type: 2} + - target: {fileID: 6547357949247521450, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 11c8d3ce034db8c4780ad2fa215bac1d, type: 2} + - target: {fileID: 7437039363987740942, guid: 9edbcaa8141bbb84ba634401b9f0a795, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 11c8d3ce034db8c4780ad2fa215bac1d, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9edbcaa8141bbb84ba634401b9f0a795, type: 3} diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Prefab/聚合.prefab.meta b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Prefab/聚合.prefab.meta new file mode 100644 index 0000000..156cad0 --- /dev/null +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Prefab/聚合.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 829e85930f128ba4d8392c39a2d680d4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Tex/光束.jpg b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Tex/光束.jpg index 7bac3f3..3ce4072 100644 Binary files a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Tex/光束.jpg and b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Tex/光束.jpg differ