Commit @f9ea3e2a6255772c70de7811c5caf7da9531f29a

임준일 2024-06-07

Save 20240607

@f9ea3e2a6255772c70de7811c5caf7da9531f29a

769b0d8

f9ea3e2

VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayInstructorManager.cs

--- VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayInstructorManager.cs

+++ VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayInstructorManager.cs


         get { return isOut; }
     }
 
-    [SerializeField] private Vector3 clickPos;
-    [SerializeField] private float scrollRectPosX = 0f;
+    [SerializeField] private Vector3 clickPos;                      // 클릭 위치 포인터
+    [SerializeField] private float scrollRectPosX = 0f;             // 강사 위치 틀 처음 위치
 
 
 

769b0d8

f9ea3e2

VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayVRUIManager.cs

--- VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayVRUIManager.cs

+++ VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayVRUIManager.cs


 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing.Text;
+using System.IO;
+using Unity.VisualScripting;
+using UnityEditor.Localization.Plugins.XLIFF.V20;
 using UnityEngine;
 using UnityEngine.InputSystem;
 

     [SerializeField] private UIMainView nowUIMainView;
     [SerializeField] private InputActionProperty backMenuButton;
 
-
+    private bool isDown = false;
     [SerializeField] private int nowSelectId;                   // 선택된 id
     public int NowSelectId{
         get{ return nowSelectId; }

 
     private List<GameObject> createInstructorObjs;              // 만들어진 코치 오브젝트를 전부 보관하는 리스트
 
+    private List<AnimationClip> tkAnimClips;
 
     #region 00.Content
     [Header("00.Content")]

         nowContent = Contents.None;         // 아무것도 선택되지 않은 상태
         popUp = transform.Find("Popup").gameObject;
         instructorObjs = new List<GameObject>();
+        tkAnimClips = new List<AnimationClip>();
         UserDataRepo.Instance.VRUIManager = this;
     }
 

         UserDataRepo.Instance.VRAnimController.ChangeAnimState(selectMode);
         UserDataRepo.Instance.VRAnimController.IsEffect = false;
 
-        //StartCoroutine(GetVRAssetBundle(NowSelectBundleName, NowSelectAnim));
+        StartCoroutine(GetVRAssetInstructor(NowSelectBundleName));
     }   // SetTkPlay
 
-    // bundleName은 모델명 이름이다
-    IEnumerator GetVRAssetBundle(string bundleName, string clipName)
+
+    /// <summary>
+    ///     강사 에셋번들을 가져오는 코루틴
+    /// </summary>
+    /// <param name="bundleName"></param>
+    /// <returns></returns>
+    IEnumerator GetVRAssetInstructor(string bundleName)
     {
         yield return null;
+        DebugTxtCall.Instance.CallDebug("GetVRAssetInstructor IN");
+
         if(0 < instructorObjs.Count) {
             foreach(var obj in instructorObjs) {
                 obj.SetActive(false);

             instructorObjs.Clear();
         }
 
-
-        AnimationClip tempClip_ = null;
+        
+        string tempBundleName_ = MakeBundleName(bundleName, false);
 
 
-        string tempBundleName_ = string.Empty;
-        // { 현재 컨텐츠를 확인하고 관련 에셋번들 리스트 위치 번호를 가져오는 과정
-        int tempContentNum_ = -1;
+        // 먼저 로컬에 강사 파일이 있는지 확인 후 없으면 다운
+        if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){
+            // 로드 된게 있는지 확인
+            if(AssetBundleRepo.Instance.GetAssetBundleList(NowContentInt()).Find(x => x.name == tempBundleName_)){
+                StartCoroutine(GetVRAnim(NowSelectBundleName));
+            }
+            else{
+                //yield return StartCoroutine(MMHelper.AsyncLoader(tempBundleName_));
 
-        if(nowContent == Contents.Taekwondo){
-            tempContentNum_ = MMDefine.VRTAEKWONDO;
+                LoadVRAssetInstructor();
+            }
+
         }
-        else if(nowContent == Contents.Taichi){
+        else{
+
+            // 관련 파일이 없어 에셋번들을 다운받아야할 경우
+            yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, LoadVRAssetInstructor));  
+
         }
-        else if(nowContent == Contents.KPop){
-        }
-        else if(nowContent == Contents.Modern){
-        }
+    }        
 
-        tempBundleName_ += MMHelper.GetAssetBundleName(tempContentNum_) + $"{bundleName.ToLower()}clip";
+    private void LoadVRAssetInstructor(){
+        StartCoroutine(LoadInstructor(NowSelectBundleName));
+    }
 
-        // 이름 규칙에 맞게 여기서 만들기?
+    /// <summary>
+    ///     에셋번들 로드
+    /// </summary>
+    /// <param name="bundleName"></param>
+    private IEnumerator LoadInstructor(string bundleName) {
+        // 에셋번들 로드하고 리스트에 넣어두고
+        yield return StartCoroutine(MMHelper.AsyncLoader(bundleName));
+
+        // 클립 로드하러 간다.
+        StartCoroutine(GetVRAnim(NowSelectBundleName));
+    }
+
+    private IEnumerator GetVRAnim(string bundleName){
+        string tempBundleName_ = MakeBundleName(bundleName, true);
 
 
+        // 먼저 로컬에 강사 애니메이션 클립 파일이 있는지 확인 후 없으면 다운
+        if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){
+            // 로드 된게 있는지 확인
+            if(AssetBundleRepo.Instance.GetAssetBundleList(NowContentInt()).Find(x => x.name == tempBundleName_)){
 
-        //클립 번들이 있는지 확인
-        if(AssetBundleRepo.Instance.GetAssetBundleList(tempContentNum_).Find(x => x.name == tempBundleName_)){
-            // 관련 파일이 있을 경우
+            }
+            else{
+                LoadVRAssetAnim();
+            }
         }
         else{
             // 관련 파일이 없어 에셋번들을 다운받아야할 경우
-            //MMHelper.DownloadAssetFile(tempBundleName_);
+            yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, LoadVRAssetAnim));  
         }
+    }
 
 
+    private void LoadVRAssetAnim(){
+        StartCoroutine(LoadAnim(NowSelectBundleName, NowSelectAnim));
+    }
 
-        // if (AssetBundleDataManager.Instance.vrtaekwondoBundles.Find(x => x.name == $"vrtaekwondo/{bundleName.ToLower()}clip"))
-        // {
-        //     // 여기서 따로 저장된 클립이 있다면 가져온다 
-        //     if (tkAnimClips.ContainsKey($"vrtaekwondo/{bundleName.ToLower()}{clipName.ToLower()}"))
-        //     {
-        //         tempClip_ = tkAnimClips[$"vrtaekwondo/{bundleName.ToLower()}{clipName.ToLower()}"];
-        //     }
-        //     else
-        //     {
-        //         // 필요한 파일을 꺼낸다.
-        //         yield return StartCoroutine(AssetBundleDataManager.Instance.GetAssetBundleClip($"vrtaekwondo/{bundleName.ToLower()}clip", clipName, clip =>
-        //         {
-        //             tempClip_ = clip;
-        //         }));
-        //     }
+    private IEnumerator LoadAnim(string bundleName, string clipName)
+    {
+        yield return StartCoroutine(MMHelper.AsyncLoader(bundleName + "clip"));
 
-        //     // 필요한 파일을 꺼낸다.
-        //     yield return StartCoroutine(AssetBundleDataManager.Instance.GetAssetBundleClip($"vrtaekwondo/{coachName.ToLower()}clip", clipName, clip =>
-        //     {
-        //        tempClip_ = clip;
-        //     }));
-        // }
-        // else
-        // {
-        //     yield return StartCoroutine(NetworkManager.Instance.GetAssetBundleAnim($"vrtaekwondo/{bundleName.ToLower()}clip", clipName, clip =>
-        //     {
-        //         tempClip_ = clip;
-        //     }));
-        // }
+        // 강사 클립 둘다 로드했으니 이제 꺼내자
+        GameObject tempInstructor_ = null;
+        AnimationClip tempAnimClip_ = null;
 
-        // // 새로운 클립을 Dict에 넣어준다 / {코치 이름} + {클립 이름} 키값으로
-        // if (!tkAnimClips.ContainsKey($"vrtaekwondo/{coachName.ToLower()}{clipName.ToLower()}"))
-        // {
-        //     tkAnimClips.Add($"vrtaekwondo/{coachName.ToLower()}{clipName.ToLower()}", tempClip_);
-        // }
+        yield return StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>("vrtaekwondo", NowSelectBundleName, callback => {
+            tempInstructor_ = callback;
+        }));
 
