diff --git a/Assets/ManagedResources/~Lua/Logic/Game.lua b/Assets/ManagedResources/~Lua/Logic/Game.lua index 8a73fca7ca..32790bfb8c 100644 --- a/Assets/ManagedResources/~Lua/Logic/Game.lua +++ b/Assets/ManagedResources/~Lua/Logic/Game.lua @@ -19,9 +19,9 @@ function Game.Initialize() this.InitManagers() -- 默认30帧 if PlayerPrefs.HasKey("ResLution") then - UnityEngine.Application.targetFrameRate = PlayerPrefs.GetInt("ResLution") == 0 and 30 or 60 + UnityEngine.Application.targetFrameRate = 60--PlayerPrefs.GetInt("ResLution") == 0 and 30 or 60 else - UnityEngine.Application.targetFrameRate = 30 + UnityEngine.Application.targetFrameRate = 60 end -- 延迟 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua index 7d1adbac38..170d5caaa4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua @@ -94,7 +94,7 @@ function SettingInfo:SetReslutionTipShow() local value = PlayerPrefs.GetInt("ResLution") this.selectResolution.value = value if value == 0 then - UnityEngine.Application.targetFrameRate = 30; + UnityEngine.Application.targetFrameRate = 45; this.selectResolutionText.text = "普通帧率" this.selectResolutionTip.gameObject:SetActive(false) else diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua index 0fe3995d39..5d13c8312f 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua @@ -570,7 +570,7 @@ function this.SetTeamInfo(_go,teamData,type) Util.SetParticleSortLayer(teamList[hero.position].starGrid,this.sortingOrder + 1) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid) teamList[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) - teamList[hero.position].levelText.text =endLess[heroTid].Level or hero.level + teamList[hero.position].levelText.text = hero.level teamList[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star)) SetHeroIcon(this.spLoader, hero,teamList[hero.position].icon,heroConfig) SetHeroFlyEffect(teamList[hero.position].hero,this.spLoader,star,this.sortingOrder+1,0.6,2) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayMyTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayMyTeamPanel.lua index 1512ba1c23..0f49a7ecf2 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayMyTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayMyTeamPanel.lua @@ -202,8 +202,8 @@ function GodsWayMyTeamPanel:SetSingleFormation(go,data,index) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id) allPower=allPower+heroData.warPower self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId)) - self.Heros[index][hero.position].levelText.text = endLessConfig[heroData.id].Level or heroData.lv - self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,star)) + self.Heros[index][hero.position].levelText.text = heroData.lv --endLessConfig[heroData.id].Level or heroData.lv + self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,star)) SetHeroIcon(self.spLoader,heroData,self.Heros[index][hero.position].icon,heroConfig) local heroData = {} Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function()