Merge remote-tracking branch 'origin/main'

This commit is contained in:
YiHan0621
2025-09-14 20:22:00 +08:00
4 changed files with 58 additions and 35 deletions

View File

@@ -7088,7 +7088,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -247.39996, y: -65.84}
m_AnchoredPosition: {x: -247.39996, y: -65.839966}
m_SizeDelta: {x: 494.79, y: 131.69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1449244093741349574
@@ -14561,7 +14561,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -135.79999, y: 44.28}
m_AnchoredPosition: {x: -135.80005, y: 44.28003}
m_SizeDelta: {x: 210.96, y: 81.14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4201586067522883778
@@ -17028,6 +17028,16 @@ PrefabInstance:
propertyPath: card_angle
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5110355759202193847, guid: 4f5d06d57a8cd5f42b526a96b940dca7,
type: 3}
propertyPath: usePathMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5110355759202193847, guid: 4f5d06d57a8cd5f42b526a96b940dca7,
type: 3}
propertyPath: cardback_path
value: Cardbacks/cardback_gold.png
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f5d06d57a8cd5f42b526a96b940dca7, type: 3}
--- !u!114 &5052310800691334680
@@ -21847,7 +21857,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -137.20001, y: 123.83002}
m_AnchoredPosition: {x: -137.19995, y: 123.83002}
m_SizeDelta: {x: 213.76, y: 77.96}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6512466294668775865
@@ -21983,7 +21993,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -140.16}
m_AnchoredPosition: {x: 0, y: -140.16003}
m_SizeDelta: {x: 794.78, y: 280.32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6577887540008874255