-        // // 코치 오브젝트 생성
-        // GameObject tempCoach_ = null;
+        yield return StartCoroutine(MMHelper.GetAssetObjAsync<AnimationClip>("vrtaekwondo", NowSelectBundleName + "clip", callback => {
+            tempAnimClip_ = callback;
+        }));
 
-
-        // if(AssetBundleDataManager.Instance.vrtaekwondoBundles.Find(x => x.name == $"vrtaekwondo/{coachName.ToLower()}"))            
-        // {
-        //     if(tkCreateCoachObjs.Find(x => x.name == $"{coachName}"))
-        //     {
-        //         int tempIndex_ = tkCreateCoachObjs.FindIndex(x => x.name == $"{coachName}");
-
-        //         tkCoachObjs.Clear();
-        //         // 4회 반복한다.
-        //         for(int i = 0; i < 4; i++)
-        //         {
-        //             tkCoachObjs.Add(tkCreateCoachObjs[tempIndex_]);
-        //             tkCreateCoachObjs.Remove(tkCreateCoachObjs[tempIndex_]);                    
-        //         }
-
-        //         tempCoach_ = tkCoachObjs[0];
-        //     }
-        //     else
-        //     {
-        //         // 필요한 파일을 꺼낸다.
-        //         yield return StartCoroutine(AssetBundleDataManager.Instance.GetAssetObj<GameObject>("vrtaekwondo", coachName, bundle =>
-        //         {
-        //             tempCoach_ = (GameObject)bundle;
-        //         }));
-        //     }
-
-
-        // }
-        // else
-        // {
-        //     yield return StartCoroutine(NetworkManager.Instance.GetAssetBundleObj<GameObject>(coachName, coach =>
-        //     {
-        //         tempCoach_ = coach;
-        //     }));
-
-        // }
-
-        // // [Junil] 24/03/28 - PlayMap 추가
-        // uiManager.mapChange.ChangePlayMap(string.Empty);
-        // uiManager.mapChange.AllOffMapLobby();
-
-        // ShowVRTkAnim(tempCoach_, tempClip_);
+        ShowVRTkAnim(tempInstructor_, tempAnimClip_);
     }
 
 

         ChangeMainUI(false);
     }
 
+    private int NowContentInt() {
+        int tempContentNum_ = -1;
+
+        if(nowContent == Contents.Taekwondo){
+            tempContentNum_ = MMDefine.VRTAEKWONDO;
+        }
+        else if(nowContent == Contents.Taichi){
+        }
+        else if(nowContent == Contents.KPop){
+        }
+        else if(nowContent == Contents.Modern){
+        }
+
+        return tempContentNum_;
+    }
+
+    /// <summary>
+    ///     번들 이름을 보내면 에셋번들 이름을 만들어서 반환해주는 함수
+    /// </summary>
+    /// <param name="bundleName"></param>
+    /// <param name="isAnim"> true면 clip이 추가로 붙고, false면 패스 </param>
+    /// <returns></returns>
+    private string MakeBundleName(string bundleName, bool isAnim){
+        
+        string tempBundleName_ = string.Empty;
+        // { 현재 컨텐츠를 확인하고 관련 에셋번들 리스트 위치 번호를 가져오는 과정        
+
+        tempBundleName_ = MMHelper.GetAssetBundleName(NowContentInt()) + $"_{bundleName.ToLower()}";
+
+        if(isAnim){
+            tempBundleName_ += "clip";
+        }
+
+        return tempBundleName_;
+    }
+
     public void SetInputKey(InputActionProperty backBtn)
     {
         backMenuButton = backBtn;

769b0d8

f9ea3e2

VRTK/Assets/00.MAINSTREAM/Scripts/Utils/MMHelper.cs

--- VRTK/Assets/00.MAINSTREAM/Scripts/Utils/MMHelper.cs

+++ VRTK/Assets/00.MAINSTREAM/Scripts/Utils/MMHelper.cs


 using System;
 using System.Collections;
+using System.IO;
 using Oculus.Platform;
 using Oculus.Platform.Models;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.SceneManagement;
 using UnityEngine.U2D;
 using UnityEngine.UI;

     /// <param name="useObjName"></param>
     /// <param name="callback"></param>
     /// <returns></returns>
-    public static IEnumerator GetAssetObjAsync<T>(string bundleName, string useObjName, Action<GameObject> callback)
+    public static IEnumerator GetAssetObjAsync<T>(string bundleName, string useObjName, Action<T> callback)
     {
         int tempCaseNum_ = 0;
         int tempNumber_ = 0;

         yield return reqAsset_.isDone;
         Debug.LogError(reqAsset_.asset);
 
-        GameObject tempObj_ = (GameObject)reqAsset_.asset;
+        T tempObj_ = reqAsset_.asset.GetComponent<T>();
+
 #if UNITY_EDITOR
-        AssetBundleEditorUtil.FixShadersForEditor(tempObj_);
-#endif
+        // tempObj_가 GameObject 형식인지 확인하고 반환
+        GameObject tempCheck_ = tempObj_ as GameObject;
+        if(tempCheck_ != null) {
+            AssetBundleEditorUtil.FixShadersForEditor(tempCheck_);
+
+            tempObj_ = tempCheck_.GetComponent<T>();
+
+            callback(tempObj_);
+        }
+#else
         callback(tempObj_);
+#endif
 
     }
 

     ///     파일 이름을 받아서 해당 파일 에셋을 다운로드 처리
     /// </summary>
     /// <param name="fileName"> 다운로드 받을 파일명 </param>
-    public static IEnumerator DownloadAssetFile(string fileName, Action<AnimationClip> callback)
+    public static IEnumerator DownloadAssetFile(string fileName, Action callss)
     {
         int tempAssetIndex_ = AppDataRepo.Instance.GetAssetFileList().FindIndex(a => a.fileName == fileName);
-
-        yield return AssetFile.DownloadById(AppDataRepo.Instance.GetAssetFileList()[tempAssetIndex_].assetId).OnComplete(callback =>{
-            if (callback.IsError) {
-            return;
+        
+        yield return AssetFile.DownloadById(AppDataRepo.Instance.GetAssetFileList()[tempAssetIndex_].assetId).OnComplete( callback =>{
+            if (callback.IsError)
+            {
+                return;
             }
 
             // 에셋 파일의 다운로드 진행 사황을 나타내기 위해서 사용
             AssetFile.SetDownloadUpdateNotificationCallback(call =>
             {
                 AssetFileDownloadUpdate downloadUpdate = call.GetAssetFileDownloadUpdate();
-
 
                 if (downloadUpdate != null)
                 {

                     if (downloadUpdate.Completed)
                     {
                         // 경로에 파일이 생겼으니 로드하여 사용한다.
-                                                
+                        if(File.Exists(callback.GetAssetFileDownloadResult().Filepath)){
+                            DebugTxtCall.Instance.CallDebug($"{callback.GetAssetFileDownloadResult().Filepath} 있다!");
+                        }
+                        else{
+                            DebugTxtCall.Instance.CallDebug($"{callback.GetAssetFileDownloadResult().Filepath} 없어!!");
+                        }
+
+                        callss();
+                        //AssetFileDownloadResult assetInfo_ = msg.GetAssetFileDownloadResult();
+                        //debugTxt.text += $"DownloadAsset : {assetInfo_.Filepath} {assetInfo_.AssetId}" +
+                        //$" AssetFileDownloadResult : {File.Exists(assetInfo_.Filepath)}" +
+                        //$" path : {File.Exists(Define.FULL_FILE_PATH + AppDataRepo.Instance.assetBundleDataList.Find(x => x.fileName == "TAEKWONDO_initList_DLC.json").fileName)}\n";
                     }
                 }
                 else
                 {
-                    //debugTxt.text += "SetDownloadUpdateNotificationCallback null";
+                        //debugTxt.text += "SetDownloadUpdateNotificationCallback null";
                 }
             });
-
-
+            
         });
-        
+
+        if(File.Exists(MMDefine.FULL_FILE_PATH + fileName)){
+            Debug.Log("있다");
+        }
+
+
+
+        // yield return AssetFile.DownloadById(AppDataRepo.Instance.GetAssetFileList()[tempAssetIndex_].assetId).OnComplete(msg => {
+        //     if (msg.IsError)
+        //     {
+        //         return;
+        //     }
+
+        //     // 에셋 파일의 다운로드 진행 사황을 나타내기 위해서 사용
+        //     AssetFile.SetDownloadUpdateNotificationCallback(call =>
+        //     {
+        //         AssetFileDownloadUpdate downloadUpdate = call.GetAssetFileDownloadUpdate();
+
+
+        //         if (downloadUpdate != null)
+        //         {
+        //             //debugTxt.text += $"{downloadUpdate.AssetId} trans {downloadUpdate.BytesTransferred} total {downloadUpdate.BytesTotal}";
+
+        //             // 에셋 파일의 다운로드가 완료되었다면 실행
+        //             if (downloadUpdate.Completed)
+        //             {
+        //                 // 경로에 파일이 생겼으니 로드하여 사용한다.
+        //                 //callback();
+
+        //                 //AssetFileDownloadResult assetInfo_ = msg.GetAssetFileDownloadResult();
+        //                 //debugTxt.text += $"DownloadAsset : {assetInfo_.Filepath} {assetInfo_.AssetId}" +
+        //                 //$" AssetFileDownloadResult : {File.Exists(assetInfo_.Filepath)}" +
+        //                 //$" path : {File.Exists(Define.FULL_FILE_PATH + AppDataRepo.Instance.assetBundleDataList.Find(x => x.fileName == "TAEKWONDO_initList_DLC.json").fileName)}\n";
+        //             }
+        //         }
+        //         else
+        //         {
+        //             //debugTxt.text += "SetDownloadUpdateNotificationCallback null";
+        //         }
+        //     });
+        // });
+
 
     }
+
 
     /// <summary>
     ///     message를 받아서 관련 에셋 파일을 다운받는 함수
     /// </summary>
     /// <param name="msg"> 콜백 메세지 </param>
-    private static void GetDownloadByIdCallBack(Message<AssetFileDownloadResult> msg)
+    private static void GetDownloadByIdCallBack(Message<AssetFileDownloadResult> msg, Action callback)
     {
         if (msg.IsError)
         {

                 if (downloadUpdate.Completed)
                 {
                     // 경로에 파일이 생겼으니 로드하여 사용한다.
+
+
 
                     //AssetFileDownloadResult assetInfo_ = msg.GetAssetFileDownloadResult();
                     //debugTxt.text += $"DownloadAsset : {assetInfo_.Filepath} {assetInfo_.AssetId}" +

         if(assetBundleNum == MMDefine.PARTICLE) { return "ptcl"; }
         return null;
     }
-
 
 }

769b0d8

f9ea3e2

VRTK/Assets/01.Junil/Scenes/00.ModelIkTest.unity

--- VRTK/Assets/01.Junil/Scenes/00.ModelIkTest.unity

+++ VRTK/Assets/01.Junil/Scenes/00.ModelIkTest.unity


     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!21 &11960495
+--- !u!21 &44350371
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

     - _StencilWriteMask: 255
     - _UseUIAlphaClip: 0
     m_Colors:
-    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
+    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
   m_BuildTextureStacks: []
 --- !u!1 &52320011
 GameObject:

   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 52320011}
   m_CullTransparentMesh: 1
---- !u!21 &81467375
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0}
-  m_BuildTextureStacks: []
---- !u!21 &422238552
+--- !u!21 &195577173
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 481761039}
   m_CullTransparentMesh: 1
---- !u!21 &495101009
+--- !u!21 &496267222
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0}
+  m_BuildTextureStacks: []
+--- !u!21 &514692571
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

     m_Colors:
     - _WidthHeightRadius: {r: 55, g: 20, b: 8, a: 0}
   m_BuildTextureStacks: []
---- !u!21 &556651564
+--- !u!21 &557629876
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

     - _StencilWriteMask: 255
     - _UseUIAlphaClip: 0
     m_Colors:
-    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
+    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
   m_BuildTextureStacks: []
 --- !u!1001 &652386251
 PrefabInstance:

   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &671286112
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
-  m_BuildTextureStacks: []
---- !u!21 &672532294
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0}
-  m_BuildTextureStacks: []
 --- !u!1 &820939528
 GameObject:
   m_ObjectHideFlags: 0

   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!21 &888347671
