Merge pull request '[한수빈] 홈 화면 UI를 기존 씬에 적용' (#10) from hsb/260128_00 into main
Reviewed-on: http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo/pulls/10
This commit was merged in pull request #10.
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -13,7 +13,7 @@ GameObject:
|
||||
- component: {fileID: 712852770799068156}
|
||||
- component: {fileID: 422136855652268701}
|
||||
m_Layer: 5
|
||||
m_Name: Home
|
||||
m_Name: HomePanel
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,6 +13,7 @@ MonoBehaviour:
|
||||
m_Name: Data_Chunil
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: Chunil
|
||||
description: "Detail1: \nDetail2:\nDetail3:"
|
||||
description: "Location: \uC778\uCC9C\uAD11\uC5ED\uC2DC \uB0A8\uB3D9\uAD6C \uACE0\uC794\uB3D9
|
||||
727-4\nFile Size: 14.4MB \nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: 205401cea8bd275449563f2073f42a43, type: 3}
|
||||
modelPrefab: {fileID: 1600303972707744018, guid: 02de84299dbbd354fa8fe07b680d5d8c, type: 3}
|
||||
@@ -13,10 +13,7 @@ MonoBehaviour:
|
||||
m_Name: Data_HyundaiWIA
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: HyundaiWIA
|
||||
description: 'Detail1:
|
||||
|
||||
Detail2:
|
||||
|
||||
Detail3:'
|
||||
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: eb13fc16ac6f16049acb9ccdd516c757, type: 3}
|
||||
modelPrefab: {fileID: 6643881922534305485, guid: 33752c03399fcc747b7a98abefac3638, type: 3}
|
||||
@@ -13,10 +13,7 @@ MonoBehaviour:
|
||||
m_Name: Data_KEPCO
|
||||
m_EditorClassIdentifier: Assembly-CSharp::OCTOPUS_TWIN.ProjectData
|
||||
projectName: KEPCO
|
||||
description: 'Detail1:
|
||||
|
||||
Detail2:
|
||||
|
||||
Detail3:'
|
||||
description: "Location: \uACBD\uAE30\uB3C4 \uC758\uC815\uBD80\uC2DC \uC790\uC77C\uB3D9\nFile
|
||||
Size: 13MB\nLast Updated: 2026.02.11"
|
||||
thumbnail: {fileID: 21300000, guid: 27104938b8e6c48428b4267d662a7299, type: 3}
|
||||
modelPrefab: {fileID: 6167234359858882918, guid: c52eae10aab90474c983d73f3b828c51, type: 3}
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fd8f052e86be84e479c26960e362c68a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,4 +1,4 @@
|
||||
// TODO. 설정 항목 생기면 TabController 등 요소 추가 (XRLib 참고)
|
||||
// TODO(한수빈): 설정 항목 생기면 TabController 등 요소 추가 (XRLib 참고)
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bf1cb8f4b0360904fad8f98fc8a87fdb
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -9,7 +9,7 @@ namespace OCTOPUS_TWIN
|
||||
{
|
||||
private static UILoading instance;
|
||||
|
||||
private const string PREFAB_PATH = "UI/Prefabs/Template/UILoading";
|
||||
private const string PREFAB_PATH = "UI/Prefabs/Home/UILoading";
|
||||
private float loadingDuration = 1.5f;
|
||||
private float fadeSpeed = 2.0f;
|
||||
|
||||
Reference in New Issue
Block a user