diff --git a/Assets/0_Scenes/SampleScene.unity b/Assets/0_Scenes/SampleScene.unity index c23b4ed..f63d4e5 100644 --- a/Assets/0_Scenes/SampleScene.unity +++ b/Assets/0_Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.44748783, g: 0.49744153, b: 0.5753023, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -150,19 +150,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ef9cc52e7e67f984f880a0afc3071385, type: 3} m_Name: m_EditorClassIdentifier: - StoreItems: - - Id: 0 - Name: Guy - Price: 100 - Icon: {fileID: 21300000, guid: afb1eb6db263c73429abcadedd4607a4, type: 3} - Prefab: {fileID: 7363997819604639264, guid: 63f56fca1e9c3cc48ba57e14a6774a4b, - type: 3} - - Id: 1 - Name: Zombie - Price: 200 - Icon: {fileID: 21300000, guid: 8c950c7829811dc48a532caad8f4fbe1, type: 3} - Prefab: {fileID: 5187417456626266655, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} + StoreItems: [] + characterList: {fileID: 11400000, guid: 1ac8f72d5ee3c69448022f810a35ec71, type: 2} --- !u!4 &40247147 Transform: m_ObjectHideFlags: 0 @@ -229,6 +218,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -306,6 +296,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -439,6 +430,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -582,6 +574,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -729,6 +722,11 @@ PrefabInstance: propertyPath: m_Name value: EnviromentPrefab objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalPosition.x @@ -744,6 +742,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 774 objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalRotation.x @@ -759,16 +762,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -853,6 +846,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -986,6 +980,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1230,6 +1225,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1267,6 +1263,11 @@ PrefabInstance: propertyPath: m_Name value: EnviromentPrefab objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalPosition.x @@ -1282,6 +1283,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 511 objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalRotation.x @@ -1297,16 +1303,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1527,6 +1523,11 @@ PrefabInstance: propertyPath: m_Name value: EnviromentPrefab objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalPosition.x @@ -1542,6 +1543,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 248 objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalRotation.x @@ -1557,16 +1563,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1713,6 +1709,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1889,6 +1886,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1945,6 +1943,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2191,6 +2190,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2338,6 +2338,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2531,6 +2532,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2664,6 +2666,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2969,6 +2972,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -3117,6 +3121,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -3541,6 +3546,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -3580,6 +3586,11 @@ PrefabInstance: propertyPath: m_Name value: EnviromentPrefab objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalPosition.x @@ -3595,6 +3606,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -15 objectReference: {fileID: 0} + - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalRotation.x @@ -3610,16 +3626,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 4913665152517020828, guid: c3a693492e7d2454fa875282f1e91dc9, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/2_Prefabs/Char01.prefab b/Assets/2_Prefabs/Char01.prefab index e140a5c..60f3458 100644 --- a/Assets/2_Prefabs/Char01.prefab +++ b/Assets/2_Prefabs/Char01.prefab @@ -511,7 +511,7 @@ GameObject: - component: {fileID: 7363997819378707834} - component: {fileID: 7363997819378707835} m_Layer: 0 - m_Name: free_male_1 + m_Name: Char01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -671,7 +671,7 @@ SkinnedMeshRenderer: - {fileID: 7363997819604992586} - {fileID: 7363997819604992594} m_BlendShapeWeights: [] - m_RootBone: {fileID: 7363997819604992592} + m_RootBone: {fileID: 0} m_AABB: m_Center: {x: -0.026544098, y: -0.000065948814, z: 0.000000010244548} m_Extent: {x: 0.055122387, y: 0.019937018, z: 0.029521387} diff --git a/Assets/2_Prefabs/CharBase.prefab b/Assets/2_Prefabs/CharacterLogic.prefab similarity index 65% rename from Assets/2_Prefabs/CharBase.prefab rename to Assets/2_Prefabs/CharacterLogic.prefab index dda8116..5cbd466 100644 --- a/Assets/2_Prefabs/CharBase.prefab +++ b/Assets/2_Prefabs/CharacterLogic.prefab @@ -9,10 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8244124671374508983} - - component: {fileID: 5447749944364158844} - component: {fileID: 4085908619852332775} m_Layer: 0 - m_Name: CharBase + m_Name: CharacterLogic m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32,25 +31,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &5447749944364158844 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7450849567795141773} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 8b9a677f24793ba45bdc27a1dab7745e, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!136 &4085908619852332775 CapsuleCollider: m_ObjectHideFlags: 0 diff --git a/Assets/2_Prefabs/CharBase.prefab.meta b/Assets/2_Prefabs/CharacterLogic.prefab.meta similarity index 100% rename from Assets/2_Prefabs/CharBase.prefab.meta rename to Assets/2_Prefabs/CharacterLogic.prefab.meta diff --git a/Assets/3_Scripts/Store.cs b/Assets/3_Scripts/Store.cs index 4693849..b5f30a9 100644 --- a/Assets/3_Scripts/Store.cs +++ b/Assets/3_Scripts/Store.cs @@ -2,12 +2,12 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; [System.Serializable] public class StoreItem { - public int Id; public string Name; public int Price; public Sprite Icon; @@ -19,6 +19,13 @@ public class Store : Singleton public List StoreItems; public Action OnItemSelected; + [SerializeField] + private CharacterList characterList; + + void Awake() { + StoreItems.AddRange(characterList.Characters.Select(c => c.ToStoreItem())); + } + public void SelectItem(StoreItem item) { OnItemSelected?.Invoke(item); diff --git a/Assets/CharacterData.meta b/Assets/CharacterData.meta new file mode 100644 index 0000000..498a5ee --- /dev/null +++ b/Assets/CharacterData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76b373270c6873c48bf8435442d7cb48 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CharacterData/CharacterData.cs b/Assets/CharacterData/CharacterData.cs new file mode 100644 index 0000000..882898b --- /dev/null +++ b/Assets/CharacterData/CharacterData.cs @@ -0,0 +1,33 @@ +using EditorPlus; +using EditorPlus.Editor; +using UnityEditor; +using UnityEngine; + +[CreateAssetMenu] +public class CharacterData : ScriptableObject +{ + public int Price; + public Sprite Icon; + public GameObject Prefab; + + public StoreItem ToStoreItem() { + return new StoreItem { + Name = name, + Price = Price, + Icon = Icon, + Prefab = Prefab + }; + } + +#if UNITY_EDITOR + [Button] + private void DeleteCharacterCompletely() { + AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(Icon)); + AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(Prefab)); + + AssetDatabaseUtils.GetSingle()?.Characters.Remove(this); + + AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(this)); + } +#endif +} diff --git a/Assets/CharacterPhotoBooth/PreviewTest.cs.meta b/Assets/CharacterData/CharacterData.cs.meta similarity index 83% rename from Assets/CharacterPhotoBooth/PreviewTest.cs.meta rename to Assets/CharacterData/CharacterData.cs.meta index 545a656..99b90e0 100644 --- a/Assets/CharacterPhotoBooth/PreviewTest.cs.meta +++ b/Assets/CharacterData/CharacterData.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebfa4117587e10d41bb2039267509f5a +guid: 72078f82a01beca4193b49c325124966 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/CharacterData/CharacterList.cs b/Assets/CharacterData/CharacterList.cs new file mode 100644 index 0000000..b9dfa7c --- /dev/null +++ b/Assets/CharacterData/CharacterList.cs @@ -0,0 +1,6 @@ +using System.Collections.Generic; +using UnityEngine; + +public class CharacterList : ScriptableObject { + public List Characters; +} diff --git a/Assets/CharacterData/CharacterList.cs.meta b/Assets/CharacterData/CharacterList.cs.meta new file mode 100644 index 0000000..3bac39c --- /dev/null +++ b/Assets/CharacterData/CharacterList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eeb1d2773c137214e9fa034cf29be43a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CharacterPhotoBooth/CharacterPhotoShootBooth.unity b/Assets/CharacterPhotoBooth/CharacterPhotoShootBooth.unity index ac11d9c..03e017a 100644 --- a/Assets/CharacterPhotoBooth/CharacterPhotoShootBooth.unity +++ b/Assets/CharacterPhotoBooth/CharacterPhotoShootBooth.unity @@ -179,7 +179,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 804763684} - {fileID: 1510394312} m_Father: {fileID: 0} m_RootOrder: 2 @@ -452,92 +451,6 @@ Transform: m_Father: {fileID: 2085843000} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &804763683 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 313146520} - m_Modifications: - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5187417456626266655, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_Name - value: Char02 - objectReference: {fileID: 0} - - target: {fileID: 5187417456626266655, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: abf17b2357e9a2f46be8ee90facfb964, type: 3} ---- !u!4 &804763684 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5187417456625970815, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - m_PrefabInstance: {fileID: 804763683} - m_PrefabAsset: {fileID: 0} ---- !u!1 &804763685 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5187417456626266655, guid: abf17b2357e9a2f46be8ee90facfb964, - type: 3} - m_PrefabInstance: {fileID: 804763683} - m_PrefabAsset: {fileID: 0} --- !u!1 &867653294 GameObject: m_ObjectHideFlags: 0 @@ -1159,7 +1072,7 @@ GameObject: - component: {fileID: 1510394314} - component: {fileID: 1510394313} m_Layer: 0 - m_Name: char(Clone) + m_Name: CharacterPreview m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1179,7 +1092,7 @@ Transform: - {fileID: 1666877688} - {fileID: 925622504} m_Father: {fileID: 313146520} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &1510394313 CapsuleCollider: @@ -1274,9 +1187,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9538483776ee0b54197ec0939f714179, type: 3} m_Name: m_EditorClassIdentifier: - CharacterPreview: {fileID: 804763685} - CharacterParent: {fileID: 313146520} - RenderCamera: {fileID: 776646493} + characterPreview: {fileID: 1510394311} + characterParent: {fileID: 313146520} + renderCamera: {fileID: 776646493} --- !u!4 &1663066772 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/CharacterPhotoBooth/CharacterPreviewCreator.cs b/Assets/CharacterPhotoBooth/CharacterPreviewCreator.cs index 9dbf93e..b7d9633 100644 --- a/Assets/CharacterPhotoBooth/CharacterPreviewCreator.cs +++ b/Assets/CharacterPhotoBooth/CharacterPreviewCreator.cs @@ -1,20 +1,66 @@ using System.Collections; using System.Collections.Generic; using System.IO; +using System.Linq; +using System.Threading; using UnityEditor; +using UnityEditor.SceneManagement; using UnityEngine; +using UnityEngine.SceneManagement; public class CharacterPreviewCreator : MonoBehaviour { [SerializeField] - private GameObject CharacterPreview; + private GameObject characterPreview; [SerializeField] - private Transform CharacterParent; + private Transform characterParent; [SerializeField] - private Camera RenderCamera; + private Camera renderCamera; - public void CreatePreview(GameObject previewTargetPrefab, string targetFile) { - CharacterPreview.SetActive(false); - GameObject previewTarget = Instantiate(previewTargetPrefab, CharacterParent, false); +#region static interface + public static void CreatePreview(GameObject previewTargetPrefab, string photoBoothSceneName, string targetFile) { + Scene[] loadedScenes = GetAllLoadedScenes().ToArray(); + if (loadedScenes.Any(s => s.isDirty)) { + if (EditorUtility.DisplayDialog("Edited scenes found", "Do you want to save the opened scenes ?", "Yes", + "No")) { + EditorSceneManager.SaveScenes(loadedScenes); + } + } + string[] scenePaths = loadedScenes.Select(s => s.path).ToArray(); + + Scene shootBoothScene = EditorSceneManager.OpenScene(photoBoothSceneName, OpenSceneMode.Single); + GetComponentInScene(shootBoothScene).InSceneCreatePreview(previewTargetPrefab, targetFile); + + // reload back the previous scenes + EditorSceneManager.OpenScene(scenePaths.First(), OpenSceneMode.Single); + for (int i = 1; i < loadedScenes.Length; i++) { + EditorSceneManager.OpenScene(scenePaths[i], OpenSceneMode.Additive); + } + } + + private static T GetComponentInScene(Scene scene, bool includeInactive = false) where T : UnityEngine.Object { + + foreach (var gameObject in scene.GetRootGameObjects()) { + T component = gameObject.GetComponentInChildren(includeInactive); + + if (component != null) { + return component; + } + } + + return null; + } + + private static IEnumerable GetAllLoadedScenes() { + for (int i = 0; i < SceneManager.sceneCount; i++) { + yield return SceneManager.GetSceneAt(i); + } + } +#endregion + + + private void InSceneCreatePreview(GameObject previewTargetPrefab, string targetFile) { + characterPreview.SetActive(false); + GameObject previewTarget = Instantiate(previewTargetPrefab, characterParent, false); previewTarget.transform.position = Vector3.zero; Texture2D outputTexture = RenderFrameToTexture(); @@ -23,8 +69,10 @@ public void CreatePreview(GameObject previewTargetPrefab, string targetFile) { File.WriteAllBytes(targetFile, outputTexture.EncodeToPNG()); DestroyImmediate(outputTexture); - //DestroyImmediate(previewTarget); - CharacterPreview.SetActive(true); + DestroyImmediate(previewTarget); + characterPreview.SetActive(true); + + AssetDatabase.Refresh(ImportAssetOptions.ForceSynchronousImport); ChangeImportSettings(targetFile); } @@ -34,13 +82,13 @@ private Texture2D RenderFrameToTexture() { // The Render Texture in RenderTexture.active is the one // that will be read by ReadPixels. var currentRT = RenderTexture.active; - RenderTexture.active = RenderCamera.targetTexture; + RenderTexture.active = renderCamera.targetTexture; // Render the camera's view. - RenderCamera.Render(); + renderCamera.Render(); // Make a new texture and read the active Render Texture into it. - var targetTexture = RenderCamera.targetTexture; + var targetTexture = renderCamera.targetTexture; Texture2D image = new Texture2D(targetTexture.width, targetTexture.height); image.ReadPixels(new Rect(0, 0, targetTexture.width, targetTexture.height), 0, 0); image.Apply(); diff --git a/Assets/CharacterPhotoBooth/PreviewTest.cs b/Assets/CharacterPhotoBooth/PreviewTest.cs deleted file mode 100644 index 7ae4876..0000000 --- a/Assets/CharacterPhotoBooth/PreviewTest.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using UnityEditor; -using UnityEditor.SceneManagement; -using UnityEngine; -using UnityEngine.SceneManagement; - -public class PreviewTest : EditorWindow -{ - [MenuItem("Preview test/test")] - public static void ShowWindow() { - GetWindow().Show(); - } - - private const string SceneName = "Assets/CharacterPhotoBooth/CharacterPhotoShootBooth.unity"; - - private string targetFilePath = "Assets/"; - private GameObject objectToPreview; - - private void OnEnable() { - - } - - private void OnGUI() { - - targetFilePath = EditorGUILayout.TextField("Target file path", targetFilePath); - objectToPreview = (GameObject)EditorGUILayout.ObjectField("Object to create preview of", objectToPreview, typeof(GameObject), false); - - if (GUILayout.Button("Create Preview")) { - - Scene[] loadedScenes = GetAllLoadedScenes().ToArray(); - - if (loadedScenes.Any(s => s.isDirty)) { - if (EditorUtility.DisplayDialog("Edited scenes found", "Do you want to save the opened scenes ?", "Yes", - "No")) { - EditorSceneManager.SaveScenes(loadedScenes); - } - } - - Scene shootBoothScene = EditorSceneManager.OpenScene(SceneName, OpenSceneMode.Single); - GetComponentInScene(shootBoothScene).CreatePreview(objectToPreview, targetFilePath); - } - } - - private T GetComponentInScene(Scene scene, bool includeInactive = false) where T : UnityEngine.Object { - - foreach (var gameObject in scene.GetRootGameObjects()) { - T component = gameObject.GetComponentInChildren(includeInactive); - - if (component != null) { - return component; - } - } - - return null; - } - - private IEnumerable GetAllLoadedScenes() { - for (int i = 0; i < SceneManager.sceneCount; i++) { - yield return SceneManager.GetSceneAt(i); - } - } -} diff --git a/Assets/CharacterPrefabCreator/CharacterCreationParameters.asset b/Assets/CharacterPrefabCreator/CharacterCreationParameters.asset new file mode 100644 index 0000000..691b376 --- /dev/null +++ b/Assets/CharacterPrefabCreator/CharacterCreationParameters.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5a3c15419c89c94aaee17490243dc93, type: 3} + m_Name: CharacterCreationParameters + m_EditorClassIdentifier: + characterFolder: Assets/Characters + characterPrefabFolderName: Prefabs + characterPreviewFolderName: Previews + characterDataFolderName: Data + CharacterPrefabBase: {fileID: 7450849567795141773, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + PhotoBoothSceneName: Assets/CharacterPhotoBooth/CharacterPhotoShootBooth.unity diff --git a/Assets/CharacterPrefabCreator/CharacterCreationParameters.asset.meta b/Assets/CharacterPrefabCreator/CharacterCreationParameters.asset.meta new file mode 100644 index 0000000..a68a9f9 --- /dev/null +++ b/Assets/CharacterPrefabCreator/CharacterCreationParameters.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ab03d86fff256140acc1a3c1724b692 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CharacterPrefabCreator/CharacterCreationParameters.cs b/Assets/CharacterPrefabCreator/CharacterCreationParameters.cs new file mode 100644 index 0000000..b3f3817 --- /dev/null +++ b/Assets/CharacterPrefabCreator/CharacterCreationParameters.cs @@ -0,0 +1,29 @@ +using System.IO; +using EditorPlus.Editor; +using UnityEditor.Animations; +using UnityEngine; + +public class CharacterCreationParameters : ScriptableObject { + + public static CharacterCreationParameters Instance => AssetDatabaseUtils.GetSingle(); + + [SerializeField] + private string characterFolder = "Assets/"; + + [Header("Folder Names")] + [SerializeField] + private string characterPrefabFolderName; + [SerializeField] + private string characterPreviewFolderName; + [SerializeField] + private string characterDataFolderName; + + [Space] + public GameObject CharacterPrefabBase; + public AnimatorController CharacterAnimatorController; + public string PhotoBoothSceneName; + + public string CharacterPrefabFolder => Path.Combine(characterFolder, characterPrefabFolderName); + public string CharacterPreviewFolder => Path.Combine(characterFolder, characterPreviewFolderName); + public string CharacterDataFolder => Path.Combine(characterFolder, characterDataFolderName); +} diff --git a/Assets/CharacterPrefabCreator/CharacterCreationParameters.cs.meta b/Assets/CharacterPrefabCreator/CharacterCreationParameters.cs.meta new file mode 100644 index 0000000..b4997fa --- /dev/null +++ b/Assets/CharacterPrefabCreator/CharacterCreationParameters.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b5a3c15419c89c94aaee17490243dc93 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CharacterPrefabCreator/CharacterCreationWindow.cs b/Assets/CharacterPrefabCreator/CharacterCreationWindow.cs index c5044c7..d5e5c3a 100644 --- a/Assets/CharacterPrefabCreator/CharacterCreationWindow.cs +++ b/Assets/CharacterPrefabCreator/CharacterCreationWindow.cs @@ -1,35 +1,40 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO; using System.Linq; +using EditorPlus.Editor; +using JetBrains.Annotations; using UnityEditor; using UnityEngine; +using UnityEngine.UI; public class CharacterCreationWindow : EditorWindow { - [MenuItem("Avatar Creator/Open Window")] + [MenuItem("Character Creator/Open Window")] public static void ShowWindow() { GetWindow().Show(); } - private GameObject characterRig; - private GameObject characterModel; - private Avatar characterAvatar; + private string characterName; + private int characterPrice; + + private GameObject characterFBXAsset; private Renderer modelRenderer; private Material[] materials; - - private GameObject characterBasePrefab; - private string targetPrefabPath = "Assets/"; - + void OnGUI() { - EditorGUILayout.LabelField("Character", EditorStyles.boldLabel); - characterRig = ObjectField("Character Rig", characterRig, false); + characterName = EditorGUILayout.TextField("Character Name", characterName); + characterPrice = EditorGUILayout.IntField("Character Price", characterPrice); + + EditorGUILayout.Space(); + + EditorGUILayout.LabelField("3D Model", EditorStyles.boldLabel); EditorGUI.BeginChangeCheck(); - characterModel = ObjectField("Character Model", characterModel, false); + characterFBXAsset = ObjectField("Character FBX Asset", characterFBXAsset, false); if (EditorGUI.EndChangeCheck()) UpdateMaterialList(); - characterAvatar = ObjectField("Character Avatar", characterAvatar, false); EditorGUILayout.Space(); @@ -42,37 +47,35 @@ void OnGUI() { } EditorGUILayout.Space(); - - characterBasePrefab = ObjectField("Character Avatar", characterBasePrefab, false); - targetPrefabPath = EditorGUILayout.TextField("Target prefab path", targetPrefabPath); - + GUI.enabled = IsCharacterCreationPossible(); if (GUILayout.Button("Create Character")) { - GameObject characterPrefabVariant = CreatePrefabVariant(characterBasePrefab, targetPrefabPath); - characterPrefabVariant.GetComponent().avatar = characterAvatar; - - AddGameObjectsAsChildrenToPrefab(characterPrefabVariant, characterRig, characterModel); - - EditPrefabValue(characterPrefabVariant, prefab => { - Renderer renderer = prefab.GetComponentInChildren(); - - // We must use a cloned array, because Renderer.sharedMaterials returns a copy of the array. - // source: bottom of https://docs.unity3d.com/ScriptReference/Renderer-sharedMaterials.html - Material[] materialsClone = new Material[materials.Length]; - Array.Copy(materials, materialsClone, materials.Length); - - renderer.sharedMaterials = materialsClone; - - if (renderer is SkinnedMeshRenderer skinnedMeshRenderer) { - skinnedMeshRenderer.rootBone = FindRecursive(prefab.transform, skinnedMeshRenderer.rootBone.name); - } - }); + var parameters = CharacterCreationParameters.Instance; + var characterPrefabPath = Path.Combine(parameters.CharacterPrefabFolder, characterName + ".prefab"); + var characterPreviewPath = Path.Combine(parameters.CharacterPreviewFolder, characterName + ".png"); + var characterDataPath = Path.Combine(parameters.CharacterDataFolder, characterName + ".asset"); + + GameObject characterPrefab = CreateCharacterPrefab(parameters.CharacterPrefabBase, + characterPrefabPath, parameters); + + CharacterPreviewCreator.CreatePreview(characterPrefab, parameters.PhotoBoothSceneName, + characterPreviewPath); + Sprite characterPreview = AssetDatabase.LoadAssetAtPath(characterPreviewPath); + + CharacterData characterData = CreateInstance(); + characterData.Icon = characterPreview; + characterData.Prefab = characterPrefab; + characterData.Price = characterPrice; + + AssetDatabase.CreateAsset(characterData, characterDataPath); + + AssetDatabaseUtils.GetSingle()?.Characters.Add(characterData); } } private void UpdateMaterialList() { - if (characterModel is null) { + if (characterFBXAsset is null) { modelRenderer = null; materials = null; @@ -80,7 +83,7 @@ private void UpdateMaterialList() { } if (modelRenderer is null) - modelRenderer = characterModel.GetComponent(); + modelRenderer = characterFBXAsset.GetComponentInChildren(); int modelMaterialCount = modelRenderer.sharedMaterials.Length; if (materials == null) { @@ -90,20 +93,48 @@ private void UpdateMaterialList() { Array.Resize(ref materials, modelMaterialCount); } } + +#region Prefab Creation + private GameObject CreateCharacterPrefab(GameObject logicGameObject, string targetPrefabPath, CharacterCreationParameters parameters) { + GameObject characterPrefabVariant = CreateSeparatePrefab(characterFBXAsset, targetPrefabPath); + + AddGameObjectsAsChildrenToPrefab(characterPrefabVariant, targetPrefabPath, logicGameObject); + + EditPrefabValue(characterPrefabVariant, prefab => { + Renderer renderer = prefab.GetComponentInChildren(); + + // We must use a cloned array, because Renderer.sharedMaterials returns a copy of the array. + // source: bottom of https://docs.unity3d.com/ScriptReference/Renderer-sharedMaterials.html + Material[] materialsClone = new Material[materials.Length]; + Array.Copy(materials, materialsClone, materials.Length); + + renderer.sharedMaterials = materialsClone; + + if (renderer is SkinnedMeshRenderer skinnedMeshRenderer) { + skinnedMeshRenderer.rootBone = FindRecursive(prefab.transform, skinnedMeshRenderer.rootBone.name); + } + + prefab.GetComponentInChildren().runtimeAnimatorController = + parameters.CharacterAnimatorController; + }); + + return characterPrefabVariant; + } - private GameObject CreatePrefabVariant(GameObject prefabBase, string targetPath) { + private GameObject CreateSeparatePrefab(GameObject prefabBase, string targetPrefabPath) { GameObject prefabBaseInstance = (GameObject)PrefabUtility.InstantiatePrefab(prefabBase); - GameObject prefabVariant = PrefabUtility.SaveAsPrefabAsset(prefabBaseInstance, targetPath); + PrefabUtility.UnpackPrefabInstance(prefabBaseInstance, PrefabUnpackMode.OutermostRoot, InteractionMode.AutomatedAction); + GameObject prefabVariant = PrefabUtility.SaveAsPrefabAsset(prefabBaseInstance, targetPrefabPath); DestroyImmediate(prefabBaseInstance); return prefabVariant; } - private void AddGameObjectsAsChildrenToPrefab(GameObject prefab, params GameObject[] childrenToAdd) { + private void AddGameObjectsAsChildrenToPrefab(GameObject prefab, string targetPrefabPath, params GameObject[] prefabChildrenToAdd) { GameObject prefabInstance = (GameObject)PrefabUtility.InstantiatePrefab(prefab); - foreach (GameObject child in childrenToAdd) { - GameObject childInstance = Instantiate(child, prefabInstance.transform); + foreach (GameObject child in prefabChildrenToAdd) { + GameObject childInstance = (GameObject)PrefabUtility.InstantiatePrefab(child, prefabInstance.transform); PrefabUtility.ApplyAddedGameObject(childInstance, targetPrefabPath, InteractionMode.AutomatedAction); } @@ -120,14 +151,11 @@ private void EditPrefabValue(GameObject prefab, Action valuesModifie valuesModifier.Invoke(instance); PrefabUtility.ApplyPrefabInstance(instance, InteractionMode.AutomatedAction); - //DestroyImmediate(instance); + DestroyImmediate(instance); } private bool IsCharacterCreationPossible() => - characterRig != null - && characterModel != null - && characterAvatar != null - && characterBasePrefab != null; + characterFBXAsset != null; /// /// Works just like Transform.Find(string), but recursively. @@ -161,4 +189,5 @@ private List GetAllDirectChildrenOf(Transform parent) => private T ObjectField(string fieldLabel, T obj, bool allowSceneObjects) where T : UnityEngine.Object { return (T) EditorGUILayout.ObjectField(fieldLabel, obj, typeof(T), allowSceneObjects); } +#endregion } diff --git a/Assets/Characters.meta b/Assets/Characters.meta new file mode 100644 index 0000000..9b6b406 --- /dev/null +++ b/Assets/Characters.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6433ca0ba12338c42ad91ef02c9ee478 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/CharacterList.asset b/Assets/Characters/CharacterList.asset new file mode 100644 index 0000000..13dd172 --- /dev/null +++ b/Assets/Characters/CharacterList.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eeb1d2773c137214e9fa034cf29be43a, type: 3} + m_Name: CharacterList + m_EditorClassIdentifier: + Characters: + - {fileID: 11400000, guid: 19744e492b2e1464a82e3b0e819b026b, type: 2} + - {fileID: 11400000, guid: f4c9550a71794944fb13f1d910b5ec96, type: 2} diff --git a/Assets/Characters/CharacterList.asset.meta b/Assets/Characters/CharacterList.asset.meta new file mode 100644 index 0000000..c6f618e --- /dev/null +++ b/Assets/Characters/CharacterList.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ac8f72d5ee3c69448022f810a35ec71 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Data.meta b/Assets/Characters/Data.meta new file mode 100644 index 0000000..561332e --- /dev/null +++ b/Assets/Characters/Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b82483ef4a5a5034487fa2efd16589f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Data/Narmol.asset b/Assets/Characters/Data/Narmol.asset new file mode 100644 index 0000000..c68ca7d --- /dev/null +++ b/Assets/Characters/Data/Narmol.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72078f82a01beca4193b49c325124966, type: 3} + m_Name: Narmol + m_EditorClassIdentifier: + Price: 0 + Icon: {fileID: 21300000, guid: 83d2dccbdba1235478930bbcfc4f9ddd, type: 3} + Prefab: {fileID: 7950973473709792752, guid: 5574bc04bff642b4e8cf3a0543e60bf3, type: 3} diff --git a/Assets/Characters/Data/Narmol.asset.meta b/Assets/Characters/Data/Narmol.asset.meta new file mode 100644 index 0000000..d0f77c1 --- /dev/null +++ b/Assets/Characters/Data/Narmol.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 798e8a08ee304b94ea8c353c4372fe81 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Prefabs.meta b/Assets/Characters/Prefabs.meta new file mode 100644 index 0000000..8974078 --- /dev/null +++ b/Assets/Characters/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3401b048ac5d8d34ba603553ddc84309 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Prefabs/Narmol.prefab b/Assets/Characters/Prefabs/Narmol.prefab new file mode 100644 index 0000000..cf3fe5d --- /dev/null +++ b/Assets/Characters/Prefabs/Narmol.prefab @@ -0,0 +1,1107 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7950973473709792640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425056} + m_Layer: 0 + m_Name: basic_rig L Finger0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425056 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792640} + m_LocalRotation: {x: -0.07481257, y: -0.24372122, z: -0.080375746, w: 0.9636093} + m_LocalPosition: {x: -0.030959338, y: -0.005252266, z: -0.026663536} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425082} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425058} + m_Layer: 0 + m_Name: basic_rig L Finger1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425058 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792642} + m_LocalRotation: {x: -0.00039815973, y: 1.2234834e-10, z: -0.0000000149011115, w: 0.99999994} + m_LocalPosition: {x: -0.09509619, y: 0.0013267898, z: -0.008340397} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425082} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425060} + m_Layer: 0 + m_Name: basic_rig L Finger2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425060 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792644} + m_LocalRotation: {x: -0.00038227852, y: 0.27959305, z: -0.00011132961, w: 0.96011853} + m_LocalPosition: {x: -0.08257887, y: 0.0015520096, z: 0.024709873} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425082} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425062} + m_Layer: 0 + m_Name: basic_rig L Foot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425062 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792646} + m_LocalRotation: {x: 0.0000130019735, y: 0.008274116, z: -0.119211085, w: 0.9928345} + m_LocalPosition: {x: -0.11653762, y: 0, z: -0.0000000047683715} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425086} + m_Father: {fileID: 7950973473709425068} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425064} + m_Layer: 0 + m_Name: basic_rig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425064 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792648} + m_LocalRotation: {x: -0.50000036, y: 0.49999964, z: 0.49999964, w: 0.50000036} + m_LocalPosition: {x: -5.9604643e-10, y: 0.27992854, z: -0.003742392} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425076} + m_Father: {fileID: 7950973473709425040} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425066} + m_Layer: 0 + m_Name: basic_rig Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425066 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792650} + m_LocalRotation: {x: -5.6082302e-14, y: -0.0000000011042546, z: 0.00039882964, w: 0.99999994} + m_LocalPosition: {x: -0.051421735, y: 0, z: 9.094947e-15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425074} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425068} + m_Layer: 0 + m_Name: basic_rig L Calf + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425068 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792652} + m_LocalRotation: {x: -1.0726464e-10, y: 9.2512487e-10, z: 0.11517454, w: 0.99334526} + m_LocalPosition: {x: -0.12845731, y: 5.9604643e-10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425062} + m_Father: {fileID: 7950973473709425084} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425070} + m_Layer: 0 + m_Name: basic_rig L Clavicle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792654} + m_LocalRotation: {x: -0.60876137, y: -0.00024348815, z: 0.79335326, w: -0.0003150326} + m_LocalPosition: {x: -0.097930945, y: -0.032242324, z: 0.03381914} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425072} + m_Father: {fileID: 7950973473709425052} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425072} + m_Layer: 0 + m_Name: basic_rig L UpperArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792656} + m_LocalRotation: {x: 0.006366949, y: -0.34436083, z: -0.005388389, w: 0.93880033} + m_LocalPosition: {x: -0.073148504, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425080} + m_Father: {fileID: 7950973473709425070} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792658 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425074} + m_Layer: 0 + m_Name: basic_rig Neck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792658} + m_LocalRotation: {x: -2.652536e-15, y: 0.00000012098273, z: -0.043619383, w: 0.99904823} + m_LocalPosition: {x: -0.13221313, y: -0.01147458, z: -9.459313e-11} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425066} + m_Father: {fileID: 7950973473709425052} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425076} + m_Layer: 0 + m_Name: basic_rig Pelvis + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425076 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792660} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.4999993, w: 0.5000007} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425084} + - {fileID: 7950973473709425030} + - {fileID: 7950973473709425050} + m_Father: {fileID: 7950973473709425064} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425078} + m_Layer: 0 + m_Name: basic_rig R Calf + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792662} + m_LocalRotation: {x: -1.3239253e-10, y: -0.000000001890474, z: 0.11517453, w: 0.99334526} + m_LocalPosition: {x: -0.1284573, y: 0, z: -0.0000000047683715} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425024} + m_Father: {fileID: 7950973473709425030} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425080} + m_Layer: 0 + m_Name: basic_rig L Forearm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425080 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792664} + m_LocalRotation: {x: 0.0000000010476531, y: 1.3341092e-11, z: 0.012733233, w: 0.99991894} + m_LocalPosition: {x: -0.10840538, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425082} + m_Father: {fileID: 7950973473709425072} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425082} + m_Layer: 0 + m_Name: basic_rig L Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425082 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792666} + m_LocalRotation: {x: -0.70510024, y: -0.049390048, z: -0.049350735, w: 0.70566195} + m_LocalPosition: {x: -0.11165712, y: -0.0000000023841857, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425056} + - {fileID: 7950973473709425058} + - {fileID: 7950973473709425060} + m_Father: {fileID: 7950973473709425080} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425084} + m_Layer: 0 + m_Name: basic_rig L Thigh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425084 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792668} + m_LocalRotation: {x: 0.0040685274, y: 0.9999575, z: -0.00094074855, w: 0.0082198605} + m_LocalPosition: {x: 0.000000095367426, y: 0.00000010341406, z: 0.06581989} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425068} + m_Father: {fileID: 7950973473709425076} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425086} + m_Layer: 0 + m_Name: basic_rig L Toe0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425086 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792670} + m_LocalRotation: {x: -0.00000001545431, y: 0.00000001545431, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.038557664, y: 0.038214017, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425062} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425024} + m_Layer: 0 + m_Name: basic_rig R Foot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425024 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792736} + m_LocalRotation: {x: -0.000013012073, y: -0.008274201, z: -0.11921108, w: 0.9928345} + m_LocalPosition: {x: -0.11653762, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425048} + m_Father: {fileID: 7950973473709425078} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425026} + m_Layer: 0 + m_Name: basic_rig R Forearm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425026 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792738} + m_LocalRotation: {x: -7.84579e-10, y: -0.000000029814732, z: 0.012733233, w: 0.99991894} + m_LocalPosition: {x: -0.10840538, y: -0.0000000047683715, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425028} + m_Father: {fileID: 7950973473709425054} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792740 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425028} + m_Layer: 0 + m_Name: basic_rig R Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792740} + m_LocalRotation: {x: 0.70510024, y: 0.04939005, z: -0.04935074, w: 0.70566195} + m_LocalPosition: {x: -0.11165716, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425034} + - {fileID: 7950973473709425036} + - {fileID: 7950973473709425038} + m_Father: {fileID: 7950973473709425026} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425030} + m_Layer: 0 + m_Name: basic_rig R Thigh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425030 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792742} + m_LocalRotation: {x: 0.0040685404, y: 0.9999575, z: 0.00093935576, w: -0.008221327} + m_LocalPosition: {x: -0.000000095367426, y: -0.00000007897615, z: -0.065819904} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425078} + m_Father: {fileID: 7950973473709425076} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425032} + m_Layer: 0 + m_Name: basic_rig R Clavicle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792744} + m_LocalRotation: {x: 0.60876137, y: 0.0002412877, z: 0.79335326, w: -0.00031672104} + m_LocalPosition: {x: -0.097930945, y: -0.03224214, z: -0.03381932} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425054} + m_Father: {fileID: 7950973473709425052} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425034} + m_Layer: 0 + m_Name: basic_rig R Finger0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792746} + m_LocalRotation: {x: 0.07481256, y: 0.24372122, z: -0.08037573, w: 0.9636093} + m_LocalPosition: {x: -0.0309593, y: -0.005252266, z: 0.026663538} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425028} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425036} + m_Layer: 0 + m_Name: basic_rig R Finger1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792748} + m_LocalRotation: {x: 0.00039815938, y: 1.16415315e-10, z: -4.6351852e-14, w: 0.99999994} + m_LocalPosition: {x: -0.09509618, y: 0.0013267898, z: 0.008340402} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425028} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425038} + m_Layer: 0 + m_Name: basic_rig R Finger2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792750} + m_LocalRotation: {x: 0.0003822732, y: -0.27959305, z: -0.0001113467, w: 0.96011853} + m_LocalPosition: {x: -0.082578845, y: 0.0015519332, z: -0.024709867} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425028} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425040} + - component: {fileID: 7950973473719316040} + m_Layer: 0 + m_Name: Narmol + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792752} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425064} + - {fileID: 7950973473709425042} + - {fileID: 129292296389779568} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &7950973473719316040 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792752} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + m_Controller: {fileID: 9100000, guid: 8b9a677f24793ba45bdc27a1dab7745e, type: 2} + m_CullingMode: 1 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7950973473709792754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425042} + - component: {fileID: 7950973473723388040} + m_Layer: 0 + m_Name: zombie_zombie4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792754} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425040} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &7950973473723388040 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792754} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cd498a1a8b711464ebdc6816978beb29, type: 2} + - {fileID: 2100000, guid: cd498a1a8b711464ebdc6816978beb29, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + m_Bones: + - {fileID: 7950973473709425066} + - {fileID: 7950973473709425068} + - {fileID: 7950973473709425084} + - {fileID: 7950973473709425076} + - {fileID: 7950973473709425030} + - {fileID: 7950973473709425062} + - {fileID: 7950973473709425086} + - {fileID: 7950973473709425050} + - {fileID: 7950973473709425078} + - {fileID: 7950973473709425024} + - {fileID: 7950973473709425048} + - {fileID: 7950973473709425052} + - {fileID: 7950973473709425070} + - {fileID: 7950973473709425072} + - {fileID: 7950973473709425080} + - {fileID: 7950973473709425032} + - {fileID: 7950973473709425074} + - {fileID: 7950973473709425082} + - {fileID: 7950973473709425056} + - {fileID: 7950973473709425058} + - {fileID: 7950973473709425060} + - {fileID: 7950973473709425054} + - {fileID: 7950973473709425026} + - {fileID: 7950973473709425028} + - {fileID: 7950973473709425034} + - {fileID: 7950973473709425036} + - {fileID: 7950973473709425038} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 7950973473709425076} + m_AABB: + m_Center: {x: -0.2262297, y: 0.003887251, z: 0} + m_Extent: {x: 0.5237266, y: 0.20348991, z: 0.30575648} + m_DirtyAABB: 0 +--- !u!1 &7950973473709792760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425048} + m_Layer: 0 + m_Name: basic_rig R Toe0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425048 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792760} + m_LocalRotation: {x: 0.000000015454312, y: -0.000000015454312, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.038557664, y: 0.038214017, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7950973473709425024} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425050} + m_Layer: 0 + m_Name: basic_rig Spine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792762} + m_LocalRotation: {x: -0.000002080476, y: 0.000000693676, z: -0.000398159, w: 0.99999994} + m_LocalPosition: {x: -0.05329628, y: -0.000105138715, z: 0.00000007405702} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425052} + m_Father: {fileID: 7950973473709425076} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425052} + m_Layer: 0 + m_Name: basic_rig Spine1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425052 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792764} + m_LocalRotation: {x: -3.0117673e-14, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0.1320565, y: -0.00010515332, z: -2.9165279e-10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425070} + - {fileID: 7950973473709425074} + - {fileID: 7950973473709425032} + m_Father: {fileID: 7950973473709425050} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7950973473709792766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7950973473709425054} + m_Layer: 0 + m_Name: basic_rig UpperArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7950973473709425054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7950973473709792766} + m_LocalRotation: {x: -0.006366949, y: 0.34436083, z: -0.005388389, w: 0.93880033} + m_LocalPosition: {x: -0.073148504, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7950973473709425026} + m_Father: {fileID: 7950973473709425032} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8332315843896419271 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7950973473709425040} + m_Modifications: + - target: {fileID: 7450849567795141773, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_Name + value: CharacterLogic + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6363cc0f634bd004ea859073a8534f2a, type: 3} +--- !u!4 &129292296389779568 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, + type: 3} + m_PrefabInstance: {fileID: 8332315843896419271} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/char.prefab.meta b/Assets/Characters/Prefabs/Narmol.prefab.meta similarity index 74% rename from Assets/char.prefab.meta rename to Assets/Characters/Prefabs/Narmol.prefab.meta index c70c4bc..25fc949 100644 --- a/Assets/char.prefab.meta +++ b/Assets/Characters/Prefabs/Narmol.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f6eaad2670d77e7458f2875d109bdde9 +guid: 5574bc04bff642b4e8cf3a0543e60bf3 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/char.prefab b/Assets/Characters/Prefabs/NewCharacter.prefab similarity index 79% rename from Assets/char.prefab rename to Assets/Characters/Prefabs/NewCharacter.prefab index c7e02dd..43133e6 100644 --- a/Assets/char.prefab +++ b/Assets/Characters/Prefabs/NewCharacter.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &272342981255297249 +--- !u!1 &529610967126921512 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,30 +8,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 244915204493187364} + - component: {fileID: 2179543672545921358} m_Layer: 0 - m_Name: basic_rig L Forearm + m_Name: basic_rig R Calf m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &244915204493187364 +--- !u!4 &2179543672545921358 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 272342981255297249} - m_LocalRotation: {x: 0.0000000010476531, y: 1.3341092e-11, z: 0.012733233, w: 0.99991894} - m_LocalPosition: {x: -0.10840538, y: 0, z: 0} + m_GameObject: {fileID: 529610967126921512} + m_LocalRotation: {x: -1.3239253e-10, y: -0.000000001890474, z: 0.11517453, w: 0.99334526} + m_LocalPosition: {x: -0.1284573, y: 0, z: -0.0000000047683715} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8546313461054577822} - m_Father: {fileID: 7624207055085734630} + - {fileID: 6339806049268003083} + m_Father: {fileID: 3737473603988124399} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &309285278058097576 +--- !u!1 &708648045014543902 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -39,29 +39,109 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5020074112655270564} + - component: {fileID: 5330368730003298690} + - component: {fileID: 8376630089609931048} m_Layer: 0 - m_Name: basic_rig L Finger2 + m_Name: zombie_zombie4(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5020074112655270564 +--- !u!4 &5330368730003298690 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 309285278058097576} - m_LocalRotation: {x: -0.00038227852, y: 0.27959305, z: -0.00011132961, w: 0.96011853} - m_LocalPosition: {x: -0.08257887, y: 0.0015520096, z: 0.024709873} + m_GameObject: {fileID: 708648045014543902} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8546313461054577822} - m_RootOrder: 2 + m_Father: {fileID: 1367442650371087181} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &324757756884027942 +--- !u!137 &8376630089609931048 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708648045014543902} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ba0f96cbb74387a4b8bac35af80b2748, type: 2} + - {fileID: 2100000, guid: ba0f96cbb74387a4b8bac35af80b2748, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + m_Bones: + - {fileID: 400002, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400004, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400020, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400028, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400046, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400014, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400022, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400050, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400030, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400040, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400048, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400052, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400006, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400024, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400016, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400032, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400026, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400018, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400008, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400010, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400012, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400054, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400042, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400044, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400034, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400036, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + - {fileID: 400038, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 3475562907873147553} + m_AABB: + m_Center: {x: -0.2262297, y: 0.003887251, z: 0} + m_Extent: {x: 0.5237266, y: 0.20348991, z: 0.30575648} + m_DirtyAABB: 0 +--- !u!1 &778937432353562440 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -69,30 +149,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 220173210361221657} + - component: {fileID: 8583809015936385455} m_Layer: 0 - m_Name: basic_rig Neck + m_Name: basic_rig L Foot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &220173210361221657 +--- !u!4 &8583809015936385455 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 324757756884027942} - m_LocalRotation: {x: -2.652536e-15, y: 0.00000012098273, z: -0.043619383, w: 0.99904823} - m_LocalPosition: {x: -0.13221313, y: -0.01147458, z: -9.459313e-11} + m_GameObject: {fileID: 778937432353562440} + m_LocalRotation: {x: 0.0000130019735, y: 0.008274116, z: -0.119211085, w: 0.9928345} + m_LocalPosition: {x: -0.11653762, y: 0, z: -0.0000000047683715} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2426806525915566619} - m_Father: {fileID: 8304144215675197943} - m_RootOrder: 1 + - {fileID: 7551996481859408390} + m_Father: {fileID: 1282248062552274600} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &400272915502423159 +--- !u!1 &2161151906954606849 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -100,30 +180,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9080435461166154013} + - component: {fileID: 7278933360946293667} m_Layer: 0 - m_Name: basic_rig L Calf + m_Name: basic_rig R Clavicle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &9080435461166154013 +--- !u!4 &7278933360946293667 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400272915502423159} - m_LocalRotation: {x: -1.0726464e-10, y: 9.2512487e-10, z: 0.11517454, w: 0.99334526} - m_LocalPosition: {x: -0.12845731, y: 5.9604643e-10, z: 0} + m_GameObject: {fileID: 2161151906954606849} + m_LocalRotation: {x: 0.60876137, y: 0.00024128768, z: 0.79335326, w: -0.000316721} + m_LocalPosition: {x: -0.097930945, y: -0.03224214, z: -0.03381932} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7569171611172347631} - m_Father: {fileID: 1584376599269205128} - m_RootOrder: 0 + - {fileID: 8828151806961448203} + m_Father: {fileID: 1858509012970542496} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &928670957468889565 +--- !u!1 &2187969023136906846 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,32 +211,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8546313461054577822} + - component: {fileID: 8715142258166281225} m_Layer: 0 - m_Name: basic_rig L Hand + m_Name: basic_rig R Toe0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8546313461054577822 +--- !u!4 &8715142258166281225 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 928670957468889565} - m_LocalRotation: {x: -0.70510024, y: -0.049390048, z: -0.049350735, w: 0.70566195} - m_LocalPosition: {x: -0.11165712, y: -0.0000000023841857, z: 0} + m_GameObject: {fileID: 2187969023136906846} + m_LocalRotation: {x: 0.000000015454312, y: -0.000000015454312, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.038557664, y: 0.038214017, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5615110700874972321} - - {fileID: 8204715075133274829} - - {fileID: 5020074112655270564} - m_Father: {fileID: 244915204493187364} + m_Children: [] + m_Father: {fileID: 6339806049268003083} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1716812824388479572 +--- !u!1 &2384385654777207947 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -164,29 +241,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5615110700874972321} + - component: {fileID: 2036121992915311064} m_Layer: 0 - m_Name: basic_rig L Finger0 + m_Name: basic_rig R Finger2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5615110700874972321 +--- !u!4 &2036121992915311064 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1716812824388479572} - m_LocalRotation: {x: -0.07481257, y: -0.24372122, z: -0.080375746, w: 0.9636093} - m_LocalPosition: {x: -0.030959338, y: -0.005252266, z: -0.026663536} + m_GameObject: {fileID: 2384385654777207947} + m_LocalRotation: {x: 0.0003822732, y: -0.27959305, z: -0.0001113467, w: 0.96011853} + m_LocalPosition: {x: -0.082578845, y: 0.0015519332, z: -0.024709867} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8546313461054577822} - m_RootOrder: 0 + m_Father: {fileID: 7830918767811790532} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1763783112385420289 +--- !u!1 &2679540990384206894 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -194,30 +271,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3464818619151201844} + - component: {fileID: 3475562907873147553} m_Layer: 0 - m_Name: basic_rig UpperArm + m_Name: basic_rig Pelvis m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3464818619151201844 +--- !u!4 &3475562907873147553 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763783112385420289} - m_LocalRotation: {x: -0.006366949, y: 0.34436083, z: -0.005388389, w: 0.93880033} - m_LocalPosition: {x: -0.073148504, y: 0, z: 0} + m_GameObject: {fileID: 2679540990384206894} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.4999993, w: 0.5000007} + m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4331969699096901084} - m_Father: {fileID: 3186819888068319387} + - {fileID: 4072987094083159533} + - {fileID: 3737473603988124399} + - {fileID: 9120572593902253268} + m_Father: {fileID: 6738001785944973896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2244374694203130819 +--- !u!1 &2870760425735839967 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -225,30 +304,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2751127697185348938} + - component: {fileID: 4002373586589946625} m_Layer: 0 - m_Name: basic_rig R Thigh + m_Name: basic_rig R Finger0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2751127697185348938 +--- !u!4 &4002373586589946625 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2244374694203130819} - m_LocalRotation: {x: 0.0040685404, y: 0.9999575, z: 0.00093935576, w: -0.008221327} - m_LocalPosition: {x: -0.000000095367426, y: -0.00000007897615, z: -0.065819904} + m_GameObject: {fileID: 2870760425735839967} + m_LocalRotation: {x: 0.07481256, y: 0.24372122, z: -0.08037573, w: 0.9636093} + m_LocalPosition: {x: -0.0309593, y: -0.005252266, z: 0.026663538} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 723713093156174847} - m_Father: {fileID: 204775503482516853} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 7830918767811790532} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2430451795249622382 +--- !u!1 &4353888664568077696 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -256,29 +334,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8204715075133274829} + - component: {fileID: 3737473603988124399} m_Layer: 0 - m_Name: basic_rig L Finger1 + m_Name: basic_rig R Thigh m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8204715075133274829 +--- !u!4 &3737473603988124399 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2430451795249622382} - m_LocalRotation: {x: -0.00039815973, y: 1.2234834e-10, z: -0.0000000149011115, w: 0.99999994} - m_LocalPosition: {x: -0.09509619, y: 0.0013267898, z: -0.008340397} + m_GameObject: {fileID: 4353888664568077696} + m_LocalRotation: {x: 0.0040685404, y: 0.9999575, z: 0.00093935576, w: -0.008221327} + m_LocalPosition: {x: -0.000000095367426, y: -0.00000007897615, z: -0.065819904} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8546313461054577822} + m_Children: + - {fileID: 2179543672545921358} + m_Father: {fileID: 3475562907873147553} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2449335850721125862 +--- !u!1 &4474439691380238168 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -286,30 +365,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8581160017705443530} + - component: {fileID: 4072987094083159533} m_Layer: 0 - m_Name: basic_rig Spine + m_Name: basic_rig L Thigh m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8581160017705443530 +--- !u!4 &4072987094083159533 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2449335850721125862} - m_LocalRotation: {x: -0.000002080476, y: 0.000000693676, z: -0.000398159, w: 0.99999994} - m_LocalPosition: {x: -0.05329628, y: -0.000105138715, z: 0.00000007405702} + m_GameObject: {fileID: 4474439691380238168} + m_LocalRotation: {x: 0.0040685274, y: 0.9999575, z: -0.00094074855, w: 0.0082198605} + m_LocalPosition: {x: 0.000000095367426, y: 0.00000010341406, z: 0.06581989} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8304144215675197943} - m_Father: {fileID: 204775503482516853} - m_RootOrder: 2 + - {fileID: 1282248062552274600} + m_Father: {fileID: 3475562907873147553} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3028385973853303872 +--- !u!1 &5115225088441366008 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -317,29 +396,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8898811840239590776} + - component: {fileID: 2815996703444295987} m_Layer: 0 - m_Name: basic_rig R Finger2 + m_Name: basic_rig L UpperArm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8898811840239590776 +--- !u!4 &2815996703444295987 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3028385973853303872} - m_LocalRotation: {x: 0.0003822732, y: -0.27959305, z: -0.0001113467, w: 0.96011853} - m_LocalPosition: {x: -0.082578845, y: 0.0015519332, z: -0.024709867} + m_GameObject: {fileID: 5115225088441366008} + m_LocalRotation: {x: 0.006366949, y: -0.34436083, z: -0.005388389, w: 0.93880033} + m_LocalPosition: {x: -0.073148504, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7512790670008701006} - m_RootOrder: 2 + m_Children: + - {fileID: 3121202059176361628} + m_Father: {fileID: 6036601113265736439} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3274481158970491059 +--- !u!1 &5246444533348432295 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -347,30 +427,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3186819888068319387} + - component: {fileID: 1282248062552274600} m_Layer: 0 - m_Name: basic_rig R Clavicle + m_Name: basic_rig L Calf m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3186819888068319387 +--- !u!4 &1282248062552274600 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3274481158970491059} - m_LocalRotation: {x: 0.60876137, y: 0.00024128768, z: 0.79335326, w: -0.000316721} - m_LocalPosition: {x: -0.097930945, y: -0.03224214, z: -0.03381932} + m_GameObject: {fileID: 5246444533348432295} + m_LocalRotation: {x: -1.0726464e-10, y: 9.2512487e-10, z: 0.11517454, w: 0.99334526} + m_LocalPosition: {x: -0.12845731, y: 5.9604643e-10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3464818619151201844} - m_Father: {fileID: 8304144215675197943} - m_RootOrder: 2 + - {fileID: 8583809015936385455} + m_Father: {fileID: 4072987094083159533} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3538106781549967396 +--- !u!1 &5923224032285777684 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -378,30 +458,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 723713093156174847} + - component: {fileID: 1858509012970542496} m_Layer: 0 - m_Name: basic_rig R Calf + m_Name: basic_rig Spine1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &723713093156174847 +--- !u!4 &1858509012970542496 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3538106781549967396} - m_LocalRotation: {x: -1.3239253e-10, y: -0.000000001890474, z: 0.11517453, w: 0.99334526} - m_LocalPosition: {x: -0.1284573, y: 0, z: -0.0000000047683715} + m_GameObject: {fileID: 5923224032285777684} + m_LocalRotation: {x: -3.0117673e-14, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0.1320565, y: -0.00010515332, z: -2.9165279e-10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6850896975486049822} - m_Father: {fileID: 2751127697185348938} + - {fileID: 6036601113265736439} + - {fileID: 8630768682241199040} + - {fileID: 7278933360946293667} + m_Father: {fileID: 9120572593902253268} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3617085540511422680 +--- !u!1 &6690788318234280848 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -409,30 +491,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6850896975486049822} + - component: {fileID: 3121202059176361628} m_Layer: 0 - m_Name: basic_rig R Foot + m_Name: basic_rig L Forearm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6850896975486049822 +--- !u!4 &3121202059176361628 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3617085540511422680} - m_LocalRotation: {x: -0.000013012073, y: -0.008274201, z: -0.11921108, w: 0.9928345} - m_LocalPosition: {x: -0.11653762, y: 0, z: 0} + m_GameObject: {fileID: 6690788318234280848} + m_LocalRotation: {x: 0.0000000010476531, y: 1.3341092e-11, z: 0.012733233, w: 0.99991894} + m_LocalPosition: {x: -0.10840538, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1452628591085006516} - m_Father: {fileID: 723713093156174847} + - {fileID: 7459450206649684034} + m_Father: {fileID: 2815996703444295987} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3699659942214167880 +--- !u!1 &6797925932977135630 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -440,32 +522,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7512790670008701006} + - component: {fileID: 6738001785944973896} m_Layer: 0 - m_Name: basic_rig R Hand + m_Name: basic_rig(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7512790670008701006 +--- !u!4 &6738001785944973896 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3699659942214167880} - m_LocalRotation: {x: 0.70510024, y: 0.04939005, z: -0.04935074, w: 0.70566195} - m_LocalPosition: {x: -0.11165716, y: 0, z: 0} + m_GameObject: {fileID: 6797925932977135630} + m_LocalRotation: {x: -0.50000036, y: 0.49999964, z: 0.49999964, w: 0.50000036} + m_LocalPosition: {x: -5.9604643e-10, y: 0.27992854, z: -0.003742392} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6078171329584403707} - - {fileID: 301508307796103175} - - {fileID: 8898811840239590776} - m_Father: {fileID: 4331969699096901084} + - {fileID: 3475562907873147553} + m_Father: {fileID: 1367442650371087181} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4792846043859636057 +--- !u!1 &6821721855236161888 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -473,29 +553,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2426806525915566619} + - component: {fileID: 7551996481859408390} m_Layer: 0 - m_Name: basic_rig Head + m_Name: basic_rig L Toe0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2426806525915566619 +--- !u!4 &7551996481859408390 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4792846043859636057} - m_LocalRotation: {x: -5.6082302e-14, y: -0.0000000011042546, z: 0.00039882964, w: 0.99999994} - m_LocalPosition: {x: -0.051421735, y: 0, z: 9.094947e-15} + m_GameObject: {fileID: 6821721855236161888} + m_LocalRotation: {x: -0.00000001545431, y: 0.00000001545431, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.038557664, y: 0.038214017, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 220173210361221657} + m_Father: {fileID: 8583809015936385455} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4989464805066051595 +--- !u!1 &6860233829767273587 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -503,29 +583,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4375132758233704463} + - component: {fileID: 6795725491858654471} m_Layer: 0 - m_Name: basic_rig L Toe0 + m_Name: basic_rig R Finger1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4375132758233704463 +--- !u!4 &6795725491858654471 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4989464805066051595} - m_LocalRotation: {x: -0.00000001545431, y: 0.00000001545431, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.038557664, y: 0.038214017, z: 0} + m_GameObject: {fileID: 6860233829767273587} + m_LocalRotation: {x: 0.00039815938, y: 1.16415315e-10, z: -4.6351852e-14, w: 0.99999994} + m_LocalPosition: {x: -0.09509618, y: 0.0013267898, z: 0.008340402} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7569171611172347631} - m_RootOrder: 0 + m_Father: {fileID: 7830918767811790532} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5046066633632970384 +--- !u!1 &6968656704648093090 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -533,30 +613,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7624207055085734630} + - component: {fileID: 166600901909914823} m_Layer: 0 - m_Name: basic_rig L UpperArm + m_Name: basic_rig L Finger2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7624207055085734630 +--- !u!4 &166600901909914823 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5046066633632970384} - m_LocalRotation: {x: 0.006366949, y: -0.34436083, z: -0.005388389, w: 0.93880033} - m_LocalPosition: {x: -0.073148504, y: 0, z: 0} + m_GameObject: {fileID: 6968656704648093090} + m_LocalRotation: {x: -0.00038227852, y: 0.27959305, z: -0.00011132961, w: 0.96011853} + m_LocalPosition: {x: -0.08257887, y: 0.0015520096, z: 0.024709873} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 244915204493187364} - m_Father: {fileID: 7135417014136785550} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 7459450206649684034} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5293497855247039982 +--- !u!1 &7047511380441349994 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -564,29 +643,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1452628591085006516} + - component: {fileID: 1198441730380507569} m_Layer: 0 - m_Name: basic_rig R Toe0 + m_Name: basic_rig L Finger0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1452628591085006516 +--- !u!4 &1198441730380507569 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5293497855247039982} - m_LocalRotation: {x: 0.000000015454312, y: -0.000000015454312, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.038557664, y: 0.038214017, z: 0} + m_GameObject: {fileID: 7047511380441349994} + m_LocalRotation: {x: -0.07481257, y: -0.24372122, z: -0.080375746, w: 0.9636093} + m_LocalPosition: {x: -0.030959338, y: -0.005252266, z: -0.026663536} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6850896975486049822} + m_Father: {fileID: 7459450206649684034} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5726133448678412869 +--- !u!1 &7358188494442637987 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -594,29 +673,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 301508307796103175} + - component: {fileID: 7459450206649684034} m_Layer: 0 - m_Name: basic_rig R Finger1 + m_Name: basic_rig L Hand m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &301508307796103175 +--- !u!4 &7459450206649684034 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5726133448678412869} - m_LocalRotation: {x: 0.00039815938, y: 1.16415315e-10, z: -4.6351852e-14, w: 0.99999994} - m_LocalPosition: {x: -0.09509618, y: 0.0013267898, z: 0.008340402} + m_GameObject: {fileID: 7358188494442637987} + m_LocalRotation: {x: -0.70510024, y: -0.049390048, z: -0.049350735, w: 0.70566195} + m_LocalPosition: {x: -0.11165712, y: -0.0000000023841857, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7512790670008701006} - m_RootOrder: 1 + m_Children: + - {fileID: 1198441730380507569} + - {fileID: 7922869308637682566} + - {fileID: 166600901909914823} + m_Father: {fileID: 3121202059176361628} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5838512693375644565 +--- !u!1 &7618491209446355120 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -624,30 +706,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7135417014136785550} + - component: {fileID: 7830918767811790532} m_Layer: 0 - m_Name: basic_rig L Clavicle + m_Name: basic_rig R Hand m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7135417014136785550 +--- !u!4 &7830918767811790532 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5838512693375644565} - m_LocalRotation: {x: -0.60876137, y: -0.00024348813, z: 0.79335326, w: -0.00031503258} - m_LocalPosition: {x: -0.097930945, y: -0.032242324, z: 0.03381914} + m_GameObject: {fileID: 7618491209446355120} + m_LocalRotation: {x: 0.70510024, y: 0.04939005, z: -0.04935074, w: 0.70566195} + m_LocalPosition: {x: -0.11165716, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7624207055085734630} - m_Father: {fileID: 8304144215675197943} + - {fileID: 4002373586589946625} + - {fileID: 6795725491858654471} + - {fileID: 2036121992915311064} + m_Father: {fileID: 2031386598121849209} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6399079441535643173 +--- !u!1 &7883074101126807261 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -655,29 +739,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6078171329584403707} + - component: {fileID: 3245381155162531101} m_Layer: 0 - m_Name: basic_rig R Finger0 + m_Name: basic_rig Head m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6078171329584403707 +--- !u!4 &3245381155162531101 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6399079441535643173} - m_LocalRotation: {x: 0.07481256, y: 0.24372122, z: -0.08037573, w: 0.9636093} - m_LocalPosition: {x: -0.0309593, y: -0.005252266, z: 0.026663538} + m_GameObject: {fileID: 7883074101126807261} + m_LocalRotation: {x: -5.6082302e-14, y: -0.0000000011042546, z: 0.00039882964, w: 0.99999994} + m_LocalPosition: {x: -0.051421735, y: 0, z: 9.094947e-15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7512790670008701006} + m_Father: {fileID: 8630768682241199040} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6998720669406970857 +--- !u!1 &7884844996736310571 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -685,30 +769,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7569171611172347631} + - component: {fileID: 6339806049268003083} m_Layer: 0 - m_Name: basic_rig L Foot + m_Name: basic_rig R Foot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7569171611172347631 +--- !u!4 &6339806049268003083 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6998720669406970857} - m_LocalRotation: {x: 0.0000130019735, y: 0.008274116, z: -0.119211085, w: 0.9928345} - m_LocalPosition: {x: -0.11653762, y: 0, z: -0.0000000047683715} + m_GameObject: {fileID: 7884844996736310571} + m_LocalRotation: {x: -0.000013012073, y: -0.008274201, z: -0.11921108, w: 0.9928345} + m_LocalPosition: {x: -0.11653762, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4375132758233704463} - m_Father: {fileID: 9080435461166154013} + - {fileID: 8715142258166281225} + m_Father: {fileID: 2179543672545921358} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7926829873879082801 +--- !u!1 &8377637317973706598 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -716,30 +800,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1584376599269205128} + - component: {fileID: 8630768682241199040} m_Layer: 0 - m_Name: basic_rig L Thigh + m_Name: basic_rig Neck m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1584376599269205128 +--- !u!4 &8630768682241199040 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7926829873879082801} - m_LocalRotation: {x: 0.0040685274, y: 0.9999575, z: -0.00094074855, w: 0.0082198605} - m_LocalPosition: {x: 0.000000095367426, y: 0.00000010341406, z: 0.06581989} + m_GameObject: {fileID: 8377637317973706598} + m_LocalRotation: {x: -2.652536e-15, y: 0.00000012098273, z: -0.043619383, w: 0.99904823} + m_LocalPosition: {x: -0.13221313, y: -0.01147458, z: -9.459313e-11} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9080435461166154013} - m_Father: {fileID: 204775503482516853} - m_RootOrder: 0 + - {fileID: 3245381155162531101} + m_Father: {fileID: 1858509012970542496} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8144442369501783724 +--- !u!1 &8576061843703253695 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -747,109 +831,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4415038107445127885} - - component: {fileID: 1669771443126063624} + - component: {fileID: 9120572593902253268} m_Layer: 0 - m_Name: zombie_zombie4(Clone) + m_Name: basic_rig Spine m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4415038107445127885 +--- !u!4 &9120572593902253268 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8144442369501783724} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_GameObject: {fileID: 8576061843703253695} + m_LocalRotation: {x: -0.000002080476, y: 0.000000693676, z: -0.000398159, w: 0.99999994} + m_LocalPosition: {x: -0.05329628, y: -0.000105138715, z: 0.00000007405702} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4296735121265668217} - m_RootOrder: 1 + m_Children: + - {fileID: 1858509012970542496} + m_Father: {fileID: 3475562907873147553} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &1669771443126063624 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8144442369501783724} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: b127ad846a00e084d91f36cf308e8270, type: 2} - - {fileID: 2100000, guid: b127ad846a00e084d91f36cf308e8270, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 4300000, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - m_Bones: - - {fileID: 400002, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400004, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400020, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400028, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400046, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400014, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400022, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400050, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400030, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400040, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400048, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400052, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400006, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400024, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400016, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400032, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400026, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400018, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400008, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400010, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400012, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400054, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400042, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400044, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400034, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400036, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - - {fileID: 400038, guid: 8c53cffd52097cf4582f0a090c9a833e, type: 3} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 204775503482516853} - m_AABB: - m_Center: {x: -0.2262297, y: 0.003887251, z: 0} - m_Extent: {x: 0.5237266, y: 0.20348991, z: 0.30575648} - m_DirtyAABB: 0 ---- !u!1 &8368374184128464298 +--- !u!1 &8584963958111441203 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -857,30 +862,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4331969699096901084} + - component: {fileID: 6036601113265736439} m_Layer: 0 - m_Name: basic_rig R Forearm + m_Name: basic_rig L Clavicle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4331969699096901084 +--- !u!4 &6036601113265736439 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8368374184128464298} - m_LocalRotation: {x: -7.84579e-10, y: -0.000000029814732, z: 0.012733233, w: 0.99991894} - m_LocalPosition: {x: -0.10840538, y: -0.0000000047683715, z: 0} + m_GameObject: {fileID: 8584963958111441203} + m_LocalRotation: {x: -0.60876137, y: -0.00024348813, z: 0.79335326, w: -0.00031503258} + m_LocalPosition: {x: -0.097930945, y: -0.032242324, z: 0.03381914} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7512790670008701006} - m_Father: {fileID: 3464818619151201844} + - {fileID: 2815996703444295987} + m_Father: {fileID: 1858509012970542496} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8602873828308219061 +--- !u!1 &8657865858384458896 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -888,32 +893,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8304144215675197943} + - component: {fileID: 2031386598121849209} m_Layer: 0 - m_Name: basic_rig Spine1 + m_Name: basic_rig R Forearm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8304144215675197943 +--- !u!4 &2031386598121849209 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8602873828308219061} - m_LocalRotation: {x: -3.0117673e-14, y: 0, z: -0, w: 1} - m_LocalPosition: {x: -0.1320565, y: -0.00010515332, z: -2.9165279e-10} + m_GameObject: {fileID: 8657865858384458896} + m_LocalRotation: {x: -7.84579e-10, y: -0.000000029814732, z: 0.012733233, w: 0.99991894} + m_LocalPosition: {x: -0.10840538, y: -0.0000000047683715, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7135417014136785550} - - {fileID: 220173210361221657} - - {fileID: 3186819888068319387} - m_Father: {fileID: 8581160017705443530} + - {fileID: 7830918767811790532} + m_Father: {fileID: 8828151806961448203} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8789340484118909919 +--- !u!1 &8702611183998092126 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -921,32 +924,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 204775503482516853} + - component: {fileID: 7922869308637682566} m_Layer: 0 - m_Name: basic_rig Pelvis + m_Name: basic_rig L Finger1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &204775503482516853 +--- !u!4 &7922869308637682566 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8789340484118909919} - m_LocalRotation: {x: -0.5, y: 0.5, z: 0.4999993, w: 0.5000007} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_GameObject: {fileID: 8702611183998092126} + m_LocalRotation: {x: -0.00039815973, y: 1.2234834e-10, z: -0.0000000149011115, w: 0.99999994} + m_LocalPosition: {x: -0.09509619, y: 0.0013267898, z: -0.008340397} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1584376599269205128} - - {fileID: 2751127697185348938} - - {fileID: 8581160017705443530} - m_Father: {fileID: 4481400423857365808} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 7459450206649684034} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &9166455135295768220 +--- !u!1 &8709885349179962239 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -954,30 +954,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4481400423857365808} + - component: {fileID: 8828151806961448203} m_Layer: 0 - m_Name: basic_rig(Clone) + m_Name: basic_rig UpperArm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4481400423857365808 +--- !u!4 &8828151806961448203 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9166455135295768220} - m_LocalRotation: {x: -0.50000036, y: 0.49999964, z: 0.49999964, w: 0.50000036} - m_LocalPosition: {x: -5.9604643e-10, y: 0.27992854, z: -0.003742392} + m_GameObject: {fileID: 8709885349179962239} + m_LocalRotation: {x: -0.006366949, y: 0.34436083, z: -0.005388389, w: 0.93880033} + m_LocalPosition: {x: -0.073148504, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 204775503482516853} - m_Father: {fileID: 4296735121265668217} + - {fileID: 2031386598121849209} + m_Father: {fileID: 7278933360946293667} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &5316519591515780046 +--- !u!1001 &6958943704712845562 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -992,7 +992,7 @@ PrefabInstance: - target: {fileID: 7450849567795141773, guid: 6363cc0f634bd004ea859073a8534f2a, type: 3} propertyPath: m_Name - value: char + value: NewCharacter objectReference: {fileID: 0} - target: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, type: 3} @@ -1051,9 +1051,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6363cc0f634bd004ea859073a8534f2a, type: 3} ---- !u!4 &4296735121265668217 stripped +--- !u!4 &1367442650371087181 stripped Transform: m_CorrespondingSourceObject: {fileID: 8244124671374508983, guid: 6363cc0f634bd004ea859073a8534f2a, type: 3} - m_PrefabInstance: {fileID: 5316519591515780046} + m_PrefabInstance: {fileID: 6958943704712845562} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Characters/Prefabs/NewCharacter.prefab.meta b/Assets/Characters/Prefabs/NewCharacter.prefab.meta new file mode 100644 index 0000000..ee6308f --- /dev/null +++ b/Assets/Characters/Prefabs/NewCharacter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4cac6f97c962df4d88ecdc3f86d78c0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Previews.meta b/Assets/Characters/Previews.meta new file mode 100644 index 0000000..d0f2351 --- /dev/null +++ b/Assets/Characters/Previews.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63b1a517d50d69c41a6d7507917eef59 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Previews/Narmol.png b/Assets/Characters/Previews/Narmol.png new file mode 100644 index 0000000..5fb462c Binary files /dev/null and b/Assets/Characters/Previews/Narmol.png differ diff --git a/Assets/test.png.meta b/Assets/Characters/Previews/Narmol.png.meta similarity index 98% rename from Assets/test.png.meta rename to Assets/Characters/Previews/Narmol.png.meta index e2a147d..fc57d3f 100644 --- a/Assets/test.png.meta +++ b/Assets/Characters/Previews/Narmol.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bdd923e9dc02e6143b9a48a7803c24ee +guid: 83d2dccbdba1235478930bbcfc4f9ddd TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/EditorPlus.meta b/Assets/EditorPlus.meta new file mode 100644 index 0000000..e5c2244 --- /dev/null +++ b/Assets/EditorPlus.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fff172fc24c70bb4d81e972b74172f5e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/EditorPlus/Editor/EditorPlusDrawers/ObjectDrawer/EditorPlusObjectEditor.cs b/Assets/EditorPlus/Editor/EditorPlusDrawers/ObjectDrawer/EditorPlusObjectEditor.cs index fde1728..18c63ec 100644 --- a/Assets/EditorPlus/Editor/EditorPlusDrawers/ObjectDrawer/EditorPlusObjectEditor.cs +++ b/Assets/EditorPlus/Editor/EditorPlusDrawers/ObjectDrawer/EditorPlusObjectEditor.cs @@ -45,7 +45,10 @@ public override void OnInspectorGUI() { Rect controlRect = EditorGUILayout.GetControlRect(true, Drawer.GetPropertyHeight(property, false)); Drawer.Draw(controlRect, property, false); - serializedObject.ApplyModifiedProperties(); + + // Prevent error if the target has been destroyed during OnInspectorGUI + if ((bool)serializedObject.targetObject) + serializedObject.ApplyModifiedProperties(); } } diff --git a/Assets/test.png b/Assets/test.png deleted file mode 100644 index a247894..0000000 Binary files a/Assets/test.png and /dev/null differ diff --git a/EditorPlusEditor.csproj.DotSettings b/EditorPlusEditor.csproj.DotSettings new file mode 100644 index 0000000..b5b235a --- /dev/null +++ b/EditorPlusEditor.csproj.DotSettings @@ -0,0 +1,2 @@ + + Default \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6054efd..0b08aec 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -603,9 +603,9 @@ PlayerSettings: webGLWasmStreaming: 0 scriptingDefineSymbols: 1: CROSS_PLATFORM_INPUT - 4: CROSS_PLATFORM_INPUT - 7: CROSS_PLATFORM_INPUT - 14: + 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT + 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT + 14: MOBILE_INPUT platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} @@ -617,7 +617,8 @@ PlayerSettings: gcIncremental: 0 assemblyVersionValidation: 1 gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D