diff --git a/SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab b/SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab index a4288e81..84912315 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab +++ b/SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab @@ -1,88 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7661601162608444638 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2038441939940343167} - - component: {fileID: 7518206150319689926} - - component: {fileID: 3410143886686102134} - m_Layer: 0 - m_Name: surface - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2038441939940343167 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7661601162608444638} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0.00042, y: -0.00774, z: -0.0164} - m_LocalScale: {x: 0.0026850183, y: 0.013216278, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1245463814537934017} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!33 &7518206150319689926 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7661601162608444638} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &3410143886686102134 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7661601162608444638} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1001 &1640013680829502250 PrefabInstance: m_ObjectHideFlags: 0 @@ -149,13 +66,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3} - insertIndex: -1 - addedObject: {fileID: 2038441939940343167} - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3} - insertIndex: -1 - addedObject: {fileID: 97544495125374557} + m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3} insertIndex: -1 @@ -167,11 +78,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 6531800841171930545} m_SourcePrefab: {fileID: 100100000, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3} ---- !u!4 &1245463814537934017 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3} - m_PrefabInstance: {fileID: 1640013680829502250} - m_PrefabAsset: {fileID: 0} --- !u!1 &1874366132397452923 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3} @@ -381,113 +287,3 @@ MonoBehaviour: _modelTypeEnum: 0 _toolsPackScene: 0 IsClick: 1 ---- !u!1001 &3349601928785135740 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1245463814537934017} - m_Modifications: - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7059219998895239338, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8460126229225677331, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_Name - value: Canvas - objectReference: {fileID: 0} - - target: {fileID: 8460126229225677331, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} ---- !u!224 &97544495125374557 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3} - m_PrefabInstance: {fileID: 3349601928785135740} - m_PrefabAsset: {fileID: 0} diff --git a/SXElectricityInformationAcquisition/Assets/Model/工具/Tex/验电笔_E.jpg b/SXElectricityInformationAcquisition/Assets/Model/工具/Tex/验电笔_E.jpg index a357de62..2fa8edaa 100644 Binary files a/SXElectricityInformationAcquisition/Assets/Model/工具/Tex/验电笔_E.jpg and b/SXElectricityInformationAcquisition/Assets/Model/工具/Tex/验电笔_E.jpg differ diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset index a66d9b69..839b4dfe 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset @@ -67,6 +67,54 @@ MonoBehaviour: settings: - {fileID: -1851505970847268626} - {fileID: 7474006403498107821} + - {fileID: 3579922850427680025} +--- !u!114 &3579922850427680025 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 48a79b01ea5641d4aa6daa2e23605641, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + intensity: + overrideState: 1 + value: 1 + threshold: + overrideState: 1 + value: 1 + softKnee: + overrideState: 0 + value: 0.5 + clamp: + overrideState: 0 + value: 65472 + diffusion: + overrideState: 0 + value: 7 + anamorphicRatio: + overrideState: 0 + value: 0 + color: + overrideState: 0 + value: {r: 1, g: 1, b: 1, a: 1} + fastMode: + overrideState: 0 + value: 0 + dirtTexture: + overrideState: 0 + value: {fileID: 0} + defaultState: 1 + dirtIntensity: + overrideState: 0 + value: 0 --- !u!114 &7474006403498107821 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader b/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader index cf4798cd..6e6c821c 100644 --- a/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader +++ b/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader @@ -15,8 +15,9 @@ Shader "PBR/MpMaterial" _Tex_N2("Tex_N2", 2D) = "bump" {} _Int_N2("Int_N2", Range( 0 , 3)) = 1 _Tex_E("Tex_E", 2D) = "black" {} - [HDR]_Int_E("Int_E", Color) = (0,0,0,0) _Whiteint("White int", Range( 0 , 1)) = 0 + [Toggle]_SwitchOfEmi("SwitchOfEmi", Float) = 1 + [HDR]_EmiCol("EmiCol", Color) = (8,0,0,0) [HideInInspector] _texcoord( "", 2D ) = "white" {} [HideInInspector] __dirty( "", Int ) = 1 } @@ -41,8 +42,9 @@ Shader "PBR/MpMaterial" uniform sampler2D _Tex_D; uniform float4 _MainCol; uniform float _Whiteint; + uniform float _SwitchOfEmi; uniform sampler2D _Tex_E; - uniform float4 _Int_E; + uniform float4 _EmiCol; uniform sampler2D _Tex_Mp; uniform float _Int_M; uniform float _Int_S; @@ -59,7 +61,7 @@ Shader "PBR/MpMaterial" float4 temp_cast_0 = ((1.0 + (_Whiteint - 0.0) * (0.0 - 1.0) / (1.0 - 0.0))).xxxx; float4 BaseTex24 = pow( ( tex2D( _Tex_D, i.uv_texcoord ) * _MainCol ) , temp_cast_0 ); o.Albedo = BaseTex24.rgb; - float4 Emission41 = ( tex2D( _Tex_E, i.uv_texcoord ) * _Int_E ); + float4 Emission41 = (( _SwitchOfEmi )?( ( tex2D( _Tex_E, i.uv_texcoord ) * _EmiCol ) ):( float4( 0,0,0,0 ) )); o.Emission = Emission41.rgb; float4 tex2DNode4 = tex2D( _Tex_Mp, i.uv_texcoord ); float Metalness28 = ( tex2DNode4.r * _Int_M ); @@ -78,94 +80,95 @@ Shader "PBR/MpMaterial" } /*ASEBEGIN Version=18935 -501;314;1241;671;2620.031;-0.2017822;1;True;True +7;300;1241;665;3445.875;889.4883;2.349958;True;True Node;AmplifyShaderEditor.CommentaryNode;58;-3165.146,-654.9154;Inherit;False;1515.344;687.8996;法线;13;15;48;2;3;46;45;12;18;47;19;44;22;53;N;1,1,1,1;0;0 Node;AmplifyShaderEditor.TextureCoordinatesNode;53;-3058.097,-340.4971;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.CommentaryNode;68;-3399.707,-1820.042;Inherit;False;1759.98;1006.942;基础色;8;1;5;52;6;24;75;76;77;D;1,1,1,1;0;0 -Node;AmplifyShaderEditor.CommentaryNode;56;-3157.236,824.247;Inherit;False;1464.678;593.5877;金属度&粗糙度&环境光遮蔽;11;4;11;9;10;13;14;29;28;30;55;72;M&R&ao;1,1,1,1;0;0 -Node;AmplifyShaderEditor.SamplerNode;2;-2781.136,-604.9154;Inherit;True;Property;_Tex_N1;Tex_N1;6;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;True;bump;Auto;True;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.CommentaryNode;56;-3166.394,1620.99;Inherit;False;1464.678;593.5877;金属度&粗糙度&环境光遮蔽;11;4;11;9;10;13;14;29;28;30;55;72;M&R&ao;1,1,1,1;0;0 +Node;AmplifyShaderEditor.SamplerNode;2;-2781.136,-604.9154;Inherit;True;Property;_Tex_N1;Tex_N1;6;0;Create;True;0;0;0;False;0;False;-1;None;095b5bb7b257d5044a0b26e14592c207;True;0;True;bump;Auto;True;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.TextureCoordinatesNode;52;-2968.977,-1580.875;Inherit;True;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.RangedFloatNode;15;-2776.901,-385.0208;Inherit;False;Property;_Int_N1;Int_N1;7;0;Create;True;0;0;0;False;0;False;1;1;0;3;0;1;FLOAT;0 Node;AmplifyShaderEditor.SamplerNode;3;-2782.087,-286.1283;Inherit;True;Property;_Tex_N2;Tex_N2;8;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;bump;Auto;True;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.RangedFloatNode;48;-2776.618,-83.01582;Inherit;False;Property;_Int_N2;Int_N2;9;0;Create;True;0;0;0;False;0;False;1;1;0;3;0;1;FLOAT;0 -Node;AmplifyShaderEditor.CommentaryNode;57;-2841.289,174.038;Inherit;False;1184.615;454.2521;自发光;5;39;37;38;41;54;E;1,1,1,1;0;0 -Node;AmplifyShaderEditor.TextureCoordinatesNode;54;-2791.289,279.9649;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.SamplerNode;1;-2663.69,-1570.131;Inherit;True;Property;_Tex_D;Tex_D;0;0;Create;True;0;0;0;False;0;False;-1;0c7963899115f53439e3e4fffda96f4a;0c7963899115f53439e3e4fffda96f4a;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.TextureCoordinatesNode;54;-3084.469,277.6756;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;18;-2440.802,-409.3207;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.SamplerNode;1;-2663.69,-1570.131;Inherit;True;Property;_Tex_D;Tex_D;0;0;Create;True;0;0;0;False;0;False;-1;0c7963899115f53439e3e4fffda96f4a;ad25aa5846bbe1f41afaf271bfa53e74;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SamplerNode;37;-2781.541,234.2221;Inherit;True;Property;_Tex_E;Tex_E;10;0;Create;True;0;0;0;False;0;False;-1;dd71a43e709951743854a48bddfb35f8;dd71a43e709951743854a48bddfb35f8;True;0;False;black;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.TextureCoordinatesNode;55;-3116.394,1721.609;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;45;-2447.952,-291.0161;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.ColorNode;5;-2596.019,-1338.487;Inherit;False;Property;_MainCol;MainCol;1;0;Create;True;0;0;0;False;0;False;1,1,1,0;1,1,1,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.RangedFloatNode;75;-2693.186,-1008.266;Inherit;False;Property;_Whiteint;White int;11;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;12;-2445.802,-559.3214;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;46;-2442.952,-141.0155;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.RangedFloatNode;75;-2693.186,-1008.266;Inherit;False;Property;_Whiteint;White int;12;0;Create;True;0;0;0;False;0;False;0;0;0;1;0;1;FLOAT;0 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;45;-2447.952,-291.0161;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.TextureCoordinatesNode;55;-3107.236,924.8668;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.ColorNode;5;-2596.019,-1338.487;Inherit;False;Property;_MainCol;MainCol;1;0;Create;True;0;0;0;False;0;False;1,1,1,0;1,0.9874567,0.1745283,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.SamplerNode;37;-2422.427,224.038;Inherit;True;Property;_Tex_E;Tex_E;10;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;black;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.RangedFloatNode;11;-2807.403,1301.835;Inherit;False;Property;_Int_ao;Int_ao;5;0;Create;True;0;0;0;False;0;False;1;1;0;2;0;1;FLOAT;0 -Node;AmplifyShaderEditor.ColorNode;39;-2346.54,435.8982;Inherit;False;Property;_Int_E;Int_E;11;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.DynamicAppendNode;19;-2284.801,-493.321;Inherit;False;FLOAT3;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT3;0 -Node;AmplifyShaderEditor.TFHCRemapNode;76;-2307.473,-1035.666;Inherit;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;3;FLOAT;1;False;4;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;6;-2319.296,-1371.12;Inherit;True;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.RangedFloatNode;10;-2801.51,1082.138;Inherit;False;Property;_Int_M;Int_M;3;0;Create;True;0;0;0;False;0;False;1;1;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.ColorNode;81;-2704.125,483.7484;Inherit;False;Property;_EmiCol;EmiCol;13;1;[HDR];Create;True;0;0;0;False;0;False;8,0,0,0;32,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.RangedFloatNode;9;-2821.207,1988.544;Inherit;False;Property;_Int_S;Int_S;4;0;Create;True;0;0;0;False;0;False;1;1;0;1;0;1;FLOAT;0 Node;AmplifyShaderEditor.DynamicAppendNode;47;-2286.951,-225.0158;Inherit;False;FLOAT3;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT3;0 -Node;AmplifyShaderEditor.RangedFloatNode;9;-2812.049,1191.802;Inherit;False;Property;_Int_S;Int_S;4;0;Create;True;0;0;0;False;0;False;1;1;0;1;0;1;FLOAT;0 -Node;AmplifyShaderEditor.SamplerNode;4;-2804.579,874.247;Inherit;True;Property;_Tex_Mp;Tex_Mp;2;0;Create;True;0;0;0;False;0;False;-1;47648d49215492b4cb7c8d7ec10223ba;47648d49215492b4cb7c8d7ec10223ba;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;14;-2273.617,1017.208;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.DynamicAppendNode;19;-2284.801,-493.321;Inherit;False;FLOAT3;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT3;0 +Node;AmplifyShaderEditor.SamplerNode;4;-2813.737,1670.99;Inherit;True;Property;_Tex_Mp;Tex_Mp;2;0;Create;True;0;0;0;False;0;False;-1;47648d49215492b4cb7c8d7ec10223ba;58e7b5467a5f44e44b86d55a22b00f4c;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;80;-2431.287,355.8207;Inherit;True;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.RangedFloatNode;11;-2816.561,2098.578;Inherit;False;Property;_Int_ao;Int_ao;5;0;Create;True;0;0;0;False;0;False;1;1;0;2;0;1;FLOAT;0 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;6;-2319.296,-1371.12;Inherit;True;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.TFHCRemapNode;76;-2307.473,-1035.666;Inherit;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;3;FLOAT;1;False;4;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.RangedFloatNode;10;-2810.668,1878.88;Inherit;False;Property;_Int_M;Int_M;3;0;Create;True;0;0;0;False;0;False;1;1;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.PowerNode;77;-2095.301,-1200.637;Inherit;True;False;2;0;COLOR;0,0,0,0;False;1;FLOAT;1;False;1;COLOR;0 +Node;AmplifyShaderEditor.PowerNode;72;-2208.533,2034.831;Inherit;False;False;2;0;FLOAT;0;False;1;FLOAT;1;False;1;FLOAT;0 +Node;AmplifyShaderEditor.ToggleSwitchNode;79;-2166.186,331.8682;Inherit;True;Property;_SwitchOfEmi;SwitchOfEmi;12;0;Create;True;0;0;0;False;0;False;1;True;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.BlendNormalsNode;44;-2113.549,-353.3292;Inherit;False;0;3;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;1;FLOAT3;0 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;13;-2266.879,893.8857;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;38;-2069.762,369.9097;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.PowerNode;72;-2199.375,1238.089;Inherit;False;False;2;0;FLOAT;0;False;1;FLOAT;1;False;1;FLOAT;0 -Node;AmplifyShaderEditor.PowerNode;77;-2069.3,-1164.237;Inherit;True;False;2;0;COLOR;0,0,0,0;False;1;FLOAT;1;False;1;COLOR;0 -Node;AmplifyShaderEditor.RegisterLocalVarNode;41;-1880.675,340.2439;Inherit;False;Emission;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.RegisterLocalVarNode;29;-1917.222,1081.872;Inherit;False;Smoothness;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.RegisterLocalVarNode;30;-1936.56,1235.873;Inherit;False;AmbientOcclusion;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.RegisterLocalVarNode;24;-1840.634,-1383.542;Inherit;False;BaseTex;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;13;-2276.037,1690.628;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;14;-2282.775,1813.95;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.RegisterLocalVarNode;29;-1926.38,1878.614;Inherit;False;Smoothness;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.RegisterLocalVarNode;30;-1945.718,2032.615;Inherit;False;AmbientOcclusion;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.RegisterLocalVarNode;22;-1873.802,-347.9721;Inherit;False;Normal;-1;True;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0 -Node;AmplifyShaderEditor.RegisterLocalVarNode;28;-1919.991,959.7667;Inherit;False;Metalness;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.GetLocalVarNode;26;-473.7759,-132.9712;Inherit;False;22;Normal;1;0;OBJECT;;False;1;FLOAT3;0 +Node;AmplifyShaderEditor.RegisterLocalVarNode;24;-1840.634,-1383.542;Inherit;False;BaseTex;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.RegisterLocalVarNode;41;-1883.11,340.2439;Inherit;True;Emission;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.RegisterLocalVarNode;28;-1929.149,1756.509;Inherit;False;Metalness;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.GetLocalVarNode;43;-477.1973,-57.97;Inherit;False;41;Emission;1;0;OBJECT;;False;1;COLOR;0 -Node;AmplifyShaderEditor.GetLocalVarNode;32;-470.8406,23.49832;Inherit;False;28;Metalness;1;0;OBJECT;;False;1;FLOAT;0 -Node;AmplifyShaderEditor.GetLocalVarNode;33;-480.8406,117.4983;Inherit;False;29;Smoothness;1;0;OBJECT;;False;1;FLOAT;0 Node;AmplifyShaderEditor.GetLocalVarNode;31;-498.8406,230.4985;Inherit;False;30;AmbientOcclusion;1;0;OBJECT;;False;1;FLOAT;0 +Node;AmplifyShaderEditor.GetLocalVarNode;26;-473.7759,-132.9712;Inherit;False;22;Normal;1;0;OBJECT;;False;1;FLOAT3;0 +Node;AmplifyShaderEditor.GetLocalVarNode;33;-480.8406,117.4983;Inherit;False;29;Smoothness;1;0;OBJECT;;False;1;FLOAT;0 +Node;AmplifyShaderEditor.GetLocalVarNode;32;-470.8406,23.49832;Inherit;False;28;Metalness;1;0;OBJECT;;False;1;FLOAT;0 Node;AmplifyShaderEditor.GetLocalVarNode;27;-473.6052,-211.7178;Inherit;False;24;BaseTex;1;0;OBJECT;;False;1;COLOR;0 Node;AmplifyShaderEditor.StandardSurfaceOutputNode;0;-146.0046,-76.68896;Float;False;True;-1;2;ASEMaterialInspector;0;0;Standard;PBR/MpMaterial;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;Back;0;False;-1;0;False;-1;False;0;False;-1;0;False;-1;False;0;Opaque;0.5;True;True;0;False;Opaque;;Geometry;All;18;all;True;True;True;True;0;False;-1;False;0;False;-1;255;False;-1;255;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;False;2;15;10;25;False;0.5;True;0;0;False;-1;0;False;-1;0;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;0;0,0,0,0;VertexOffset;True;False;Cylindrical;False;True;Relative;0;;-1;-1;-1;-1;0;False;0;0;False;-1;-1;0;False;-1;0;0;0;False;0.1;False;-1;0;False;-1;False;16;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;6;FLOAT3;0,0,0;False;7;FLOAT3;0,0,0;False;8;FLOAT;0;False;9;FLOAT;0;False;10;FLOAT;0;False;13;FLOAT3;0,0,0;False;11;FLOAT3;0,0,0;False;12;FLOAT3;0,0,0;False;14;FLOAT4;0,0,0,0;False;15;FLOAT3;0,0,0;False;0 WireConnection;2;1;53;0 WireConnection;3;1;53;0 -WireConnection;1;1;52;0 WireConnection;18;0;2;2 WireConnection;18;1;15;0 +WireConnection;1;1;52;0 +WireConnection;37;1;54;0 +WireConnection;45;0;3;1 +WireConnection;45;1;48;0 WireConnection;12;0;2;1 WireConnection;12;1;15;0 WireConnection;46;0;3;2 WireConnection;46;1;48;0 -WireConnection;45;0;3;1 -WireConnection;45;1;48;0 -WireConnection;37;1;54;0 -WireConnection;19;0;12;0 -WireConnection;19;1;18;0 -WireConnection;19;2;2;3 -WireConnection;76;0;75;0 -WireConnection;6;0;1;0 -WireConnection;6;1;5;0 WireConnection;47;0;45;0 WireConnection;47;1;46;0 WireConnection;47;2;3;3 +WireConnection;19;0;12;0 +WireConnection;19;1;18;0 +WireConnection;19;2;2;3 WireConnection;4;1;55;0 -WireConnection;14;0;4;3 -WireConnection;14;1;9;0 +WireConnection;80;0;37;0 +WireConnection;80;1;81;0 +WireConnection;6;0;1;0 +WireConnection;6;1;5;0 +WireConnection;76;0;75;0 +WireConnection;77;0;6;0 +WireConnection;77;1;76;0 +WireConnection;72;0;4;2 +WireConnection;72;1;11;0 +WireConnection;79;1;80;0 WireConnection;44;0;19;0 WireConnection;44;1;47;0 WireConnection;13;0;4;1 WireConnection;13;1;10;0 -WireConnection;38;0;37;0 -WireConnection;38;1;39;0 -WireConnection;72;0;4;2 -WireConnection;72;1;11;0 -WireConnection;77;0;6;0 -WireConnection;77;1;76;0 -WireConnection;41;0;38;0 +WireConnection;14;0;4;3 +WireConnection;14;1;9;0 WireConnection;29;0;14;0 WireConnection;30;0;72;0 -WireConnection;24;0;77;0 WireConnection;22;0;44;0 +WireConnection;24;0;77;0 +WireConnection;41;0;79;0 WireConnection;28;0;13;0 WireConnection;0;0;27;0 WireConnection;0;1;26;0 @@ -174,4 +177,4 @@ WireConnection;0;3;32;0 WireConnection;0;4;33;0 WireConnection;0;5;31;0 ASEEND*/ -//CHKSM=52AC30B2EDD3B595D5CB1F528AF5D1D2D889B82C \ No newline at end of file +//CHKSM=D10DB3FBAF9494F13F27974441275E7B116069D7 \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader.meta b/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader.meta index abdf1a0e..7fe14c6f 100644 --- a/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader.meta +++ b/SXElectricityInformationAcquisition/Assets/Shader/遮罩贴图材质球.shader.meta @@ -2,7 +2,10 @@ fileFormatVersion: 2 guid: 05135f69c99a2914098b433aa80d9fbe ShaderImporter: externalObjects: {} - defaultTextures: [] + defaultTextures: + - _Tex_D: {fileID: 2800000, guid: 0c7963899115f53439e3e4fffda96f4a, type: 3} + - _Tex_E: {fileID: 2800000, guid: dd71a43e709951743854a48bddfb35f8, type: 3} + - _Tex_Mp: {fileID: 2800000, guid: 47648d49215492b4cb7c8d7ec10223ba, type: 3} nonModifiableTextures: [] userData: assetBundleName: diff --git a/SXElectricityInformationAcquisition/Packages/packages-lock.json b/SXElectricityInformationAcquisition/Packages/packages-lock.json index 96ad547f..aa5b66b8 100644 --- a/SXElectricityInformationAcquisition/Packages/packages-lock.json +++ b/SXElectricityInformationAcquisition/Packages/packages-lock.json @@ -5,21 +5,21 @@ "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.feature.development": { "version": "1.0.1", @@ -42,7 +42,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -51,21 +51,21 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.postprocessing": { "version": "3.4.0", @@ -74,14 +74,14 @@ "dependencies": { "com.unity.modules.physics": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.settings-manager": { "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.test-framework": { "version": "1.1.33", @@ -92,7 +92,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.testtools.codecoverage": { "version": "1.2.5", @@ -102,7 +102,7 @@ "com.unity.test-framework": "1.0.16", "com.unity.settings-manager": "1.0.1" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -111,7 +111,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.timeline": { "version": "1.7.6", @@ -123,7 +123,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ugui": { "version": "1.0.0", @@ -142,7 +142,7 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset b/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset index 112a053b..e6641787 100644 --- a/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset +++ b/SXElectricityInformationAcquisition/ProjectSettings/PackageManagerSettings.asset @@ -13,23 +13,24 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EnablePreReleasePackages: 0 - m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.com + m_Url: https://packages.unity.cn m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 + m_ConfigSource: 0 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -830 - m_OriginalInstanceId: -832 + m_UserModificationsInstanceId: -850 + m_OriginalInstanceId: -852 m_LoadAssets: 0 diff --git a/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt b/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt index c47c8be7..1cf12ebb 100644 --- a/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt +++ b/SXElectricityInformationAcquisition/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.22f1 -m_EditorVersionWithRevision: 2022.3.22f1 (887be4894c44) +m_EditorVersion: 2022.3.22f1c1 +m_EditorVersionWithRevision: 2022.3.22f1c1 (c3cbd310e76e)