优化页面修改一些bug
parent
966c4dd542
commit
9f345ad331
|
|
@ -488,9 +488,9 @@ RectTransform:
|
|||
m_Father: {fileID: 6817509615464741921}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -1136.0966, y: 82}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 82}
|
||||
m_SizeDelta: {x: 0, y: 164}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &396553229042369324
|
||||
|
|
@ -38717,7 +38717,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
|
|
|||
|
|
@ -45257,7 +45257,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
|
|
|||
|
|
@ -7968,14 +7968,14 @@ RectTransform:
|
|||
m_GameObject: {fileID: 572218719925450075}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: -1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7754725958776047094}
|
||||
m_RootOrder: 0
|
||||
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.5, y: 23.1}
|
||||
m_AnchoredPosition: {x: -0.5, y: 34.5}
|
||||
m_SizeDelta: {x: 456.5, y: 173.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2070110680592621684
|
||||
|
|
@ -7999,7 +7999,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -73773,7 +73773,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 6278373347935340855}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 0.70133346, y: 0.70133346, z: 1}
|
||||
m_LocalScale: {x: -0.7013335, y: 0.70133346, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3432970067664715992}
|
||||
m_Father: {fileID: 8831099743542526053}
|
||||
|
|
@ -73781,8 +73781,8 @@ 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: -86, y: 214}
|
||||
m_SizeDelta: {x: 595.26, y: 346.5}
|
||||
m_AnchoredPosition: {x: -5.04, y: 178.25}
|
||||
m_SizeDelta: {x: 484.16, y: 244.54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &738290502969369036
|
||||
CanvasRenderer:
|
||||
|
|
@ -73812,7 +73812,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: c65229ed443ab0b4fa61b949bfdb1fef, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 87f84a90c5b5ebb4fb5c8d664c1a7430, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -98933,12 +98933,12 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
|
|
@ -99173,12 +99173,12 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
|
|
@ -99398,12 +99398,12 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
|
|
@ -99488,12 +99488,12 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
- target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ function BagPanel:InitComponent()
|
|||
this.noneImage=Util.GetGameObject(self.gameObject,"NoneImage")
|
||||
this.noneTxt=Util.GetGameObject(self.gameObject,"NoneImage/TextImage/Text"):GetComponent("Text")
|
||||
this.noneBtn=Util.GetGameObject(self.gameObject,"NoneImage/TextImage")
|
||||
this.tabBox:GetComponent("RectTransform").anchoredPosition3D=Vector3.New(-540,82,0)
|
||||
this.tabBox:GetComponent("RectTransform").anchoredPosition3D=Vector3.New(0,82,0)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -814,7 +814,7 @@ function this.SetBottomBarIsActive()
|
|||
num = num + 1
|
||||
end
|
||||
end
|
||||
this.tabBox:GetComponent("RectTransform").pivot = num > 5 and Vector2.New(0, 0.5) or Vector2.New(0.5, 0.5)
|
||||
--this.tabBox:GetComponent("RectTransform").pivot = num > 5 and Vector2.New(0, 0.5) or Vector2.New(0.5, 0.5)
|
||||
end
|
||||
|
||||
local orginLayer
|
||||
|
|
|
|||
|
|
@ -397,8 +397,8 @@ function RoleView:OnSkillPlay()
|
|||
local cardRenderMat = self.liveRender.material
|
||||
cardRenderMat:SetInt("_IsMask", 0)
|
||||
end
|
||||
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "atk", false)
|
||||
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "skill2", false)
|
||||
end
|
||||
|
||||
function RoleView:OnSkillEnd()
|
||||
|
|
|
|||
|
|
@ -1700,6 +1700,7 @@ function this.SetBoxEffect(isShow, state, pos)
|
|||
end
|
||||
|
||||
function this:OnClose()
|
||||
isPlay = false
|
||||
end
|
||||
|
||||
function this:Dispose()
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ function this:RightBtnOnClick()
|
|||
index = (index + 1 <= #heroDatas and index + 1 or 1)
|
||||
curHeroData = heroDatas[index]
|
||||
if this.leftLiveObj then
|
||||
poolManager:UnLoadLive(leftHeroData.live, this.leftLiveObj)
|
||||
poolManager:UnLoadLive(this.leftLiveObj.name, this.leftLiveObj)
|
||||
this.leftLiveObj = nil
|
||||
end
|
||||
this.curLiveObj.transform:SetParent(this.leftObj.transform)
|
||||
|
|
|
|||
Loading…
Reference in New Issue