diff --git a/.gitignore b/.gitignore index 9537673..45397e2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /u3d-ShanDongVirtualPowerPlant/.vs /u3d-ShanDongVirtualPowerPlant/obj /u3d-ShanDongVirtualPowerPlant/*.rar +/u3d-ShanDongVirtualPowerPlant/Recordings diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity index edc0509..618e3fb 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity +++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main_XGTZ.unity @@ -2242,7 +2242,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 97f3a396ac8b2ca4286621a12e8c1e5a, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1098357463150158480, guid: 97f3a396ac8b2ca4286621a12e8c1e5a, type: 3} @@ -2686,7 +2686,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!64 &982446484 MeshCollider: m_ObjectHideFlags: 0 diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/map.mat b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/map.mat index 8a4ee33..f34b88f 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/map.mat +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Mat/map.mat @@ -43,7 +43,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseTex: - m_Texture: {fileID: 2800000, guid: 1a4fab891ab11fb499b0189d0f06ed8d, type: 3} + m_Texture: {fileID: 2800000, guid: 516f43efa00f86941a155175395289ca, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -125,8 +125,8 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _MaskInt: 0.5 - - _MaskInt_1: 1 + - _MaskInt: 0.7 + - _MaskInt_1: 0.56 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 @@ -146,7 +146,7 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmiCol: {r: 0.40242437, g: 0.92534506, b: 1.7411013, a: 1} - - _EmiCol2: {r: 0.031149868, g: 0.096681416, b: 0.26415092, a: 1} + - _EmiCol2: {r: 0, g: 0.013591297, b: 0.047169805, a: 1} - _EmiCol_1: {r: 0.255374, g: 0.6861565, b: 1.203095, a: 0} - _EmissionColor: {r: 0.5245282, g: 0.5245282, b: 0.5245282, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Model/ShanDongMap-AT.fbx b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Model/ShanDongMap-AT.fbx new file mode 100644 index 0000000..c44c496 Binary files /dev/null and b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Model/ShanDongMap-AT.fbx differ diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Model/ShanDongMap-AT.fbx.meta b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Model/ShanDongMap-AT.fbx.meta new file mode 100644 index 0000000..042983f --- /dev/null +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Model/ShanDongMap-AT.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: dcace06c9fa7c7a4b8ec9072b535fb5e +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: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Shader/SG_Map.shadergraph b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Shader/SG_Map.shadergraph index bcedab7..985f43a 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Shader/SG_Map.shadergraph +++ b/u3d-ShanDongVirtualPowerPlant/Assets/GameAssets/Shader/SG_Map.shadergraph @@ -18,6 +18,9 @@ { "m_Id": "dfd5a444f439436ab7a51eee6f259158" }, + { + "m_Id": "808f3a59a6024048857b9d32eb17cbc5" + }, { "m_Id": "778799dfb6a0478f9f32a65567be13fc" }, @@ -101,6 +104,15 @@ }, { "m_Id": "c8cb322585f54e94bcd97693ef292cef" + }, + { + "m_Id": "63f0e2272a814497b72ed300a4436e45" + }, + { + "m_Id": "6873fc175b1d4282ba626ee211bfd16e" + }, + { + "m_Id": "78a06bc45bc046119355edd7017abf2c" } ], "m_GroupDatas": [], @@ -148,6 +160,48 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "63f0e2272a814497b72ed300a4436e45" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e33218504c564bdf934248f436c5cc2e" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6873fc175b1d4282ba626ee211bfd16e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "63f0e2272a814497b72ed300a4436e45" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "78a06bc45bc046119355edd7017abf2c" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "63f0e2272a814497b72ed300a4436e45" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -229,7 +283,7 @@ "m_Node": { "m_Id": "e33218504c564bdf934248f436c5cc2e" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -241,9 +295,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "e33218504c564bdf934248f436c5cc2e" + "m_Id": "78a06bc45bc046119355edd7017abf2c" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -271,7 +325,7 @@ "m_Node": { "m_Id": "e33218504c564bdf934248f436c5cc2e" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -491,6 +545,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "13be7ddf42504b3db6d6221f146aa512", + "m_Id": 0, + "m_DisplayName": "MaskInt (1)", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -529,6 +598,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "21bb1db1ee1143ffb6de0650297db3b8", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -966,6 +1059,54 @@ "m_SerializedDescriptor": "SurfaceDescription.Smoothness" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "4732e7a7f50d4d07a907575af8eeae77", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -990,6 +1131,9 @@ { "m_Id": "c4221450606445edad227721b34ef965" }, + { + "m_Id": "808f3a59a6024048857b9d32eb17cbc5" + }, { "m_Id": "dfd5a444f439436ab7a51eee6f259158" } @@ -1276,6 +1420,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "63f0e2272a814497b72ed300a4436e45", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1300.0, + "y": 563.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "ef37f2a12030473596aa7547777c2885" + }, + { + "m_Id": "ae3080f2bf5d44c08c50d80c008bf6f2" + }, + { + "m_Id": "4732e7a7f50d4d07a907575af8eeae77" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1291,6 +1478,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "6873fc175b1d4282ba626ee211bfd16e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1589.0, + "y": 563.0, + "width": 133.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "13be7ddf42504b3db6d6221f146aa512" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "808f3a59a6024048857b9d32eb17cbc5" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -1453,6 +1676,74 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", + "m_ObjectId": "78a06bc45bc046119355edd7017abf2c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "One Minus", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1602.0, + "y": 662.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "21bb1db1ee1143ffb6de0650297db3b8" + }, + { + "m_Id": "8baaa93e96fa4b39af5859f5d2cc22d5" + } + ], + "synonyms": [ + "complement", + "invert", + "opposite" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "808f3a59a6024048857b9d32eb17cbc5", + "m_Guid": { + "m_GuidSerialized": "163eb8b2-b76b-4b18-b444-9650ce49970e" + }, + "m_Name": "MaskInt (1)", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MaskInt (1)", + "m_DefaultReferenceName": "_MaskInt_1", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.12999999523162843, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1502,6 +1793,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8baaa93e96fa4b39af5859f5d2cc22d5", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1514,10 +1829,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1830.0, - "y": 611.0, + "x": -2098.0, + "y": 662.0, "width": 147.0, - "height": 33.99993896484375 + "height": 34.0 } }, "m_Slots": [ @@ -1820,6 +2135,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ae3080f2bf5d44c08c50d80c008bf6f2", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1935,10 +2298,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1589.0, - "y": 580.9999389648438, - "width": 208.0, - "height": 435.00006103515627 + "x": -1856.9998779296875, + "y": 632.0, + "width": 207.9998779296875, + "height": 435.0 } }, "m_Slots": [ @@ -2660,6 +3023,54 @@ "m_SerializedDescriptor": "VertexDescription.Tangent" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ef37f2a12030473596aa7547777c2885", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",