diff --git a/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset.asset b/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset.asset index 28f14400..467a9a2f 100644 --- a/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset.asset +++ b/Assets/Artists/Configs/URP/New Universal Render Pipeline Asset.asset @@ -103,7 +103,7 @@ MonoBehaviour: m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 - m_PrefilterDBufferMRT3: 1 + m_PrefilterDBufferMRT3: 0 m_PrefilterSoftShadowsQualityLow: 1 m_PrefilterSoftShadowsQualityMedium: 1 m_PrefilterSoftShadowsQualityHigh: 1 diff --git a/Assets/Artists/Scenes/Workshop.unity b/Assets/Artists/Scenes/Workshop.unity index feaf8fe4..8427e1fe 100644 --- a/Assets/Artists/Scenes/Workshop.unity +++ b/Assets/Artists/Scenes/Workshop.unity @@ -9775,6 +9775,7 @@ Transform: - {fileID: 324953849} - {fileID: 495300441} - {fileID: 2087774128} + - {fileID: 554909162} - {fileID: 1237214210} - {fileID: 1228132877} - {fileID: 676926185} @@ -11200,6 +11201,69 @@ Transform: m_CorrespondingSourceObject: {fileID: 1093686136660250980, guid: d25e6ff943432834c877c29af5e8ff40, type: 3} m_PrefabInstance: {fileID: 541966726} m_PrefabAsset: {fileID: 0} +--- !u!1 &554909161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 554909162} + - component: {fileID: 554909164} + - component: {fileID: 554909163} + m_Layer: 0 + m_Name: Waiting + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: 2427f62ec555df341837da126e892853, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &554909162 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 554909161} + 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: 475671028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &554909163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 554909161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 241915c4814e5224f9d3ffd6dab7a98e, type: 3} + m_Name: + m_EditorClassIdentifier: + handleTemplate: {fileID: 9197481963319205126, guid: 418bc306b2e063847b56f7b5f5a23f7d, type: 3} + asGlobal: 1 +--- !u!114 &554909164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 554909161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PanelSettings: {fileID: 11400000, guid: 64cd93f02c042ad43a96d66da32f0c6c, type: 2} + m_ParentUI: {fileID: 0} + sourceAsset: {fileID: 9197481963319205126, guid: fd7776bbc384e3747a370568288ad98c, type: 3} + m_SortingOrder: 8 --- !u!1001 &555911125 PrefabInstance: m_ObjectHideFlags: 0 @@ -12219,6 +12283,109 @@ Transform: m_CorrespondingSourceObject: {fileID: 2723349985642794010, guid: d22a44843d244fc4fb4459be68ead0bb, type: 3} m_PrefabInstance: {fileID: 596252691} m_PrefabAsset: {fileID: 0} +--- !u!1 &599164994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 599164995} + - component: {fileID: 599164997} + - component: {fileID: 599164996} + m_Layer: 0 + m_Name: manual-button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &599164995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 599164994} + 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 &599164996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 599164994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c307dd96b0ae44db43b135d73ae46a, type: 3} + m_Name: + m_EditorClassIdentifier: + mark: + actions: + - rid: 1308798704739418115 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1308798704739418115 + type: {class: BITAppForUnity/OpenUrl, ns: BITKit, asm: BITKit} + data: + url: http://server.bitfall.icu:3000/root/iFactory.Cutting.Unity + urlReference: + rid: -2 +--- !u!114 &599164997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 599164994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44e9dc9ae2389a74abe198bbd3f86c69, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1237214209} + bindName: + bindNameProvider: + rid: 1308798704739418114 + allowRightClick: 0 + onClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 599164996} + m_TargetAssemblyTypeName: BITKit.MonoAction, BITKit + m_MethodName: Execute + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onRightClick: + m_PersistentCalls: + m_Calls: [] + clicked: + Targets: [] + references: + version: 2 + RefIds: + - rid: 1308798704739418114 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 599164994} --- !u!1001 &599941887 PrefabInstance: m_ObjectHideFlags: 0 @@ -24689,6 +24856,7 @@ Transform: - {fileID: 128062587} - {fileID: 857627674} - {fileID: 698951664} + - {fileID: 599164995} - {fileID: 1460596583} m_Father: {fileID: 475671028} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Artists/Scripts/UX/UXCuttingToolService.cs b/Assets/Artists/Scripts/UX/UXCuttingToolService.cs index bb92e438..450a38fc 100644 --- a/Assets/Artists/Scripts/UX/UXCuttingToolService.cs +++ b/Assets/Artists/Scripts/UX/UXCuttingToolService.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; using AYellowpaper.SerializedCollections; @@ -120,85 +121,7 @@ namespace BITFactory.Cutting _brushFieldsContainer.Clear(); - var fields = arg2.GetType().GetFields(ReflectionHelper.Flags); - foreach (var fieldInfo in fields) - { - if (Attribute.IsDefined(fieldInfo, typeof(ExportAttribute)) is false) continue; - var exportAttribute = fieldInfo.GetCustomAttribute(); - - // var runtimeFieldInfo = arg2.GetType().GetRuntimeField(fieldInfo.Name); - // runtimeFieldInfo= arg2.GetType().GetField(fieldInfo.Name); - // - // Debug.Log(runtimeFieldInfo); - // var _ref = TypedReference.MakeTypedReference(arg2, new []{runtimeFieldInfo}); - - var handler = UXDataBindingService.CreateBinding(arg2.GetExport(fieldInfo.Name),fieldInfo.GetValue(arg2)); - - //var handler = UXDataBindingService.CreateBinding(_ref); - - _brushFieldsContainer.Add(handler.visualElement); - - handler.visualElement.GetType().GetProperty("label")!.SetValue(handler.visualElement, - string.IsNullOrEmpty(exportAttribute.Name) ? fieldInfo.Name:exportAttribute.Name - ); - - //var handler = UXDataBindingService.CreateBinding(ref arg2.GetExport(fieldInfo.Name)); - - // switch (fieldInfo.GetValue(arg2)) - // { - // case float _float: - // var floatField = _brushFieldsContainer.Create(); - // floatField.label =string.IsNullOrEmpty(exportAttribute.Name) ? fieldInfo.Name:exportAttribute.Name; - // floatField.value = _float; - // floatField.RegisterValueChangedCallback(evt => - // { - // fieldInfo.SetValue(arg2, evt.newValue); - // }); - // break; - // case Vector3 _vector3: - // var vector3Field = _brushFieldsContainer.Create(); - // vector3Field.label =string.IsNullOrEmpty(exportAttribute.Name) ? fieldInfo.Name:exportAttribute.Name; - // vector3Field.value = _vector3; - // vector3Field.RegisterValueChangedCallback(evt => - // { - // fieldInfo.SetValue(arg2, evt.newValue); - // }); - // break; - // } - } - - foreach (var methodInfo in arg2.GetType().GetMethods(ReflectionHelper.Flags)) - { - if (Attribute.IsDefined(methodInfo, typeof(ExportAttribute)) is false) continue; - var exportAttribute = methodInfo.GetCustomAttribute(); - - var button = _brushFieldsContainer.Create