Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/restaurant_ui

This commit is contained in:
NTG_Lenovo 2025-08-13 18:32:12 +09:00
commit 0687587483

View File

@ -4130,12 +4130,12 @@ GameObject:
- component: {fileID: 338150129} - component: {fileID: 338150129}
- component: {fileID: 338150128} - component: {fileID: 338150128}
- component: {fileID: 338150127} - component: {fileID: 338150127}
m_Layer: 0 m_Layer: 7
m_Name: Spine GameObject (Coral)_010 m_Name: Spine GameObject (Coral)_010
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &338150126 --- !u!4 &338150126
Transform: Transform:
@ -7585,12 +7585,12 @@ GameObject:
- component: {fileID: 661919370} - component: {fileID: 661919370}
- component: {fileID: 661919369} - component: {fileID: 661919369}
- component: {fileID: 661919368} - component: {fileID: 661919368}
m_Layer: 0 m_Layer: 7
m_Name: Spine GameObject (Coral)_007 m_Name: Spine GameObject (Coral)_007
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &661919367 --- !u!4 &661919367
Transform: Transform:
@ -8107,12 +8107,12 @@ GameObject:
- component: {fileID: 714455158} - component: {fileID: 714455158}
- component: {fileID: 714455157} - component: {fileID: 714455157}
- component: {fileID: 714455156} - component: {fileID: 714455156}
m_Layer: 0 m_Layer: 7
m_Name: Spine GameObject (Coral)_006 m_Name: Spine GameObject (Coral)_006
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &714455155 --- !u!4 &714455155
Transform: Transform:
@ -18793,12 +18793,12 @@ GameObject:
- component: {fileID: 1771012168} - component: {fileID: 1771012168}
- component: {fileID: 1771012167} - component: {fileID: 1771012167}
- component: {fileID: 1771012166} - component: {fileID: 1771012166}
m_Layer: 0 m_Layer: 7
m_Name: Spine GameObject (Coral)_009 m_Name: Spine GameObject (Coral)_009
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &1771012165 --- !u!4 &1771012165
Transform: Transform:
@ -19510,12 +19510,12 @@ GameObject:
- component: {fileID: 1890916875} - component: {fileID: 1890916875}
- component: {fileID: 1890916874} - component: {fileID: 1890916874}
- component: {fileID: 1890916873} - component: {fileID: 1890916873}
m_Layer: 0 m_Layer: 7
m_Name: Spine GameObject (Coral)_008 m_Name: Spine GameObject (Coral)_008
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &1890916872 --- !u!4 &1890916872
Transform: Transform: