Merge branch 'main' of http://xr.flexing.ai:3000/UVCXR/OCTOPUS_TWIN-Demo
This commit is contained in:
@@ -132,7 +132,7 @@ namespace UVC.Studio.Manager
|
||||
if (isDoubleClick)
|
||||
{
|
||||
// 더블클릭: 카메라 포커스 이동
|
||||
_stageObjectManager.Focus(stageObject.GameObject);
|
||||
//_stageObjectManager.Focus(stageObject.GameObject);
|
||||
_lastClickTime = 0f; // 연속 더블클릭 방지
|
||||
_lastClickedStageObject = null;
|
||||
return;
|
||||
|
||||
@@ -30,7 +30,7 @@ ModelImporter:
|
||||
extraExposedTransformPaths: []
|
||||
extraUserProperties: []
|
||||
clipAnimations: []
|
||||
isReadable: 0
|
||||
isReadable: 1
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
|
||||
@@ -45119,6 +45119,7 @@ MonoBehaviour:
|
||||
IgnoreSingleOpenMode: 0
|
||||
cameraViewPoints: []
|
||||
cameraControlItem: {fileID: 0}
|
||||
isSceneReady: 0
|
||||
--- !u!114 &2971630961222987377
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -207,7 +207,7 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 8336187291158303008}
|
||||
m_HandleRect: {fileID: 4895034935293481331}
|
||||
m_Direction: 2
|
||||
m_Value: 1.0000067
|
||||
m_Value: 1.0000013
|
||||
m_Size: 0.9141791
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
@@ -455,13 +455,12 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2699047025111990782}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
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: 4857956198528770958}
|
||||
- {fileID: 7575454773085745182}
|
||||
- {fileID: 8554777376944691644}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -1090,6 +1089,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.LanguageDropdownController
|
||||
languageDropdown: {fileID: 5051347081278813304}
|
||||
unsupportedPopup: {fileID: 0}
|
||||
modalCanvasRoot: {fileID: 0}
|
||||
--- !u!1 &4601403750547695367
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1795,96 +1795,6 @@ MonoBehaviour:
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &7506634691919617042
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7575454773085745182}
|
||||
- component: {fileID: 5048634560451985470}
|
||||
- component: {fileID: 3034454661102045682}
|
||||
m_Layer: 5
|
||||
m_Name: ProjectList
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7575454773085745182
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7506634691919617042}
|
||||
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: 2921858315922449812}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 960, y: -540}
|
||||
m_SizeDelta: {x: 1920, y: 880}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5048634560451985470
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7506634691919617042}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 4
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!114 &3034454661102045682
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7506634691919617042}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ee6bc60fa8d97c448f7733a9630d35d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
itemPrefab: {fileID: 4405376598340963303, guid: 1f4bc755d66a72a4bad665b2f5026805, type: 3}
|
||||
contentParent: {fileID: 7575454773085745182}
|
||||
projectDataList:
|
||||
- {fileID: 11400000, guid: e64e9a2b1feb4d849af07549deddf7ba, type: 2}
|
||||
- {fileID: 11400000, guid: 1b1f8db8ab645f54a91bbf6c944bd925, type: 2}
|
||||
- {fileID: 11400000, guid: df9e390ded1c7b244887f8dc781de41c, type: 2}
|
||||
toastPopup: {fileID: 0}
|
||||
homeRoot: {fileID: 2699047025111990782}
|
||||
sceneMainRoot: {fileID: 0}
|
||||
modelRoot: {fileID: 0}
|
||||
staticCanvasRoot: {fileID: 0}
|
||||
popupCanvasRoot: {fileID: 0}
|
||||
labelCanvasRoot: {fileID: 0}
|
||||
modalCanvasRoot: {fileID: 0}
|
||||
currentProjectData: {fileID: 0}
|
||||
--- !u!1 &7511830050681407725
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2248,7 +2158,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.00058798917}
|
||||
m_AnchoredPosition: {x: 0, y: -0.00008869797}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &8731893201824529277
|
||||
@@ -2269,9 +2179,11 @@ MonoBehaviour:
|
||||
- {fileID: 11400000, guid: e64e9a2b1feb4d849af07549deddf7ba, type: 2}
|
||||
- {fileID: 11400000, guid: 1b1f8db8ab645f54a91bbf6c944bd925, type: 2}
|
||||
- {fileID: 11400000, guid: df9e390ded1c7b244887f8dc781de41c, type: 2}
|
||||
- {fileID: 11400000, guid: 01338d1235b49a844b0d64290c8c015d, type: 2}
|
||||
- {fileID: 11400000, guid: f00d24b5b2ee5f244af3fdb38a96b9cf, type: 2}
|
||||
- {fileID: 11400000, guid: 2c93cb1d12307c249a14bccd868e169c, type: 2}
|
||||
- {fileID: 11400000, guid: 3dd1001b0a1d6454bbb96e8f3a8f7d95, type: 2}
|
||||
- {fileID: 11400000, guid: 21128e94512247f4b9249cbd940eb884, type: 2}
|
||||
toastPopup: {fileID: 0}
|
||||
homeRoot: {fileID: 2699047025111990782}
|
||||
sceneMainRoot: {fileID: 0}
|
||||
@@ -2281,6 +2193,7 @@ MonoBehaviour:
|
||||
labelCanvasRoot: {fileID: 0}
|
||||
modalCanvasRoot: {fileID: 0}
|
||||
currentProjectData: {fileID: 0}
|
||||
volume: {fileID: 0}
|
||||
--- !u!114 &5194693047979651783
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -416,7 +416,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 346, y: 263}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6692477140310534073
|
||||
@@ -448,7 +448,7 @@ MonoBehaviour:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: f6b8c67c8a7c66e4097597bb91381678, type: 3}
|
||||
m_Type: 0
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@@ -456,7 +456,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 3
|
||||
m_PixelsPerUnitMultiplier: 4
|
||||
--- !u!1 &5246644621837638575
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
BIN
Assets/Resources/UI/Sprites/Home/Afas_bg.png
Normal file
BIN
Assets/Resources/UI/Sprites/Home/Afas_bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
117
Assets/Resources/UI/Sprites/Home/Afas_bg.png.meta
Normal file
117
Assets/Resources/UI/Sprites/Home/Afas_bg.png.meta
Normal file
@@ -0,0 +1,117 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 77287373a259fab409ed7c74935c5102
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 447 KiB After Width: | Height: | Size: 392 KiB |
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ca39334a3209a014d977435e2b0363ba
|
||||
guid: 48812a0cc4b904f4b8dda5a89691424b
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
BIN
Assets/Resources/UI/Sprites/Home/SH-INT_bg.png
Normal file
BIN
Assets/Resources/UI/Sprites/Home/SH-INT_bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
117
Assets/Resources/UI/Sprites/Home/SH-INT_bg.png.meta
Normal file
117
Assets/Resources/UI/Sprites/Home/SH-INT_bg.png.meta
Normal file
@@ -0,0 +1,117 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cab18c80575252e46a468d4abeefe5fc
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -49,7 +49,7 @@ TextureImporter:
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteBorder: {x: 8, y: 8, z: 8, w: 8}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
@@ -114,7 +114,7 @@ TextureImporter:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
internalID: 1537655665
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: eaab35019b583af4e82acbcbc77db606
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,5 @@
|
||||
using ChunilENG.Management;
|
||||
using ChunilENG.UI;
|
||||
using OCTOPUS_TWIN;
|
||||
using UnityEngine;
|
||||
using UnityEngine.InputSystem.XR;
|
||||
@@ -34,10 +35,15 @@ namespace ChunilENG.Command
|
||||
curDistance = 10f;
|
||||
curElevation = 23f;
|
||||
curAzimuth = 305f;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ChunilENGSceneMain.Instance.GetManager<ChunilENGUIManager>())
|
||||
{
|
||||
var leftSidePanel = ChunilENGSceneMain.Instance.GetManager<ChunilENGUIManager>().GetCanvas<StaticCanvas>().GetPanel<LeftSidePanel>();
|
||||
leftSidePanel.DeactiveSideToolButton();
|
||||
}
|
||||
|
||||
targetPos = new Vector3(26.7f, 20f, 205.3f);
|
||||
curDistance = 60f;
|
||||
curElevation = 56;
|
||||
@@ -49,37 +55,6 @@ namespace ChunilENG.Command
|
||||
controller.currentAzimuth = curAzimuth;
|
||||
|
||||
controller.SetTargetPos(targetPos);
|
||||
var manager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
|
||||
if (manager != null)
|
||||
manager.ActiveIcons(uiIsActive);
|
||||
//Ä«¸Þ¶ó À̵¿½Ã۰ÚÀ½.
|
||||
|
||||
//var building = ChunilENGSceneMain.Instance.building;
|
||||
//building.SetFloor(floorIndex);
|
||||
|
||||
//var cameraController = OctopusTwinAppMain.Instance.cameraController;
|
||||
//var allMachines = building.GetMachines();
|
||||
|
||||
//if (cameraController.viewMode == ViewMode.TopView)
|
||||
//{
|
||||
// foreach (var machine in allMachines)
|
||||
// {
|
||||
// machine.ReleaseAnimators();
|
||||
// }
|
||||
// return;
|
||||
//}
|
||||
|
||||
//foreach(var machine in allMachines)
|
||||
//{
|
||||
// if(machine.GetMachineFloorIndex() == floorIndex)
|
||||
// {
|
||||
// machine.AssignAnimators();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// machine.ReleaseAnimators();
|
||||
// }
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,8 +12,6 @@ namespace ChunilENG.UI.Command
|
||||
|
||||
var uiManager = ChunilENGSceneMain.Instance.GetManager<ChunilENGUIManager>();
|
||||
uiManager.GetCanvas<PopupCanvas>().ClosePanel();
|
||||
|
||||
//uiManager.GetCanvas<StaticCanvas>().GetPanel<LeftSidePanel>().ResetToolBox();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,8 @@ namespace ChunilENG.Management
|
||||
public Action<Machine> onClickKPIToMachine;
|
||||
|
||||
public float defaultNameHeight = 2f;
|
||||
private bool activeIconEnable;
|
||||
|
||||
public bool activeIconEnable;
|
||||
[Header("Scale Settings")]
|
||||
[Range(0.1f, 1.5f)] public float minScale;
|
||||
[Range(0.5f, 3f)] public float maxScale;
|
||||
@@ -39,7 +40,7 @@ namespace ChunilENG.Management
|
||||
|
||||
machineInfoItem = Resources.Load<MachineInfoItem>($"{ResourceURL.chunilENGUIPrefabFolderPath}{nameof(MachineInfoItem)}");
|
||||
machines = ChunilENGSceneMain.Instance.building.GetMachines();
|
||||
if(machines !=null)
|
||||
if (machines != null)
|
||||
{
|
||||
foreach (var machine in machines)
|
||||
{
|
||||
@@ -50,7 +51,6 @@ namespace ChunilENG.Management
|
||||
itemToMachines.Add(infoItem, machine);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
await UniTask.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -13,24 +13,19 @@ namespace ChunilENG.UI
|
||||
public CameraPoint point;
|
||||
public int floorIndex;
|
||||
private Button button;
|
||||
public Image SelectImage; // 선택 상태를 표시할 이미지
|
||||
|
||||
public Action<CameraControlItem> OnItemClicked;
|
||||
|
||||
public void SettingButton(int index, CameraPoint point)
|
||||
public void SettingButton(CameraPoint point)
|
||||
{
|
||||
gameObject.name = $"{point.name}_Button";
|
||||
|
||||
this.point = point;
|
||||
floorIndex = point.floorIndex;
|
||||
|
||||
|
||||
button = GetComponent<Button>();
|
||||
var buttonText = GetComponentInChildren<TMP_Text>();
|
||||
|
||||
var selectImageTransform = transform.Find(nameof(SelectImage));
|
||||
if (selectImageTransform != null)
|
||||
{
|
||||
SelectImage = selectImageTransform.GetComponent<Image>();
|
||||
}
|
||||
|
||||
if (buttonText != null)
|
||||
{
|
||||
buttonText.SetText(point.name);
|
||||
@@ -41,20 +36,8 @@ namespace ChunilENG.UI
|
||||
|
||||
private void HandleClick()
|
||||
{
|
||||
OnItemClicked?.Invoke(this);
|
||||
}
|
||||
|
||||
//public void Select()
|
||||
//{
|
||||
// if (SelectImage != null)
|
||||
// SelectImage.gameObject.SetActive(true);
|
||||
// }
|
||||
|
||||
//public void Deselect()
|
||||
//{
|
||||
// if (SelectImage != null)
|
||||
// SelectImage.gameObject.SetActive(false);
|
||||
// }
|
||||
}
|
||||
OnItemClicked?.Invoke(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -53,9 +53,11 @@ namespace ChunilENG.UI
|
||||
|
||||
if (selectedCameraControlItem != null)
|
||||
{
|
||||
var point = cameraButtons.Find(x => x.name == selectedCameraControlItem.name).point;
|
||||
Debug.Log(selectedCameraControlItem.name);
|
||||
var point = cameraButtons.Find(x => selectedCameraControlItem.name.Contains(x.name)).point;
|
||||
CommandManager.Instance.Execute(new ChangedCameraCommand(point));
|
||||
selectedCameraControlItem = null;
|
||||
ChunilENGSceneMain.Instance.GetManager<ChunilENGUIManager>().GetCanvas<StaticCanvas>().GetPanel<BottomLeftToolbar>().HideItem();
|
||||
}
|
||||
}
|
||||
public void SettingButtons()
|
||||
@@ -72,7 +74,7 @@ namespace ChunilENG.UI
|
||||
for (int i = 0; i < cameraViewPoints.Count; i++)
|
||||
{
|
||||
var cameraButton = Instantiate(cameraControlItem, transform);
|
||||
cameraButton.SettingButton(i, cameraViewPoints[i]);
|
||||
cameraButton.SettingButton(cameraViewPoints[i]);
|
||||
cameraButton.OnItemClicked += HandleItemClicked;
|
||||
cameraButtons.Add(cameraButton);
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ namespace ChunilENG.UI
|
||||
|
||||
public SideTabBar SideTabBar { get { return sideTabBar; } }
|
||||
private CaptureRecoder recorder;
|
||||
public bool isActive;
|
||||
|
||||
public override async UniTask Init()
|
||||
{
|
||||
@@ -98,13 +99,13 @@ namespace ChunilENG.UI
|
||||
"화면을 녹화합니다.");
|
||||
|
||||
// 내/외벽 활성화/비활성화
|
||||
toolbarModel.AddToggleButton("button_wall_control", true,
|
||||
toolbarModel.AddToggleButton("button_icon_control", false,
|
||||
"Prefabs/UI/Toolbar/images/IMG_WallControl_on",
|
||||
"Prefabs/UI/Toolbar/images/IMG_WallControl_off",
|
||||
(isSelected) =>
|
||||
{
|
||||
var itemManager = ChunilENGSceneMain.Instance.GetManager<MachineInfoItemManager>();
|
||||
itemManager.ActiveIcons(!isSelected);
|
||||
itemManager.ActiveIcons(isSelected);
|
||||
},
|
||||
new ActiveWallControlPanelCommand(),
|
||||
"내/외벽 조절 UI를 활성화/비활성화 합니다.");
|
||||
@@ -134,11 +135,8 @@ namespace ChunilENG.UI
|
||||
}
|
||||
public void DeactiveSideToolButton()
|
||||
{
|
||||
toolbar.SetToggleButtonState("button_minimap", false);
|
||||
toolbar.SetToggleButtonState("button_position_fix", false);
|
||||
toolbar.SetToggleButtonState("button_floor_control", false);
|
||||
toolbar.SetToggleButtonState("button_ruler", false);
|
||||
toolbar.SetToggleButtonState("button_wall_control", false);
|
||||
toolbar.SetToggleButtonState("button_icon_control", false);
|
||||
toolbar.SetRadioButtonSelection("CameraControlGroup", "Quarter View", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
27
Assets/Scripts/Data/Data_AFAS.asset
Normal file
27
Assets/Scripts/Data/Data_AFAS.asset
Normal file
@@ -0,0 +1,27 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c6afc1f7da23fd44d957e1b9874bdf6d, type: 3}
|
||||
m_Name: Data_AFAS
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: AFAS
|
||||
description: "Location: \uACBD\uAE30 \uC548\uC0B0\uC2DC \uB2E8\uC6D0\uAD6C \uC0B0\uC131\uB85C
|
||||
52\nFile Size: 15.2MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: 77287373a259fab409ed7c74935c5102, type: 3}
|
||||
curSceneStatus: 0
|
||||
modelPrefab: {fileID: 0}
|
||||
sceneAssets: []
|
||||
volumeProfiles: []
|
||||
staticCanvasPrefab: {fileID: 0}
|
||||
popupCanvasPrefab: {fileID: 0}
|
||||
sceneMain: {fileID: 0}
|
||||
labelCanvas: {fileID: 0}
|
||||
isLocked: 1
|
||||
@@ -1,7 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f70093cfdd0bbbf4384a585c136ba80a
|
||||
DefaultImporter:
|
||||
guid: 01338d1235b49a844b0d64290c8c015d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -13,9 +13,10 @@ MonoBehaviour:
|
||||
m_Name: Data_AZTECH
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: AZTECH
|
||||
description: "Location: \uBD80\uC0B0 \uC0AC\uD558\uAD6C \uD558\uC2E0 \uBC88\uC601\uB85C
|
||||
99\nFile Size: 13MB\nLast Updated: 2026.02.11"
|
||||
description: "Location: \uBD80\uC0B0 \uC0AC\uD558\uAD6C \uD558\uC2E0\nFile Size:
|
||||
113MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: c2dd61a75c3903248971617c8f89b32d, type: 3}
|
||||
curSceneStatus: 0
|
||||
modelPrefab: {fileID: 0}
|
||||
sceneAssets: []
|
||||
volumeProfiles: []
|
||||
|
||||
@@ -13,8 +13,8 @@ MonoBehaviour:
|
||||
m_Name: Data_Chunil
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: Chunil
|
||||
description: "Location: \uC778\uCC9C\uAD11\uC5ED\uC2DC \uB0A8\uB3D9\uAD6C \uACE0\uC794\uB3D9
|
||||
727-4\nFile Size: 14.4MB \nLast Updated: 2026.02.11"
|
||||
description: "Location: \uC778\uCC9C\uAD11\uC5ED\uC2DC \uB0A8\uB3D9\uAD6C \uACE0\uC794\uB3D9\nFile
|
||||
Size: 214.4MB \nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: d85da74f58022cd49a25bad0655e3ee3, type: 3}
|
||||
curSceneStatus: 1
|
||||
modelPrefab: {fileID: 1600303972707744018, guid: 02de84299dbbd354fa8fe07b680d5d8c, type: 3}
|
||||
|
||||
@@ -13,9 +13,10 @@ MonoBehaviour:
|
||||
m_Name: Data_ENGLEWOODLAB
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: ENGLEWOODLAB
|
||||
description: "Location: \uC778\uCC9C\uAD11\uC5ED\uC2DC \uB0A8\uB3D9\uAD6C \uB0A8\uB3D9\uB300\uB85C
|
||||
425\uBC88\uAE38\nFile Size: 14MB\nLast Updated: 2026.02.11"
|
||||
description: "Location: \uC778\uCC9C\uAD11\uC5ED\uC2DC \uB0A8\uB3D9\uAD6C\nFile
|
||||
Size: 114MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: cf9aa331ea4a9de40889555cfce67a2e, type: 3}
|
||||
curSceneStatus: 0
|
||||
modelPrefab: {fileID: 0}
|
||||
sceneAssets: []
|
||||
volumeProfiles: []
|
||||
|
||||
@@ -13,9 +13,9 @@ MonoBehaviour:
|
||||
m_Name: Data_HyundaiWIA
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: HyundaiWIA
|
||||
description: "Location: \uACBD\uC0C1\uB0A8\uB3C4 \uCC3D\uC6D0\uC2DC \uC131\uC0B0\uAD6C
|
||||
\uC815\uB3D9\uB85C 153 ?\nFile Size: 15MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: ca39334a3209a014d977435e2b0363ba, type: 3}
|
||||
description: "Location: \uACBD\uC0C1\uB0A8\uB3C4 \uCC3D\uC6D0\uC2DC \uC131\uC0B0\uAD6C\nFile
|
||||
Size: 155MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: 48812a0cc4b904f4b8dda5a89691424b, type: 3}
|
||||
curSceneStatus: 3
|
||||
modelPrefab: {fileID: 7895599977219415672, guid: 1640d857ae03ade4f958a521e19f11cd, type: 3}
|
||||
sceneAssets: []
|
||||
|
||||
@@ -14,7 +14,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: KEPCO
|
||||
description: "Location: \uACBD\uAE30\uB3C4 \uC758\uC815\uBD80\uC2DC \uC790\uC77C\uB3D9\nFile
|
||||
Size: 13MB\nLast Updated: 2026.02.11"
|
||||
Size: 193MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: a11db3b67adb5f844b78ee3c762c7e75, type: 3}
|
||||
curSceneStatus: 2
|
||||
modelPrefab: {fileID: 1364758469199115521, guid: 423036aa0a8d7e54896acc2d79cf08b5, type: 3}
|
||||
|
||||
@@ -13,9 +13,10 @@ MonoBehaviour:
|
||||
m_Name: Data_SAMKWANG
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: SAMKWANG
|
||||
description: "Location: \uC6B8\uC0B0\uAD11\uC5ED\uC2DC \uB0A8\uAD6C \uC6A9\uC5F0\uB85C
|
||||
248\uBC88\uAE38 83\nFile Size: 11MB\nLast Updated: 2026.02.11"
|
||||
description: "Location: \uC6B8\uC0B0\uAD11\uC5ED\uC2DC \uB0A8\uAD6C\nFile Size:
|
||||
181MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: 677015f688ee11a44af399dfb1e395a6, type: 3}
|
||||
curSceneStatus: 0
|
||||
modelPrefab: {fileID: 0}
|
||||
sceneAssets: []
|
||||
volumeProfiles: []
|
||||
|
||||
27
Assets/Scripts/Data/Data_SH-INT.asset
Normal file
27
Assets/Scripts/Data/Data_SH-INT.asset
Normal file
@@ -0,0 +1,27 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c6afc1f7da23fd44d957e1b9874bdf6d, type: 3}
|
||||
m_Name: Data_SH-INT
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: SH-INT
|
||||
description: "Location: \uACBD\uB0A8 \uAE40\uD574\uC2DC \uC9C4\uC601\uC74D \uC11C\uBD80\uB85C
|
||||
123\uBC88\uAE38\nFile Size: 14.7MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: cab18c80575252e46a468d4abeefe5fc, type: 3}
|
||||
curSceneStatus: 0
|
||||
modelPrefab: {fileID: 0}
|
||||
sceneAssets: []
|
||||
volumeProfiles: []
|
||||
staticCanvasPrefab: {fileID: 0}
|
||||
popupCanvasPrefab: {fileID: 0}
|
||||
sceneMain: {fileID: 0}
|
||||
labelCanvas: {fileID: 0}
|
||||
isLocked: 1
|
||||
@@ -1,7 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c2867ea2e3b50b64a8b0f3584e508bbf
|
||||
DefaultImporter:
|
||||
guid: 21128e94512247f4b9249cbd940eb884
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -40,7 +40,7 @@ namespace KEPCO.Object
|
||||
Animation_Echo _alram;
|
||||
Animation_Echo.Option option_Alram;
|
||||
Animation_Scaling _selectEffect;
|
||||
internal Outline outline;
|
||||
internal EPOOutline.Outlinable outline;
|
||||
string normalName;
|
||||
public bool gisActive;
|
||||
static Dictionary<SensorType, string> table_SensorTypeInitial = new Dictionary<SensorType, string>();
|
||||
@@ -136,7 +136,7 @@ namespace KEPCO.Object
|
||||
var collider = this.GetOrAddComponent<BoxCollider>();
|
||||
collider.isTrigger = true;
|
||||
|
||||
outline = transform.GetOrAddComponent<Outline>();
|
||||
outline = transform.GetOrAddComponent<EPOOutline.Outlinable>();
|
||||
outline.enabled = false;
|
||||
|
||||
FindGISObjectGroup();
|
||||
@@ -225,7 +225,7 @@ namespace KEPCO.Object
|
||||
if (hover)
|
||||
{
|
||||
//icon.SetOriginScale();
|
||||
outline.OutlineColor = color_State;
|
||||
outline.OutlineParameters.Color = color_State;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user