puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

Browse Source
This commit is contained in:
chenxi 2023-04-22 00:53:26 +08:00
commit abc81c49d2
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Assets/prefabs/ui/battle/battle_result_ui.prefab
View File

@ -101,9 +101,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 12 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -92.46918, y: -512} m_AnchoredPosition: {x: -92.46918, y: 128}
m_SizeDelta: {x: 62, y: 65} m_SizeDelta: {x: 62, y: 65}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1618187034406966015 --- !u!222 &1618187034406966015
@ -539,8 +539,8 @@ RectTransform:
m_Father: {fileID: 595361820078002785} m_Father: {fileID: 595361820078002785}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -214.5} m_AnchoredPosition: {x: 0, y: -214.5}
m_SizeDelta: {x: 494, y: 429} m_SizeDelta: {x: 494, y: 429}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -615,9 +615,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 8 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 111, y: -730} m_AnchoredPosition: {x: -249, y: -90}
m_SizeDelta: {x: 228, y: 50} m_SizeDelta: {x: 228, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &2938922198113165659 --- !u!114 &2938922198113165659
@ -1197,9 +1197,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 386, y: -603} m_AnchoredPosition: {x: 26, y: 37}
m_SizeDelta: {x: 228, y: 50} m_SizeDelta: {x: 228, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &9070863500347552405 --- !u!114 &9070863500347552405
@ -1308,9 +1308,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 15 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -577.5} m_AnchoredPosition: {x: 0, y: 62.5}
m_SizeDelta: {x: 200, y: 23} m_SizeDelta: {x: 200, y: 23}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2638528053824224956 --- !u!222 &2638528053824224956
@ -1442,9 +1442,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 11 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -512} m_AnchoredPosition: {x: 0, y: 128}
m_SizeDelta: {x: 260, y: 74} m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1105495610083196996 --- !u!222 &1105495610083196996
@ -1518,8 +1518,8 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -1689,9 +1689,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 14 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -475} m_AnchoredPosition: {x: 0, y: 165}
m_SizeDelta: {x: 200, y: 20} m_SizeDelta: {x: 200, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &415780347601901034 --- !u!222 &415780347601901034
@ -1913,9 +1913,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 111, y: -603} m_AnchoredPosition: {x: -249, y: 37}
m_SizeDelta: {x: 228, y: 50} m_SizeDelta: {x: 228, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &3530958538301786522 --- !u!114 &3530958538301786522
@ -2505,7 +2505,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -624} m_AnchoredPosition: {x: 0, y: 16}
m_SizeDelta: {x: 584, y: 368} m_SizeDelta: {x: 584, y: 368}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6745387017925834104 --- !u!222 &6745387017925834104
@ -2658,9 +2658,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 7 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 386, y: -667} m_AnchoredPosition: {x: 26, y: -27}
m_SizeDelta: {x: 228, y: 50} m_SizeDelta: {x: 228, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &374806246039785815 --- !u!114 &374806246039785815
@ -3067,8 +3067,8 @@ RectTransform:
m_Father: {fileID: 445959573539459069} m_Father: {fileID: 445959573539459069}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -205} m_AnchoredPosition: {x: 0, y: -205}
m_SizeDelta: {x: 334, y: 410} m_SizeDelta: {x: 334, y: 410}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -3215,8 +3215,8 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -3697,9 +3697,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 111, y: -667} m_AnchoredPosition: {x: -249, y: -27}
m_SizeDelta: {x: 228, y: 50} m_SizeDelta: {x: 228, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &4512577292908893855 --- !u!114 &4512577292908893855
@ -4047,9 +4047,9 @@ RectTransform:
m_Father: {fileID: 4165930251451731960} m_Father: {fileID: 4165930251451731960}
m_RootOrder: 13 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -512} m_AnchoredPosition: {x: 0, y: 128}
m_SizeDelta: {x: 200, y: 20} m_SizeDelta: {x: 200, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8665334937928820573 --- !u!222 &8665334937928820573
@ -4259,7 +4259,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -624} m_AnchoredPosition: {x: 0, y: 16}
m_SizeDelta: {x: 584, y: 368} m_SizeDelta: {x: 584, y: 368}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &574983483701642747 --- !u!222 &574983483701642747