打包控制管理器上传,可以在界面选择包含的模型
This commit is contained in:
parent
67a94af9d8
commit
3beb50a1d2
|
|
@ -0,0 +1,49 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &872924480024583430
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 872924480024583432}
|
||||
- component: {fileID: 872924480024583433}
|
||||
m_Layer: 0
|
||||
m_Name: "\u6253\u5305\u63A7\u5236\u5668"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &872924480024583432
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 872924480024583430}
|
||||
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: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &872924480024583433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 872924480024583430}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: eb037169953744549be6ede6cafb352b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isConclutedAirCondition: 1
|
||||
isConclutedPump: 1
|
||||
isConclutedAirCompressor: 1
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9ec375036c37ece4aaf906d02f390247
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -2764,7 +2764,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 356366128}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.098803386, y: 1.045672, z: 0.118324734}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -29007,6 +29007,63 @@ MonoBehaviour:
|
|||
minIntensity: 0.2
|
||||
maxIntensity: 0.8
|
||||
hoverDelay: 1.5
|
||||
--- !u!1001 &872924481090035873
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 872924480024583430, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u6253\u5305\u63A7\u5236\u5668"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 24
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 872924480024583432, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9ec375036c37ece4aaf906d02f390247, type: 3}
|
||||
--- !u!1001 &1488738078823541918
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -29020,15 +29077,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2085014406165613580, guid: d6e3b7e84aa670e448f9f1831c8c62d0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.08704327
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2085014406165613580, guid: d6e3b7e84aa670e448f9f1831c8c62d0, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.040951803
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2085014406165613580, guid: d6e3b7e84aa670e448f9f1831c8c62d0, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.012250572
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2085014406165613580, guid: d6e3b7e84aa670e448f9f1831c8c62d0, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
|
|
|
|||
|
|
@ -27874,6 +27874,18 @@ MonoBehaviour:
|
|||
objectValue: {fileID: 7901037396216528395}
|
||||
dataValue:
|
||||
variableType: 10
|
||||
- name: "\u7A7A\u8C03"
|
||||
objectValue: {fileID: 8343772854449745245}
|
||||
dataValue:
|
||||
variableType: 10
|
||||
- name: "\u6CF5"
|
||||
objectValue: {fileID: 3176413909984815128}
|
||||
dataValue:
|
||||
variableType: 10
|
||||
- name: "\u7A7A\u538B\u673A"
|
||||
objectValue: {fileID: 6286428596020413016}
|
||||
dataValue:
|
||||
variableType: 10
|
||||
animators: []
|
||||
deviceBtns:
|
||||
- {fileID: 4543702428750999084}
|
||||
|
|
|
|||
|
|
@ -48,9 +48,11 @@ public class EquipmentStructureView : UIView
|
|||
{
|
||||
base.OnInit(data);
|
||||
variables.Set<EquipmentStructureView>("my_EquipmentStructure", this);
|
||||
|
||||
Init();
|
||||
}
|
||||
|
||||
void Start()
|
||||
void Init()
|
||||
{
|
||||
models.Clear();
|
||||
GameObject trans = GameObject.Find("AllModels");
|
||||
|
|
@ -63,7 +65,34 @@ public class EquipmentStructureView : UIView
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
focusDevices = "空调";
|
||||
models.RemoveAt(0);
|
||||
///打包部分检测
|
||||
if (!BuildManager.Instance.isConclutedAirCondition && BuildManager.Instance.isConclutedAirCompressor && !BuildManager.Instance.isConclutedPump)
|
||||
{
|
||||
|
||||
models.RemoveAt(1);
|
||||
models.RemoveAt(0);
|
||||
|
||||
variables.Get<RectTransform>("空调").gameObject.Deactivate();
|
||||
variables.Get<RectTransform>("泵").gameObject.Deactivate();
|
||||
variables.Get<RectTransform>("空压机").gameObject.Deactivate();
|
||||
focusDevices = "空压机";
|
||||
}
|
||||
if (!BuildManager.Instance.isConclutedAirCondition && BuildManager.Instance.isConclutedPump && !BuildManager.Instance.isConclutedAirCompressor)
|
||||
{
|
||||
|
||||
models.RemoveAt(2);
|
||||
models.RemoveAt(0);
|
||||
|
||||
variables.Get<RectTransform>("空调").gameObject.Deactivate();
|
||||
variables.Get<RectTransform>("空压机").gameObject.Deactivate();
|
||||
variables.Get<RectTransform>("泵").gameObject.Deactivate();
|
||||
|
||||
focusDevices = "泵";
|
||||
}
|
||||
|
||||
models[0].Activate();
|
||||
|
||||
|
||||
|
|
@ -74,7 +103,6 @@ public class EquipmentStructureView : UIView
|
|||
enhancedModelViewerOrbitCamera.SetTarget(models[0].transform);
|
||||
modelSpreadController.SetTarget(models[0].transform);
|
||||
|
||||
focusDevices = "空调";
|
||||
|
||||
InitLeftBtns();
|
||||
|
||||
|
|
@ -130,11 +158,11 @@ public class EquipmentStructureView : UIView
|
|||
variables.Get<Button>("安装调试").onClick.AddListener(delegate
|
||||
{
|
||||
//Debug.Log($"{_currentSelectedButton.name}");
|
||||
if (_currentSelectedButton.name.Equals("空压机"))
|
||||
if (focusDevices.Equals("空压机"))
|
||||
{
|
||||
variables.Get<RectTransform>("空气压缩机安装调试").gameObject.Activate();
|
||||
}
|
||||
else if (_currentSelectedButton.name.Equals("泵"))
|
||||
else if (focusDevices.Equals("泵"))
|
||||
{
|
||||
variables.Get<RectTransform>("水泵安装调试").gameObject.Activate();
|
||||
}
|
||||
|
|
@ -255,7 +283,7 @@ public class EquipmentStructureView : UIView
|
|||
private void OnButtonSelected(Button selectedButton, int index)
|
||||
{
|
||||
|
||||
focusDevices = models[index].name;
|
||||
focusDevices = selectedButton.name;
|
||||
variables.Get<RectTransform>("空气压缩机安装调试").gameObject.Deactivate();
|
||||
variables.Get<RectTransform>("水泵安装调试").gameObject.Deactivate();
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class BuildManager : MonoSingleton<BuildManager>
|
||||
{
|
||||
/// <summary>
|
||||
/// 打包结构认知包含空调设备
|
||||
/// </summary>
|
||||
public bool isConclutedAirCondition = true;
|
||||
/// <summary>
|
||||
/// 打包结构认知包含水泵设备
|
||||
/// </summary>
|
||||
public bool isConclutedPump = true;
|
||||
/// <summary>
|
||||
/// 打包结构认知包含空气压缩机设备
|
||||
/// </summary>
|
||||
public bool isConclutedAirCompressor = true;
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: eb037169953744549be6ede6cafb352b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -26,7 +26,7 @@ MonoBehaviour:
|
|||
m_MinSize: {x: 400, y: 100}
|
||||
m_MaxSize: {x: 32384, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 766
|
||||
controlID: 3894
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
|
|
@ -406,9 +406,9 @@ MonoBehaviour:
|
|||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: 0.15716247, y: 1.229873, z: 0.5581371}
|
||||
m_Target: {x: -0.70258766, y: 0.8126786, z: 0.66717106}
|
||||
speed: 2
|
||||
m_Value: {x: 0.15716247, y: 1.229873, z: 0.5581371}
|
||||
m_Value: {x: -0.70258766, y: 0.8126786, z: 0.66717106}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
|
|
@ -455,13 +455,13 @@ MonoBehaviour:
|
|||
m_GridAxis: 1
|
||||
m_gridOpacity: 0.5
|
||||
m_Rotation:
|
||||
m_Target: {x: -0.22194582, y: -0.0008803285, z: 0.00020039109, w: -0.9750589}
|
||||
m_Target: {x: -0.28314754, y: -0.34969106, z: 0.111749716, w: -0.88603455}
|
||||
speed: 2
|
||||
m_Value: {x: -0.22194576, y: -0.00088032824, z: 0.00020039105, w: -0.9750587}
|
||||
m_Value: {x: -0.2831473, y: -0.34969077, z: 0.11174962, w: -0.88603383}
|
||||
m_Size:
|
||||
m_Target: 2.5420592
|
||||
m_Target: 1.4792175
|
||||
speed: 2
|
||||
m_Value: 2.5420592
|
||||
m_Value: 1.4792175
|
||||
m_Ortho:
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
|
|
@ -479,7 +479,7 @@ MonoBehaviour:
|
|||
m_FarClip: 10000
|
||||
m_DynamicClip: 1
|
||||
m_OcclusionCulling: 0
|
||||
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
|
||||
m_LastSceneViewRotation: {x: -0.28314754, y: -0.34969106, z: 0.111749716, w: -0.88603455}
|
||||
m_LastSceneViewOrtho: 0
|
||||
m_ReplacementShader: {fileID: 0}
|
||||
m_ReplacementString:
|
||||
|
|
@ -546,7 +546,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 2eb1ffff82c4ffff88c4ffffb0c4fffff6c7ffff34fbfffff4ffffffe86e0000
|
||||
m_ExpandedIDs: 684bffffa85effffae5effffd65effff2eb1ffff82c4ffff88c4ffffb0c4ffff34fbfffff4ffffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
|
@ -636,7 +636,7 @@ MonoBehaviour:
|
|||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets/UIView/EquipmentChildStructureView/Resources
|
||||
- Assets/UIView/EquipmentStructureView/Resources
|
||||
m_Globs: []
|
||||
m_OriginalText:
|
||||
m_FilterByTypeIntersection: 0
|
||||
|
|
@ -651,7 +651,7 @@ MonoBehaviour:
|
|||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 48b40000
|
||||
m_LastClickedID: 46152
|
||||
m_ExpandedIDs: ffffffff00000000a8b40000aab40000acb40000aeb40000b0b40000b2b40000b4b40000b6b40000b8b40000bab40000bcb40000beb40000c0b40000c2b40000c4b40000c6b40000c8b40000cab40000
|
||||
m_ExpandedIDs: ffffffff00000000a8b40000aab40000acb40000aeb40000b0b40000b2b40000b4b40000b6b40000b8b40000bab40000bcb40000beb40000c0b40000c2b40000c4b40000c6b40000c8b40000cab400009eb50000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
|
|
@ -676,24 +676,24 @@ MonoBehaviour:
|
|||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_AssetTreeState:
|
||||
scrollPos: {x: 0, y: 262}
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: ffffffff00000000a8b40000aab40000acb40000aeb40000b0b40000b2b40000b4b40000b6b40000b8b40000bab40000bcb40000beb40000c0b40000c2b40000c4b40000c6b40000c8b40000cab400009eb50000
|
||||
m_ExpandedIDs: ffffffff00000000a8b40000aab40000acb40000aeb40000b0b40000b2b40000b6b40000b8b40000bab40000bcb40000c0b40000c6b40000c8b40000cab4000074b500009eb50000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_Name: BuildManager
|
||||
m_OriginalName: BuildManager
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_UserData: 163818
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_OriginalEventType: 0
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 7}
|
||||
m_SearchString:
|
||||
|
|
|
|||
Loading…
Reference in New Issue