Remove ignored files from the repository
This commit is contained in:
parent
0a2b286c3d
commit
77681bf6c9
0
Assets/_DDD/Restaurant/Environments/Tiles/Wall/Sources/RestaurantTile02.png
Executable file → Normal file
0
Assets/_DDD/Restaurant/Environments/Tiles/Wall/Sources/RestaurantTile02.png
Executable file → Normal file
@ -34,7 +34,7 @@ Material:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
m_CustomRenderQueue: 2450
|
||||
stringTagMap:
|
||||
RenderType: TransparentCutout
|
||||
disabledShaderPasses:
|
||||
@ -80,6 +80,7 @@ Material:
|
||||
m_Floats:
|
||||
- _AlphaClip: 1
|
||||
- _AlphaToMask: 1
|
||||
- _ApplyGI: 1
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 0
|
||||
- _BumpScale: 1
|
||||
@ -89,6 +90,7 @@ Material:
|
||||
- _DstBlend: 0
|
||||
- _EMISSION: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlobalIlluminationIntensity: 1
|
||||
- _METALLICSPECGLOSSMAP: 1
|
||||
- _Metallic: 0
|
||||
- _NORMALMAP: 1
|
||||
|
@ -48,6 +48,14 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: initialSkinName
|
||||
value: Casper
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3983248675539552489, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: skeletonDataAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2}
|
||||
- target: {fileID: 6826437533270866908, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: externalBehavior
|
||||
value:
|
||||
@ -68,8 +76,30 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: CustomerNpc
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 133104368464330048, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6054843938321605399}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
--- !u!1 &4266090516809920735 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
m_PrefabInstance: {fileID: 6675463944788402332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6054843938321605399
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4266090516809920735}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b242c4f65b2734841840c89dfab1500b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_interactionType: 0
|
||||
|
@ -6,11 +6,13 @@ public class CustomerCharacter : RestaurantNpcCharacter, ICustomerInitializer
|
||||
{
|
||||
private CustomerData _customerData;
|
||||
|
||||
public void Initialize(string customerDataId, CustomerData customerData)
|
||||
public void Initialize(CustomerData customerData)
|
||||
{
|
||||
_customerData = customerData;
|
||||
|
||||
// TODO : 손님 생성 로직 추가
|
||||
_spineController.SetSkin(_customerData.SpineSkinKey);
|
||||
_behaviorTree.EnableBehavior();
|
||||
}
|
||||
}
|
||||
}
|
@ -10,12 +10,11 @@ public interface ICustomerFactory
|
||||
|
||||
public interface ICustomerInitializer
|
||||
{
|
||||
void Initialize(string customerDataId, CustomerData customerData);
|
||||
void Initialize(CustomerData customerData);
|
||||
}
|
||||
|
||||
public struct CustomerSpawnArgs
|
||||
{
|
||||
public string CustomerDataId;
|
||||
public CustomerData CustomerData;
|
||||
public Vector3 Position;
|
||||
public Quaternion Rotation;
|
||||
@ -37,7 +36,7 @@ public async Task<GameObject> CreateAsync(CustomerSpawnArgs args)
|
||||
|
||||
if (newCustomer.TryGetComponent(out ICustomerInitializer initializer))
|
||||
{
|
||||
initializer.Initialize(args.CustomerDataId, args.CustomerData);
|
||||
initializer.Initialize(args.CustomerData);
|
||||
}
|
||||
return newCustomer;
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ public class RestaurantCustomerStateSo : ScriptableObject, IGameFlowHandler
|
||||
[SerializeField] private Vector3 _spawnPoint = new(5f, 0f, 4f);
|
||||
|
||||
[Title("디버그")]
|
||||
[SerializeField] private SpawnSchedule _spawnSchedule;
|
||||
[ReadOnly, SerializeField] private SpawnSchedule _spawnSchedule;
|
||||
|
||||
private GameStateSo _gameStateSo;
|
||||
private LevelDataSo _levelDataSo;
|
||||
@ -112,7 +112,6 @@ SpawnSchedule MakeSchedule() => scheduleBuilder.Build(new SpawnScheduleBuildArgs
|
||||
|
||||
_ = _iCustomerFactory.CreateAsync(new CustomerSpawnArgs
|
||||
{
|
||||
CustomerDataId = customerId,
|
||||
CustomerData = customerData,
|
||||
Position = _spawnPoint,
|
||||
Rotation = rotation,
|
||||
|
Loading…
Reference in New Issue
Block a user