[功能]===========新手引导提交,心魔试炼排行榜添加玩家信息

dev_chengFeng
wangzhenxing 2021-04-16 14:09:36 +08:00
parent 68658a50c9
commit c544767e29
7 changed files with 148 additions and 8 deletions

View File

@ -228,7 +228,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: -150.23, y: -5.4200544}
m_AnchoredPosition: {x: -150.22998, y: -5.4200544}
m_SizeDelta: {x: 300.45, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &144446861
@ -1205,7 +1205,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 88.2, y: -4.8}
m_AnchoredPosition: {x: 88.20001, y: -4.8}
m_SizeDelta: {x: 176.4, y: 51.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1188837880
@ -19820,6 +19820,7 @@ GameObject:
- component: {fileID: 4018688854463737437}
- component: {fileID: 4075020177426502022}
- component: {fileID: 5608968625834312670}
- component: {fileID: 2447478372970013511}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@ -19887,6 +19888,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &2447478372970013511
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3856636081483744281}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5608968625834312670}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &3901662476241383490
GameObject:
m_ObjectHideFlags: 0
@ -21394,6 +21437,7 @@ GameObject:
- component: {fileID: 8275740740669531974}
- component: {fileID: 985086502098638916}
- component: {fileID: 7984028104908653066}
- component: {fileID: 5245908033494290599}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@ -21461,6 +21505,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5245908033494290599
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6494597283182384217}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 7984028104908653066}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &6502213477216306328
GameObject:
m_ObjectHideFlags: 0

View File

@ -1680,6 +1680,7 @@ PLAYER_INFO_VIEW_TYPE = {
BLACK_REMOVE = 2,
GO_TO_BLACK = 3,
ARENA = 4,
MIND_DEMON = 5,
}
--限时达人 周卡 限时活动 拍脸 异妖直购

View File

@ -12,6 +12,8 @@ GameEvent = {
OnLoseFocus = "UIEvent_OnLoseFocus",
-- 按钮点击后通知其他界面
OnBtnClicked = "UIEvent_OnBtnClicked",
--界面更新数据
OnUpdateData = "UIEvent_OnUpdateData",
},
Guide = {
NextTrigger = "Guide.NextTrigger",

View File

@ -242,7 +242,7 @@ function this.RefreshMonsterRankInfo(item, data,myRank)
local head = Util.GetGameObject(item, "Image/head")
local roleName = Util.GetGameObject(item, "Image/textRoot/name"):GetComponent("Text")
local waveNum = Util.GetGameObject(item, "Image/textRoot/waveNum"):GetComponent("Text")
local btn_info =Util.GetGameObject(item, "Image")
--设置表现背景
if myRank == data.rankInfo.rank then
Util.GetGameObject(item,"selfBg").gameObject:SetActive(true)
@ -275,6 +275,9 @@ function this.RefreshMonsterRankInfo(item, data,myRank)
numText.text = roleRank
roleName.text = data.userName
waveNum.text = string.format(Language[11218],data.rankInfo.param1)
Util.AddOnceClick(btn_info,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.MIND_DEMON)
end)
end
------------------- 试炼排行----------------------------------------------
-- 初始化数据显示

View File

@ -8,7 +8,8 @@ local audio
local orginLayer
local live2d
local SkeletonGraphic
local nextDelayTime=0
local nextDelayChange = false
--初始化组件(用于子类重写)
function this:InitComponent()
@ -117,6 +118,9 @@ end
--end
function this.ExecuteBehavior(beType, beArgs)
if this.canvas.enabled==false then
this.canvas.enabled=true
end
if beType == 1 then --点击地图行走
local _trigger = Util.GetEventTriggerListener(this.button)
local endFunc
@ -437,6 +441,37 @@ function this.ExecuteBehavior(beType, beArgs)
this.NextGuide()
-- 在跳转界面
UIManager.OpenPanel(unpack(params))
elseif beType == 16 then
this.canvas.enabled=false
this.dialogRoot:SetActive(false)
this.mask:SetActive(false)
this.tipButtomRoot:SetActive(false)
local isSkip=false
local function OnBtnClick(id,str)
LogError("11111111111111111111111111")
nextDelayTime=0
nextDelayChange=true
isSkip=true
-- 先跳转引导
this.NextGuide()
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnBtnClicked, OnBtnClick)
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnBtnClicked, OnBtnClick)
local function OnUpdateData(id)
if isSkip then
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnUpdateData, OnUpdateData)
return
end
LogError("22222222222")
nextDelayTime=0
nextDelayChange=true
-- 先跳转引导
this.NextGuide()
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnUpdateData, OnUpdateData)
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnUpdateData, OnUpdateData)
end
end
@ -522,6 +557,10 @@ function this:OnOpen(id, func, ...)
--end
this.gameObject:GetComponent("Image").raycastTarget = true
local delay = GuideConfig[id].DelayShow
if nextDelayChange then
delay=nextDelayTime
nextDelayChange=false
end
if delay > 0 then
this.dialogRoot:SetActive(false)
this.tipButtomRoot:SetActive(false)

View File

@ -30,6 +30,10 @@ local _ViewConfig = {
formationType = FormationTypeDef.FORMATION_ARENA_DEFEND,
tip = Language[11500],
},
[PLAYER_INFO_VIEW_TYPE.MIND_DEMON] = {
formationType = FormationTypeDef.MONSTER_CAMP_ATTACK,
tip = "心魔试炼阵容:",
},
}
local curPlayerName = ""

View File

@ -119,15 +119,19 @@ function SingleRecruitPanel:BindEvent()
end)
--十连跳过按钮 直接打开十连抽展示界面
Util.AddClick(this.jumpBtn, function()
Game.GlobalEvent:DispatchEvent(GameEvent.UI.OnBtnClicked, self.uiConfig.id,this.jumpBtn.name)
isFirst=true
this.CloseAllTimer()
if state==1 then --单抽
this.UI_Effect_open:SetActive(false)
self:UpdataPanelData(heroData)
this.goBtn:SetActive(false)
this.againBtn:SetActive(true)
this.sureBtn:SetActive(true)
this.info:SetActive(false)
--如果不是在强制引导,就,,, by:王振兴 2021/04/15 适配新手引导跳过
if not GuideManager.IsInMainGuide() then
this.goBtn:SetActive(false)
this.againBtn:SetActive(true)
this.sureBtn:SetActive(true)
this.info:SetActive(false)
end
else
if lotterySetting[type].LotteryType == 11 then
isFirst=false
@ -281,6 +285,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData)
--赋值展示界面数据
-- local time2 = Timer.New(function ()
this.CloseAllTimer()
Game.GlobalEvent:DispatchEvent(GameEvent.UI.OnUpdateData, self.uiConfig.id)
this.jumpBtnGo:SetActive(false)
this.UI_Effect_appear:SetActive(false)
SoundManager.PlaySound(SoundConfig.Sound_Recruit3)