diff --git a/Assets/01_Scenes/_TestScenes/Test1.unity b/Assets/01_Scenes/_TestScenes/Test1.unity index 7982729e..14c30189 100644 --- a/Assets/01_Scenes/_TestScenes/Test1.unity +++ b/Assets/01_Scenes/_TestScenes/Test1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26d1fff35b564242e4831cce2cf4d21b4c4c8eafb7f2e0ed0ff285b37d1a7a7a -size 30916 +oid sha256:3fea4eb5be439c8f75c286c93edf37c5cfb62da48588e9556c3aa5a5c9f30640 +size 30710 diff --git a/Assets/04_Models/Characters/ToonCharacterModular/Animations/Expressions/CharacterCreatorCTRL.controller b/Assets/04_Models/Characters/ToonCharacterModular/Animations/Expressions/CharacterCreatorCTRL.controller index f8fc336f..d61098ea 100644 --- a/Assets/04_Models/Characters/ToonCharacterModular/Animations/Expressions/CharacterCreatorCTRL.controller +++ b/Assets/04_Models/Characters/ToonCharacterModular/Animations/Expressions/CharacterCreatorCTRL.controller @@ -247,7 +247,7 @@ AnimatorController: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CharacterCreatorCTRL - serializedVersion: 6 + serializedVersion: 5 m_AnimatorParameters: - m_Name: Stance m_Type: 1 @@ -310,7 +310,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - m_EvaluateTransitionsOnStart: 0 --- !u!1101 &206217660855083348 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -447,7 +446,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1107 &4760054131638637629 AnimatorStateMachine: - serializedVersion: 7 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -604,7 +603,7 @@ BlendTree: m_BlendType: 0 --- !u!1107 &6170660395283963564 AnimatorStateMachine: - serializedVersion: 7 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -687,7 +686,7 @@ AnimatorState: m_TimeParameter: --- !u!1107 &7802577738825142542 AnimatorStateMachine: - serializedVersion: 7 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} diff --git a/Assets/04_Models/Characters/Yuna_V2/Meshes/Yuna_V2_Mesh.asset b/Assets/04_Models/Characters/Yuna_V2/Meshes/Yuna_V2_Mesh.asset deleted file mode 100644 index 11538516..00000000 --- a/Assets/04_Models/Characters/Yuna_V2/Meshes/Yuna_V2_Mesh.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4514050c30e7d1ba6f0993067062316bb25f0e372b0bbeb878776d1ccee3e51 -size 8929296 diff --git a/Assets/04_Models/Characters/Yuna_V2/Prefabs/Yuna_V2.prefab b/Assets/04_Models/Characters/Yuna_V2/Prefabs/Yuna_V2.prefab deleted file mode 100644 index 927423cb..00000000 --- a/Assets/04_Models/Characters/Yuna_V2/Prefabs/Yuna_V2.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64753cf73cb215789f019b09feb8ad5ba1e61171854b59e81b392ba2eb0df8cc -size 163849 diff --git a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_D.png b/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_D.png deleted file mode 100644 index d048939e..00000000 --- a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_D.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6aa57380a3365977257c85af9651f729858b121e95df15db2268bc0f3f1d9c4e -size 816347 diff --git a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_NormalMap.png b/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_NormalMap.png deleted file mode 100644 index eee5791c..00000000 --- a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_NormalMap.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7da9ba716de1dcca4911044dbfe0ca831c4f9cc8af4af99af37aeb1348e91a90 -size 955668 diff --git a/Assets/04_Models/Characters/Yuna_V2.meta b/Assets/04_Models/Characters/Yuna_V3.meta similarity index 77% rename from Assets/04_Models/Characters/Yuna_V2.meta rename to Assets/04_Models/Characters/Yuna_V3.meta index 5f437504..9741c86e 100644 --- a/Assets/04_Models/Characters/Yuna_V2.meta +++ b/Assets/04_Models/Characters/Yuna_V3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41477da49a5621e468efee9f685cf744 +guid: 60175c8368ab3274c84ac9fcd19f86f9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/04_Models/Characters/Yuna_V2/Materials.meta b/Assets/04_Models/Characters/Yuna_V3/Materials.meta similarity index 77% rename from Assets/04_Models/Characters/Yuna_V2/Materials.meta rename to Assets/04_Models/Characters/Yuna_V3/Materials.meta index abd4b560..38622d43 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Materials.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ae5db1913dfedf48af504a689b4be74 +guid: 8baba620e2e8ae44fb43f0d2c16759b0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/04_Models/Characters/Yuna_V2/Materials/Yuna_V2_0_Mat.mat b/Assets/04_Models/Characters/Yuna_V3/Materials/Yuna_V3_0_Mat.mat similarity index 98% rename from Assets/04_Models/Characters/Yuna_V2/Materials/Yuna_V2_0_Mat.mat rename to Assets/04_Models/Characters/Yuna_V3/Materials/Yuna_V3_0_Mat.mat index d3e57026..5ad56074 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Materials/Yuna_V2_0_Mat.mat +++ b/Assets/04_Models/Characters/Yuna_V3/Materials/Yuna_V3_0_Mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Yuna_V2_0_Mat + m_Name: Yuna_V3_0_Mat m_Shader: {fileID: 4800000, guid: 4dede25c09a79bb49b62a737c00a3d9e, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -136,7 +136,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 2800000, guid: 73eb02b7f70603746bef6ebc8aa2a047, type: 3} + m_Texture: {fileID: 2800000, guid: d7b1c6e8f88ca174a8376caa4d207390, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -176,7 +176,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Texture2D: - m_Texture: {fileID: 2800000, guid: 10f414b4368344241aade9bdaa5a9ee0, type: 3} + m_Texture: {fileID: 2800000, guid: 1f00925e7185e5047b8792a7ff41c06c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/04_Models/Characters/Yuna_V2/Materials/Yuna_V2_0_Mat.mat.meta b/Assets/04_Models/Characters/Yuna_V3/Materials/Yuna_V3_0_Mat.mat.meta similarity index 79% rename from Assets/04_Models/Characters/Yuna_V2/Materials/Yuna_V2_0_Mat.mat.meta rename to Assets/04_Models/Characters/Yuna_V3/Materials/Yuna_V3_0_Mat.mat.meta index 084fbd3c..7613b3c0 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Materials/Yuna_V2_0_Mat.mat.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Materials/Yuna_V3_0_Mat.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4472a8f4df14140478190cac9d8e65a6 +guid: 16ce5616a87e2d44988c549e7f7db066 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/04_Models/Characters/Yuna_V2/Meshes.meta b/Assets/04_Models/Characters/Yuna_V3/Meshes.meta similarity index 77% rename from Assets/04_Models/Characters/Yuna_V2/Meshes.meta rename to Assets/04_Models/Characters/Yuna_V3/Meshes.meta index 76ef6783..8fc0a374 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Meshes.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Meshes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c6a90eae765469c4598bfd3071fc9549 +guid: b670cf06b70874c459df483183b87a5d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/04_Models/Characters/Yuna_V3/Meshes/Yuna_V3_Mesh.asset b/Assets/04_Models/Characters/Yuna_V3/Meshes/Yuna_V3_Mesh.asset new file mode 100644 index 00000000..eb0b242f --- /dev/null +++ b/Assets/04_Models/Characters/Yuna_V3/Meshes/Yuna_V3_Mesh.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3efec13b00bf105bc6eb4c44a2f008634de85a11bfec706ed1e84a494bd78a7d +size 7456509 diff --git a/Assets/04_Models/Characters/Yuna_V2/Meshes/Yuna_V2_Mesh.asset.meta b/Assets/04_Models/Characters/Yuna_V3/Meshes/Yuna_V3_Mesh.asset.meta similarity index 79% rename from Assets/04_Models/Characters/Yuna_V2/Meshes/Yuna_V2_Mesh.asset.meta rename to Assets/04_Models/Characters/Yuna_V3/Meshes/Yuna_V3_Mesh.asset.meta index 7d8b282f..013e0041 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Meshes/Yuna_V2_Mesh.asset.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Meshes/Yuna_V3_Mesh.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1592a65837cc944db20ece4da346b7b +guid: d6c828ea654e2244083894f1dfc9d281 NativeFormatImporter: externalObjects: {} mainObjectFileID: 4300000 diff --git a/Assets/04_Models/Characters/Yuna_V2/Prefabs.meta b/Assets/04_Models/Characters/Yuna_V3/Prefabs.meta similarity index 77% rename from Assets/04_Models/Characters/Yuna_V2/Prefabs.meta rename to Assets/04_Models/Characters/Yuna_V3/Prefabs.meta index bf957881..c73660eb 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Prefabs.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 698fa3bf9e63b394b9cdf8180367a872 +guid: 306164da8f956f84da17e10ba6a1ae67 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/04_Models/Characters/Yuna_V3/Prefabs/Yuna_V3.prefab b/Assets/04_Models/Characters/Yuna_V3/Prefabs/Yuna_V3.prefab new file mode 100644 index 00000000..595518ba --- /dev/null +++ b/Assets/04_Models/Characters/Yuna_V3/Prefabs/Yuna_V3.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91775c3077a4b7f034e4ddb5fda5c6dc5b474ac42dbb638b823fd14496ebb995 +size 164027 diff --git a/Assets/04_Models/Characters/Yuna_V2/Prefabs/Yuna_V2.prefab.meta b/Assets/04_Models/Characters/Yuna_V3/Prefabs/Yuna_V3.prefab.meta similarity index 74% rename from Assets/04_Models/Characters/Yuna_V2/Prefabs/Yuna_V2.prefab.meta rename to Assets/04_Models/Characters/Yuna_V3/Prefabs/Yuna_V3.prefab.meta index 7c4e282d..baecefec 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Prefabs/Yuna_V2.prefab.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Prefabs/Yuna_V3.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06731f8e394569f43a353495c7079ffb +guid: c61ac88a91224b647925599c88009e08 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/04_Models/Characters/Yuna_V2/Textures.meta b/Assets/04_Models/Characters/Yuna_V3/Textures.meta similarity index 77% rename from Assets/04_Models/Characters/Yuna_V2/Textures.meta rename to Assets/04_Models/Characters/Yuna_V3/Textures.meta index 50b00817..8f1ed1a4 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Textures.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e94b856916bfda48b3a65b1d82edef6 +guid: 53a8efb37af15a848883b3d205268aa0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_D.png b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_D.png new file mode 100644 index 00000000..e551f6bd --- /dev/null +++ b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b3371784216dec962d5703ba1f25afb3907b4e4efde63c3ea9416606b617771 +size 828083 diff --git a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_D.png.meta b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_D.png.meta similarity index 98% rename from Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_D.png.meta rename to Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_D.png.meta index 8b432779..11352da8 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_D.png.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_D.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10f414b4368344241aade9bdaa5a9ee0 +guid: 1f00925e7185e5047b8792a7ff41c06c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_NormalMap.png b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_NormalMap.png new file mode 100644 index 00000000..8df277a3 --- /dev/null +++ b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_NormalMap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0431febfbda49d5b95b92ffe995a47898b2fc5e316ebd0797459a3f3681b0ac7 +size 846685 diff --git a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_NormalMap.png.meta b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_NormalMap.png.meta similarity index 98% rename from Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_NormalMap.png.meta rename to Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_NormalMap.png.meta index 68bfe29b..11111a64 100644 --- a/Assets/04_Models/Characters/Yuna_V2/Textures/Yuna_V2_0_NormalMap.png.meta +++ b/Assets/04_Models/Characters/Yuna_V3/Textures/Yuna_V3_0_NormalMap.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73eb02b7f70603746bef6ebc8aa2a047 +guid: d7b1c6e8f88ca174a8376caa4d207390 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 5225c00a..0b6503be 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8f6ca56f80caf800deebea22cc2d2e55be109fd701196f0000be613a6b1e7c6 -size 104501 +oid sha256:d1fb2e72f730f7a5ab98c8d45566d7b849fa48cb27f15527d5d76d56ad17a8c1 +size 104497