UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sjm/250324' into sjm/250325

Browse Source 
# Conflicts:
#	Assets/Scripts/Studio/TwinObject/TwinObject.cs
This commit is contained in:
jmaniuvc
2025-03-25 10:55:09 +09:00
parent a6998f0193 199fdcf08f
commit 28aefae67a
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs
View File

@@ -36,16 +36,13 @@ namespace XED.Asset
public CustomAssetEventHandler assetEventHandler; public CustomAssetEventHandler assetEventHandler;
public CustomAssetCommandHandler assetCommandHandler; public CustomAssetCommandHandler assetCommandHandler;
Panel_InterferedObjectList panel_InterferedObjectList;
void Awake() void Awake()
{ {
saveLoadFBXData = FindFirstObjectByType<SaveLoadFBXData>(); saveLoadFBXData = FindFirstObjectByType<SaveLoadFBXData>();
renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>(); renderObjectHandler = FindFirstObjectByType<RenderObjectHandler>();
assetDataHandler = new CustomAssetDataHandler(this); assetDataHandler = new CustomAssetDataHandler(this);
assetEventHandler = new CustomAssetEventHandler(this); assetEventHandler = new CustomAssetEventHandler(this);
assetCommandHandler = new CustomAssetCommandHandler(this); assetCommandHandler = new CustomAssetCommandHandler(this);
panel_InterferedObjectList = FindAnyObjectByType<Panel_InterferedObjectList>();
} }
void Start() void Start()
{ {
@@ -112,12 +109,6 @@ namespace XED.Asset
selectRenderObject.CreateRenderObject(); selectRenderObject.CreateRenderObject();
selectRenderObject.Select(); selectRenderObject.Select();
selectedAssetData.AddTransformToRender(selectedItem.transform); selectedAssetData.AddTransformToRender(selectedItem.transform);
TwinObject selectedTwinObject = selectedItem.GetComponent<TwinObject>();
if (selectedTwinObject != null)
{
selectedTwinObject.OnTwinConflictEvent += panel_InterferedObjectList.CreateContentButton;
selectedTwinObject.OnTwinDeconflictEvent += panel_InterferedObjectList.RemoveContentButton;
}
} }
public void OnAssetDropped(HierarchyItem item) public void OnAssetDropped(HierarchyItem item)
{ {

3
Assets/Scripts/Studio/UI/Panel/Panel_InterferedObjectList.cs
View File

@@ -1,11 +1,12 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using XRLib;
using XRLib.UI; using XRLib.UI;
namespace XED.UI namespace XED.UI
{ {
public class Panel_InterferedObjectList : PanelBase public class Panel_InterferedObjectList : PanelBase, ISingle
{ {
Button Button_Close; Button Button_Close;
RectTransform content; RectTransform content;