diff --git a/Assets/Artists/Configs/Asset Cache.asset b/Assets/Artists/Configs/Asset Cache.asset index 515c6059..3d01e7b5 100644 --- a/Assets/Artists/Configs/Asset Cache.asset +++ b/Assets/Artists/Configs/Asset Cache.asset @@ -15,3 +15,5 @@ MonoBehaviour: isEditable: 0 _assets: - {fileID: 11400000} + - {fileID: 102900000, guid: 86a51036a0ff89148a38ab88ec6ac2c6, type: 3} + - {fileID: 102900000, guid: 99e2e5292e8ac3d4c881a0971a5e0d15, type: 3} diff --git a/Assets/Artists/Scenes/Entry.unity b/Assets/Artists/Scenes/Entry.unity index f4e52590..3e135f59 100644 --- a/Assets/Artists/Scenes/Entry.unity +++ b/Assets/Artists/Scenes/Entry.unity @@ -161,9 +161,8 @@ MonoBehaviour: rid: 1308798675025133577 buildinQueryServices: rid: 1308798675025133578 - progressBar: {fileID: 0} - document: {fileID: 0} - progressLabel: {fileID: 0} + document: {fileID: 642634920} + isOffline: 1 IsEditorSimulateMode: 1 references: version: 2 @@ -211,7 +210,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_PanelSettings: {fileID: 11400000, guid: 64cd93f02c042ad43a96d66da32f0c6c, type: 2} m_ParentUI: {fileID: 0} - sourceAsset: {fileID: 0} + sourceAsset: {fileID: 9197481963319205126, guid: 17ffb087c4b450f48903b04cfe8f7c22, type: 3} m_SortingOrder: 0 --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/Artists/Scenes/Workshop.unity b/Assets/Artists/Scenes/Workshop.unity index db1bc451..cb8c0ce0 100644 --- a/Assets/Artists/Scenes/Workshop.unity +++ b/Assets/Artists/Scenes/Workshop.unity @@ -831,6 +831,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 2723349985642794010, guid: d22a44843d244fc4fb4459be68ead0bb, type: 3} m_PrefabInstance: {fileID: 34066527} m_PrefabAsset: {fileID: 0} +--- !u!1 &36010097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 36010098} + - component: {fileID: 36010099} + m_Layer: 0 + m_Name: return-button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &36010098 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36010097} + 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: 676926185} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &36010099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36010097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44e9dc9ae2389a74abe198bbd3f86c69, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 676926187} + bindName: + bindNameProvider: + rid: 1308798704739418117 + allowRightClick: 0 + onClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 475671027} + m_TargetAssemblyTypeName: BITKit.UX.UXService, BITKit.UX + m_MethodName: Return + 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: 1308798704739418117 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 36010097} --- !u!1001 &42534409 PrefabInstance: m_ObjectHideFlags: 0 @@ -2115,6 +2191,109 @@ Transform: m_CorrespondingSourceObject: {fileID: 2723349985642794010, guid: d22a44843d244fc4fb4459be68ead0bb, type: 3} m_PrefabInstance: {fileID: 112371416} m_PrefabAsset: {fileID: 0} +--- !u!1 &118683649 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 118683650} + - component: {fileID: 118683652} + - component: {fileID: 118683651} + m_Layer: 0 + m_Name: open-manual-button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &118683650 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118683649} + 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: 1228132877} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &118683651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118683649} + 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 &118683652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118683649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44e9dc9ae2389a74abe198bbd3f86c69, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1228132879} + bindName: + bindNameProvider: + rid: 1308798704739418114 + allowRightClick: 0 + onClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 118683651} + 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: 118683649} --- !u!1 &123695856 GameObject: m_ObjectHideFlags: 0 @@ -2128,6 +2307,7 @@ GameObject: - component: {fileID: 123695857} - component: {fileID: 123695860} - component: {fileID: 123695861} + - component: {fileID: 123695862} m_Layer: 0 m_Name: ModService m_TagString: Untagged @@ -2169,6 +2349,12 @@ MonoBehaviour: - rid: 1308798675025133573 - rid: 1308798675025133574 - rid: 1308798675025133575 + - rid: 3736623274279305216 + - rid: 3736623274279305217 + - rid: 3736623274279305218 + - rid: 3736623274279305219 + - rid: 3736623274279305220 + loadLocalPackageOnStart: 1 references: version: 2 RefIds: @@ -2192,6 +2378,26 @@ MonoBehaviour: type: {class: Reference, ns: BITKit, asm: BITKit} data: value: YooAsset + - rid: 3736623274279305216 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: System.Data + - rid: 3736623274279305217 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: mscorlib.dll + - rid: 3736623274279305218 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: System.dll + - rid: 3736623274279305219 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: System.Linq.dll + - rid: 3736623274279305220 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: System.Core.dll --- !u!4 &123695859 Transform: m_ObjectHideFlags: 0 @@ -2204,7 +2410,8 @@ Transform: m_LocalPosition: {x: 0.016231008, y: 0.94129246, z: -0.09985098} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1546150613} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &123695860 @@ -2254,6 +2461,32 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0fcacd6a30c7f3d4aae646f0717125ac, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &123695862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123695856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddd3add402b85d442a6401327d8ad500, type: 3} + m_Name: + m_EditorClassIdentifier: + path: + rid: 33718224412213250 + arguments: + rid: -2 + isStreamingAssets: 1 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 33718224412213250 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: BITKit.Workshop.Client\BITKit.Workshop.Client.exe --- !u!1001 &125273977 PrefabInstance: m_ObjectHideFlags: 0 @@ -2320,6 +2553,109 @@ Transform: m_CorrespondingSourceObject: {fileID: 531461037095252097, guid: ec558ae7b235c734d8b40fd18dcfbdc7, type: 3} m_PrefabInstance: {fileID: 125273977} m_PrefabAsset: {fileID: 0} +--- !u!1 &128062586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 128062587} + - component: {fileID: 128062589} + - component: {fileID: 128062588} + m_Layer: 0 + m_Name: workshop-button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &128062587 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128062586} + 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 &128062588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128062586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c307dd96b0ae44db43b135d73ae46a, type: 3} + m_Name: + m_EditorClassIdentifier: + mark: + actions: + - rid: 33718224412213249 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 33718224412213249 + type: {class: BITAppForUnity/OpenUrl, ns: BITKit, asm: BITKit} + data: + url: https://workshop.bitfall.icu/ + urlReference: + rid: -2 +--- !u!114 &128062589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128062586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44e9dc9ae2389a74abe198bbd3f86c69, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1237214209} + bindName: + bindNameProvider: + rid: 33718224412213248 + allowRightClick: 0 + onClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 128062588} + 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: 33718224412213248 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 128062586} --- !u!1001 &128917707 PrefabInstance: m_ObjectHideFlags: 0 @@ -7719,6 +8055,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 4301870690972932130, guid: 194fc48267c4a8546b1cd3cf81b72c0f, type: 3} m_PrefabInstance: {fileID: 366526738} m_PrefabAsset: {fileID: 0} +--- !u!1 &367749726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 367749727} + - component: {fileID: 367749728} + m_Layer: 0 + m_Name: options-button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &367749727 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367749726} + 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 &367749728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367749726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44e9dc9ae2389a74abe198bbd3f86c69, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1237214209} + bindName: + bindNameProvider: + rid: 1308798704739418116 + allowRightClick: 0 + onClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 676926188} + m_TargetAssemblyTypeName: BITKit.UX.UIToolKitPanel, BITKit.UX + m_MethodName: Entry + 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: 1308798704739418116 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 367749726} --- !u!1001 &373385054 PrefabInstance: m_ObjectHideFlags: 0 @@ -8990,6 +9402,94 @@ Transform: m_CorrespondingSourceObject: {fileID: 8070779672533912818, guid: 4a3744e34338c53429c1b0e1fa714829, type: 3} m_PrefabInstance: {fileID: 453330637} m_PrefabAsset: {fileID: 0} +--- !u!1 &455873926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 455873927} + - component: {fileID: 455873929} + - component: {fileID: 455873928} + m_Layer: 0 + m_Name: exit-button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &455873927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455873926} + 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 &455873928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455873926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c307dd96b0ae44db43b135d73ae46a, type: 3} + m_Name: + m_EditorClassIdentifier: + mark: + actions: + - rid: 1308798704739418113 + references: + version: 2 + RefIds: + - rid: 1308798704739418113 + type: {class: ExitApplation, ns: BITKit, asm: BITKit} + data: +--- !u!114 &455873929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455873926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44e9dc9ae2389a74abe198bbd3f86c69, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 1237214209} + bindName: + bindNameProvider: + rid: 1308798704739418112 + allowRightClick: 0 + onClick: + m_PersistentCalls: + m_Calls: [] + onRightClick: + m_PersistentCalls: + m_Calls: [] + clicked: + Targets: + - Target: {fileID: 455873928} + MethodName: Execute + references: + version: 2 + RefIds: + - rid: 1308798704739418112 + type: {class: GetNameFromGameobject, ns: BITKit, asm: BITKit} + data: + gameobject: {fileID: 455873926} --- !u!1001 &462780259 PrefabInstance: m_ObjectHideFlags: 0 @@ -9248,9 +9748,10 @@ Transform: - {fileID: 324953849} - {fileID: 2087774128} - {fileID: 1237214210} + - {fileID: 1228132877} + - {fileID: 676926185} - {fileID: 775177448} - {fileID: 1788777632} - - {fileID: 1228132877} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &475671029 @@ -13112,6 +13613,93 @@ Transform: m_CorrespondingSourceObject: {fileID: 6623480605217477651, guid: aef48c88cb6ff5842ac07071b86c3de8, type: 3} m_PrefabInstance: {fileID: 671745027} m_PrefabAsset: {fileID: 0} +--- !u!1 &676926184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 676926185} + - component: {fileID: 676926187} + - component: {fileID: 676926186} + - component: {fileID: 676926188} + m_Layer: 0 + m_Name: Settings + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: b34f30cbf6975d34fb6ca73deeb90202, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &676926185 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676926184} + 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: 36010098} + m_Father: {fileID: 475671028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &676926186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676926184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e027a031874be5448c7ff912d31871d, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 676926187} +--- !u!114 &676926187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676926184} + 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: 23d3b0a5e2ecc284e8f845ccec023015, type: 3} + m_SortingOrder: 0 +--- !u!114 &676926188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676926184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9df4ccf721aaec45a7fadfead86ec48, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 676926187} + isAnimate: 0 + allowCursor: 1 + allowInput: 0 + autoEntry: 0 + entryDuration: + allow: 0 + value: 0 + exitDuration: + allow: 0 + value: 0 --- !u!1001 &684077897 PrefabInstance: m_ObjectHideFlags: 0 @@ -23650,6 +24238,7 @@ GameObject: - component: {fileID: 1228132879} - component: {fileID: 1228132878} - component: {fileID: 1228132880} + - component: {fileID: 1228132881} m_Layer: 0 m_Name: UXModService m_TagString: Untagged @@ -23669,7 +24258,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 118683650} m_Father: {fileID: 475671028} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1228132878 @@ -23725,6 +24315,18 @@ MonoBehaviour: exitDuration: allow: 0 value: 0 +--- !u!114 &1228132881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228132876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c8c71e08d0a2544aae8e62cd2b86af2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1234006865 PrefabInstance: m_ObjectHideFlags: 0 @@ -23868,6 +24470,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 195294709} + - {fileID: 455873927} + - {fileID: 367749727} + - {fileID: 128062587} m_Father: {fileID: 475671028} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1237214211 @@ -29041,6 +29646,51 @@ Transform: m_CorrespondingSourceObject: {fileID: 4153147061038333785, guid: a13648f2077e4e343a1cd80d845363ee, type: 3} m_PrefabInstance: {fileID: 1545194507} m_PrefabAsset: {fileID: 0} +--- !u!1 &1546150612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1546150613} + - component: {fileID: 1546150614} + m_Layer: 0 + m_Name: UDP LAN + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1546150613 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546150612} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.6810621, y: 2.0449212, z: 1.2274728} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 123695859} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1546150614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546150612} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cabe7641419ed1e45b737cf8dfd3460f, type: 3} + m_Name: + m_EditorClassIdentifier: + port: 6484 --- !u!1001 &1546230664 PrefabInstance: m_ObjectHideFlags: 0 @@ -41874,6 +42524,7 @@ SceneRoots: - {fileID: 475671028} - {fileID: 123695859} - {fileID: 1460504354} + - {fileID: 1859425352} - {fileID: 375808614} - {fileID: 1548654985} - {fileID: 2104798764} @@ -41891,5 +42542,4 @@ SceneRoots: - {fileID: 944945211} - {fileID: 510889818} - {fileID: 1549445631} - - {fileID: 1859425352} - {fileID: 1238623441} diff --git a/Assets/Artists/Scripts/UX/UXCuttingTool.cs b/Assets/Artists/Scripts/UX/UXCuttingTool.cs index 8219fc23..cfc4f1e3 100644 --- a/Assets/Artists/Scripts/UX/UXCuttingTool.cs +++ b/Assets/Artists/Scripts/UX/UXCuttingTool.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using BITKit; using BITKit.CommandPattern; +using BITKit.Mod; using BITKit.UX; using UnityEngine; using UnityEngine.UIElements; @@ -34,24 +35,25 @@ namespace BITFactory.Cutting cuttingTool.OnExecute += OnExecute; cuttingTool.OnUndo += OnUndo; cuttingTool.OnClear += OnClear; + cuttingTool.OnRelease += OnRelease; - exportButton.clicked += OnExport; + exportButton.clicked += cuttingTool.Release; clearButton.clicked += cuttingTool.Clear; undoButton.clicked += cuttingTool.Undo; } - private void OnExport() + private static void OnRelease(ICommand[] commands) { var stringBuilder = new System.Text.StringBuilder(); - foreach (var x in cuttingTool.Commands.OfType()) + foreach (var x in commands.OfType()) { stringBuilder.AppendLine(x.Name); } var value = stringBuilder.ToString(); Alert.Print(new BITKit.UX.Internal.Alert() { - message =value.Length>1024 ?"数据过长,请复制到剪贴板查看": value, + message =ModService.Mods.Length>0 ? "已安装Mod,其他程序正在处理数据" :value.Length>1024 ?"数据过长,请复制到剪贴板查看": value, OnConfirm = Copy, title = "已命令,按[确定]复制到剪切板" }); diff --git a/Assets/Artists/Scripts/UnityCuttingTool.cs b/Assets/Artists/Scripts/UnityCuttingTool.cs index 792b29e6..7f5dbd8e 100644 --- a/Assets/Artists/Scripts/UnityCuttingTool.cs +++ b/Assets/Artists/Scripts/UnityCuttingTool.cs @@ -37,6 +37,12 @@ namespace BITFactory.Cutting remove => _cuttingToolImplementation.OnUndo -= value; } + public event Action OnRelease + { + add => _cuttingToolImplementation.OnRelease += value; + remove => _cuttingToolImplementation.OnRelease -= value; + } + public void Execute(ICommand command) { _cuttingToolImplementation.Execute(command); @@ -68,6 +74,8 @@ namespace BITFactory.Cutting } public void Rebuild() => _cuttingToolImplementation.Rebuild(); + public void Release() => _cuttingToolImplementation.Release(); + public void CutPlanePoint(bool preview, float3 planeNormal, float3 planePoint) { _cuttingToolImplementation.CutPlanePoint(preview, planeNormal, planePoint); @@ -208,6 +216,7 @@ namespace BITFactory.Cutting public event Action OnExecute; public event Action OnClear; public event Action OnUndo; + public event Action OnRelease; public void Execute(ICommand command) { @@ -276,6 +285,11 @@ namespace BITFactory.Cutting } } + public void Release() + { + OnRelease?.Invoke(_executedCommands.ToArray()); + } + private void ExecuteInternal(ICommand command) { diff --git a/Assets/Artists/UX/CuttingPanel.uxml b/Assets/Artists/UX/CuttingPanel.uxml index 9a1bdfba..1d75cdab 100644 --- a/Assets/Artists/UX/CuttingPanel.uxml +++ b/Assets/Artists/UX/CuttingPanel.uxml @@ -47,13 +47,18 @@ - + + + + + + diff --git a/Assets/Artists/UX/UXSettings.uxml b/Assets/Artists/UX/UXSettings.uxml new file mode 100644 index 00000000..658ff1b5 --- /dev/null +++ b/Assets/Artists/UX/UXSettings.uxml @@ -0,0 +1,10 @@ + +