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

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

Browse Source
This commit is contained in:
xiekaidong 2023-09-19 19:41:48 +08:00
commit 55c5ad0741
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Assets/prefabs/ui/runes/runes_suit_ui.prefab
View File

@ -27,7 +27,7 @@ RectTransform:
m_GameObject: {fileID: 235979004222407487} m_GameObject: {fileID: 235979004222407487}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: m_Children:
- {fileID: 7016426493884638909} - {fileID: 7016426493884638909}
m_Father: {fileID: 3832785628741960331} m_Father: {fileID: 3832785628741960331}
@ -35,7 +35,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: -200, y: 0} m_AnchoredPosition: {x: -210, y: 0}
m_SizeDelta: {x: 104, y: 104} m_SizeDelta: {x: 104, y: 104}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5078475621352735776 --- !u!222 &5078475621352735776
@ -110,8 +110,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 15} m_AnchoredPosition: {x: 120, y: 15}
m_SizeDelta: {x: 390, y: 70} m_SizeDelta: {x: 415, y: 70}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &7559807714333049201 --- !u!222 &7559807714333049201
CanvasRenderer: CanvasRenderer:
@ -244,8 +244,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 15} m_AnchoredPosition: {x: 120, y: 15}
m_SizeDelta: {x: 390, y: 70} m_SizeDelta: {x: 415, y: 70}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &212183121499076380 --- !u!222 &212183121499076380
CanvasRenderer: CanvasRenderer:
@ -455,8 +455,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 15} m_AnchoredPosition: {x: 120, y: 15}
m_SizeDelta: {x: 390, y: 70} m_SizeDelta: {x: 415, y: 70}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &9141616766831313628 --- !u!222 &9141616766831313628
CanvasRenderer: CanvasRenderer:
@ -589,8 +589,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 15} m_AnchoredPosition: {x: 120, y: 15}
m_SizeDelta: {x: 390, y: 70} m_SizeDelta: {x: 415, y: 70}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &6561632435394626919 --- !u!222 &6561632435394626919
CanvasRenderer: CanvasRenderer:
@ -723,8 +723,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 31.4} m_AnchoredPosition: {x: 120, y: 31.4}
m_SizeDelta: {x: 330, y: 40} m_SizeDelta: {x: 415, y: 40}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4234767351712115475 --- !u!222 &4234767351712115475
CanvasRenderer: CanvasRenderer:
@ -1156,8 +1156,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 15} m_AnchoredPosition: {x: 120, y: 15}
m_SizeDelta: {x: 390, y: 70} m_SizeDelta: {x: 415, y: 70}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &4513279238057756038 --- !u!222 &4513279238057756038
CanvasRenderer: CanvasRenderer:
@ -1444,8 +1444,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 31.4} m_AnchoredPosition: {x: 120, y: 31.4}
m_SizeDelta: {x: 330, y: 40} m_SizeDelta: {x: 415, y: 40}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3295271060361413573 --- !u!222 &3295271060361413573
CanvasRenderer: CanvasRenderer:
@ -1653,8 +1653,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 31.4} m_AnchoredPosition: {x: 120, y: 31.4}
m_SizeDelta: {x: 330, y: 40} m_SizeDelta: {x: 415, y: 40}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8473159465852494304 --- !u!222 &8473159465852494304
CanvasRenderer: CanvasRenderer:
@ -2423,8 +2423,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 31.4} m_AnchoredPosition: {x: 120, y: 31.4}
m_SizeDelta: {x: 330, y: 40} m_SizeDelta: {x: 415, y: 40}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6094710387482859955 --- !u!222 &6094710387482859955
CanvasRenderer: CanvasRenderer:
@ -2626,7 +2626,7 @@ RectTransform:
m_GameObject: {fileID: 4655945366549406617} m_GameObject: {fileID: 4655945366549406617}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: m_Children:
- {fileID: 3012055646079680053} - {fileID: 3012055646079680053}
m_Father: {fileID: 2402638589861738002} m_Father: {fileID: 2402638589861738002}
@ -2634,7 +2634,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: -200, y: 0} m_AnchoredPosition: {x: -210, y: 0}
m_SizeDelta: {x: 104, y: 104} m_SizeDelta: {x: 104, y: 104}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4355422954261000037 --- !u!222 &4355422954261000037
@ -2818,8 +2818,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 140, y: 31.4} m_AnchoredPosition: {x: 120, y: 31.4}
m_SizeDelta: {x: 330, y: 40} m_SizeDelta: {x: 415, y: 40}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6908337150201984463 --- !u!222 &6908337150201984463
CanvasRenderer: CanvasRenderer:
@ -3280,7 +3280,7 @@ RectTransform:
m_GameObject: {fileID: 7443116127198517577} m_GameObject: {fileID: 7443116127198517577}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: m_Children:
- {fileID: 5327894434446027145} - {fileID: 5327894434446027145}
m_Father: {fileID: 2931705081715702810} m_Father: {fileID: 2931705081715702810}
@ -3288,7 +3288,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: -200, y: 0} m_AnchoredPosition: {x: -210, y: 0}
m_SizeDelta: {x: 104, y: 104} m_SizeDelta: {x: 104, y: 104}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4041259672221928024 --- !u!222 &4041259672221928024
@ -3599,7 +3599,7 @@ RectTransform:
m_GameObject: {fileID: 7769061922144722861} m_GameObject: {fileID: 7769061922144722861}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: m_Children:
- {fileID: 4607025231721896152} - {fileID: 4607025231721896152}
m_Father: {fileID: 1096127962611753283} m_Father: {fileID: 1096127962611753283}
@ -3607,7 +3607,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: -200, y: 0} m_AnchoredPosition: {x: -210, y: 0}
m_SizeDelta: {x: 104, y: 104} m_SizeDelta: {x: 104, y: 104}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6399566686544255877 --- !u!222 &6399566686544255877
@ -3675,7 +3675,7 @@ RectTransform:
m_GameObject: {fileID: 7989256865375097839} m_GameObject: {fileID: 7989256865375097839}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: m_Children:
- {fileID: 717067430923976688} - {fileID: 717067430923976688}
m_Father: {fileID: 4281786818317557182} m_Father: {fileID: 4281786818317557182}
@ -3683,7 +3683,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: -200, y: 0} m_AnchoredPosition: {x: -210, y: 0}
m_SizeDelta: {x: 104, y: 104} m_SizeDelta: {x: 104, y: 104}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7343905963485805353 --- !u!222 &7343905963485805353