From 5ea71bdeebd7202436a3f9bd675fb527c44d965d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 26 Feb 2021 14:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A6=96=E9=A2=86=E6=9D=A5=E8=A2=AD?= =?UTF-8?q?=E3=80=91=E7=9B=B8=E5=90=8C=E5=85=B3=E5=8D=A1=E4=B9=8B=E8=B0=88?= =?UTF-8?q?=E5=87=BA=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Battle/View/BattleBossInfoPanel.lua | 21 ++++++++++++------- .../~Lua/Modules/Battle/View/BattleView.lua | 3 ++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua index da138786e7..4433c7bf20 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBossInfoPanel.lua @@ -70,19 +70,24 @@ end -- 打开,重新打开时回调 function BattleBossInfoPanel:OnShow() + + PlayerPrefs.SetInt(PlayerManager.uid.."BattleBossShow"..FightPointPassManager.curOpenFight,1) + local data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.curOpenFight) + local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig,data.BossPreview) + local bossData = ConfigManager.GetConfigDataByKey(ConfigName.MainLevelBossConfig,"HeroId",data.BossPreview) + local time = bossData.Time/1000 + self.timer1 = Timer.New(function () PlayUIAnim(self.ani1) PlayUIAnim(self.ani2) Timer.New(function () self:ClosePanel() end,0.7):Start() - end,10) + end,time) self.timer1:Start() - local data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.curOpenFight) - local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig,data.BossPreview) - local bossData = ConfigManager.GetConfigDataByKey(ConfigName.MainLevelBossConfig,"HeroId",data.BossPreview) + --Pos - local GetcurLanguage = 0 + local GetcurLanguage = 0--为后期多语言 self.nameZh.text = heroData.ReadingName self.posTextZh.text = heroData.HeroLocation self.nameOther.text = heroData.ReadingName @@ -110,9 +115,9 @@ function BattleBossInfoPanel:OnShow() self.talismanText.text = bossData.Treasuretips --bg - self.Img1:DOShakeAnchorPos(10, Vector2.New(10, 10), 1, 50, false, false) - self.Img2:DOShakeAnchorPos(10, Vector2.New(10, 10), 1, 50, false, false) - self.Img3:DOShakeAnchorPos(10, Vector2.New(10, 10), 1, 50, false, false) + self.Img1:DOShakeAnchorPos(time, Vector2.New(10, 10), 1, 50, false, false) + self.Img2:DOShakeAnchorPos(time, Vector2.New(10, 10), 1, 50, false, false) + self.Img3:DOShakeAnchorPos(time, Vector2.New(10, 10), 1, 50, false, false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index 1fc6e57a83..43968747b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -556,8 +556,9 @@ function this.BattleOrderChange(order) end --判断是否需要显示boss信息 local data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.curOpenFight) + local key = PlayerPrefs.GetInt(PlayerManager.uid.."BattleBossShow"..FightPointPassManager.curOpenFight) Timer.New(function () - if data.BossPreview and data.BossPreview > 0 then + if data.BossPreview and data.BossPreview > 0 and key == 0 then UIManager.OpenPanel(UIName.BattleBossInfoPanel,function () func() end)