Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
b536fff156
|
|
@ -4835,7 +4835,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: -36.2, y: 48.1}
|
m_AnchoredPosition: {x: -36.2, y: -50.7}
|
||||||
m_SizeDelta: {x: 61.84, y: 27.336}
|
m_SizeDelta: {x: 61.84, y: 27.336}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &222622639373068266
|
--- !u!222 &222622639373068266
|
||||||
|
|
@ -4879,7 +4879,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: +88
|
m_Text:
|
||||||
--- !u!114 &4864852440456619184
|
--- !u!114 &4864852440456619184
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -45319,7 +45319,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: 30.74999, y: -47}
|
m_AnchoredPosition: {x: 33.8, y: -47}
|
||||||
m_SizeDelta: {x: 58.9, y: 33.35}
|
m_SizeDelta: {x: 58.9, y: 33.35}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7700085593771067834
|
--- !u!222 &7700085593771067834
|
||||||
|
|
@ -74239,27 +74239,27 @@ PrefabInstance:
|
||||||
propertyPath: m_MaskInteraction
|
propertyPath: m_MaskInteraction
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8904198713800480830, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_MaskInteraction
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8904198714661017609, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_MaskInteraction
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 8904198713310030723, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
- target: {fileID: 8904198713310030723, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_MaskInteraction
|
propertyPath: m_MaskInteraction
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_MaskInteraction
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8904198713641915434, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
- target: {fileID: 8904198713641915434, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_MaskInteraction
|
propertyPath: m_MaskInteraction
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
- target: {fileID: 8904198713800480830, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_MaskInteraction
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8904198714661017609, guid: bd194af093bc5564ba7ae00a6f664c2d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_MaskInteraction
|
propertyPath: m_MaskInteraction
|
||||||
value: 1
|
value: 1
|
||||||
|
|
|
||||||
|
|
@ -494,6 +494,7 @@ function this:RightBtnOnClick()
|
||||||
isClickLeftOrRightBtn = true
|
isClickLeftOrRightBtn = true
|
||||||
this:UpdateHeroInfoData()
|
this:UpdateHeroInfoData()
|
||||||
this.btnMask.gameObject:SetActive(false)
|
this.btnMask.gameObject:SetActive(false)
|
||||||
|
LayoutRebuilder.ForceRebuildLayoutImmediate(this.nameAndPossLayout.transform)
|
||||||
end):SetEase(Ease.Linear)
|
end):SetEase(Ease.Linear)
|
||||||
this:SetPanelBg(curHeroData.changeProId)
|
this:SetPanelBg(curHeroData.changeProId)
|
||||||
|
|
||||||
|
|
@ -563,6 +564,7 @@ function this:LeftBtnOnClick()
|
||||||
isClickLeftOrRightBtn = true
|
isClickLeftOrRightBtn = true
|
||||||
this:UpdateHeroInfoData()
|
this:UpdateHeroInfoData()
|
||||||
this.btnMask.gameObject:SetActive(false)
|
this.btnMask.gameObject:SetActive(false)
|
||||||
|
LayoutRebuilder.ForceRebuildLayoutImmediate(this.nameAndPossLayout.transform)
|
||||||
end):SetEase(Ease.Linear)
|
end):SetEase(Ease.Linear)
|
||||||
this:SetPanelBg(curHeroData.changeProId)
|
this:SetPanelBg(curHeroData.changeProId)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue