Merge branch 'dev_hero' into dev_equip

This commit is contained in:
puxuan 2025-09-19 15:02:35 +08:00
commit ac5b0c44fa
2 changed files with 3 additions and 3 deletions

View File

@ -748,7 +748,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2215335907605344149, guid: ad07cf805706e24488cdd8192edfb6e8, type: 3} - target: {fileID: 2215335907605344149, guid: ad07cf805706e24488cdd8192edfb6e8, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 20 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2215335907605344149, guid: ad07cf805706e24488cdd8192edfb6e8, type: 3} - target: {fileID: 2215335907605344149, guid: ad07cf805706e24488cdd8192edfb6e8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -903,7 +903,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4467708573080403943, guid: f77156c45ee34d84da1971ee0ac2f6ac, type: 3} - target: {fileID: 4467708573080403943, guid: f77156c45ee34d84da1971ee0ac2f6ac, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 20 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4467708573080403943, guid: f77156c45ee34d84da1971ee0ac2f6ac, type: 3} - target: {fileID: 4467708573080403943, guid: f77156c45ee34d84da1971ee0ac2f6ac, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@ -1054,7 +1054,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2385570651820488633, guid: 64689a8fb5ce5fe4fb587bdf6a95ce02, type: 3} - target: {fileID: 2385570651820488633, guid: 64689a8fb5ce5fe4fb587bdf6a95ce02, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 20 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2385570651820488633, guid: 64689a8fb5ce5fe4fb587bdf6a95ce02, type: 3} - target: {fileID: 2385570651820488633, guid: 64689a8fb5ce5fe4fb587bdf6a95ce02, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x