【十绝阵】敌人编队卡牌应使用无血条版本的边框

jiaoyangna 2020-09-15 14:47:15 +08:00
parent f0f744602e
commit aacf1d029d
3 changed files with 89 additions and 22 deletions

View File

@ -67,7 +67,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: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -110,7 +110,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, y: 10}
m_AnchoredPosition: {x: 0, y: 26.46}
m_SizeDelta: {x: 50, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5613383455795333131
@ -1524,7 +1524,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: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1720,7 +1720,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, y: 10}
m_AnchoredPosition: {x: 0, y: 26.54}
m_SizeDelta: {x: 50, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2025714628359191133
@ -2276,7 +2276,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, y: 10}
m_AnchoredPosition: {x: 0, y: 26.54}
m_SizeDelta: {x: 50, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4312992510536925577
@ -2383,7 +2383,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: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2459,7 +2459,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: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2535,7 +2535,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: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3276,12 +3276,12 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: -20
m_Bottom: 0
m_Top: -47
m_Bottom: -51
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 290, y: 442}
m_CellSize: {x: 286, y: 460}
m_Spacing: {x: 0, y: -9.6}
m_Constraint: 0
m_ConstraintCount: 2
@ -3352,7 +3352,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: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3805,7 +3805,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, y: 10}
m_AnchoredPosition: {x: 0, y: 26.54}
m_SizeDelta: {x: 50, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5874536059715083532
@ -3953,7 +3953,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, y: 10}
m_AnchoredPosition: {x: 0, y: 26.46}
m_SizeDelta: {x: 50, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6466754787218411545
@ -4186,7 +4186,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, y: 10}
m_AnchoredPosition: {x: 0, y: 26.46}
m_SizeDelta: {x: 50, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1837902985142376698
@ -5464,6 +5464,11 @@ PrefabInstance:
propertyPath: m_Name
value: Hero6
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -5527,7 +5532,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 15
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -5624,6 +5629,11 @@ PrefabInstance:
propertyPath: m_Name
value: Hero2
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -5687,7 +5697,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 15
value: 0.86
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -5784,6 +5794,11 @@ PrefabInstance:
propertyPath: m_Name
value: Hero5
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -5847,7 +5862,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 15
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -5944,6 +5959,11 @@ PrefabInstance:
propertyPath: m_Name
value: Hero1
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -6007,7 +6027,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 15
value: 0.86
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -6049,6 +6069,22 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
@ -6104,6 +6140,11 @@ PrefabInstance:
propertyPath: m_Name
value: Hero4
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -6167,7 +6208,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 15
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -6209,6 +6250,22 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
@ -6264,6 +6321,11 @@ PrefabInstance:
propertyPath: m_Name
value: Hero3
objectReference: {fileID: 0}
- target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_LocalPosition.x
@ -6327,7 +6389,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 15
value: 0.86
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}

View File

@ -74,6 +74,7 @@ end
function ATM_MainMatchView:OnOpen(...)
local isActive = ArenaTopMatchManager.IsTopMatchActive()
this.StateChange(isActive)
PlayUIAnim(this.lockPanel)
end
-- 状态切换

View File

@ -195,6 +195,10 @@ function this.SetCardSingleData(o, heroId, _pos, heroData)
-- local pos=Util.GetGameObject(o,"Pos"):GetComponent("Image")
local yuanImage=Util.GetGameObject(o,"yuanImage")
local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image")
Util.GetGameObject(o,"hpProgress").gameObject:SetActive(false)
Util.GetGameObject(o,"rageProgress").gameObject:SetActive(false)
local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
@ -219,7 +223,7 @@ function this.SetCardSingleData(o, heroId, _pos, heroData)
yuanImage:SetActive(false)
lv.text=heroData.Level
bg.sprite = Util.LoadSprite(GetBattleHeroCardStarBg[heroData.Star])
bg.sprite = Util.LoadSprite(GetHeroCardStarBg[heroData.Star])
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroData.Star])
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroData.PropertyName))