Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
4a5dc61add
|
@ -6028,7 +6028,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -509.9, y: 316.8}
|
||||
m_AnchoredPosition: {x: -509.9, y: 359}
|
||||
m_SizeDelta: {x: 977.6, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1596169475
|
||||
|
@ -52490,9 +52490,9 @@ RectTransform:
|
|||
m_Father: {fileID: 6976277603980592380}
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -7, y: -563}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 424, y: 363}
|
||||
m_SizeDelta: {x: 68, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8353568290887318895
|
||||
|
@ -70821,7 +70821,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -29.59, y: -80.3}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 106.99, y: 93.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2371187725804371199
|
||||
|
@ -129685,7 +129685,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0.090013504, y: -8.409996}
|
||||
m_AnchoredPosition: {x: 0.09001541, y: -8.409996}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3714496386058682428
|
||||
|
@ -130246,11 +130246,6 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 5391497229806396012}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: UI_Effect_MuBiaoJiangLi
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
@ -130356,6 +130351,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: UI_Effect_MuBiaoJiangLi
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
|
@ -46,7 +46,7 @@ function this:OnShow(_parent,...)
|
|||
parent=_parent
|
||||
sortingOrder =_parent.sortingOrder
|
||||
local args = {...}
|
||||
_CostItem=lotterySetting[RecruitType.RecruitBox]._CostItem[1][2]
|
||||
_CostItem=lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
|
||||
|
||||
local con = string.split(specialConfig[49].Value, "#")
|
||||
_Con_Recharge = tonumber(con[1])
|
||||
|
|
Loading…
Reference in New Issue