iwnc2020/ProjectDDD
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

레스토랑 씬 데이터 최신화

Browse Source
This commit is contained in:
NTG_Lenovo 2025-08-13 17:35:43 +09:00
parent 675a9d8ebc
commit e4e0d20f65
11 changed files with 1845 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/_DDD/_Addressables/Prefabs/BaseRestaurantCharacter.prefab
View File

@ -66,8 +66,8 @@ Transform:
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 4993183601549197863}
m_Father: {fileID: 0}
@ -118,8 +118,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.3, y: 0.5, z: 0.1}
m_Center: {x: 0, y: 0.25, z: 0.05}
m_Size: {x: 0.15, y: 0.25, z: 0.05}
m_Center: {x: 0, y: 0.125, z: 0.025}
--- !u!114 &3365694194251356714
MonoBehaviour:
m_ObjectHideFlags: 0

20
Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab
View File

@ -56,6 +56,26 @@ PrefabInstance:
propertyPath: skeletonDataAsset
value:
objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2}
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: m_Materials.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: b5430080246bbb048b939d6a0a5621cd, type: 2}
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: 'm_Materials.Array.data[1]'
value:
objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: 'm_Materials.Array.data[2]'
value:
objectReference: {fileID: 2100000, guid: 0bc9c8216989ef64ab468d6aa08cca35, type: 2}
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: 'm_Materials.Array.data[3]'
value:
objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
- target: {fileID: 6826437533270866908, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
propertyPath: externalBehavior
value:

12
Assets/_DDD/_Addressables/Prefabs/RestaurantNpc.prefab
View File

@ -12,6 +12,18 @@ PrefabInstance:
propertyPath: _initialSkinName
value: Casper
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalPosition.x
value: 0

28
Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab
View File

@ -254,18 +254,6 @@ PrefabInstance:
propertyPath: _initialSkinName
value: Basic
objectReference: {fileID: 0}
- target: {fileID: 1111036208394089843, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1111036208394089843, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1111036208394089843, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: zSpacing
value: -0.0005
@ -286,6 +274,18 @@ PrefabInstance:
propertyPath: skeletonDataAsset
value:
objectReference: {fileID: 11400000, guid: 57e95ec929c09d64c9f85a40f849786a, type: 2}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -326,6 +326,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1761643478070701343, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2182479135931305606, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3}
propertyPath: m_Layer
value: 6

18
Assets/_DDD/_Addressables/Scenes/Restaurant.unity
View File

@ -4130,7 +4130,7 @@ GameObject:
- component: {fileID: 338150129}
- component: {fileID: 338150128}
- component: {fileID: 338150127}
m_Layer: 7
m_Layer: 0
m_Name: Spine GameObject (Coral)_010
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -7585,7 +7585,7 @@ GameObject:
- component: {fileID: 661919370}
- component: {fileID: 661919369}
- component: {fileID: 661919368}
m_Layer: 7
m_Layer: 0
m_Name: Spine GameObject (Coral)_007
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -8107,7 +8107,7 @@ GameObject:
- component: {fileID: 714455158}
- component: {fileID: 714455157}
- component: {fileID: 714455156}
m_Layer: 7
m_Layer: 0
m_Name: Spine GameObject (Coral)_006
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -15370,13 +15370,9 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1428769370}
m_Modifications:
- target: {fileID: 3782685999912116715, guid: 578d3d14793df9949bf890b9c5077723, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6689525833630355058, guid: 578d3d14793df9949bf890b9c5077723, type: 3}
propertyPath: m_LocalPosition.x
value: 6.529
value: 2.53
objectReference: {fileID: 0}
- target: {fileID: 6689525833630355058, guid: 578d3d14793df9949bf890b9c5077723, type: 3}
propertyPath: m_LocalPosition.y
@ -15384,7 +15380,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6689525833630355058, guid: 578d3d14793df9949bf890b9c5077723, type: 3}
propertyPath: m_LocalPosition.z
value: -2.968
value: -0.66
objectReference: {fileID: 0}
- target: {fileID: 6689525833630355058, guid: 578d3d14793df9949bf890b9c5077723, type: 3}
propertyPath: m_LocalRotation.w
@ -18797,7 +18793,7 @@ GameObject:
- component: {fileID: 1771012168}
- component: {fileID: 1771012167}
- component: {fileID: 1771012166}
m_Layer: 7
m_Layer: 0
m_Name: Spine GameObject (Coral)_009
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -19514,7 +19510,7 @@ GameObject:
- component: {fileID: 1890916875}
- component: {fileID: 1890916874}
- component: {fileID: 1890916873}
m_Layer: 7
m_Layer: 0
m_Name: Spine GameObject (Coral)_008
m_TagString: Untagged
m_Icon: {fileID: 0}

1759
Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-08-13 16-36-14 by 남태건.json Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-08-13 16-36-14 by 남태건.json.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e260c1a1ae3496a4bb77581309ae3f37
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6
Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json
View File

@ -335,21 +335,21 @@
"Id:string": "customer_001",
"CustomerType:NativeEnum": "Normal",
"#Name": "유령1",
"SpineSkinKey": "",
"SpineSkinKey": "Casper",
"FavoriteTastes": ""
},
{
"Id:string": "customer_002",
"CustomerType:NativeEnum": "Normal",
"#Name": "유령2",
"SpineSkinKey": "",
"SpineSkinKey": "CasperBlack",
"FavoriteTastes": ""
},
{
"Id:string": "customer_003",
"CustomerType:NativeEnum": "Normal",
"#Name": "유령3",
"SpineSkinKey": "",
"SpineSkinKey": "PumkinHead",
"FavoriteTastes": ""
},
{

BIN
Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerDataSo.asset (Stored with Git LFS)
View File

Binary file not shown.

15
Assets/_DDD/_Scripts/RestaurantState/Customer/RestaurantCustomerStateSo.cs
View File

@ -4,6 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
using Sirenix.OdinInspector;
using Unity.VisualScripting;
using UnityEngine;
namespace DDD
@ -28,7 +29,7 @@ public class RestaurantCustomerStateSo : ScriptableObject, IGameFlowHandler
private ICustomerFactory _iCustomerFactory;
private CancellationTokenSource _spawnLoopCancellationTokenSource;
public async Task OnReadyNewFlow(GameFlowState newFlowState)
{
if (newFlowState == GameFlowState.RunRestaurant)
@ -85,7 +86,9 @@ private async Task InitializeRunRestaurant()
private async Task RunSpawnLoopAsync(LevelData levelData, CustomerPoolData normalPool, CustomerPoolData specialPool, CancellationToken token)
{
if (_firstSpawnDelaySeconds > 0)
await Task.Delay(TimeSpan.FromSeconds(_firstSpawnDelaySeconds), token);
{
await Awaitable.WaitForSecondsAsync(_firstSpawnDelaySeconds, token);
}
var scheduleBuilder = CreateBuilder(levelData.SpawnType);
int randomSeed = Environment.TickCount;
@ -104,6 +107,14 @@ SpawnSchedule MakeSchedule() => scheduleBuilder.Build(new SpawnScheduleBuildArgs
while (token.IsCancellationRequested == false)
{
if (Application.isPlaying == false)
{
_spawnLoopCancellationTokenSource?.Cancel();
_spawnLoopCancellationTokenSource?.Dispose();
_spawnLoopCancellationTokenSource = null;
break;
}
if (_spawnSchedule.TryDequeue(out var customerId) == false) break;
if (_customerDataSo.TryGetDataById(customerId, out var customerData))