diff --git a/Assets/Artists/Arts/Logos/logo_CN_Intelli.png b/Assets/Artists/Arts/Logos/logo_CN_Intelli.png new file mode 100644 index 00000000..18a59f9d Binary files /dev/null and b/Assets/Artists/Arts/Logos/logo_CN_Intelli.png differ diff --git a/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset_Renderer.asset b/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset_Renderer.asset index b9cbccf9..1eb00cf0 100644 --- a/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset_Renderer.asset +++ b/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset_Renderer.asset @@ -1,5 +1,28 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5786229212923697688 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: a1614fc811f8f184697d9bee70ab9fe5, type: 3} + m_Name: DecalRendererFeature + m_EditorClassIdentifier: + m_Active: 1 + m_Settings: + technique: 0 + maxDrawDistance: 1000 + decalLayers: 0 + dBufferSettings: + surfaceData: 2 + screenSpaceSettings: + normalBlend: 0 + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17,7 +40,8 @@ MonoBehaviour: hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: - {fileID: 2352265475656500780} - m_RendererFeatureMap: 2cc6ebbdfceca420 + - {fileID: -5786229212923697688} + m_RendererFeatureMap: 2cc6ebbdfceca420e8e5b106302fb3af m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} diff --git a/Assets/Artists/Materials/Default Decal.mat b/Assets/Artists/Materials/Default Decal.mat new file mode 100644 index 00000000..3567c4a3 --- /dev/null +++ b/Assets/Artists/Materials/Default Decal.mat @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6293721709757624735 +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 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Default Decal + m_Shader: {fileID: -6465566751694194690, guid: 9b4e681081e2b4c469111bb649e2f7ee, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - Base_Map: + m_Texture: {fileID: 2800000, guid: 2ded55bf792b59a4b9109c68549fe324, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Normal_Map: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + 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: + - Normal_Blend: 0.5 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DecalMeshBiasType: 0 + - _DecalMeshDepthBias: 0 + - _DecalMeshViewBias: 0 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DrawOrder: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Artists/Scenes/Workshop.unity b/Assets/Artists/Scenes/Workshop.unity index d87924ed..feaf8fe4 100644 --- a/Assets/Artists/Scenes/Workshop.unity +++ b/Assets/Artists/Scenes/Workshop.unity @@ -3051,6 +3051,38 @@ Transform: m_CorrespondingSourceObject: {fileID: 1356990118525796183, guid: 03c2ae0fa39597e4f92a5111e3228c63, type: 3} m_PrefabInstance: {fileID: 158526291} m_PrefabAsset: {fileID: 0} +--- !u!1 &160061836 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 160061837} + m_Layer: 0 + m_Name: "\u5370\u82B1\u76EE\u5F55" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &160061837 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 160061836} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1268468428} + m_Father: {fileID: 1549445631} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &167171077 PrefabInstance: m_ObjectHideFlags: 0 @@ -8754,8 +8786,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420814441} serializedVersion: 2 - m_LocalRotation: {x: -0.0000007765917, y: 0.96592575, z: -0.25881937, w: -0.0000028982759} - m_LocalPosition: {x: 0.000005197046, y: 1.5000007, z: 0.8660253} + m_LocalRotation: {x: 0.25881916, y: 0.0000028314114, z: -0.00000075867473, w: 0.9659258} + m_LocalPosition: {x: -0.0000050771478, y: 1.5000002, z: -0.8660253} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -13890,6 +13922,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 5976111924823002036, guid: 6984f1d52646a324a957fd1636eb12cb, type: 3} m_PrefabInstance: {fileID: 693389720} m_PrefabAsset: {fileID: 0} +--- !u!1 &698951663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 698951664} + - component: {fileID: 698951665} + m_Layer: 0 + m_Name: fps-label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &698951664 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698951663} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1237214210} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &698951665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698951663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b0261cd9eafc784c9d4cc6a24ea6886, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1237214209} + bindName: + bindNameProvider: + rid: 3736623439084781572 + format: + rid: 3736623439084781576 + references: + version: 2 + RefIds: + - rid: 3736623439084781572 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 698951663} + - rid: 3736623439084781576 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: FPS:{x} --- !u!1001 &700000641 PrefabInstance: m_ObjectHideFlags: 0 @@ -17216,6 +17309,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 1356990118525796183, guid: 03c2ae0fa39597e4f92a5111e3228c63, type: 3} m_PrefabInstance: {fileID: 857579238} m_PrefabAsset: {fileID: 0} +--- !u!1 &857627673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 857627674} + - component: {fileID: 857627675} + m_Layer: 0 + m_Name: ping-label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &857627674 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857627673} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1237214210} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &857627675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857627673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b0261cd9eafc784c9d4cc6a24ea6886, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1237214209} + bindName: + bindNameProvider: + rid: 3736623439084781573 + format: + rid: 3736623439084781574 + references: + version: 2 + RefIds: + - rid: 3736623439084781573 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 857627673} + - rid: 3736623439084781574 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Ping:{x}ms --- !u!1001 &861051413 PrefabInstance: m_ObjectHideFlags: 0 @@ -18500,31 +18654,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4263150313831602953, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalPosition.x - value: 0.000005197046 + value: -0.0000050771478 objectReference: {fileID: 0} - target: {fileID: 4263150313831602953, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalPosition.y - value: 0.5000007 + value: 0.50000024 objectReference: {fileID: 0} - target: {fileID: 4263150313831602953, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalPosition.z - value: 0.8660253 + value: -0.8660253 objectReference: {fileID: 0} - target: {fileID: 4263150313831602953, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.w - value: -0.0000028982759 + value: 0.9659258 objectReference: {fileID: 0} - target: {fileID: 4263150313831602953, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.x - value: -0.0000007765917 + value: 0.25881916 objectReference: {fileID: 0} - target: {fileID: 4263150313831602953, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.y - value: 0.96592575 + value: 0.0000028314114 objectReference: {fileID: 0} - target: {fileID: 4263150313831602953, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.z - value: -0.25881937 + value: -0.00000075867473 objectReference: {fileID: 0} - target: {fileID: 4263150314946998997, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: allowInput @@ -18552,19 +18706,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4263150314984849210, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.w - value: 0.0000028908253 + value: -0.9659259 objectReference: {fileID: 0} - target: {fileID: 4263150314984849210, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.x - value: 0.00000074878335 + value: -0.25881913 objectReference: {fileID: 0} - target: {fileID: 4263150314984849210, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.y - value: -0.9659258 + value: -0.00000282377 objectReference: {fileID: 0} - target: {fileID: 4263150314984849210, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalRotation.z - value: 0.25881943 + value: 0.0000007301569 objectReference: {fileID: 0} - target: {fileID: 4263150314984849210, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18572,7 +18726,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4263150314984849210, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -180 + value: -360 objectReference: {fileID: 0} - target: {fileID: 5175145412320996503, guid: 38a853bdbe097a24ebb4613f9bc99fe6, type: 3} propertyPath: m_LocalPosition.x @@ -24469,6 +24623,7 @@ GameObject: - component: {fileID: 1237214215} - component: {fileID: 1237214216} - component: {fileID: 1237214217} + - component: {fileID: 1237214218} m_Layer: 0 m_Name: CuttingPanel m_TagString: Untagged @@ -24532,6 +24687,9 @@ Transform: - {fileID: 455873927} - {fileID: 367749727} - {fileID: 128062587} + - {fileID: 857627674} + - {fileID: 698951664} + - {fileID: 1460596583} m_Father: {fileID: 475671028} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1237214211 @@ -24585,6 +24743,10 @@ MonoBehaviour: m_EditorClassIdentifier: brushIconDictionary: _serializedList: + - Key: DecalBrush + Value: {fileID: 2800000, guid: fa59a69c4ab737f4f87c1975f9726f82, type: 3} + - Key: CuttingFillBrush + Value: {fileID: 2800000, guid: f9411642918e0714b9bf44e2b0bb5475, type: 3} - Key: CuttingScriptablePointBrush Value: {fileID: 2800000, guid: 3fbb3fd56ccc5144e863171f64c7dd79, type: 3} - Key: CuttingLineBrush @@ -24676,6 +24838,53 @@ MonoBehaviour: m_EditorClassIdentifier: defaultTexture: {fileID: 0} worldImage: {fileID: 1354611256} +--- !u!114 &1237214218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1237214207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 041838da66546b241a2c3b928442dbe7, type: 3} + m_Name: + m_EditorClassIdentifier: + pingAddress: + rid: 3736623439084781581 + fpsInterval: + Interval: 1 + fpsOutput: + rid: 3736623439084781579 + pingOutput: + rid: 3736623439084781578 + resolutionOutput: + rid: -2 + frameRateOutput: + rid: 3736623439084781580 + clientPing: + rid: -2 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 3736623439084781578 + type: {class: IProviderMonoProxy, ns: BITKit, asm: BITKit} + data: + monoBehaviour: {fileID: 857627675} + - rid: 3736623439084781579 + type: {class: IProviderMonoProxy, ns: BITKit, asm: BITKit} + data: + monoBehaviour: {fileID: 698951665} + - rid: 3736623439084781580 + type: {class: IProviderMonoProxy, ns: BITKit, asm: BITKit} + data: + monoBehaviour: {fileID: 1460596584} + - rid: 3736623439084781581 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "134.175.197.97\r" --- !u!1 &1238623440 GameObject: m_ObjectHideFlags: 0 @@ -25220,6 +25429,62 @@ Transform: m_CorrespondingSourceObject: {fileID: 775197342873461764, guid: db2d086fe2ffee04dbb1f233c83f567a, type: 3} m_PrefabInstance: {fileID: 1268163722} m_PrefabAsset: {fileID: 0} +--- !u!1 &1268468426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1268468428} + - component: {fileID: 1268468427} + m_Layer: 0 + m_Name: URP Decal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1268468427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268468426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 7a6b6333b88df224eaee52d3354b8015, type: 2} + m_DrawDistance: 1000 + m_FadeScale: 0.9 + m_StartAngleFade: 180 + m_EndAngleFade: 180 + m_UVScale: {x: 1, y: 1} + m_UVBias: {x: 0, y: 0} + m_DecalLayerMask: 1 + m_ScaleMode: 0 + m_Offset: {x: 0, y: 0, z: -0.2} + m_Size: {x: 0.2, y: 0.2, z: 1} + m_FadeFactor: 1 +--- !u!4 &1268468428 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268468426} + serializedVersion: 2 + m_LocalRotation: {x: -0.70710754, y: -0, z: -0, w: 0.7071061} + m_LocalPosition: {x: 0.008, y: 0.191, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 160061837} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1001 &1272703556 PrefabInstance: m_ObjectHideFlags: 0 @@ -28497,6 +28762,67 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1460596582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1460596583} + - component: {fileID: 1460596584} + m_Layer: 0 + m_Name: rate-label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1460596583 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1460596582} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1237214210} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1460596584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1460596582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b0261cd9eafc784c9d4cc6a24ea6886, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1237214209} + bindName: + bindNameProvider: + rid: 3736623439084781571 + format: + rid: 3736623439084781577 + references: + version: 2 + RefIds: + - rid: 3736623439084781571 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 1460596582} + - rid: 3736623439084781577 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: "\u5E27\u7387\u9650\u5236:{x}" --- !u!1001 &1461716792 PrefabInstance: m_ObjectHideFlags: 0 @@ -30012,6 +30338,7 @@ GameObject: - component: {fileID: 1549445628} - component: {fileID: 1549445633} - component: {fileID: 1549445632} + - component: {fileID: 1549445634} m_Layer: 0 m_Name: "\u5207\u524A\u673A" m_TagString: Untagged @@ -30058,6 +30385,8 @@ MonoBehaviour: - rid: 1308798517044838400 - rid: 1308798517044838403 - rid: 1308798517044838404 + - rid: 3736623439084781568 + - rid: 3736623439084781569 _currentStateName: debug: 0 transitionOnNextFrame: 0 @@ -30089,6 +30418,13 @@ MonoBehaviour: - rid: 1308798517044838404 type: {class: CuttingScriptablePointBrush, ns: BITFactory.Cutting, asm: iFactory.Cutting.Runtime} data: + - rid: 3736623439084781568 + type: {class: CuttingFillBrush, ns: BITFactory.Cutting, asm: iFactory.Cutting.Runtime} + data: + transform: {fileID: 904426893} + - rid: 3736623439084781569 + type: {class: DecalBrush, ns: BITFactory.Cutting, asm: iFactory.Cutting.Runtime} + data: --- !u!114 &1549445630 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30115,6 +30451,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 904426893} + - {fileID: 160061837} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1549445632 @@ -30166,6 +30503,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f0c6c2d406bfdaf46ba4ab9883f71066, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1549445634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549445627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0d664c18eb5ee9498650bf7933378d7, type: 3} + m_Name: + m_EditorClassIdentifier: + decalProjector: {fileID: 1268468427} --- !u!1001 &1550331181 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Artists/Scripts/UX/UXCuttingToolService.cs b/Assets/Artists/Scripts/UX/UXCuttingToolService.cs index 31a7f9ab..bb92e438 100644 --- a/Assets/Artists/Scripts/UX/UXCuttingToolService.cs +++ b/Assets/Artists/Scripts/UX/UXCuttingToolService.cs @@ -175,10 +175,29 @@ namespace BITFactory.Cutting var button = _brushFieldsContainer.Create