+--- !u!21 &880964246
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 978790871}
   m_CullTransparentMesh: 1
+--- !u!21 &986363492
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &1023990068
 GameObject:
   m_ObjectHideFlags: 0

   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1106052782
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
-  m_BuildTextureStacks: []
 --- !u!1 &1139436975
 GameObject:
   m_ObjectHideFlags: 0

   m_LightCookieSize: {x: 1, y: 1}
   m_LightCookieOffset: {x: 0, y: 0}
   m_SoftShadowQuality: 0
---- !u!21 &1208821483
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
-  m_BuildTextureStacks: []
 --- !u!1 &1260657658
 GameObject:
   m_ObjectHideFlags: 0

   serializedVersion: 6
   m_Component:
   - component: {fileID: 1260657660}
-  - component: {fileID: 1260657659}
+  - component: {fileID: 1260657661}
   m_Layer: 0
   m_Name: Test
   m_TagString: Untagged

   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &1260657659
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1260657658}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fd48fae9c48cc83499aed28fecb2a6e8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  metamotionUI: {fileID: 0}
-  appLoginUI: {fileID: 0}
-  pressTxtObj: {fileID: 0}
-  isNoUpdate: 0
-  isOnClick: 0
-  testTxt: {fileID: 1490548137}
-  anyKeyInput:
-    m_UseReference: 0
-    m_Action:
-      m_Name: Any Key Input
-      m_Type: 0
-      m_ExpectedControlType: 
-      m_Id: 69c89bf9-fc8a-4ee4-8b51-c0d8c394b22b
-      m_Processors: 
-      m_Interactions: 
-      m_SingletonActionBindings: []
-      m_Flags: 0
-    m_Reference: {fileID: 0}
-  loadingManager: {fileID: 0}
-  obbFilePath: /sdcard/Android/obb/com.MetaMotion.VRTk/mqdhtest
 --- !u!4 &1260657660
 Transform:
   m_ObjectHideFlags: 0

   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1281979911
+--- !u!114 &1260657661
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1260657658}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 913aca583fb622d40b40c84ebce91f47, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  nowContent: 0
+  particalObj: {fileID: 0}
+  effectObj: {fileID: 0}
+  test:
+  - m_UseReference: 1
+    m_Action:
+      m_Name: Element 0
+      m_Type: 0
+      m_ExpectedControlType: 
+      m_Id: d968f27a-7c89-4683-8b3e-84f67aab7e11
+      m_Processors: 
+      m_Interactions: 
+      m_SingletonActionBindings: []
+      m_Flags: 0
+    m_Reference: {fileID: 4860515764186564299, guid: e39f4b35a6db18348b41eb0262520e69,
+      type: 3}
+  spriteAtlas: {fileID: 0}
+  image: {fileID: 0}
+  isDownloaded: 0
+--- !u!21 &1289620507
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

     m_Colors:
     - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
   m_BuildTextureStacks: []
---- !u!21 &1354315661
+--- !u!21 &1311389571
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

     - _StencilWriteMask: 255
     - _UseUIAlphaClip: 0
     m_Colors:
-    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
+    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
   m_BuildTextureStacks: []
 --- !u!1 &1375304115
 GameObject:

   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &1412182438
+--- !u!21 &1397594885
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

     - _StencilWriteMask: 255
     - _UseUIAlphaClip: 0
     m_Colors:
-    - _WidthHeightRadius: {r: 55, g: 20, b: 8, a: 0}
+    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
+  m_BuildTextureStacks: []
+--- !u!21 &1406648269
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
   m_BuildTextureStacks: []
 --- !u!1 &1459327236
 GameObject:

   serializedVersion: 6
   m_Component:
   - component: {fileID: 1459327237}
-  - component: {fileID: 1459327239}
   - component: {fileID: 1459327238}
+  - component: {fileID: 1459327240}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged

   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 10
-    m_Right: 10
-    m_Top: 10
-    m_Bottom: 10
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
   m_ChildAlignment: 0
   m_Spacing: 0
   m_ChildForceExpandWidth: 1

   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!114 &1459327239
+--- !u!114 &1459327240
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!21 &1477554418
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
-  m_BuildTextureStacks: []
 --- !u!1 &1490548134
 GameObject:
   m_ObjectHideFlags: 0

   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1492874939}
   m_CullTransparentMesh: 1
