From de0da38b46a3d6e546d03b04576061bdce8c587a Mon Sep 17 00:00:00 2001 From: "skrwns304@gmail.com" Date: Fri, 24 Apr 2026 00:13:16 +0900 Subject: [PATCH] =?UTF-8?q?2026-04-24=20=EC=95=84=EB=B0=94=ED=83=80=20?= =?UTF-8?q?=EA=B5=90=EC=B2=B4=20=EB=B0=8F=20=EB=B0=B0=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MyProject/GameScene.unity | 4 +- .../Black/Materials/Black_0_Mat.mat | 2 +- .../Black/Materials/Black_Neck_Mat.mat | 2 +- .../Black/Textures/Black_0_NormalMap.png.meta | 4 +- .../Textures/Black_Neck_NormalMap.png.meta | 4 +- Assets/03_Models/_Characters/Blue/Blue.prefab | 3 - .../_Characters/Blue/Meshs/Blue_Mesh.asset | 3 - .../_Characters/Blue/Textures/Blue_0_D.png | 3 - .../Blue/Textures/Blue_0_NormalMap.png | 3 - .../_Characters/{Blue.meta => Blue2.meta} | 2 +- .../{Brown => Blue2}/Animations.meta | 2 +- .../AnimController_Blue2.controller} | 2 +- .../AnimController_Blue2.controller.meta} | 2 +- .../03_Models/_Characters/Blue2/Blue2.prefab | 3 + .../Blue2.prefab.meta} | 2 +- .../{Brown => Blue2}/Materials.meta | 2 +- .../Materials/Blue2_0_Mat.mat} | 6 +- .../Materials/Blue2_0_Mat.mat.meta} | 2 +- .../_Characters/{Brown => Blue2}/Meshs.meta | 2 +- .../_Characters/Blue2/Meshs/Blue2_Mesh.asset | 3 + .../Meshs/Blue2_Mesh.asset.meta} | 2 +- .../_Characters/{Blue => Blue2}/Textures.meta | 2 +- .../_Characters/Blue2/Textures/Blue2_0_D.png | 3 + .../Textures/Blue2_0_D.png.meta} | 2 +- .../Blue2/Textures/Blue2_0_NormalMap.png | 3 + .../Textures/Blue2_0_NormalMap.png.meta} | 2 +- Assets/03_Models/_Characters/Brown.meta | 8 - .../03_Models/_Characters/Brown/Brown.prefab | 3 - .../_Characters/Brown/Meshs/Brown_Mesh.asset | 3 - .../_Characters/Brown/Textures/Brown_0_D.png | 3 - Assets/03_Models/_Characters/Brown2.meta | 8 + .../{Blue => Brown2}/Animations.meta | 2 +- .../AnimController_Brown2.controller} | 2 +- .../AnimController_Brown2.controller.meta} | 2 +- .../_Characters/Brown2/Brown2.prefab | 3 + .../Brown2.prefab.meta} | 2 +- .../{Purple => Brown2}/Materials.meta | 2 +- .../Materials/Brown2_0_Mat.mat} | 8 +- .../Materials/Brown2_0_Mat.mat.meta} | 2 +- .../_Characters/{Purple => Brown2}/Meshs.meta | 2 +- .../Brown2/Meshs/Brown2_Mesh.asset | 3 + .../Meshs/Brown2_Mesh.asset.meta} | 2 +- .../{Brown => Brown2}/Textures.meta | 2 +- .../Brown2/Textures/Brown2_0_D.png | 3 + .../Textures/Brown2_0_D.png.meta} | 2 +- .../Textures/Brown2_0_NormalMap.png} | 0 .../Textures/Brown2_0_NormalMap.png.meta | 169 ++++++++++++++++++ Assets/03_Models/_Characters/Purple.meta | 8 - .../Purple/Meshs/Purple_Mesh.asset | 3 - .../_Characters/Purple/Purple.prefab | 3 - .../Purple/Textures/Purple_0_D.png | 3 - .../Purple/Textures/Purple_0_NormalMap.png | 3 - .../Textures/Purple_0_NormalMap.png.meta | 169 ------------------ Assets/03_Models/_Characters/Purple2.meta | 8 + .../{Purple => Purple2}/Animations.meta | 2 +- .../AnimController_Purple2.controller} | 2 +- .../AnimController_Purple2.controller.meta} | 2 +- .../{Yellow => Purple2}/Materials.meta | 2 +- .../Materials/Purple2_0_Mat.mat} | 8 +- .../Materials/Purple2_0_Mat.mat.meta} | 2 +- .../_Characters/{Blue => Purple2}/Meshs.meta | 2 +- .../Purple2/Meshs/Purple2_Mesh.asset | 3 + .../Meshs/Purple2_Mesh.asset.meta} | 2 +- .../_Characters/Purple2/Purple2.prefab | 3 + .../Purple2.prefab.meta} | 2 +- .../{Purple => Purple2}/Textures.meta | 2 +- .../Purple2/Textures/Purple2_0_D.png | 3 + .../Textures/Purple2_0_D.png.meta} | 2 +- .../Purple2/Textures/Purple2_0_NormalMap.png | 3 + .../Textures/Purple2_0_NormalMap.png.meta | 169 ++++++++++++++++++ Assets/03_Models/_Characters/Yellow.meta | 8 - .../Yellow/Meshs/Yellow_Mesh.asset | 3 - .../Yellow/Textures/Yellow_0_D.png | 3 - .../Yellow/Textures/Yellow_0_D.png.meta | 169 ------------------ .../Yellow/Textures/Yellow_0_NormalMap.png | 3 - .../Textures/Yellow_0_NormalMap.png.meta | 169 ------------------ .../_Characters/Yellow/Yellow.prefab | 3 - Assets/03_Models/_Characters/Yellow2.meta | 8 + .../{Yellow => Yellow2}/Animations.meta | 2 +- .../AnimController_Yellow2.controller} | 2 +- .../AnimController_Yellow2.controller.meta} | 2 +- .../{Blue => Yellow2}/Materials.meta | 2 +- .../Materials/Yellow2_0_Mat.mat} | 8 +- .../Materials/Yellow2_0_Mat.mat.meta} | 2 +- .../{Yellow => Yellow2}/Meshs.meta | 2 +- .../Yellow2/Meshs/Yellow2_Mesh.asset | 3 + .../Meshs/Yellow2_Mesh.asset.meta} | 2 +- .../{Yellow => Yellow2}/Textures.meta | 2 +- .../Textures/MagicaClothExtension.png | 0 .../Textures/MagicaClothExtension.png.meta | 2 +- .../Yellow2/Textures/Yellow2_0_D.png | 3 + .../Textures/Yellow2_0_D.png.meta} | 2 +- .../Yellow2/Textures/Yellow2_0_NormalMap.png | 3 + .../Textures/Yellow2_0_NormalMap.png.meta | 169 ++++++++++++++++++ .../_Characters/Yellow2/Yellow2.prefab | 3 + .../Yellow2.prefab.meta} | 2 +- 96 files changed, 642 insertions(+), 642 deletions(-) delete mode 100644 Assets/03_Models/_Characters/Blue/Blue.prefab delete mode 100644 Assets/03_Models/_Characters/Blue/Meshs/Blue_Mesh.asset delete mode 100644 Assets/03_Models/_Characters/Blue/Textures/Blue_0_D.png delete mode 100644 Assets/03_Models/_Characters/Blue/Textures/Blue_0_NormalMap.png rename Assets/03_Models/_Characters/{Blue.meta => Blue2.meta} (77%) rename Assets/03_Models/_Characters/{Brown => Blue2}/Animations.meta (77%) rename Assets/03_Models/_Characters/{Brown/Animations/AnimController_Brown.controller => Blue2/Animations/AnimController_Blue2.controller} (99%) rename Assets/03_Models/_Characters/{Purple/Animations/AnimController_Purple.controller.meta => Blue2/Animations/AnimController_Blue2.controller.meta} (79%) create mode 100644 Assets/03_Models/_Characters/Blue2/Blue2.prefab rename Assets/03_Models/_Characters/{Brown/Brown.prefab.meta => Blue2/Blue2.prefab.meta} (74%) rename Assets/03_Models/_Characters/{Brown => Blue2}/Materials.meta (77%) rename Assets/03_Models/_Characters/{Brown/Materials/Brown_0_Mat.mat => Blue2/Materials/Blue2_0_Mat.mat} (98%) rename Assets/03_Models/_Characters/{Blue/Materials/Blue_0_Mat.mat.meta => Blue2/Materials/Blue2_0_Mat.mat.meta} (79%) rename Assets/03_Models/_Characters/{Brown => Blue2}/Meshs.meta (77%) create mode 100644 Assets/03_Models/_Characters/Blue2/Meshs/Blue2_Mesh.asset rename Assets/03_Models/_Characters/{Brown/Meshs/Brown_Mesh.asset.meta => Blue2/Meshs/Blue2_Mesh.asset.meta} (79%) rename Assets/03_Models/_Characters/{Blue => Blue2}/Textures.meta (77%) create mode 100644 Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_D.png rename Assets/03_Models/_Characters/{Blue/Textures/Blue_0_D.png.meta => Blue2/Textures/Blue2_0_D.png.meta} (99%) create mode 100644 Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_NormalMap.png rename Assets/03_Models/_Characters/{Brown/Textures/Brown_0_NormalMap.png.meta => Blue2/Textures/Blue2_0_NormalMap.png.meta} (99%) delete mode 100644 Assets/03_Models/_Characters/Brown.meta delete mode 100644 Assets/03_Models/_Characters/Brown/Brown.prefab delete mode 100644 Assets/03_Models/_Characters/Brown/Meshs/Brown_Mesh.asset delete mode 100644 Assets/03_Models/_Characters/Brown/Textures/Brown_0_D.png create mode 100644 Assets/03_Models/_Characters/Brown2.meta rename Assets/03_Models/_Characters/{Blue => Brown2}/Animations.meta (77%) rename Assets/03_Models/_Characters/{Purple/Animations/AnimController_Purple.controller => Brown2/Animations/AnimController_Brown2.controller} (99%) rename Assets/03_Models/_Characters/{Yellow/Animations/AnimController_Yellow.controller.meta => Brown2/Animations/AnimController_Brown2.controller.meta} (79%) create mode 100644 Assets/03_Models/_Characters/Brown2/Brown2.prefab rename Assets/03_Models/_Characters/{Purple/Purple.prefab.meta => Brown2/Brown2.prefab.meta} (74%) rename Assets/03_Models/_Characters/{Purple => Brown2}/Materials.meta (77%) rename Assets/03_Models/_Characters/{Blue/Materials/Blue_0_Mat.mat => Brown2/Materials/Brown2_0_Mat.mat} (98%) rename Assets/03_Models/_Characters/{Brown/Materials/Brown_0_Mat.mat.meta => Brown2/Materials/Brown2_0_Mat.mat.meta} (79%) rename Assets/03_Models/_Characters/{Purple => Brown2}/Meshs.meta (77%) create mode 100644 Assets/03_Models/_Characters/Brown2/Meshs/Brown2_Mesh.asset rename Assets/03_Models/_Characters/{Blue/Meshs/Blue_Mesh.asset.meta => Brown2/Meshs/Brown2_Mesh.asset.meta} (79%) rename Assets/03_Models/_Characters/{Brown => Brown2}/Textures.meta (77%) create mode 100644 Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_D.png rename Assets/03_Models/_Characters/{Blue/Textures/Blue_0_NormalMap.png.meta => Brown2/Textures/Brown2_0_D.png.meta} (99%) rename Assets/03_Models/_Characters/{Brown/Textures/Brown_0_NormalMap.png => Brown2/Textures/Brown2_0_NormalMap.png} (100%) create mode 100644 Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_NormalMap.png.meta delete mode 100644 Assets/03_Models/_Characters/Purple.meta delete mode 100644 Assets/03_Models/_Characters/Purple/Meshs/Purple_Mesh.asset delete mode 100644 Assets/03_Models/_Characters/Purple/Purple.prefab delete mode 100644 Assets/03_Models/_Characters/Purple/Textures/Purple_0_D.png delete mode 100644 Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png delete mode 100644 Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png.meta create mode 100644 Assets/03_Models/_Characters/Purple2.meta rename Assets/03_Models/_Characters/{Purple => Purple2}/Animations.meta (77%) rename Assets/03_Models/_Characters/{Blue/Animations/AnimController_Blue.controller => Purple2/Animations/AnimController_Purple2.controller} (99%) rename Assets/03_Models/_Characters/{Brown/Animations/AnimController_Brown.controller.meta => Purple2/Animations/AnimController_Purple2.controller.meta} (79%) rename Assets/03_Models/_Characters/{Yellow => Purple2}/Materials.meta (77%) rename Assets/03_Models/_Characters/{Purple/Materials/Purple_0_Mat.mat => Purple2/Materials/Purple2_0_Mat.mat} (98%) rename Assets/03_Models/_Characters/{Purple/Materials/Purple_0_Mat.mat.meta => Purple2/Materials/Purple2_0_Mat.mat.meta} (79%) rename Assets/03_Models/_Characters/{Blue => Purple2}/Meshs.meta (77%) create mode 100644 Assets/03_Models/_Characters/Purple2/Meshs/Purple2_Mesh.asset rename Assets/03_Models/_Characters/{Purple/Meshs/Purple_Mesh.asset.meta => Purple2/Meshs/Purple2_Mesh.asset.meta} (79%) create mode 100644 Assets/03_Models/_Characters/Purple2/Purple2.prefab rename Assets/03_Models/_Characters/{Blue/Blue.prefab.meta => Purple2/Purple2.prefab.meta} (74%) rename Assets/03_Models/_Characters/{Purple => Purple2}/Textures.meta (77%) create mode 100644 Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_D.png rename Assets/03_Models/_Characters/{Brown/Textures/Brown_0_D.png.meta => Purple2/Textures/Purple2_0_D.png.meta} (99%) create mode 100644 Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png create mode 100644 Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png.meta delete mode 100644 Assets/03_Models/_Characters/Yellow.meta delete mode 100644 Assets/03_Models/_Characters/Yellow/Meshs/Yellow_Mesh.asset delete mode 100644 Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png delete mode 100644 Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png.meta delete mode 100644 Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png delete mode 100644 Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png.meta delete mode 100644 Assets/03_Models/_Characters/Yellow/Yellow.prefab create mode 100644 Assets/03_Models/_Characters/Yellow2.meta rename Assets/03_Models/_Characters/{Yellow => Yellow2}/Animations.meta (77%) rename Assets/03_Models/_Characters/{Yellow/Animations/AnimController_Yellow.controller => Yellow2/Animations/AnimController_Yellow2.controller} (99%) rename Assets/03_Models/_Characters/{Blue/Animations/AnimController_Blue.controller.meta => Yellow2/Animations/AnimController_Yellow2.controller.meta} (79%) rename Assets/03_Models/_Characters/{Blue => Yellow2}/Materials.meta (77%) rename Assets/03_Models/_Characters/{Yellow/Materials/Yellow_0_Mat.mat => Yellow2/Materials/Yellow2_0_Mat.mat} (98%) rename Assets/03_Models/_Characters/{Yellow/Materials/Yellow_0_Mat.mat.meta => Yellow2/Materials/Yellow2_0_Mat.mat.meta} (79%) rename Assets/03_Models/_Characters/{Yellow => Yellow2}/Meshs.meta (77%) create mode 100644 Assets/03_Models/_Characters/Yellow2/Meshs/Yellow2_Mesh.asset rename Assets/03_Models/_Characters/{Yellow/Meshs/Yellow_Mesh.asset.meta => Yellow2/Meshs/Yellow2_Mesh.asset.meta} (79%) rename Assets/03_Models/_Characters/{Yellow => Yellow2}/Textures.meta (77%) rename Assets/03_Models/_Characters/{Yellow => Yellow2}/Textures/MagicaClothExtension.png (100%) rename Assets/03_Models/_Characters/{Yellow => Yellow2}/Textures/MagicaClothExtension.png.meta (99%) create mode 100644 Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_D.png rename Assets/03_Models/_Characters/{Purple/Textures/Purple_0_D.png.meta => Yellow2/Textures/Yellow2_0_D.png.meta} (99%) create mode 100644 Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png create mode 100644 Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png.meta create mode 100644 Assets/03_Models/_Characters/Yellow2/Yellow2.prefab rename Assets/03_Models/_Characters/{Yellow/Yellow.prefab.meta => Yellow2/Yellow2.prefab.meta} (74%) diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 1802c046..f7e614a5 100644 --- a/Assets/01_Scenes/MyProject/GameScene.unity +++ b/Assets/01_Scenes/MyProject/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ced04e0e0f9a99ce540d336cfa37df15619adbf8f8791c5924d9fc21f3f45bc1 -size 13269220 +oid sha256:e0aca45c491c610f518c00fc000170412c7498e8968ad4ab5d8ea0ef0ae9f03a +size 13279888 diff --git a/Assets/03_Models/_Characters/Black/Materials/Black_0_Mat.mat b/Assets/03_Models/_Characters/Black/Materials/Black_0_Mat.mat index 50a044ec..400aedf8 100644 --- a/Assets/03_Models/_Characters/Black/Materials/Black_0_Mat.mat +++ b/Assets/03_Models/_Characters/Black/Materials/Black_0_Mat.mat @@ -49,7 +49,7 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/03_Models/_Characters/Black/Materials/Black_Neck_Mat.mat b/Assets/03_Models/_Characters/Black/Materials/Black_Neck_Mat.mat index 4c47d189..57d9996b 100644 --- a/Assets/03_Models/_Characters/Black/Materials/Black_Neck_Mat.mat +++ b/Assets/03_Models/_Characters/Black/Materials/Black_Neck_Mat.mat @@ -49,7 +49,7 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/03_Models/_Characters/Black/Textures/Black_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Black/Textures/Black_0_NormalMap.png.meta index 2978005e..bf4f2025 100644 --- a/Assets/03_Models/_Characters/Black/Textures/Black_0_NormalMap.png.meta +++ b/Assets/03_Models/_Characters/Black/Textures/Black_0_NormalMap.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 diff --git a/Assets/03_Models/_Characters/Black/Textures/Black_Neck_NormalMap.png.meta b/Assets/03_Models/_Characters/Black/Textures/Black_Neck_NormalMap.png.meta index 52775a8b..fe90bfdc 100644 --- a/Assets/03_Models/_Characters/Black/Textures/Black_Neck_NormalMap.png.meta +++ b/Assets/03_Models/_Characters/Black/Textures/Black_Neck_NormalMap.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -54,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 diff --git a/Assets/03_Models/_Characters/Blue/Blue.prefab b/Assets/03_Models/_Characters/Blue/Blue.prefab deleted file mode 100644 index f26c3c21..00000000 --- a/Assets/03_Models/_Characters/Blue/Blue.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d1c007165e344ed0b9049c05f52fed68d60dfda06613da092be63dcca6aa561 -size 157749 diff --git a/Assets/03_Models/_Characters/Blue/Meshs/Blue_Mesh.asset b/Assets/03_Models/_Characters/Blue/Meshs/Blue_Mesh.asset deleted file mode 100644 index a2657e18..00000000 --- a/Assets/03_Models/_Characters/Blue/Meshs/Blue_Mesh.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e953104bcacd81488d95c9049884148cddafe413e0191df4ef35d6f145fc1b5 -size 7565333 diff --git a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_D.png b/Assets/03_Models/_Characters/Blue/Textures/Blue_0_D.png deleted file mode 100644 index 824d704b..00000000 --- a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_D.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0af9ccf976fdbd236021098d22f6883cd6e33c0b059ae9dadbb3539b38f5ef54 -size 1320244 diff --git a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_NormalMap.png b/Assets/03_Models/_Characters/Blue/Textures/Blue_0_NormalMap.png deleted file mode 100644 index 8458ad29..00000000 --- a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_NormalMap.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14bd35a8ea35d876eafca778ff0a551b02ba459b20de1f3c5e009197e04d1bd5 -size 1250787 diff --git a/Assets/03_Models/_Characters/Blue.meta b/Assets/03_Models/_Characters/Blue2.meta similarity index 77% rename from Assets/03_Models/_Characters/Blue.meta rename to Assets/03_Models/_Characters/Blue2.meta index 4796c7d8..628bc68a 100644 --- a/Assets/03_Models/_Characters/Blue.meta +++ b/Assets/03_Models/_Characters/Blue2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8976f6f6df9b5034c810bbe938afaf60 +guid: db402dc38d091a64c89ef2b543606eaa folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Brown/Animations.meta b/Assets/03_Models/_Characters/Blue2/Animations.meta similarity index 77% rename from Assets/03_Models/_Characters/Brown/Animations.meta rename to Assets/03_Models/_Characters/Blue2/Animations.meta index 5fe70bc4..81166710 100644 --- a/Assets/03_Models/_Characters/Brown/Animations.meta +++ b/Assets/03_Models/_Characters/Blue2/Animations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11e9da86ab35b1042ac8b122a6b0cb09 +guid: 8560fef58e6634f4ba924643365da6c9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Brown/Animations/AnimController_Brown.controller b/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller similarity index 99% rename from Assets/03_Models/_Characters/Brown/Animations/AnimController_Brown.controller rename to Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller index 1ca7472d..8dcab504 100644 --- a/Assets/03_Models/_Characters/Brown/Animations/AnimController_Brown.controller +++ b/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller @@ -83,7 +83,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AnimController_Brown + m_Name: AnimController_Blue2 serializedVersion: 5 m_AnimatorParameters: - m_Name: Expression diff --git a/Assets/03_Models/_Characters/Purple/Animations/AnimController_Purple.controller.meta b/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller.meta similarity index 79% rename from Assets/03_Models/_Characters/Purple/Animations/AnimController_Purple.controller.meta rename to Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller.meta index 4a9d66f7..60498b03 100644 --- a/Assets/03_Models/_Characters/Purple/Animations/AnimController_Purple.controller.meta +++ b/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25b3140f2991b8c428c5b9582f6f3bef +guid: 4fcf745f56ff80046a97c739ffb3708a NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/03_Models/_Characters/Blue2/Blue2.prefab b/Assets/03_Models/_Characters/Blue2/Blue2.prefab new file mode 100644 index 00000000..61cbd606 --- /dev/null +++ b/Assets/03_Models/_Characters/Blue2/Blue2.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b27bc34a6c497ae2a42383ee9928bf1abf0fb622353c81e70033e8f7e2191cfb +size 157814 diff --git a/Assets/03_Models/_Characters/Brown/Brown.prefab.meta b/Assets/03_Models/_Characters/Blue2/Blue2.prefab.meta similarity index 74% rename from Assets/03_Models/_Characters/Brown/Brown.prefab.meta rename to Assets/03_Models/_Characters/Blue2/Blue2.prefab.meta index 23f7a127..02937ed4 100644 --- a/Assets/03_Models/_Characters/Brown/Brown.prefab.meta +++ b/Assets/03_Models/_Characters/Blue2/Blue2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b03a548014d428d4b9060fa6ccb5c7e9 +guid: 4a94091fd3fb4014c861b146b2afe7ff PrefabImporter: externalObjects: {} userData: diff --git a/Assets/03_Models/_Characters/Brown/Materials.meta b/Assets/03_Models/_Characters/Blue2/Materials.meta similarity index 77% rename from Assets/03_Models/_Characters/Brown/Materials.meta rename to Assets/03_Models/_Characters/Blue2/Materials.meta index 37d75c0e..d413c8c3 100644 --- a/Assets/03_Models/_Characters/Brown/Materials.meta +++ b/Assets/03_Models/_Characters/Blue2/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 406867481907b964493f0b7c2ad45989 +guid: 5a8c3fd25578ca24b8153a4eb1549fc9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Brown/Materials/Brown_0_Mat.mat b/Assets/03_Models/_Characters/Blue2/Materials/Blue2_0_Mat.mat similarity index 98% rename from Assets/03_Models/_Characters/Brown/Materials/Brown_0_Mat.mat rename to Assets/03_Models/_Characters/Blue2/Materials/Blue2_0_Mat.mat index b0aa3ac1..e8f151b7 100644 --- a/Assets/03_Models/_Characters/Brown/Materials/Brown_0_Mat.mat +++ b/Assets/03_Models/_Characters/Blue2/Materials/Blue2_0_Mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Brown_0_Mat + m_Name: Blue2_0_Mat m_Shader: {fileID: 4800000, guid: 4dede25c09a79bb49b62a737c00a3d9e, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -137,7 +137,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 2800000, guid: 5243aa06d7320cc42b72147aa84e6b60, type: 3} + m_Texture: {fileID: 2800000, guid: ba72d1d922e18f840a901943d561f8f5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -177,7 +177,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Texture2D: - m_Texture: {fileID: 2800000, guid: 7f831d0539b9c9f4babc115c6a8a776e, type: 3} + m_Texture: {fileID: 2800000, guid: 076771e4c4c8bb346af7bb196156aee8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/03_Models/_Characters/Blue/Materials/Blue_0_Mat.mat.meta b/Assets/03_Models/_Characters/Blue2/Materials/Blue2_0_Mat.mat.meta similarity index 79% rename from Assets/03_Models/_Characters/Blue/Materials/Blue_0_Mat.mat.meta rename to Assets/03_Models/_Characters/Blue2/Materials/Blue2_0_Mat.mat.meta index de3970a4..fce4d5a2 100644 --- a/Assets/03_Models/_Characters/Blue/Materials/Blue_0_Mat.mat.meta +++ b/Assets/03_Models/_Characters/Blue2/Materials/Blue2_0_Mat.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc804de5f8d3a4f4080d8b3989b60302 +guid: cd1dff1e44d26da479f619bc1c65b53e NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/03_Models/_Characters/Brown/Meshs.meta b/Assets/03_Models/_Characters/Blue2/Meshs.meta similarity index 77% rename from Assets/03_Models/_Characters/Brown/Meshs.meta rename to Assets/03_Models/_Characters/Blue2/Meshs.meta index 301f7f12..8449cca9 100644 --- a/Assets/03_Models/_Characters/Brown/Meshs.meta +++ b/Assets/03_Models/_Characters/Blue2/Meshs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed342f7159b65db459bbb250d92a3545 +guid: 039e8acdebc8999419698268a0ec11d6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Blue2/Meshs/Blue2_Mesh.asset b/Assets/03_Models/_Characters/Blue2/Meshs/Blue2_Mesh.asset new file mode 100644 index 00000000..dbabe6df --- /dev/null +++ b/Assets/03_Models/_Characters/Blue2/Meshs/Blue2_Mesh.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c02e7b9ba65f4f24a127fbf46981e59b77d267ec8d731fd30f061d0cb3e8797 +size 7662799 diff --git a/Assets/03_Models/_Characters/Brown/Meshs/Brown_Mesh.asset.meta b/Assets/03_Models/_Characters/Blue2/Meshs/Blue2_Mesh.asset.meta similarity index 79% rename from Assets/03_Models/_Characters/Brown/Meshs/Brown_Mesh.asset.meta rename to Assets/03_Models/_Characters/Blue2/Meshs/Blue2_Mesh.asset.meta index 39db16e2..3417f3ec 100644 --- a/Assets/03_Models/_Characters/Brown/Meshs/Brown_Mesh.asset.meta +++ b/Assets/03_Models/_Characters/Blue2/Meshs/Blue2_Mesh.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c7d44458236e71548ad47351e160f1a7 +guid: 1f412f75cac2f604abf5add1015017c7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 4300000 diff --git a/Assets/03_Models/_Characters/Blue/Textures.meta b/Assets/03_Models/_Characters/Blue2/Textures.meta similarity index 77% rename from Assets/03_Models/_Characters/Blue/Textures.meta rename to Assets/03_Models/_Characters/Blue2/Textures.meta index 6ffe008b..300c22f7 100644 --- a/Assets/03_Models/_Characters/Blue/Textures.meta +++ b/Assets/03_Models/_Characters/Blue2/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c1afafe1980f66b4887add129ab7eef3 +guid: 87a49ab7aeafc0345987b32db7cf92ad folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_D.png b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_D.png new file mode 100644 index 00000000..0b67fd41 --- /dev/null +++ b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f13123dc9901542c10f9c9451657afcf9f5fa0c53ac81c8afcd5fc9464094aee +size 1399598 diff --git a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_D.png.meta b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_D.png.meta similarity index 99% rename from Assets/03_Models/_Characters/Blue/Textures/Blue_0_D.png.meta rename to Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_D.png.meta index f6f92cc3..0a438d26 100644 --- a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_D.png.meta +++ b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_D.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 232087b8b4ad2e4459d3c3eea5fd1ecc +guid: 076771e4c4c8bb346af7bb196156aee8 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_NormalMap.png b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_NormalMap.png new file mode 100644 index 00000000..c612b83c --- /dev/null +++ b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_NormalMap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ff7fb2965336862e632f45f18517e7df920705982cd7606db0445e4357eb613 +size 1305745 diff --git a/Assets/03_Models/_Characters/Brown/Textures/Brown_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_NormalMap.png.meta similarity index 99% rename from Assets/03_Models/_Characters/Brown/Textures/Brown_0_NormalMap.png.meta rename to Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_NormalMap.png.meta index 1358ac09..47fc3ef4 100644 --- a/Assets/03_Models/_Characters/Brown/Textures/Brown_0_NormalMap.png.meta +++ b/Assets/03_Models/_Characters/Blue2/Textures/Blue2_0_NormalMap.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5243aa06d7320cc42b72147aa84e6b60 +guid: ba72d1d922e18f840a901943d561f8f5 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03_Models/_Characters/Brown.meta b/Assets/03_Models/_Characters/Brown.meta deleted file mode 100644 index 7427c428..00000000 --- a/Assets/03_Models/_Characters/Brown.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 95cd1271b32afed4f980acb5c32c0460 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Brown/Brown.prefab b/Assets/03_Models/_Characters/Brown/Brown.prefab deleted file mode 100644 index 81761935..00000000 --- a/Assets/03_Models/_Characters/Brown/Brown.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3eda8b87e075836411aa7583dabaee13b365c97ea1b4f438a821638202cc344 -size 158918 diff --git a/Assets/03_Models/_Characters/Brown/Meshs/Brown_Mesh.asset b/Assets/03_Models/_Characters/Brown/Meshs/Brown_Mesh.asset deleted file mode 100644 index 13bf83c6..00000000 --- a/Assets/03_Models/_Characters/Brown/Meshs/Brown_Mesh.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1afa03ec1f7f0e4f712fc58027ace33381979e9d43a54c6e0f12fdf7670a36e -size 7287270 diff --git a/Assets/03_Models/_Characters/Brown/Textures/Brown_0_D.png b/Assets/03_Models/_Characters/Brown/Textures/Brown_0_D.png deleted file mode 100644 index b7297d4f..00000000 --- a/Assets/03_Models/_Characters/Brown/Textures/Brown_0_D.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4df21b10ba0299b84e10788ab1d722d9d05a4e98a231d7bd4d0b9853196ec11f -size 1247540 diff --git a/Assets/03_Models/_Characters/Brown2.meta b/Assets/03_Models/_Characters/Brown2.meta new file mode 100644 index 00000000..8c44191d --- /dev/null +++ b/Assets/03_Models/_Characters/Brown2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2466f15c85f3a46498cafe62ffb706dc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Blue/Animations.meta b/Assets/03_Models/_Characters/Brown2/Animations.meta similarity index 77% rename from Assets/03_Models/_Characters/Blue/Animations.meta rename to Assets/03_Models/_Characters/Brown2/Animations.meta index 6143cd06..cb2526f8 100644 --- a/Assets/03_Models/_Characters/Blue/Animations.meta +++ b/Assets/03_Models/_Characters/Brown2/Animations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13e570cc335c10644ad0b15ab93adb64 +guid: 8a3af017cc9138047be764d6fb895621 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Purple/Animations/AnimController_Purple.controller b/Assets/03_Models/_Characters/Brown2/Animations/AnimController_Brown2.controller similarity index 99% rename from Assets/03_Models/_Characters/Purple/Animations/AnimController_Purple.controller rename to Assets/03_Models/_Characters/Brown2/Animations/AnimController_Brown2.controller index 9beb4022..cf88264d 100644 --- a/Assets/03_Models/_Characters/Purple/Animations/AnimController_Purple.controller +++ b/Assets/03_Models/_Characters/Brown2/Animations/AnimController_Brown2.controller @@ -83,7 +83,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AnimController_Purple + m_Name: AnimController_Brown2 serializedVersion: 5 m_AnimatorParameters: - m_Name: Expression diff --git a/Assets/03_Models/_Characters/Yellow/Animations/AnimController_Yellow.controller.meta b/Assets/03_Models/_Characters/Brown2/Animations/AnimController_Brown2.controller.meta similarity index 79% rename from Assets/03_Models/_Characters/Yellow/Animations/AnimController_Yellow.controller.meta rename to Assets/03_Models/_Characters/Brown2/Animations/AnimController_Brown2.controller.meta index 58b78f4f..88595494 100644 --- a/Assets/03_Models/_Characters/Yellow/Animations/AnimController_Yellow.controller.meta +++ b/Assets/03_Models/_Characters/Brown2/Animations/AnimController_Brown2.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81bc04d57048fa243bcc6f28834dae50 +guid: 62dd32a7e15a08e408dfe9bec31073d3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/03_Models/_Characters/Brown2/Brown2.prefab b/Assets/03_Models/_Characters/Brown2/Brown2.prefab new file mode 100644 index 00000000..e8ea7761 --- /dev/null +++ b/Assets/03_Models/_Characters/Brown2/Brown2.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06e3bfd049d8bd772bce9329e8657e94f6803c1fd4220a18e9337bf5e1d9e654 +size 158263 diff --git a/Assets/03_Models/_Characters/Purple/Purple.prefab.meta b/Assets/03_Models/_Characters/Brown2/Brown2.prefab.meta similarity index 74% rename from Assets/03_Models/_Characters/Purple/Purple.prefab.meta rename to Assets/03_Models/_Characters/Brown2/Brown2.prefab.meta index 2f850407..8ad187d2 100644 --- a/Assets/03_Models/_Characters/Purple/Purple.prefab.meta +++ b/Assets/03_Models/_Characters/Brown2/Brown2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a3b6c5f5d4446e74e9f991d27b362e82 +guid: 8448fa891abdbff4e81189cd163ebb77 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/03_Models/_Characters/Purple/Materials.meta b/Assets/03_Models/_Characters/Brown2/Materials.meta similarity index 77% rename from Assets/03_Models/_Characters/Purple/Materials.meta rename to Assets/03_Models/_Characters/Brown2/Materials.meta index 5eb68059..edcc8f27 100644 --- a/Assets/03_Models/_Characters/Purple/Materials.meta +++ b/Assets/03_Models/_Characters/Brown2/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ddecf00566044114ba7f97f32100d011 +guid: 88bfe49c15f76d24b8f532b0f6eedc98 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Blue/Materials/Blue_0_Mat.mat b/Assets/03_Models/_Characters/Brown2/Materials/Brown2_0_Mat.mat similarity index 98% rename from Assets/03_Models/_Characters/Blue/Materials/Blue_0_Mat.mat rename to Assets/03_Models/_Characters/Brown2/Materials/Brown2_0_Mat.mat index a492fc62..14ec6869 100644 --- a/Assets/03_Models/_Characters/Blue/Materials/Blue_0_Mat.mat +++ b/Assets/03_Models/_Characters/Brown2/Materials/Brown2_0_Mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Blue_0_Mat + m_Name: Brown2_0_Mat m_Shader: {fileID: 4800000, guid: 4dede25c09a79bb49b62a737c00a3d9e, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -49,7 +49,7 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -137,7 +137,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 2800000, guid: 4e22d01701b1f904085a7611704a9273, type: 3} + m_Texture: {fileID: 2800000, guid: 275441ae9aaf5b849827c3a9e9c14df6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -177,7 +177,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Texture2D: - m_Texture: {fileID: 2800000, guid: 232087b8b4ad2e4459d3c3eea5fd1ecc, type: 3} + m_Texture: {fileID: 2800000, guid: a63283c71328ddd418f4dce016c6c008, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/03_Models/_Characters/Brown/Materials/Brown_0_Mat.mat.meta b/Assets/03_Models/_Characters/Brown2/Materials/Brown2_0_Mat.mat.meta similarity index 79% rename from Assets/03_Models/_Characters/Brown/Materials/Brown_0_Mat.mat.meta rename to Assets/03_Models/_Characters/Brown2/Materials/Brown2_0_Mat.mat.meta index 86b74b68..cd67f62c 100644 --- a/Assets/03_Models/_Characters/Brown/Materials/Brown_0_Mat.mat.meta +++ b/Assets/03_Models/_Characters/Brown2/Materials/Brown2_0_Mat.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13c25f7c6a3ed2440a1e2a26c64c0210 +guid: 354d2a05323d11249bb747fe7a46d1ab NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/03_Models/_Characters/Purple/Meshs.meta b/Assets/03_Models/_Characters/Brown2/Meshs.meta similarity index 77% rename from Assets/03_Models/_Characters/Purple/Meshs.meta rename to Assets/03_Models/_Characters/Brown2/Meshs.meta index 82f0941a..b814766e 100644 --- a/Assets/03_Models/_Characters/Purple/Meshs.meta +++ b/Assets/03_Models/_Characters/Brown2/Meshs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e3afa45bb80678547ab395b99695551b +guid: 680c7d3c7130cdd4ca267cef902d5c0c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Brown2/Meshs/Brown2_Mesh.asset b/Assets/03_Models/_Characters/Brown2/Meshs/Brown2_Mesh.asset new file mode 100644 index 00000000..d3122c73 --- /dev/null +++ b/Assets/03_Models/_Characters/Brown2/Meshs/Brown2_Mesh.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:972acbb485f0abef75636fd74774c9ca5ea4fbeee4b7d8e8a67247c02de3ab63 +size 7287271 diff --git a/Assets/03_Models/_Characters/Blue/Meshs/Blue_Mesh.asset.meta b/Assets/03_Models/_Characters/Brown2/Meshs/Brown2_Mesh.asset.meta similarity index 79% rename from Assets/03_Models/_Characters/Blue/Meshs/Blue_Mesh.asset.meta rename to Assets/03_Models/_Characters/Brown2/Meshs/Brown2_Mesh.asset.meta index 2ef80d2f..7c801a02 100644 --- a/Assets/03_Models/_Characters/Blue/Meshs/Blue_Mesh.asset.meta +++ b/Assets/03_Models/_Characters/Brown2/Meshs/Brown2_Mesh.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04e5752f3ee49784fb1890e7c96669e9 +guid: 6038d62cb0dca2e45a519c5da8c5c6e2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 4300000 diff --git a/Assets/03_Models/_Characters/Brown/Textures.meta b/Assets/03_Models/_Characters/Brown2/Textures.meta similarity index 77% rename from Assets/03_Models/_Characters/Brown/Textures.meta rename to Assets/03_Models/_Characters/Brown2/Textures.meta index 94b5661f..56b3c296 100644 --- a/Assets/03_Models/_Characters/Brown/Textures.meta +++ b/Assets/03_Models/_Characters/Brown2/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8b502dc7a4ccd364c81b21735543fabb +guid: 723faf3f245046848bdea3537c62ffea folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_D.png b/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_D.png new file mode 100644 index 00000000..ceba8d98 --- /dev/null +++ b/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:536429b39ff90970e9d2c742a97900905ebbbab292264e46a66873d54ed89b22 +size 1246905 diff --git a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_D.png.meta similarity index 99% rename from Assets/03_Models/_Characters/Blue/Textures/Blue_0_NormalMap.png.meta rename to Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_D.png.meta index c1da59ae..93bfe944 100644 --- a/Assets/03_Models/_Characters/Blue/Textures/Blue_0_NormalMap.png.meta +++ b/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_D.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e22d01701b1f904085a7611704a9273 +guid: a63283c71328ddd418f4dce016c6c008 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03_Models/_Characters/Brown/Textures/Brown_0_NormalMap.png b/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_NormalMap.png similarity index 100% rename from Assets/03_Models/_Characters/Brown/Textures/Brown_0_NormalMap.png rename to Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_NormalMap.png diff --git a/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_NormalMap.png.meta new file mode 100644 index 00000000..b6206965 --- /dev/null +++ b/Assets/03_Models/_Characters/Brown2/Textures/Brown2_0_NormalMap.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 275441ae9aaf5b849827c3a9e9c14df6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + 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: iOS + 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: Android + 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 + - serializedVersion: 4 + buildTarget: WebGL + 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: WindowsStoreApps + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Purple.meta b/Assets/03_Models/_Characters/Purple.meta deleted file mode 100644 index 89932822..00000000 --- a/Assets/03_Models/_Characters/Purple.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8f2c19edbcef57b43a85741fd34c219f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Purple/Meshs/Purple_Mesh.asset b/Assets/03_Models/_Characters/Purple/Meshs/Purple_Mesh.asset deleted file mode 100644 index eaff1928..00000000 --- a/Assets/03_Models/_Characters/Purple/Meshs/Purple_Mesh.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94f59e3a657145111370651ebee3498f02c23d4bc0f2a78b06646d67b0d7d86b -size 7150181 diff --git a/Assets/03_Models/_Characters/Purple/Purple.prefab b/Assets/03_Models/_Characters/Purple/Purple.prefab deleted file mode 100644 index f4abc903..00000000 --- a/Assets/03_Models/_Characters/Purple/Purple.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24a5f3022d9152d39592f22f5fb48aa4f736d08251dae6db8e8ca2484b8c20ce -size 161700 diff --git a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_D.png b/Assets/03_Models/_Characters/Purple/Textures/Purple_0_D.png deleted file mode 100644 index 67bb452b..00000000 --- a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_D.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4f190dc2f8d03393fbcb3227f765e2caf94061574902354507d175ff65d293e -size 1045154 diff --git a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png b/Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png deleted file mode 100644 index a401ad90..00000000 --- a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e9dd365f956ffae10a360aabd88d633d069a866e5e5faf360c7ace84b23b6dc -size 1004651 diff --git a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png.meta deleted file mode 100644 index 265ca108..00000000 --- a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_NormalMap.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: a8cd16fba5060364a85f50f82f823108 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: iOS - 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: Android - 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 - - serializedVersion: 4 - buildTarget: WebGL - 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: WindowsStoreApps - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Purple2.meta b/Assets/03_Models/_Characters/Purple2.meta new file mode 100644 index 00000000..f1d68ce3 --- /dev/null +++ b/Assets/03_Models/_Characters/Purple2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a09028753ca62349a0dbaf209858bfb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Purple/Animations.meta b/Assets/03_Models/_Characters/Purple2/Animations.meta similarity index 77% rename from Assets/03_Models/_Characters/Purple/Animations.meta rename to Assets/03_Models/_Characters/Purple2/Animations.meta index c80b0a4c..b441d8a0 100644 --- a/Assets/03_Models/_Characters/Purple/Animations.meta +++ b/Assets/03_Models/_Characters/Purple2/Animations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 95e43299d65ea5b49aea85248dd65901 +guid: e36c2ddf7a26fe647af19460ecb139af folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Blue/Animations/AnimController_Blue.controller b/Assets/03_Models/_Characters/Purple2/Animations/AnimController_Purple2.controller similarity index 99% rename from Assets/03_Models/_Characters/Blue/Animations/AnimController_Blue.controller rename to Assets/03_Models/_Characters/Purple2/Animations/AnimController_Purple2.controller index a8dfd509..f1a7d935 100644 --- a/Assets/03_Models/_Characters/Blue/Animations/AnimController_Blue.controller +++ b/Assets/03_Models/_Characters/Purple2/Animations/AnimController_Purple2.controller @@ -83,7 +83,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AnimController_Blue + m_Name: AnimController_Purple2 serializedVersion: 5 m_AnimatorParameters: - m_Name: Expression diff --git a/Assets/03_Models/_Characters/Brown/Animations/AnimController_Brown.controller.meta b/Assets/03_Models/_Characters/Purple2/Animations/AnimController_Purple2.controller.meta similarity index 79% rename from Assets/03_Models/_Characters/Brown/Animations/AnimController_Brown.controller.meta rename to Assets/03_Models/_Characters/Purple2/Animations/AnimController_Purple2.controller.meta index 792a2adf..ca141acb 100644 --- a/Assets/03_Models/_Characters/Brown/Animations/AnimController_Brown.controller.meta +++ b/Assets/03_Models/_Characters/Purple2/Animations/AnimController_Purple2.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7c4631ea1b38a4b48916dedc7ed18f68 +guid: a1c9ea5ddc2f3684d9cabc064cf4311c NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/03_Models/_Characters/Yellow/Materials.meta b/Assets/03_Models/_Characters/Purple2/Materials.meta similarity index 77% rename from Assets/03_Models/_Characters/Yellow/Materials.meta rename to Assets/03_Models/_Characters/Purple2/Materials.meta index 79919a9c..91e1ae9b 100644 --- a/Assets/03_Models/_Characters/Yellow/Materials.meta +++ b/Assets/03_Models/_Characters/Purple2/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9954f7bb4a9683c42bd92d15cda8826b +guid: 564631f9836ccd04782e55dbb7eb1be3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Purple/Materials/Purple_0_Mat.mat b/Assets/03_Models/_Characters/Purple2/Materials/Purple2_0_Mat.mat similarity index 98% rename from Assets/03_Models/_Characters/Purple/Materials/Purple_0_Mat.mat rename to Assets/03_Models/_Characters/Purple2/Materials/Purple2_0_Mat.mat index 16cc8a21..22dabb27 100644 --- a/Assets/03_Models/_Characters/Purple/Materials/Purple_0_Mat.mat +++ b/Assets/03_Models/_Characters/Purple2/Materials/Purple2_0_Mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Purple_0_Mat + m_Name: Purple2_0_Mat m_Shader: {fileID: 4800000, guid: 4dede25c09a79bb49b62a737c00a3d9e, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -49,7 +49,7 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -137,7 +137,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 2800000, guid: a8cd16fba5060364a85f50f82f823108, type: 3} + m_Texture: {fileID: 2800000, guid: ec4a1676f7e1a1b4181f8948434cf377, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -177,7 +177,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Texture2D: - m_Texture: {fileID: 2800000, guid: 2ec90647b697aa048a346a9739d429c1, type: 3} + m_Texture: {fileID: 2800000, guid: 0fc3cc7fe5b7659488c4ef00a580e133, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/03_Models/_Characters/Purple/Materials/Purple_0_Mat.mat.meta b/Assets/03_Models/_Characters/Purple2/Materials/Purple2_0_Mat.mat.meta similarity index 79% rename from Assets/03_Models/_Characters/Purple/Materials/Purple_0_Mat.mat.meta rename to Assets/03_Models/_Characters/Purple2/Materials/Purple2_0_Mat.mat.meta index 3d16f8dc..2a899a25 100644 --- a/Assets/03_Models/_Characters/Purple/Materials/Purple_0_Mat.mat.meta +++ b/Assets/03_Models/_Characters/Purple2/Materials/Purple2_0_Mat.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb92b6099f6ef1748b79f343c938c55d +guid: 761c5680cb4a5a24da099722c3e68eed NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/03_Models/_Characters/Blue/Meshs.meta b/Assets/03_Models/_Characters/Purple2/Meshs.meta similarity index 77% rename from Assets/03_Models/_Characters/Blue/Meshs.meta rename to Assets/03_Models/_Characters/Purple2/Meshs.meta index 3ab225cb..64e6dfdf 100644 --- a/Assets/03_Models/_Characters/Blue/Meshs.meta +++ b/Assets/03_Models/_Characters/Purple2/Meshs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8b8c438033630140bd7d323e9413b42 +guid: d3437e0cfdfc6be46a2b1878d0bcf641 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Purple2/Meshs/Purple2_Mesh.asset b/Assets/03_Models/_Characters/Purple2/Meshs/Purple2_Mesh.asset new file mode 100644 index 00000000..01496e06 --- /dev/null +++ b/Assets/03_Models/_Characters/Purple2/Meshs/Purple2_Mesh.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62f852748868bfb4547e49c44f5fea34c937a15eff337209ec5debf6a33b4dea +size 7463834 diff --git a/Assets/03_Models/_Characters/Purple/Meshs/Purple_Mesh.asset.meta b/Assets/03_Models/_Characters/Purple2/Meshs/Purple2_Mesh.asset.meta similarity index 79% rename from Assets/03_Models/_Characters/Purple/Meshs/Purple_Mesh.asset.meta rename to Assets/03_Models/_Characters/Purple2/Meshs/Purple2_Mesh.asset.meta index a6de9111..5ad286a5 100644 --- a/Assets/03_Models/_Characters/Purple/Meshs/Purple_Mesh.asset.meta +++ b/Assets/03_Models/_Characters/Purple2/Meshs/Purple2_Mesh.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5887feef0938f8d498c05a9e09f36ee4 +guid: 73a769f60c871f9478a6fa10a1c4ac61 NativeFormatImporter: externalObjects: {} mainObjectFileID: 4300000 diff --git a/Assets/03_Models/_Characters/Purple2/Purple2.prefab b/Assets/03_Models/_Characters/Purple2/Purple2.prefab new file mode 100644 index 00000000..924b751c --- /dev/null +++ b/Assets/03_Models/_Characters/Purple2/Purple2.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2143a06626fb61c80fb82359c224df754fde8159a40f98cb16c35b0afb385a1f +size 162219 diff --git a/Assets/03_Models/_Characters/Blue/Blue.prefab.meta b/Assets/03_Models/_Characters/Purple2/Purple2.prefab.meta similarity index 74% rename from Assets/03_Models/_Characters/Blue/Blue.prefab.meta rename to Assets/03_Models/_Characters/Purple2/Purple2.prefab.meta index 1d1b65ff..f27b98fd 100644 --- a/Assets/03_Models/_Characters/Blue/Blue.prefab.meta +++ b/Assets/03_Models/_Characters/Purple2/Purple2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 29281e4cf4ee824409638bf10c8234ef +guid: 5ab4f810ef1991f41adeb378b43fb545 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/03_Models/_Characters/Purple/Textures.meta b/Assets/03_Models/_Characters/Purple2/Textures.meta similarity index 77% rename from Assets/03_Models/_Characters/Purple/Textures.meta rename to Assets/03_Models/_Characters/Purple2/Textures.meta index fedd743a..76dcf949 100644 --- a/Assets/03_Models/_Characters/Purple/Textures.meta +++ b/Assets/03_Models/_Characters/Purple2/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2592eeeb3127c3340955beaa4dba27ce +guid: 6dc87e2e50bcdb2448b7bd4d4a2d7917 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_D.png b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_D.png new file mode 100644 index 00000000..15937c7f --- /dev/null +++ b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b315eb02e01213d2599f46d52953a77928667e882a9ccdbee62d32c39bb0c0c0 +size 984718 diff --git a/Assets/03_Models/_Characters/Brown/Textures/Brown_0_D.png.meta b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_D.png.meta similarity index 99% rename from Assets/03_Models/_Characters/Brown/Textures/Brown_0_D.png.meta rename to Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_D.png.meta index fa251be9..1221c287 100644 --- a/Assets/03_Models/_Characters/Brown/Textures/Brown_0_D.png.meta +++ b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_D.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f831d0539b9c9f4babc115c6a8a776e +guid: 0fc3cc7fe5b7659488c4ef00a580e133 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png new file mode 100644 index 00000000..446e51d8 --- /dev/null +++ b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa01b57c1349fff9a2ee60feec1c42747514bd5817a0b9f31289cb949c384908 +size 967551 diff --git a/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png.meta new file mode 100644 index 00000000..4f4dff59 --- /dev/null +++ b/Assets/03_Models/_Characters/Purple2/Textures/Purple2_0_NormalMap.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: ec4a1676f7e1a1b4181f8948434cf377 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + 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: iOS + 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: Android + 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 + - serializedVersion: 4 + buildTarget: WebGL + 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: WindowsStoreApps + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Yellow.meta b/Assets/03_Models/_Characters/Yellow.meta deleted file mode 100644 index 55326bf4..00000000 --- a/Assets/03_Models/_Characters/Yellow.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30d7f52c74d15724eaf7be3f875e1b3b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Yellow/Meshs/Yellow_Mesh.asset b/Assets/03_Models/_Characters/Yellow/Meshs/Yellow_Mesh.asset deleted file mode 100644 index d5288f53..00000000 --- a/Assets/03_Models/_Characters/Yellow/Meshs/Yellow_Mesh.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd1d7a0826ec177f800a6097de9aa57368b51357a4c46e8663d4059266610003 -size 7083058 diff --git a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png b/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png deleted file mode 100644 index 228b490e..00000000 --- a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7612b820ac8f39479509fbc125fef25695dab2a0b63b78e8cce1aa23269f3f66 -size 970947 diff --git a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png.meta b/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png.meta deleted file mode 100644 index ee14a895..00000000 --- a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_D.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: e3c0efc9ee802ad428d1639acde59dc2 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: iOS - 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: Android - 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 - - serializedVersion: 4 - buildTarget: WebGL - 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: WindowsStoreApps - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png b/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png deleted file mode 100644 index 2bfda231..00000000 --- a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:616ec04761235e3f66a614195bbf782789041389a43c0492ecd561bdd39e0fcd -size 931015 diff --git a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png.meta deleted file mode 100644 index e26a2713..00000000 --- a/Assets/03_Models/_Characters/Yellow/Textures/Yellow_0_NormalMap.png.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 073e6560be176b24d9591179a96d7b7f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: iOS - 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: Android - 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 - - serializedVersion: 4 - buildTarget: WebGL - 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: WindowsStoreApps - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Yellow/Yellow.prefab b/Assets/03_Models/_Characters/Yellow/Yellow.prefab deleted file mode 100644 index 26e6cd29..00000000 --- a/Assets/03_Models/_Characters/Yellow/Yellow.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d05abae52b4a53123dd81c28117673b69611d6adbcad86f8d647d9f75648ae3e -size 158264 diff --git a/Assets/03_Models/_Characters/Yellow2.meta b/Assets/03_Models/_Characters/Yellow2.meta new file mode 100644 index 00000000..de75d40d --- /dev/null +++ b/Assets/03_Models/_Characters/Yellow2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6ade944dca68714fac9531cc6048f82 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Yellow/Animations.meta b/Assets/03_Models/_Characters/Yellow2/Animations.meta similarity index 77% rename from Assets/03_Models/_Characters/Yellow/Animations.meta rename to Assets/03_Models/_Characters/Yellow2/Animations.meta index 735eec9a..ff088335 100644 --- a/Assets/03_Models/_Characters/Yellow/Animations.meta +++ b/Assets/03_Models/_Characters/Yellow2/Animations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 576b984be9dca044f81aadfbd079dfab +guid: f125cb9094882e046843eae753b20a0d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Yellow/Animations/AnimController_Yellow.controller b/Assets/03_Models/_Characters/Yellow2/Animations/AnimController_Yellow2.controller similarity index 99% rename from Assets/03_Models/_Characters/Yellow/Animations/AnimController_Yellow.controller rename to Assets/03_Models/_Characters/Yellow2/Animations/AnimController_Yellow2.controller index 4a255400..6ade09bd 100644 --- a/Assets/03_Models/_Characters/Yellow/Animations/AnimController_Yellow.controller +++ b/Assets/03_Models/_Characters/Yellow2/Animations/AnimController_Yellow2.controller @@ -83,7 +83,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AnimController_Yellow + m_Name: AnimController_Yellow2 serializedVersion: 5 m_AnimatorParameters: - m_Name: Expression diff --git a/Assets/03_Models/_Characters/Blue/Animations/AnimController_Blue.controller.meta b/Assets/03_Models/_Characters/Yellow2/Animations/AnimController_Yellow2.controller.meta similarity index 79% rename from Assets/03_Models/_Characters/Blue/Animations/AnimController_Blue.controller.meta rename to Assets/03_Models/_Characters/Yellow2/Animations/AnimController_Yellow2.controller.meta index ca694181..da4dec45 100644 --- a/Assets/03_Models/_Characters/Blue/Animations/AnimController_Blue.controller.meta +++ b/Assets/03_Models/_Characters/Yellow2/Animations/AnimController_Yellow2.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aaeff4e753e9a9843abb037e54029554 +guid: d48c15ad7cbc2164182993f0ddb18f25 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/03_Models/_Characters/Blue/Materials.meta b/Assets/03_Models/_Characters/Yellow2/Materials.meta similarity index 77% rename from Assets/03_Models/_Characters/Blue/Materials.meta rename to Assets/03_Models/_Characters/Yellow2/Materials.meta index c4499c48..762c76ca 100644 --- a/Assets/03_Models/_Characters/Blue/Materials.meta +++ b/Assets/03_Models/_Characters/Yellow2/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 074d829963562b143869c46a965be612 +guid: 274c34efa655c9c41a72f014c2d1b913 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Yellow/Materials/Yellow_0_Mat.mat b/Assets/03_Models/_Characters/Yellow2/Materials/Yellow2_0_Mat.mat similarity index 98% rename from Assets/03_Models/_Characters/Yellow/Materials/Yellow_0_Mat.mat rename to Assets/03_Models/_Characters/Yellow2/Materials/Yellow2_0_Mat.mat index 8c5e639a..53ee1f46 100644 --- a/Assets/03_Models/_Characters/Yellow/Materials/Yellow_0_Mat.mat +++ b/Assets/03_Models/_Characters/Yellow2/Materials/Yellow2_0_Mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Yellow_0_Mat + m_Name: Yellow2_0_Mat m_Shader: {fileID: 4800000, guid: 4dede25c09a79bb49b62a737c00a3d9e, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -49,7 +49,7 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -137,7 +137,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 2800000, guid: 073e6560be176b24d9591179a96d7b7f, type: 3} + m_Texture: {fileID: 2800000, guid: f6caa2079b98440428fb782e758b9b5f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -177,7 +177,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Texture2D: - m_Texture: {fileID: 2800000, guid: e3c0efc9ee802ad428d1639acde59dc2, type: 3} + m_Texture: {fileID: 2800000, guid: ad8d4a4732e59d342945f95be28c0b2c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/03_Models/_Characters/Yellow/Materials/Yellow_0_Mat.mat.meta b/Assets/03_Models/_Characters/Yellow2/Materials/Yellow2_0_Mat.mat.meta similarity index 79% rename from Assets/03_Models/_Characters/Yellow/Materials/Yellow_0_Mat.mat.meta rename to Assets/03_Models/_Characters/Yellow2/Materials/Yellow2_0_Mat.mat.meta index a9f265ca..0366faa5 100644 --- a/Assets/03_Models/_Characters/Yellow/Materials/Yellow_0_Mat.mat.meta +++ b/Assets/03_Models/_Characters/Yellow2/Materials/Yellow2_0_Mat.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5888bf9926bae4a439811082b25abfb7 +guid: e1f246a5c92d09d4da763b0995488651 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/03_Models/_Characters/Yellow/Meshs.meta b/Assets/03_Models/_Characters/Yellow2/Meshs.meta similarity index 77% rename from Assets/03_Models/_Characters/Yellow/Meshs.meta rename to Assets/03_Models/_Characters/Yellow2/Meshs.meta index fcbdb9af..62f17c47 100644 --- a/Assets/03_Models/_Characters/Yellow/Meshs.meta +++ b/Assets/03_Models/_Characters/Yellow2/Meshs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6b3ca964e4d23ad44b8fc80da86a9a93 +guid: 74b8e814063e2a24ca42b35afdd28967 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Yellow2/Meshs/Yellow2_Mesh.asset b/Assets/03_Models/_Characters/Yellow2/Meshs/Yellow2_Mesh.asset new file mode 100644 index 00000000..c1a90624 --- /dev/null +++ b/Assets/03_Models/_Characters/Yellow2/Meshs/Yellow2_Mesh.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fb3688a8f4a0d82faa0badd46f7e207fff300b71c0764313ef0b8172f2bb1fa +size 7288538 diff --git a/Assets/03_Models/_Characters/Yellow/Meshs/Yellow_Mesh.asset.meta b/Assets/03_Models/_Characters/Yellow2/Meshs/Yellow2_Mesh.asset.meta similarity index 79% rename from Assets/03_Models/_Characters/Yellow/Meshs/Yellow_Mesh.asset.meta rename to Assets/03_Models/_Characters/Yellow2/Meshs/Yellow2_Mesh.asset.meta index 95c94246..05e534d1 100644 --- a/Assets/03_Models/_Characters/Yellow/Meshs/Yellow_Mesh.asset.meta +++ b/Assets/03_Models/_Characters/Yellow2/Meshs/Yellow2_Mesh.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac86c3adbb008164c88b12049c33bac0 +guid: c7a772e699b534042871ffb62add34fc NativeFormatImporter: externalObjects: {} mainObjectFileID: 4300000 diff --git a/Assets/03_Models/_Characters/Yellow/Textures.meta b/Assets/03_Models/_Characters/Yellow2/Textures.meta similarity index 77% rename from Assets/03_Models/_Characters/Yellow/Textures.meta rename to Assets/03_Models/_Characters/Yellow2/Textures.meta index a03ddf0c..d38509fe 100644 --- a/Assets/03_Models/_Characters/Yellow/Textures.meta +++ b/Assets/03_Models/_Characters/Yellow2/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 044435bf8d25df54195d1e391d394cb0 +guid: 1bdf83954cb29aa4ca0723504ddd7e7b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03_Models/_Characters/Yellow/Textures/MagicaClothExtension.png b/Assets/03_Models/_Characters/Yellow2/Textures/MagicaClothExtension.png similarity index 100% rename from Assets/03_Models/_Characters/Yellow/Textures/MagicaClothExtension.png rename to Assets/03_Models/_Characters/Yellow2/Textures/MagicaClothExtension.png diff --git a/Assets/03_Models/_Characters/Yellow/Textures/MagicaClothExtension.png.meta b/Assets/03_Models/_Characters/Yellow2/Textures/MagicaClothExtension.png.meta similarity index 99% rename from Assets/03_Models/_Characters/Yellow/Textures/MagicaClothExtension.png.meta rename to Assets/03_Models/_Characters/Yellow2/Textures/MagicaClothExtension.png.meta index b2914fed..635e44cf 100644 --- a/Assets/03_Models/_Characters/Yellow/Textures/MagicaClothExtension.png.meta +++ b/Assets/03_Models/_Characters/Yellow2/Textures/MagicaClothExtension.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bdcd2f5f083f0648866f886040e2340 +guid: cd6cfcd9c866a844dafd602fe50d24a4 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_D.png b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_D.png new file mode 100644 index 00000000..f2d6527f --- /dev/null +++ b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d33558c59b3e15a7b8dd5b0b4793e51bc0caf388a886e0c6b5a464adf38684c +size 1039018 diff --git a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_D.png.meta b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_D.png.meta similarity index 99% rename from Assets/03_Models/_Characters/Purple/Textures/Purple_0_D.png.meta rename to Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_D.png.meta index 40a7ca26..4be2af53 100644 --- a/Assets/03_Models/_Characters/Purple/Textures/Purple_0_D.png.meta +++ b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_D.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2ec90647b697aa048a346a9739d429c1 +guid: ad8d4a4732e59d342945f95be28c0b2c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png new file mode 100644 index 00000000..469181c0 --- /dev/null +++ b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3321abf6629ec02b80818025ae4b46f47319381c5c046336f98cf5a46d24697f +size 923790 diff --git a/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png.meta b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png.meta new file mode 100644 index 00000000..1287a2fd --- /dev/null +++ b/Assets/03_Models/_Characters/Yellow2/Textures/Yellow2_0_NormalMap.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: f6caa2079b98440428fb782e758b9b5f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + 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: iOS + 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: Android + 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 + - serializedVersion: 4 + buildTarget: WebGL + 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: WindowsStoreApps + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Yellow2/Yellow2.prefab b/Assets/03_Models/_Characters/Yellow2/Yellow2.prefab new file mode 100644 index 00000000..bd65fd98 --- /dev/null +++ b/Assets/03_Models/_Characters/Yellow2/Yellow2.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a338d58e81505f51f5b5e5a2c88d60bbf1b69fc47bb0b7668f0bffcc52faf994 +size 161231 diff --git a/Assets/03_Models/_Characters/Yellow/Yellow.prefab.meta b/Assets/03_Models/_Characters/Yellow2/Yellow2.prefab.meta similarity index 74% rename from Assets/03_Models/_Characters/Yellow/Yellow.prefab.meta rename to Assets/03_Models/_Characters/Yellow2/Yellow2.prefab.meta index 7069ce1e..9803b615 100644 --- a/Assets/03_Models/_Characters/Yellow/Yellow.prefab.meta +++ b/Assets/03_Models/_Characters/Yellow2/Yellow2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 316bcd92d81a96f42a741fe1eaaa152c +guid: 6d13ba8cbda8dcd4cab57e84ce763ca9 PrefabImporter: externalObjects: {} userData: