From 0362b2c6062094119a5f4df58ddf0c9597b261a0 Mon Sep 17 00:00:00 2001 From: CortexCore <2630229280@qq.com> Date: Tue, 16 Apr 2024 04:15:06 +0800 Subject: [PATCH] 1 --- .../New Universal Render Pipeline Asset.asset | 2 +- Assets/Artists/Scenes/Workshop.unity | 168 +++++++ .../Scripts/UX/UXCuttingToolService.cs | 81 +--- .../Artists/Scripts/UnityCuttingToolBrush.cs | 35 +- .../UnityCuttingToolScriptableBrush.cs | 10 - .../Scripts/iFactory.Cutting.Runtime.asmdef | 3 +- Assets/Artists/UX/CuttingPanel.uxml | 42 +- Assets/BITKit/Core/Attributes/IBITCommand.cs | 14 +- .../DependencyInjection.cs | 16 + Assets/BITKit/Core/Exceptions/MyException.cs | 9 + Assets/BITKit/Core/Extensions/Generic.cs | 1 + Assets/BITKit/Core/Group/ActivableGroup.cs | 3 +- Assets/BITKit/Core/Item/Item.cs | 7 + Assets/BITKit/Core/Item/ItemContainer.cs | 17 +- Assets/BITKit/Core/Item/ItemObject.cs | 13 + Assets/BITKit/Core/Mathematics/MathE.cs | 18 +- Assets/BITKit/Core/Mod/ModService.cs | 90 ++-- .../BITKit/Core/Modification/IModification.cs | 28 +- .../Probability/BITKit.Probability.asmdef | 14 + .../BITKit/Core/Probability/IProbability.cs | 50 +++ Assets/BITKit/Core/Property/Property.cs | 91 ++-- Assets/BITKit/Core/Sharp/BITSharp.cs | 12 +- Assets/BITKit/Core/Tag/ITag.cs | 1 + Assets/BITKit/Core/UX/IUXBarService.cs | 13 + Assets/BITKit/Core/UX/IUXWaiting.cs | 19 + Assets/BITKit/Core/Utility/GenericEvent.cs | 7 + Assets/BITKit/Core/Utility/Provider.cs | 1 + Assets/BITKit/Core/Utility/References.cs | 3 +- .../Configs/Input/BITController.inputactions | 2 +- Assets/BITKit/Unity/Materials/BITSky.mat | 3 + .../Unity/Materials/UX_Video.renderTexture | 1 + .../BITKit.Pool.asmdef} | 6 +- Assets/BITKit/Unity/Pool/PoolService.cs | 78 ++++ .../Scripts/Addressable/AddressableHelper.cs | 117 ----- .../Unity/Scripts/Animator/AnimatorHelper.cs | 10 +- .../Unity/Scripts/Assets/AddressableHelper.cs | 90 ++++ .../Unity/Scripts/Config/PlayerConfig.cs | 2 +- .../Unity/Scripts/DataBind/IBindableData.cs | 32 ++ .../AudioObject/EntityAudioObject.cs | 28 -- .../Entity/Components/Health/DamageService.cs | 5 +- .../Entity/Components/Health/EntityHealth.cs | 2 +- .../Entity/Components/Hitbox/EntityHitbox.cs | 48 +- .../Components/Hitbox/EntityHitboxBuilder.cs | 77 ++++ .../{Core => }/BITKit.Entities.Physics.asmdef | 0 .../Components/Physics/EntityPhysics.cs | 144 ------ .../Physics/{Core => }/IEntityPhysics.cs | 0 .../Unity/Scripts/Entity/Core/Entity.cs | 2 +- .../Entity/Net/BITKit.Entities.Net.asmdef | 3 +- .../BITKit.Entities.World.Runtime.asmdef} | 7 +- .../Unity/Scripts/Entity/World/EntityLOD.cs | 24 + .../Unity/Scripts/I18N/Plugins.I18N.asmdef | 2 +- .../Scripts/Location/LocationAdditive.cs | 26 +- .../Location/LocationAdditiveElement.cs | 9 +- .../Unity/Scripts/Mod/UnityModService.cs | 11 +- .../BITKit.MotionMatching.asmdef | 20 + .../MotionMatching/IMotionMatchingService.cs | 50 +++ .../ScriptableMotionMatchingObject.cs | 15 + .../ScriptableMotionMatchingService.cs | 77 ++++ .../MotionMatching/UnityMotionMatching.cs | 0 .../BITKit.NativeQuadTree.Editor.asmdef | 4 +- .../Unity/Scripts/Physics/IClosePoint.cs | 89 +++- .../Scripts/Physics/PhysicsBasedAnimation.cs | 2 +- .../Unity/Scripts/Physics/Prop_Physics.cs | 3 +- .../Scripts/Quadtree/BITKit.Quadtree.asmdef | 3 + .../Quadtree/GameObjectQuadtreeRoot.cs | 11 + Assets/BITKit/Unity/Scripts/Quadtree/INode.cs | 118 +++++ .../Unity/Scripts/Quadtree/IQuadtreeRoot.cs | 70 +++ .../Unity/Scripts/Quadtree/IntraLocation.cs | 22 + .../Scripts/Quadtree/Items/GameObjectItem.cs | 10 + .../Quadtree/Items/GameObjectItemBase.cs | 152 +++++++ .../Unity/Scripts/Quadtree/Items/IItem.cs | 29 ++ .../Scripts/Quadtree/Items/RendererItem.cs | 46 ++ Assets/BITKit/Unity/Scripts/Quadtree/Node.cs | 12 + .../BITKit/Unity/Scripts/Quadtree/NodeBase.cs | 416 ++++++++++++++++++ .../Scripts/Quadtree/QuadtreeMonoRoot.cs | 102 +++++ .../Unity/Scripts/Quadtree/QuadtreeRoot.cs | 148 +++++++ .../Rig/TickOverrideTranformService.cs | 141 ++++++ .../Scripts/Rig/TickOverrideTransform.cs | 34 ++ .../Scripts/Scenes/Core/ISceneService.cs | 19 + .../Scenes/Editor/MaterialPaletteWindow.cs | 56 ++- .../Unity/Scripts/Scenes/SceneService.cs | 28 +- .../Unity/Scripts/Sensor/AudioSensor.cs | 56 +-- .../Scripts/Sensor/AudioSensorService.cs | 67 +++ .../Unity/Scripts/Sensor/BITKit.Sensor.asmdef | 3 +- .../Unity/Scripts/Sensor/Core/Sensor.cs | 23 +- .../Unity/Scripts/Sensor/Core/SensorTarget.cs | 16 + .../BITKit/Unity/Scripts/Sensor/MixSensor.cs | 2 +- .../Unity/Scripts/Sensor/RangeSensor.cs | 70 +-- .../BITKit/Unity/Scripts/Sensor/RaySensor.cs | 4 +- .../Unity/Scripts/Sensor/SensorQueue.cs | 43 +- .../Scripts/Sensor/Smart/SmartTargetSensor.cs | 216 +-------- .../Sensor/Smart/SmartTargetSensorStates.cs | 30 ++ .../Unity/Scripts/Sensor/TriggerSensor.cs | 6 +- .../Scripts/StateMachine/MonoStateMachine.cs | 11 +- Assets/BITKit/Unity/Scripts/Tag/Tag.cs | 8 +- .../Unity/Scripts/Tick/GameTickService.cs | 20 +- .../Unity/Scripts/Tick/IntervalTickService.cs | 27 +- .../BITKit/Unity/Scripts/UX/Alert/UXAlert.cs | 2 +- .../Unity/Scripts/UX/Builder/UXBuilder.cs | 8 +- .../UX/Chart/BITKit.UX.Chart.Runtime.asmdef | 24 + .../Unity/Scripts/UX/Chart/SkiaChart.cs | 202 +++++++++ .../Unity/Scripts/UX/Chart/SkiaExtensions.cs | 35 ++ .../Chart/Test/BITKit.UX.Chart.Tests.asmdef | 25 ++ .../Scripts/UX/Chart/Test/SKPaintComponent.cs | 99 +++++ .../Unity/Scripts/UX/Core/UXContainer.cs | 12 +- .../UX/DataBind/BITKit.UX.DataBind.asmdef | 4 +- .../UX/DataBind/UXDataBindingHandler.cs | 153 +++++++ .../UX/DataBind/UXDataBindingService.cs | 246 +++++------ .../DataBind/UXIEnumerableBindingHandler.cs | 193 ++++++++ .../Scripts/UX/Library/JsonBasedTable.cs | 6 +- .../Unity/Scripts/UX/Library/ProgressBlock.cs | 84 ++++ .../UX/Service/UI Toolkit/UIToolKitPanel.cs | 12 +- .../Scripts/UX/UXBarService/UXBarService.cs | 70 +++ .../BITKit/Unity/Scripts/UX/Utils/UXUtils.cs | 7 +- .../Unity/Scripts/UX/Waiting/UXWaiting.cs | 108 +++++ .../Unity/Scripts/UX/Waiting/WaitingScreen.cs | 34 -- .../BITKit/Unity/Scripts/Utility/Behaviour.cs | 9 + .../Scripts/Utility/Editor/BITInspector.cs | 58 ++- Assets/BITKit/Unity/Scripts/Utility/Pool.cs | 31 +- .../BITKit/Unity/Scripts/Utility/Utility.cs | 4 + .../Unity/Scripts/VFXManager/VFXService.cs | 21 +- .../BITKit/Unity/Scripts/Vehicle/Vehicle.cs | 1 + .../Scripts/WorldChunk/AIChunkService.cs | 12 + .../WorldChunk/BITKit.WorldChunk.asmdef | 23 + .../Scripts/WorldChunk/BuildingChunkObject.cs | 35 ++ .../Scripts/WorldChunk/ChunkBehaviour.cs | 46 ++ .../Scripts/WorldChunk/ChunkLodObject.cs | 73 +++ .../Unity/Scripts/WorldChunk/ChunkObject.cs | 55 +++ .../Scripts/WorldChunk/ColliderChunkObject.cs | 67 +++ .../Unity/Scripts/WorldChunk/IChunkService.cs | 23 + .../Unity/Scripts/WorldChunk/IWorldBound.cs | 37 -- .../Unity/Scripts/WorldChunk/ObjectChunk.cs | 39 -- .../Unity/Scripts/WorldChunk/TerrainChunk.cs | 20 - .../WorldChunk/UnityWorldChunkService.cs | 24 + .../Scripts/WorldChunk/WorldChunkManager.cs | 42 -- .../Scripts/WorldChunk/WorldChunkService.cs | 177 ++++++++ .../WorldChunk/WorldTerrainBehaviour.cs | 85 ++++ .../Scripts/WorldChunk/WorldTerrainService.cs | 10 + .../WorldNode/BITKit.WorldNode.Runtime.asmdef | 3 +- .../Scripts/WorldNode/WorldNodeService.cs | 19 + Assets/BITKit/Unity/UX/Common/Common.uss | 41 +- .../Unity/UX/UXWaiting_Handle_Template.uxml | 5 + Assets/BITKit/Unity/UX/WaitingScreen.uxml | 13 +- .../UnityEditor/AssetCacheDefaultWindow.cs | 38 +- .../UnityEditor/AssetCacheScriptableObject.cs | 36 +- .../UnityEditor/BITKit.Unity.Editor.asmdef | 2 +- .../DictionaryReferenceEditorWindow.cs | 2 +- .../BITKit/UnityEditor/SceneGizmoReference.cs | 2 +- .../ScriptableObjectGroupEditor.cs | 152 +++++-- ...ITKit.AdvancedCullingSystem.Runtime.asmdef | 20 + .../OpenWorldCombiner.cs | 54 +++ .../MonkeyCommand/QuickFixFloatModel.cs | 33 ++ .../BITKit.Extensions.NodeCanvas.asmdef | 4 +- .../NodeCanvas/CreateQuest.cs | 34 +- .../Director/ActorRandomAnimation.cs | 32 ++ .../NodeCanvas/Director/DirectorNode.cs | 22 + .../NodeCanvas/Director/DirectorService.cs | 79 ++++ .../NodeCanvas/EntityBehaviourTree.cs | 1 - .../Sensor/SmartTargetDetectionNode.cs | 2 +- .../Polaris/BITKit.Extensions.Polaris.asmdef | 3 +- .../Polaris/PolarisTerrainChunk.cs | 47 -- .../Polaris/PolarisTerrainChunkManager.cs | 20 - .../Polaris/PolarisTerrainChunkService.cs | 59 +++ .../UnityPluginsSupport/Steamwork/26.asset | 18 + .../UnityPluginsSupport/Steamwork/Steve.asset | 6 +- .../BITKit.Extensions.TranslucentImage.asmdef | 20 + .../TranslucentImage/TranslucentService.cs | 16 + .../TranslucentVisualElement.cs | 23 + .../TranslucentImage/UXTranslucentService.cs | 38 ++ .../UnitySpline/UnitySpline.asmdef | 4 +- .../UnitySpline/UnitySplineAnimateAsset.cs | 109 +++++ .../UnitySpline/UnitySplineAnimateTrack.cs | 15 + .../UnitySpline/UnitySplineWorldElement.cs | 1 - Assets/BITKit/package.json | 10 + .../iFactory.Cutting/ICuttingToolService.cs | 7 - Mods/bitkit.workshop.samples/Class1.cs | 62 --- Mods/bitkit.workshop.samples/package.json | 18 - .../export_638458005252230589.cfg | 1 + .../export_638459579900410760.cfg | 1 + .../export_638459582193431149.cfg | 44 ++ .../export_638459582552548475.cfg | 30 ++ ProjectSettings/ProjectSettings.asset | 2 +- README.md | 8 +- 183 files changed, 5695 insertions(+), 1453 deletions(-) create mode 100644 Assets/BITKit/Core/Exceptions/MyException.cs create mode 100644 Assets/BITKit/Core/Item/ItemObject.cs create mode 100644 Assets/BITKit/Core/Probability/BITKit.Probability.asmdef create mode 100644 Assets/BITKit/Core/Probability/IProbability.cs create mode 100644 Assets/BITKit/Core/UX/IUXBarService.cs create mode 100644 Assets/BITKit/Core/UX/IUXWaiting.cs rename Assets/BITKit/Unity/{Scripts/WorldChunk/BITKit.WorkdChunk.asmdef => Pool/BITKit.Pool.asmdef} (73%) create mode 100644 Assets/BITKit/Unity/Pool/PoolService.cs delete mode 100644 Assets/BITKit/Unity/Scripts/Addressable/AddressableHelper.cs create mode 100644 Assets/BITKit/Unity/Scripts/Assets/AddressableHelper.cs create mode 100644 Assets/BITKit/Unity/Scripts/DataBind/IBindableData.cs delete mode 100644 Assets/BITKit/Unity/Scripts/Entity/Components/AudioObject/EntityAudioObject.cs create mode 100644 Assets/BITKit/Unity/Scripts/Entity/Components/Hitbox/EntityHitboxBuilder.cs rename Assets/BITKit/Unity/Scripts/Entity/Components/Physics/{Core => }/BITKit.Entities.Physics.asmdef (100%) delete mode 100644 Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs rename Assets/BITKit/Unity/Scripts/Entity/Components/Physics/{Core => }/IEntityPhysics.cs (100%) rename Assets/BITKit/Unity/Scripts/Entity/{Components/Physics/BITKit.Entities.Physics.Runtime.asmdef => World/BITKit.Entities.World.Runtime.asmdef} (68%) create mode 100644 Assets/BITKit/Unity/Scripts/Entity/World/EntityLOD.cs create mode 100644 Assets/BITKit/Unity/Scripts/MotionMatching/BITKit.MotionMatching.asmdef create mode 100644 Assets/BITKit/Unity/Scripts/MotionMatching/IMotionMatchingService.cs create mode 100644 Assets/BITKit/Unity/Scripts/MotionMatching/ScriptableMotionMatchingObject.cs create mode 100644 Assets/BITKit/Unity/Scripts/MotionMatching/ScriptableMotionMatchingService.cs create mode 100644 Assets/BITKit/Unity/Scripts/MotionMatching/UnityMotionMatching.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/BITKit.Quadtree.asmdef create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/GameObjectQuadtreeRoot.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/INode.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/IQuadtreeRoot.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/IntraLocation.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/Items/GameObjectItem.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/Items/GameObjectItemBase.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/Items/IItem.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/Items/RendererItem.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/Node.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/NodeBase.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/QuadtreeMonoRoot.cs create mode 100644 Assets/BITKit/Unity/Scripts/Quadtree/QuadtreeRoot.cs create mode 100644 Assets/BITKit/Unity/Scripts/Rig/TickOverrideTranformService.cs create mode 100644 Assets/BITKit/Unity/Scripts/Rig/TickOverrideTransform.cs create mode 100644 Assets/BITKit/Unity/Scripts/Sensor/AudioSensorService.cs create mode 100644 Assets/BITKit/Unity/Scripts/Sensor/Core/SensorTarget.cs create mode 100644 Assets/BITKit/Unity/Scripts/Sensor/Smart/SmartTargetSensorStates.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/Chart/BITKit.UX.Chart.Runtime.asmdef create mode 100644 Assets/BITKit/Unity/Scripts/UX/Chart/SkiaChart.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/Chart/SkiaExtensions.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/Chart/Test/BITKit.UX.Chart.Tests.asmdef create mode 100644 Assets/BITKit/Unity/Scripts/UX/Chart/Test/SKPaintComponent.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/DataBind/UXDataBindingHandler.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/DataBind/UXIEnumerableBindingHandler.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/Library/ProgressBlock.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/UXBarService/UXBarService.cs create mode 100644 Assets/BITKit/Unity/Scripts/UX/Waiting/UXWaiting.cs delete mode 100644 Assets/BITKit/Unity/Scripts/UX/Waiting/WaitingScreen.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/AIChunkService.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/BITKit.WorldChunk.asmdef create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/BuildingChunkObject.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/ChunkBehaviour.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/ChunkLodObject.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/ChunkObject.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/ColliderChunkObject.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/IChunkService.cs delete mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/IWorldBound.cs delete mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/ObjectChunk.cs delete mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/TerrainChunk.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/UnityWorldChunkService.cs delete mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/WorldChunkManager.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/WorldChunkService.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/WorldTerrainBehaviour.cs create mode 100644 Assets/BITKit/Unity/Scripts/WorldChunk/WorldTerrainService.cs create mode 100644 Assets/BITKit/Unity/UX/UXWaiting_Handle_Template.uxml create mode 100644 Assets/BITKit/UnityPluginsSupport/AdvancedCullingSystem/BITKit.AdvancedCullingSystem.Runtime.asmdef create mode 100644 Assets/BITKit/UnityPluginsSupport/AdvancedCullingSystem/OpenWorldCombiner.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/MonkeyCommand/QuickFixFloatModel.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/NodeCanvas/Director/ActorRandomAnimation.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/NodeCanvas/Director/DirectorNode.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/NodeCanvas/Director/DirectorService.cs delete mode 100644 Assets/BITKit/UnityPluginsSupport/Polaris/PolarisTerrainChunk.cs delete mode 100644 Assets/BITKit/UnityPluginsSupport/Polaris/PolarisTerrainChunkManager.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/Polaris/PolarisTerrainChunkService.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/Steamwork/26.asset create mode 100644 Assets/BITKit/UnityPluginsSupport/TranslucentImage/BITKit.Extensions.TranslucentImage.asmdef create mode 100644 Assets/BITKit/UnityPluginsSupport/TranslucentImage/TranslucentService.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/TranslucentImage/TranslucentVisualElement.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/TranslucentImage/UXTranslucentService.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/UnitySpline/UnitySplineAnimateAsset.cs create mode 100644 Assets/BITKit/UnityPluginsSupport/UnitySpline/UnitySplineAnimateTrack.cs create mode 100644 Assets/BITKit/package.json delete mode 100644 Mods/bitkit.workshop.samples/Class1.cs delete mode 100644 Mods/bitkit.workshop.samples/package.json create mode 100644 Mods/ifactory.cutting.mod.auto_save_images/export_638458005252230589.cfg create mode 100644 Mods/ifactory.cutting.mod.auto_save_images/export_638459579900410760.cfg create mode 100644 Mods/ifactory.cutting.mod.auto_save_images/export_638459582193431149.cfg create mode 100644 Mods/ifactory.cutting.mod.auto_save_images/export_638459582552548475.cfg 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