+--- !u!21 &1514506780
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0}
+  m_BuildTextureStacks: []
+--- !u!1 &1564624327
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1564624329}
+  - component: {fileID: 1564624328}
+  m_Layer: 0
+  m_Name: Entitlement
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1564624328
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1564624327}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f0f8f3cde43c25b4abe357598ec48a4a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1564624329
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1564624327}
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &1597992833
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &1686366219
 GameObject:
   m_ObjectHideFlags: 0

   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &1820346284
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _WidthHeightRadius: {r: 55, g: 20, b: 8, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &1843438519
 GameObject:
   m_ObjectHideFlags: 0

   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1861891630}
   m_CullTransparentMesh: 1
---- !u!21 &1949174212
+--- !u!21 &1887308933
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0

     - _StencilWriteMask: 255
     - _UseUIAlphaClip: 0
     m_Colors:
-    - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0}
+    - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0}
   m_BuildTextureStacks: []
 --- !u!1 &1951601262
 GameObject:

   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1951601262}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1fc2a484125ad9c45977fdae7a8f3838, type: 3}
   m_Name: 

   - {fileID: 5975180139057207256}
   - {fileID: 1260657660}
   - {fileID: 1951601268}
+  - {fileID: 1564624329}

769b0d8

f9ea3e2

VRTK/Assets/01.Junil/Script/DebugTxtCall.cs

--- VRTK/Assets/01.Junil/Script/DebugTxtCall.cs

+++ VRTK/Assets/01.Junil/Script/DebugTxtCall.cs


 
             return;
         }
-        debugTxt.text = debug;
+        debugTxt.text += debug + "\n";
     }
 
     public void CallDebugTwo(string debug)

769b0d8

f9ea3e2

VRTK/Assets/01.Junil/Script/Test/TestScrpit.cs

--- VRTK/Assets/01.Junil/Script/Test/TestScrpit.cs

+++ VRTK/Assets/01.Junil/Script/Test/TestScrpit.cs


 
 using I2.Loc;
+using Oculus.Platform;
+using Oculus.Platform.Models;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using TMPro;
 using UnityEngine;
 using UnityEngine.InputSystem;

 
 public class TestScrpit : MonoBehaviour
 {
+
+    public enum Contents{
+        None,
+        Taekwondo,
+        Taichi,
+        KPop,
+        Modern
+    }
+
+    [SerializeField] private Contents nowContent;
+
     [Header("Effect")]
     public GameObject particalObj;
     public GameObject effectObj;

     public SpriteAtlas spriteAtlas;
     public Image image;
 
+    public bool isDownloaded = false;
 
     // Start is called before the first frame update
-    void Start()
+    void Awake()
     {
+        AppDataRepo.Instance.Builder();
+        nowContent = Contents.Taekwondo;
 
-        spriteAtlas = Resources.Load<SpriteAtlas>("Atlas/VRSpriteAtlas");
-        image.sprite = spriteAtlas.GetSprite("poomsae5");
+    }
+    private void Start() {
+        isDownloaded = false;
+        AssetFile.GetList().OnComplete(GetAssetBundleCallBack);
+        DebugTxtCall.Instance.CallDebug("AssetFile IN");
     }
 
     private void Update()
     {
         if (test[0].action.WasPressedThisFrame())
         {
-            DebugTxtCall.Instance.CallDebug("menu");
+            StartCoroutine(GetVRAssetBundle("go0003"));
+
         }
 
-        if (test[1].action.WasPressedThisFrame())
-        {
-            DebugTxtCall.Instance.CallDebug("menuBtn");
-        }
+        // if (test[1].action.WasPressedThisFrame())
+        // {
+        //     DebugTxtCall.Instance.CallDebug("menuBtn");
+        // }
 
-        if (test[2].action.WasPressedThisFrame())
-        {
-            DebugTxtCall.Instance.CallDebug("mod");
-        }
+        // if (test[2].action.WasPressedThisFrame())
+        // {
+        //     DebugTxtCall.Instance.CallDebug("mod");
+        // }
 
     }
 

 
     }   // SetCurrentTimeUI
 
-    
+    public void EndDownload(){
+        isDownloaded = true;
+
+        if(File.Exists(MMDefine.FULL_FILE_PATH + "vrtaekwondo_go0003")){
+            DebugTxtCall.Instance.CallDebug($"vrtaekwondo_go0003 EndDownload 있다");
+        }
+        else{
+            DebugTxtCall.Instance.CallDebug($"vrtaekwondo_go0003 EndDownload 없다");
+        }
+    }
+
+
+
+
+/// <summary>
+    ///     앱의 에셋파일 리스트를 각각 파싱하여 파일명을 찾고, AppDataRepo의 assetFileList 구성
+    /// </summary>
+    /// <param name="msg"></param>
+    private void GetAssetBundleCallBack(Message<AssetDetailsList> msg)
+    {
+        if (msg.IsError)
+        {
+            return;
+        }
+
+        string[] units;
+        string fileName;
+        int crucialIdx, i;
+
+        foreach (var ad in msg.GetAssetDetailsList())
+        {
+            units = ad.Filepath.Split("/");
+            fileName = "";
+            crucialIdx = i = 0;
+            for (i = 0; i < units.Length; i++)
+            {
+                if (units[i].CompareTo(MMDefine.PACKAGE_PATH) == 0)
+                {
+                    crucialIdx = i + 1;
+                    break;
+                }
+            }
+            if (crucialIdx < units.Length)
+            {
+                fileName += units[crucialIdx];
+            }
+            for (i = crucialIdx + 1; i < units.Length; i++)
+            {
+                fileName += "/";
+                fileName += units[i];
+            }
+            AppDataRepo.Instance.AddAssetFileUnit(new AssetFileUnitForm(ad.AssetId, fileName, ad.IapStatus, ad.DownloadStatus));
+        }
+
+        DebugTxtCall.Instance.CallDebug("AssetFileList End");
+
+        AppDataRepo.Instance.AssetFileListLoadComplete();
+    }
+
+
+    IEnumerator GetVRAssetBundle(string bundleName)
+    {
+        yield return null;
+        DebugTxtCall.Instance.CallDebug("GetVRAssetBundle IN");
+
+
+        GameObject tempInstructor_ = null;
+        AnimationClip tempClip_ = null;
+
+
+        string tempBundleName_ = string.Empty;
+        // { 현재 컨텐츠를 확인하고 관련 에셋번들 리스트 위치 번호를 가져오는 과정
+        int tempContentNum_ = -1;
+
+        if(nowContent == Contents.Taekwondo){
+            tempContentNum_ = MMDefine.VRTAEKWONDO;
+        }
+        else if(nowContent == Contents.Taichi){
+        }
+        else if(nowContent == Contents.KPop){
+        }
+        else if(nowContent == Contents.Modern){
+        }
+
+        // 이름 규칙에 맞게 여기서 만들기?
+        tempBundleName_ = MMHelper.GetAssetBundleName(tempContentNum_) + $"_{bundleName.ToLower()}";
+        DebugTxtCall.Instance.CallDebug(tempBundleName_);
+
+        if(File.Exists(MMDefine.FULL_FILE_PATH + "vrui_animplay")){
+            DebugTxtCall.Instance.CallDebug("vrui_animplay 파일이 있다");
+
+
+        }
+        if(File.Exists(MMDefine.FULL_FILE_PATH + "vrmap_lobby01")){
+            DebugTxtCall.Instance.CallDebug("vrmap_lobby01 파일이 있다");
+
+
+        }
+        
+        // 먼저 로컬에 강사 파일이 있는지 확인 후 없으면 다운
+        if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){
+            DebugTxtCall.Instance.CallDebug("파일이 있다?");
+
+
+        }
+        else{
+            DebugTxtCall.Instance.CallDebug("파일이 없다 당연");
+
+            DebugTxtCall.Instance.CallDebug("코루틴 시작"+ DateTime.Now);
+
+            // 관련 파일이 없어 에셋번들을 다운받아야할 경우
+            yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, EndDownload));
+            DebugTxtCall.Instance.CallDebug("코루틴 끝" + DateTime.Now);
+
+            // yield return isDownloaded == true;
+            // isDownloaded = false;
+
+            //yield return StartCoroutine(MMHelper.AsyncLoader(tempBundleName_));        
+
+        }
+
+       
+
+        // string[] tempName_ = tempBundleName_.Split("_");
+
+        // yield return StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>(tempName_[0], tempName_[tempName_.Length - 1],
+        //     callBack => {
+        //         tempInstructor_ = callBack;
+        // }));  
+
+
+    }
 }

769b0d8

f9ea3e2

VRTK/Assets/VRRes/VRUI/00.Prefab/VRUI_KPop.prefab.meta

