Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2022-01-12 14:36:43 +08:00
commit 6cc1b55503
2 changed files with 7 additions and 7 deletions

View File

@ -15123,7 +15123,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: -125, y: 140}
m_AnchoredPosition: {x: -323, y: 140}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8042445684654677535
@ -20334,7 +20334,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: -105.850006, y: -287}
m_AnchoredPosition: {x: -105.850006, y: -829}
m_SizeDelta: {x: 185.7, y: 182.92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7992213219080702781
@ -23021,9 +23021,9 @@ 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: 148, y: 81}
m_AnchoredPosition: {x: 216, y: -722}
m_SizeDelta: {x: 650, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &7396113761718134804
CanvasRenderer:
m_ObjectHideFlags: 0
@ -23092,7 +23092,7 @@ MonoBehaviour:
m_Right: 0
m_Top: 20
m_Bottom: 50
m_ChildAlignment: 1
m_ChildAlignment: 7
m_Spacing: 20
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0

View File

@ -312,7 +312,7 @@ end
--初始化详细信息列表
function HomeLand:InitDetailBar()
local targetPos = bool and Vector3.zero or Vector3.New(863,81,0)
local targetPos = bool and Vector3.zero or Vector3.New(863,-722,0)
self.Kuang:GetComponent("RectTransform").localPosition = targetPos
self.maskBtn:SetActive(bool)
@ -364,7 +364,7 @@ end
--详细信息列表的移动
function HomeLand:SetDetailBar()
self.maskBtn:SetActive(bool)
local targetPos = bool and Vector3.New(216,81,0) or Vector3.New(863,81,0)
local targetPos = bool and Vector3.New(216,-722,0) or Vector3.New(863,-722,0)
local rotation = bool and Vector3.New(0,180,0) or Vector3.zero
self.Kuang.transform:DOLocalMove(targetPos, 0.8)
self.BtnImage.transform:DORotate(rotation,0.8)