diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerCharacter.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerCharacter.prefab new file mode 100644 index 000000000..31ce504ef --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerCharacter.prefab @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3417590820015712106 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 500600556154722887, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: _initialSkinName + value: Casper + objectReference: {fileID: 0} + - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: initialSkinName + value: Casper + objectReference: {fileID: 0} + - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Name + value: CustomerCharacter + objectReference: {fileID: 0} + - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Materials.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: b5430080246bbb048b939d6a0a5621cd, type: 2} + - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} + - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: 'm_Materials.Array.data[2]' + value: + objectReference: {fileID: 2100000, guid: 0bc9c8216989ef64ab468d6aa08cca35, type: 2} + - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: 'm_Materials.Array.data[3]' + value: + objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerCharacter.prefab.meta b/Assets/_DDD/_Addressables/Prefabs/CustomerCharacter.prefab.meta new file mode 100644 index 000000000..92b055a42 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerCharacter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ceeea618d8ee23642a0e56b3f963448c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index 646a17c6c..6c9f1a2bb 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -250,6 +250,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 500600556154722887, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: _initialSkinName + value: Basic + objectReference: {fileID: 0} - target: {fileID: 1111036208394089843, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_LocalScale.x value: 2 @@ -325,6 +329,7 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3365694194251356714, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} - {fileID: 127430239903465757, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + - {fileID: 7606279200344222219, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4993183601549197863, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} @@ -345,7 +350,7 @@ PrefabInstance: addedObject: {fileID: 5643954521731085080} - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1 - addedObject: {fileID: 1115647804376030753} + addedObject: {fileID: 388082324973004231} m_SourcePrefab: {fileID: 100100000, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} --- !u!1 &7316134055819320434 stripped GameObject: @@ -388,7 +393,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d4e8820e36cdbec4fb86f9bc0e3fd638, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1115647804376030753 +--- !u!114 &388082324973004231 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -397,17 +402,20 @@ MonoBehaviour: m_GameObject: {fileID: 7316134055819320434} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6d7e5480ae1ebf54b8537ad2a08696d2, type: 3} + m_Script: {fileID: 11500000, guid: 81e01dd8c1cc3404d805400eba1bb4ae, type: 3} m_Name: m_EditorClassIdentifier: - _originalMaterial: {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} - _replacementMaterial: {fileID: 0} - _isSkinSet: 1 - _initialSkinName: Basic - _isRandomSkin: 0 - _isRandomRange: 0 - _randomRange: {x: 0, y: 0} - _randomStrings: [] + _nearColliders: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} --- !u!4 &7511707580127947132 stripped Transform: m_CorrespondingSourceObject: {fileID: 4993183601549197863, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab index fcc593f36..27469bbe8 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 127430239903465757} - component: {fileID: 3095965496140440094} - component: {fileID: 7606279200344222219} + - component: {fileID: 500600556154722887} m_Layer: 0 m_Name: BaseRestaurantCharacter m_TagString: Untagged @@ -177,6 +178,26 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} +--- !u!114 &500600556154722887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5259510642736920361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d7e5480ae1ebf54b8537ad2a08696d2, type: 3} + m_Name: + m_EditorClassIdentifier: + _originalMaterial: {fileID: 0} + _replacementMaterial: {fileID: 0} + _isSkinSet: 1 + _initialSkinName: default + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] --- !u!1 &6791841979869644848 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc.meta new file mode 100644 index 000000000..3d4acccb1 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9842fda5de8da1641ae1f8b12b0f030c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer.meta new file mode 100644 index 000000000..a199e1e35 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05e79ebcdc69f7c43adbfbe42ebfbb83 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs new file mode 100644 index 000000000..77f409cd6 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace DDD +{ + public class CustomerCharacter : MonoBehaviour + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs.meta new file mode 100644 index 000000000..b7f59fb7f --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b242c4f65b2734841840c89dfab1500b \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerInteraction.cs.meta b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerInteraction.cs.meta new file mode 100644 index 000000000..1d0deec52 --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerInteraction.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 81e01dd8c1cc3404d805400eba1bb4ae \ No newline at end of file