--- VRTK/Assets/VRRes/VRUI/00.Prefab/VRUI_KPop.prefab.meta

+++ VRTK/Assets/VRRes/VRUI/00.Prefab/VRUI_KPop.prefab.meta


 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: vrui/vrui_kpop
+  assetBundleName: 
   assetBundleVariant: 

769b0d8

f9ea3e2

VRTK/Assets/VRRes/VRUI/00.Prefab/vrui.prefab

--- VRTK/Assets/VRRes/VRUI/00.Prefab/vrui.prefab

+++ VRTK/Assets/VRRes/VRUI/00.Prefab/vrui.prefab

This diff is too big to display.

769b0d8

f9ea3e2

VRTK/ProjectSettings/EditorBuildSettings.asset

--- VRTK/ProjectSettings/EditorBuildSettings.asset

+++ VRTK/ProjectSettings/EditorBuildSettings.asset


   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
+  - enabled: 0
     path: Assets/00.MAINSTREAM/Scenes/InitScene.unity
     guid: 5f4f9138efe79d1448dc037a021875be
-  - enabled: 1
+  - enabled: 0
     path: Assets/00.MAINSTREAM/Scenes/PlayScene.unity
     guid: 14ff1613d7e77bb4baa1d0c0a984254f
-  - enabled: 0
+  - enabled: 1
     path: Assets/01.Junil/Scenes/00.ModelIkTest.unity
     guid: dbe716d95baf0b1479d449c3ff9538fc
   - enabled: 0

769b0d8

f9ea3e2

VRTK/ProjectSettings/ProjectSettings.asset

--- VRTK/ProjectSettings/ProjectSettings.asset

+++ VRTK/ProjectSettings/ProjectSettings.asset


     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 167
+  AndroidBundleVersionCode: 181
   AndroidMinSdkVersion: 29
   AndroidTargetSdkVersion: 32
   AndroidPreferredInstallLocation: 0

Add a comment

Open 0
Closed 0

List

...	...	@@ -225,7 +225,7 @@
225	225	iPhone: 0
226	226	tvOS: 0
227	227	overrideDefaultApplicationIdentifier: 1
228		- AndroidBundleVersionCode: 167
	228	+ AndroidBundleVersionCode: 181
229	229	AndroidMinSdkVersion: 29
230	230	AndroidTargetSdkVersion: 32
231	231	AndroidPreferredInstallLocation: 0

...	...	@@ -26,8 +26,8 @@
26	26	get { return isOut; }
27	27	}
28	28
29		- [SerializeField] private Vector3 clickPos;
30		- [SerializeField] private float scrollRectPosX = 0f;
	29	+ [SerializeField] private Vector3 clickPos; // 클릭 위치 포인터
	30	+ [SerializeField] private float scrollRectPosX = 0f; // 강사 위치 틀 처음 위치
31	31
32	32
33	33

...	...	@@ -8,6 +8,10 @@
8	8	using System;
9	9	using System.Collections;
10	10	using System.Collections.Generic;
	11	+using System.Drawing.Text;
	12	+using System.IO;
	13	+using Unity.VisualScripting;
	14	+using UnityEditor.Localization.Plugins.XLIFF.V20;
11	15	using UnityEngine;
12	16	using UnityEngine.InputSystem;
13	17
...	...	@@ -34,7 +38,7 @@
34	38	[SerializeField] private UIMainView nowUIMainView;
35	39	[SerializeField] private InputActionProperty backMenuButton;
36	40
37		-
	41	+ private bool isDown = false;
38	42	[SerializeField] private int nowSelectId; // 선택된 id
39	43	public int NowSelectId{
40	44	get{ return nowSelectId; }
...	...	@@ -65,6 +69,7 @@
65	69
66	70	private List<GameObject> createInstructorObjs; // 만들어진 코치 오브젝트를 전부 보관하는 리스트
67	71
	72	+ private List<AnimationClip> tkAnimClips;
68	73
69	74	#region 00.Content
70	75	[Header("00.Content")]
...	...	@@ -182,6 +187,7 @@
182	187	nowContent = Contents.None; // 아무것도 선택되지 않은 상태
183	188	popUp = transform.Find("Popup").gameObject;
184	189	instructorObjs = new List<GameObject>();
	190	+ tkAnimClips = new List<AnimationClip>();
185	191	UserDataRepo.Instance.VRUIManager = this;
186	192	}
187	193
...	...	@@ -218,13 +224,20 @@
218	224	UserDataRepo.Instance.VRAnimController.ChangeAnimState(selectMode);
219	225	UserDataRepo.Instance.VRAnimController.IsEffect = false;
220	226
221		- //StartCoroutine(GetVRAssetBundle(NowSelectBundleName, NowSelectAnim));
	227	+ StartCoroutine(GetVRAssetInstructor(NowSelectBundleName));
222	228	} // SetTkPlay
223	229
224		- // bundleName은 모델명 이름이다
225		- IEnumerator GetVRAssetBundle(string bundleName, string clipName)
	230	+
	231	+ /// <summary>
	232	+ /// 강사 에셋번들을 가져오는 코루틴
	233	+ /// </summary>
	234	+ /// <param name="bundleName"></param>
	235	+ /// <returns></returns>
	236	+ IEnumerator GetVRAssetInstructor(string bundleName)
226	237	{
227	238	yield return null;
	239	+ DebugTxtCall.Instance.CallDebug("GetVRAssetInstructor IN");
	240	+
228	241	if(0 < instructorObjs.Count) {
229	242	foreach(var obj in instructorObjs) {
230	243	obj.SetActive(false);
...	...	@@ -234,122 +247,89 @@
234	247	instructorObjs.Clear();
235	248	}
236	249
237		-
238		- AnimationClip tempClip_ = null;
	250	+
	251	+ string tempBundleName_ = MakeBundleName(bundleName, false);
239	252
240	253
241		- string tempBundleName_ = string.Empty;
242		- // { 현재 컨텐츠를 확인하고 관련 에셋번들 리스트 위치 번호를 가져오는 과정
243		- int tempContentNum_ = -1;
	254	+ // 먼저 로컬에 강사 파일이 있는지 확인 후 없으면 다운
	255	+ if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){
	256	+ // 로드 된게 있는지 확인
	257	+ if(AssetBundleRepo.Instance.GetAssetBundleList(NowContentInt()).Find(x => x.name == tempBundleName_)){
	258	+ StartCoroutine(GetVRAnim(NowSelectBundleName));
	259	+ }
	260	+ else{
	261	+ //yield return StartCoroutine(MMHelper.AsyncLoader(tempBundleName_));
244	262
245		- if(nowContent == Contents.Taekwondo){
246		- tempContentNum_ = MMDefine.VRTAEKWONDO;
	263	+ LoadVRAssetInstructor();
	264	+ }
	265	+
247	266	}
248		- else if(nowContent == Contents.Taichi){
	267	+ else{
	268	+
	269	+ // 관련 파일이 없어 에셋번들을 다운받아야할 경우
	270	+ yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, LoadVRAssetInstructor));
	271	+
249	272	}
250		- else if(nowContent == Contents.KPop){
251		- }
252		- else if(nowContent == Contents.Modern){
253		- }
	273	+ }
254	274
255		- tempBundleName_ += MMHelper.GetAssetBundleName(tempContentNum_) + $"{bundleName.ToLower()}clip";
	275	+ private void LoadVRAssetInstructor(){
	276	+ StartCoroutine(LoadInstructor(NowSelectBundleName));
	277	+ }
256	278
257		- // 이름 규칙에 맞게 여기서 만들기?
	279	+ /// <summary>
	280	+ /// 에셋번들 로드
	281	+ /// </summary>
	282	+ /// <param name="bundleName"></param>
	283	+ private IEnumerator LoadInstructor(string bundleName) {
	284	+ // 에셋번들 로드하고 리스트에 넣어두고
	285	+ yield return StartCoroutine(MMHelper.AsyncLoader(bundleName));
	286	+
	287	+ // 클립 로드하러 간다.
	288	+ StartCoroutine(GetVRAnim(NowSelectBundleName));
	289	+ }
	290	+
	291	+ private IEnumerator GetVRAnim(string bundleName){
	292	+ string tempBundleName_ = MakeBundleName(bundleName, true);
258	293
259	294
	295	+ // 먼저 로컬에 강사 애니메이션 클립 파일이 있는지 확인 후 없으면 다운
	296	+ if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){
	297	+ // 로드 된게 있는지 확인
	298	+ if(AssetBundleRepo.Instance.GetAssetBundleList(NowContentInt()).Find(x => x.name == tempBundleName_)){
260	299
261		- //클립 번들이 있는지 확인
262		- if(AssetBundleRepo.Instance.GetAssetBundleList(tempContentNum_).Find(x => x.name == tempBundleName_)){
263		- // 관련 파일이 있을 경우
	300	+ }
	301	+ else{
	302	+ LoadVRAssetAnim();
	303	+ }
264	304	}
265	305	else{
266	306	// 관련 파일이 없어 에셋번들을 다운받아야할 경우
267		- //MMHelper.DownloadAssetFile(tempBundleName_);
	307	+ yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, LoadVRAssetAnim));
