Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
NTG 2025-09-02 18:56:43 +09:00
commit 33d72c3ba5
4 changed files with 8 additions and 8 deletions

View File

@ -77,7 +77,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 22cbc31c0f91548f096d10d462447973, type: 3}
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -85,7 +85,7 @@ SpriteRenderer:
m_Size: {x: 0.41, y: 3.41}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &7433508832753786351

View File

@ -51,10 +51,10 @@ PrefabInstance:
- target: {fileID: 3761059052922690693, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 42a128f365d0c4c52b151466427d1cc9, type: 3}
objectReference: {fileID: 0}
- target: {fileID: 4103096974375017811, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
propertyPath: m_Name
value: PointMarker Variant
value: WaitingQueue
objectReference: {fileID: 0}
- target: {fileID: 7433508832753786351, guid: 186d28777ccbc484780568f74c110ff7, type: 3}
propertyPath: _pointType

Binary file not shown.

View File

@ -10489,7 +10489,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 157773281879251590, guid: ba6905dd36b009a4aa3b6ad80520ee3c, type: 3}
propertyPath: _waitingRangeRadius
value: 5
value: 4.5
objectReference: {fileID: 0}
- target: {fileID: 2655961481751516314, guid: ba6905dd36b009a4aa3b6ad80520ee3c, type: 3}
propertyPath: m_Name
@ -10505,7 +10505,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3421080875838994749, guid: ba6905dd36b009a4aa3b6ad80520ee3c, type: 3}
propertyPath: m_LocalPosition.z
value: 21
value: 19
objectReference: {fileID: 0}
- target: {fileID: 3421080875838994749, guid: ba6905dd36b009a4aa3b6ad80520ee3c, type: 3}
propertyPath: m_LocalRotation.w