268	308	}
	309	+ }
269	310
270	311
	312	+ private void LoadVRAssetAnim(){
	313	+ StartCoroutine(LoadAnim(NowSelectBundleName, NowSelectAnim));
	314	+ }
271	315
272		- // if (AssetBundleDataManager.Instance.vrtaekwondoBundles.Find(x => x.name == $"vrtaekwondo/{bundleName.ToLower()}clip"))
273		- // {
274		- // // 여기서 따로 저장된 클립이 있다면 가져온다
275		- // if (tkAnimClips.ContainsKey($"vrtaekwondo/{bundleName.ToLower()}{clipName.ToLower()}"))
276		- // {
277		- // tempClip_ = tkAnimClips[$"vrtaekwondo/{bundleName.ToLower()}{clipName.ToLower()}"];
278		- // }
279		- // else
280		- // {
281		- // // 필요한 파일을 꺼낸다.
282		- // yield return StartCoroutine(AssetBundleDataManager.Instance.GetAssetBundleClip($"vrtaekwondo/{bundleName.ToLower()}clip", clipName, clip =>
283		- // {
284		- // tempClip_ = clip;
285		- // }));
286		- // }
	316	+ private IEnumerator LoadAnim(string bundleName, string clipName)
	317	+ {
	318	+ yield return StartCoroutine(MMHelper.AsyncLoader(bundleName + "clip"));
287	319
288		- // // 필요한 파일을 꺼낸다.
289		- // yield return StartCoroutine(AssetBundleDataManager.Instance.GetAssetBundleClip($"vrtaekwondo/{coachName.ToLower()}clip", clipName, clip =>
290		- // {
291		- // tempClip_ = clip;
292		- // }));
293		- // }
294		- // else
295		- // {
296		- // yield return StartCoroutine(NetworkManager.Instance.GetAssetBundleAnim($"vrtaekwondo/{bundleName.ToLower()}clip", clipName, clip =>
297		- // {
298		- // tempClip_ = clip;
299		- // }));
300		- // }
	320	+ // 강사 클립 둘다 로드했으니 이제 꺼내자
	321	+ GameObject tempInstructor_ = null;
	322	+ AnimationClip tempAnimClip_ = null;
301	323
302		- // // 새로운 클립을 Dict에 넣어준다 / {코치 이름} + {클립 이름} 키값으로
303		- // if (!tkAnimClips.ContainsKey($"vrtaekwondo/{coachName.ToLower()}{clipName.ToLower()}"))
304		- // {
305		- // tkAnimClips.Add($"vrtaekwondo/{coachName.ToLower()}{clipName.ToLower()}", tempClip_);
306		- // }
	324	+ yield return StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>("vrtaekwondo", NowSelectBundleName, callback => {
	325	+ tempInstructor_ = callback;
	326	+ }));
307	327
308		- // // 코치 오브젝트 생성
309		- // GameObject tempCoach_ = null;
	328	+ yield return StartCoroutine(MMHelper.GetAssetObjAsync<AnimationClip>("vrtaekwondo", NowSelectBundleName + "clip", callback => {
	329	+ tempAnimClip_ = callback;
	330	+ }));
310	331
311		-
312		- // if(AssetBundleDataManager.Instance.vrtaekwondoBundles.Find(x => x.name == $"vrtaekwondo/{coachName.ToLower()}"))
313		- // {
314		- // if(tkCreateCoachObjs.Find(x => x.name == $"{coachName}"))
315		- // {
316		- // int tempIndex_ = tkCreateCoachObjs.FindIndex(x => x.name == $"{coachName}");
317		-
318		- // tkCoachObjs.Clear();
319		- // // 4회 반복한다.
320		- // for(int i = 0; i < 4; i++)
321		- // {
322		- // tkCoachObjs.Add(tkCreateCoachObjs[tempIndex_]);
323		- // tkCreateCoachObjs.Remove(tkCreateCoachObjs[tempIndex_]);
324		- // }
325		-
326		- // tempCoach_ = tkCoachObjs[0];
327		- // }
328		- // else
329		- // {
330		- // // 필요한 파일을 꺼낸다.
331		- // yield return StartCoroutine(AssetBundleDataManager.Instance.GetAssetObj<GameObject>("vrtaekwondo", coachName, bundle =>
332		- // {
333		- // tempCoach_ = (GameObject)bundle;
334		- // }));
335		- // }
336		-
337		-
338		- // }
339		- // else
340		- // {
341		- // yield return StartCoroutine(NetworkManager.Instance.GetAssetBundleObj<GameObject>(coachName, coach =>
342		- // {
343		- // tempCoach_ = coach;
344		- // }));
345		-
346		- // }
347		-
348		- // // [Junil] 24/03/28 - PlayMap 추가
349		- // uiManager.mapChange.ChangePlayMap(string.Empty);
350		- // uiManager.mapChange.AllOffMapLobby();
351		-
352		- // ShowVRTkAnim(tempCoach_, tempClip_);
	332	+ ShowVRTkAnim(tempInstructor_, tempAnimClip_);
353	333	}
354	334
355	335
...	...	@@ -442,6 +422,42 @@
442	422	ChangeMainUI(false);
443	423	}
444	424
	425	+ private int NowContentInt() {
	426	+ int tempContentNum_ = -1;
	427	+
	428	+ if(nowContent == Contents.Taekwondo){
	429	+ tempContentNum_ = MMDefine.VRTAEKWONDO;
	430	+ }
	431	+ else if(nowContent == Contents.Taichi){
	432	+ }
	433	+ else if(nowContent == Contents.KPop){
	434	+ }
	435	+ else if(nowContent == Contents.Modern){
	436	+ }
	437	+
	438	+ return tempContentNum_;
	439	+ }
	440	+
	441	+ /// <summary>
	442	+ /// 번들 이름을 보내면 에셋번들 이름을 만들어서 반환해주는 함수
	443	+ /// </summary>
	444	+ /// <param name="bundleName"></param>
	445	+ /// <param name="isAnim"> true면 clip이 추가로 붙고, false면 패스 </param>
	446	+ /// <returns></returns>
	447	+ private string MakeBundleName(string bundleName, bool isAnim){
	448	+
	449	+ string tempBundleName_ = string.Empty;
	450	+ // { 현재 컨텐츠를 확인하고 관련 에셋번들 리스트 위치 번호를 가져오는 과정
	451	+
	452	+ tempBundleName_ = MMHelper.GetAssetBundleName(NowContentInt()) + $"_{bundleName.ToLower()}";
	453	+
	454	+ if(isAnim){
	455	+ tempBundleName_ += "clip";
	456	+ }
	457	+
	458	+ return tempBundleName_;
	459	+ }
	460	+
445	461	public void SetInputKey(InputActionProperty backBtn)
446	462	{
447	463	backMenuButton = backBtn;

...	...	@@ -1,9 +1,11 @@
1	1	using System;
2	2	using System.Collections;
	3	+using System.IO;
3	4	using Oculus.Platform;
4	5	using Oculus.Platform.Models;
5	6	using Unity.VisualScripting;
6	7	using UnityEngine;
	8	+using UnityEngine.Events;
7	9	using UnityEngine.SceneManagement;
8	10	using UnityEngine.U2D;
9	11	using UnityEngine.UI;
...	...	@@ -63,7 +65,7 @@
63	65	/// <param name="useObjName"></param>
64	66	/// <param name="callback"></param>
65	67	/// <returns></returns>
66		- public static IEnumerator GetAssetObjAsync<T>(string bundleName, string useObjName, Action<GameObject> callback)
	68	+ public static IEnumerator GetAssetObjAsync<T>(string bundleName, string useObjName, Action<T> callback)
67	69	{
68	70	int tempCaseNum_ = 0;
69	71	int tempNumber_ = 0;
...	...	@@ -102,11 +104,21 @@
102	104	yield return reqAsset_.isDone;
103	105	Debug.LogError(reqAsset_.asset);
104	106
105		- GameObject tempObj_ = (GameObject)reqAsset_.asset;
	107	+ T tempObj_ = reqAsset_.asset.GetComponent<T>();
	108	+
106	109	#if UNITY_EDITOR
107		- AssetBundleEditorUtil.FixShadersForEditor(tempObj_);
108		-#endif
	110	+ // tempObj_가 GameObject 형식인지 확인하고 반환
	111	+ GameObject tempCheck_ = tempObj_ as GameObject;
	112	+ if(tempCheck_ != null) {
	113	+ AssetBundleEditorUtil.FixShadersForEditor(tempCheck_);
	114	+
	115	+ tempObj_ = tempCheck_.GetComponent<T>();
	116	+
	117	+ callback(tempObj_);
	118	+ }
	119	+#else
109	120	callback(tempObj_);
	121	+#endif
110	122
111	123	}
112	124
...	...	@@ -116,20 +128,20 @@
116	128	/// 파일 이름을 받아서 해당 파일 에셋을 다운로드 처리
117	129	/// </summary>
118	130	/// <param name="fileName"> 다운로드 받을 파일명 </param>
119		- public static IEnumerator DownloadAssetFile(string fileName, Action<AnimationClip> callback)
	131	+ public static IEnumerator DownloadAssetFile(string fileName, Action callss)
120	132	{
121	133	int tempAssetIndex_ = AppDataRepo.Instance.GetAssetFileList().FindIndex(a => a.fileName == fileName);
122		-
123		- yield return AssetFile.DownloadById(AppDataRepo.Instance.GetAssetFileList()[tempAssetIndex_].assetId).OnComplete(callback =>{
124		- if (callback.IsError) {
125		- return;
	134	+
	135	+ yield return AssetFile.DownloadById(AppDataRepo.Instance.GetAssetFileList()[tempAssetIndex_].assetId).OnComplete( callback =>{
	136	+ if (callback.IsError)
	137	+ {
	138	+ return;
126	139	}
127	140
128	141	// 에셋 파일의 다운로드 진행 사황을 나타내기 위해서 사용
129	142	AssetFile.SetDownloadUpdateNotificationCallback(call =>
130	143	{
131	144	AssetFileDownloadUpdate downloadUpdate = call.GetAssetFileDownloadUpdate();
132		-
133	145
134	146	if (downloadUpdate != null)
135	147	{
...	...	@@ -139,26 +151,78 @@
139	151	if (downloadUpdate.Completed)
140	152	{
141	153	// 경로에 파일이 생겼으니 로드하여 사용한다.
142		-
	154	+ if(File.Exists(callback.GetAssetFileDownloadResult().Filepath)){
	155	+ DebugTxtCall.Instance.CallDebug($"{callback.GetAssetFileDownloadResult().Filepath} 있다!");
	156	+ }
	157	+ else{
	158	+ DebugTxtCall.Instance.CallDebug($"{callback.GetAssetFileDownloadResult().Filepath} 없어!!");
	159	+ }
	160	+
	161	+ callss();
	162	+ //AssetFileDownloadResult assetInfo_ = msg.GetAssetFileDownloadResult();
	163	+ //debugTxt.text += $"DownloadAsset : {assetInfo_.Filepath} {assetInfo_.AssetId}" +
	164	+ //$" AssetFileDownloadResult : {File.Exists(assetInfo_.Filepath)}" +
	165	+ //$" path : {File.Exists(Define.FULL_FILE_PATH + AppDataRepo.Instance.assetBundleDataList.Find(x => x.fileName == "TAEKWONDO_initList_DLC.json").fileName)}\n";
143	166	}
144	167	}
145	168	else
146	169	{
147		- //debugTxt.text += "SetDownloadUpdateNotificationCallback null";
	170	+ //debugTxt.text += "SetDownloadUpdateNotificationCallback null";
148	171	}
149	172	});
150		-
151		-
	173	+
152	174	});
153		-
	175	+
	176	+ if(File.Exists(MMDefine.FULL_FILE_PATH + fileName)){
	177	+ Debug.Log("있다");
	178	+ }
	179	+
	180	+
	181	+
	182	+ // yield return AssetFile.DownloadById(AppDataRepo.Instance.GetAssetFileList()[tempAssetIndex_].assetId).OnComplete(msg => {
	183	+ // if (msg.IsError)
	184	+ // {
	185	+ // return;
	186	+ // }
	187	+
	188	+ // // 에셋 파일의 다운로드 진행 사황을 나타내기 위해서 사용
	189	+ // AssetFile.SetDownloadUpdateNotificationCallback(call =>
	190	+ // {
	191	+ // AssetFileDownloadUpdate downloadUpdate = call.GetAssetFileDownloadUpdate();
	192	+
	193	+
	194	+ // if (downloadUpdate != null)
	195	+ // {
	196	+ // //debugTxt.text += $"{downloadUpdate.AssetId} trans {downloadUpdate.BytesTransferred} total {downloadUpdate.BytesTotal}";
	197	+
	198	+ // // 에셋 파일의 다운로드가 완료되었다면 실행
	199	+ // if (downloadUpdate.Completed)
	200	+ // {
	201	+ // // 경로에 파일이 생겼으니 로드하여 사용한다.
	202	+ // //callback();
	203	+
	204	+ // //AssetFileDownloadResult assetInfo_ = msg.GetAssetFileDownloadResult();
	205	+ // //debugTxt.text += $"DownloadAsset : {assetInfo_.Filepath} {assetInfo_.AssetId}" +
	206	+ // //$" AssetFileDownloadResult : {File.Exists(assetInfo_.Filepath)}" +
	207	+ // //$" path : {File.Exists(Define.FULL_FILE_PATH + AppDataRepo.Instance.assetBundleDataList.Find(x => x.fileName == "TAEKWONDO_initList_DLC.json").fileName)}\n";
	208	+ // }
	209	+ // }
	210	+ // else
	211	+ // {
	212	+ // //debugTxt.text += "SetDownloadUpdateNotificationCallback null";
	213	+ // }
	214	+ // });
	215	+ // });
	216	+
154	217
155	218	}
	219	+
156	220
157	221	/// <summary>
158	222	/// message를 받아서 관련 에셋 파일을 다운받는 함수
159	223	/// </summary>
160	224	/// <param name="msg"> 콜백 메세지 </param>
161		- private static void GetDownloadByIdCallBack(Message<AssetFileDownloadResult> msg)
	225	+ private static void GetDownloadByIdCallBack(Message<AssetFileDownloadResult> msg, Action callback)
162	226	{
163	227	if (msg.IsError)
164	228	{
...	...	@@ -179,6 +243,8 @@
179	243	if (downloadUpdate.Completed)
180	244	{
181	245	// 경로에 파일이 생겼으니 로드하여 사용한다.
	246	+
	247	+
182	248
183	249	//AssetFileDownloadResult assetInfo_ = msg.GetAssetFileDownloadResult();
184	250	//debugTxt.text += $"DownloadAsset : {assetInfo_.Filepath} {assetInfo_.AssetId}" +
...	...	@@ -280,6 +346,5 @@
280	346	if(assetBundleNum == MMDefine.PARTICLE) { return "ptcl"; }
281	347	return null;
282	348	}
283		-
284	349
285	350	}

...	...	@@ -59,7 +59,7 @@
59	59
60	60	return;
61	61	}
62		- debugTxt.text = debug;
	62	+ debugTxt.text += debug + "\n";
63	63	}
64	64
65	65	public void CallDebugTwo(string debug)

...	...	@@ -1,8 +1,11 @@
1	1
2	2	using I2.Loc;
	3	+using Oculus.Platform;
	4	+using Oculus.Platform.Models;
3	5	using System;
4	6	using System.Collections;
5	7	using System.Collections.Generic;
	8	+using System.IO;
6	9	using TMPro;
7	10	using UnityEngine;
8	11	using UnityEngine.InputSystem;
...	...	@@ -11,6 +14,17 @@
11	14
12	15	public class TestScrpit : MonoBehaviour
13	16	{
	17	+
	18	+ public enum Contents{
	19	+ None,
	20	+ Taekwondo,
	21	+ Taichi,
	22	+ KPop,
	23	+ Modern
	24	+ }
	25	+
	26	+ [SerializeField] private Contents nowContent;
	27	+
14	28	[Header("Effect")]
15	29	public GameObject particalObj;
16	30	public GameObject effectObj;
...	...	@@ -20,31 +34,38 @@
20	34	public SpriteAtlas spriteAtlas;
21	35	public Image image;
22	36
	37	+ public bool isDownloaded = false;
23	38
24	39	// Start is called before the first frame update
25		- void Start()
	40	+ void Awake()
26	41	{
	42	+ AppDataRepo.Instance.Builder();
	43	+ nowContent = Contents.Taekwondo;
27	44
28		- spriteAtlas = Resources.Load<SpriteAtlas>("Atlas/VRSpriteAtlas");
29		- image.sprite = spriteAtlas.GetSprite("poomsae5");
	45	+ }
	46	+ private void Start() {
	47	+ isDownloaded = false;
	48	+ AssetFile.GetList().OnComplete(GetAssetBundleCallBack);
	49	+ DebugTxtCall.Instance.CallDebug("AssetFile IN");
30	50	}
31	51
32	52	private void Update()
33	53	{
34	54	if (test[0].action.WasPressedThisFrame())
35	55	{
36		- DebugTxtCall.Instance.CallDebug("menu");
	56	+ StartCoroutine(GetVRAssetBundle("go0003"));
	57	+
37	58	}
38	59
39		- if (test[1].action.WasPressedThisFrame())
40		- {
41		- DebugTxtCall.Instance.CallDebug("menuBtn");
42		- }
	60	+ // if (test[1].action.WasPressedThisFrame())
	61	+ // {
	62	+ // DebugTxtCall.Instance.CallDebug("menuBtn");
	63	+ // }
43	64
44		- if (test[2].action.WasPressedThisFrame())
45		- {
46		- DebugTxtCall.Instance.CallDebug("mod");
47		- }
	65	+ // if (test[2].action.WasPressedThisFrame())
	66	+ // {
	67	+ // DebugTxtCall.Instance.CallDebug("mod");
	68	+ // }
48	69
49	70	}
50	71
...	...	@@ -56,5 +77,136 @@
56	77
57	78	} // SetCurrentTimeUI
58	79
59		-
	80	+ public void EndDownload(){
	81	+ isDownloaded = true;
	82	+
	83	+ if(File.Exists(MMDefine.FULL_FILE_PATH + "vrtaekwondo_go0003")){
	84	+ DebugTxtCall.Instance.CallDebug($"vrtaekwondo_go0003 EndDownload 있다");
	85	+ }
	86	+ else{
	87	+ DebugTxtCall.Instance.CallDebug($"vrtaekwondo_go0003 EndDownload 없다");
	88	+ }
	89	+ }
	90	+
	91	+
	92	+
	93	+
	94	+/// <summary>
	95	+ /// 앱의 에셋파일 리스트를 각각 파싱하여 파일명을 찾고, AppDataRepo의 assetFileList 구성
	96	+ /// </summary>
	97	+ /// <param name="msg"></param>
	98	+ private void GetAssetBundleCallBack(Message<AssetDetailsList> msg)
	99	+ {
	100	+ if (msg.IsError)
	101	+ {
	102	+ return;
	103	+ }
	104	+
	105	+ string[] units;
	106	+ string fileName;
	107	+ int crucialIdx, i;
	108	+
	109	+ foreach (var ad in msg.GetAssetDetailsList())
	110	+ {
	111	+ units = ad.Filepath.Split("/");
	112	+ fileName = "";
	113	+ crucialIdx = i = 0;
	114	+ for (i = 0; i < units.Length; i++)
	115	+ {
	116	+ if (units[i].CompareTo(MMDefine.PACKAGE_PATH) == 0)
	117	+ {
	118	+ crucialIdx = i + 1;
	119	+ break;
	120	+ }
	121	+ }
	122	+ if (crucialIdx < units.Length)
	123	+ {
	124	+ fileName += units[crucialIdx];
	125	+ }
	126	+ for (i = crucialIdx + 1; i < units.Length; i++)
	127	+ {
	128	+ fileName += "/";
	129	+ fileName += units[i];
	130	+ }
	131	+ AppDataRepo.Instance.AddAssetFileUnit(new AssetFileUnitForm(ad.AssetId, fileName, ad.IapStatus, ad.DownloadStatus));
	132	+ }
	133	+
	134	+ DebugTxtCall.Instance.CallDebug("AssetFileList End");
	135	+
	136	+ AppDataRepo.Instance.AssetFileListLoadComplete();
	137	+ }
	138	+
	139	+
	140	+ IEnumerator GetVRAssetBundle(string bundleName)
	141	+ {
	142	+ yield return null;
	143	+ DebugTxtCall.Instance.CallDebug("GetVRAssetBundle IN");
	144	+
	145	+
	146	+ GameObject tempInstructor_ = null;
	147	+ AnimationClip tempClip_ = null;
	148	+
	149	+
	150	+ string tempBundleName_ = string.Empty;
	151	+ // { 현재 컨텐츠를 확인하고 관련 에셋번들 리스트 위치 번호를 가져오는 과정
	152	+ int tempContentNum_ = -1;
	153	+
	154	+ if(nowContent == Contents.Taekwondo){
	155	+ tempContentNum_ = MMDefine.VRTAEKWONDO;
	156	+ }
	157	+ else if(nowContent == Contents.Taichi){
	158	+ }
	159	+ else if(nowContent == Contents.KPop){
	160	+ }
	161	+ else if(nowContent == Contents.Modern){
	162	+ }
	163	+
	164	+ // 이름 규칙에 맞게 여기서 만들기?
	165	+ tempBundleName_ = MMHelper.GetAssetBundleName(tempContentNum_) + $"_{bundleName.ToLower()}";
	166	+ DebugTxtCall.Instance.CallDebug(tempBundleName_);
	167	+
	168	+ if(File.Exists(MMDefine.FULL_FILE_PATH + "vrui_animplay")){
	169	+ DebugTxtCall.Instance.CallDebug("vrui_animplay 파일이 있다");
	170	+
	171	+
	172	+ }
	173	+ if(File.Exists(MMDefine.FULL_FILE_PATH + "vrmap_lobby01")){
	174	+ DebugTxtCall.Instance.CallDebug("vrmap_lobby01 파일이 있다");
	175	+
	176	+
	177	+ }
	178	+
	179	+ // 먼저 로컬에 강사 파일이 있는지 확인 후 없으면 다운
	180	+ if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){
	181	+ DebugTxtCall.Instance.CallDebug("파일이 있다?");
	182	+
	183	+
	184	+ }
	185	+ else{
	186	+ DebugTxtCall.Instance.CallDebug("파일이 없다 당연");
	187	+
	188	+ DebugTxtCall.Instance.CallDebug("코루틴 시작"+ DateTime.Now);
	189	+
	190	+ // 관련 파일이 없어 에셋번들을 다운받아야할 경우
	191	+ yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, EndDownload));
	192	+ DebugTxtCall.Instance.CallDebug("코루틴 끝" + DateTime.Now);
	193	+
	194	+ // yield return isDownloaded == true;
	195	+ // isDownloaded = false;
	196	+
	197	+ //yield return StartCoroutine(MMHelper.AsyncLoader(tempBundleName_));
	198	+
	199	+ }
	200	+
	201	+
	202	+
	203	+ // string[] tempName_ = tempBundleName_.Split("_");
	204	+
	205	+ // yield return StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>(tempName_[0], tempName_[tempName_.Length - 1],
	206	+ // callBack => {
	207	+ // tempInstructor_ = callBack;
	208	+ // }));
	209	+
	210	+
	211	+ }
60	212	}

...	...	@@ -3,5 +3,5 @@
3	3	PrefabImporter:
4	4	externalObjects: {}
5	5	userData:
6		- assetBundleName: vrui/vrui_kpop
	6	+ assetBundleName:
7	7	assetBundleVariant:

...	...	@@ -5,13 +5,13 @@
5	5	m_ObjectHideFlags: 0
6	6	serializedVersion: 2
7	7	m_Scenes:
8		- - enabled: 1
	8	+ - enabled: 0
9	9	path: Assets/00.MAINSTREAM/Scenes/InitScene.unity
10	10	guid: 5f4f9138efe79d1448dc037a021875be
11		- - enabled: 1
	11	+ - enabled: 0
12	12	path: Assets/00.MAINSTREAM/Scenes/PlayScene.unity
13	13	guid: 14ff1613d7e77bb4baa1d0c0a984254f
14		- - enabled: 0
	14	+ - enabled: 1
15	15	path: Assets/01.Junil/Scenes/00.ModelIkTest.unity
16	16	guid: dbe716d95baf0b1479d449c3ff9538fc
17	17	- enabled: 0

Delete comment