From ef374b841a8d3e6368b3e9769c993d67e8ba389a Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 2 Apr 2021 15:02:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E7=A0=B4=E7=9B=BE=EF=BC=8C=E6=B8=85=E9=99=A4=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/Language.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 5bdd05a8fb..6c4ff4baa7 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2277,4 +2277,6 @@ [12276] = GetLanguageStrById("灵兽篇"), [12277] = GetLanguageStrById("激活属性:"), [12278] = GetLanguageStrById("激活成功,获得%s%s"), + [12279] = GetLanguageStrById("破盾"), + [12280] = GetLanguageStrById("清除"), } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 7dadfe9122..9de455dd07 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -978,9 +978,9 @@ function this.GetArtFontConfig(_ArtFontType) if _ArtFontType == BattleArtFontType.Immune then return {type = 2, content = Language[10203]} elseif _ArtFontType == BattleArtFontType.Shield then - return {type = 2, content = Language[12236]} + return {type = 2, content = Language[12279]} elseif _ArtFontType == BattleArtFontType.clear then - return {type = 2, content = Language[12237]} + return {type = 2, content = Language[12280]} end end From 53912b5384819b69a11c492acd77dd1dbe929e23 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 2 Apr 2021 15:12:39 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E5=B1=8F=E5=B9=95=E9=80=82?= =?UTF-8?q?=E9=85=8D=E3=80=91CanvasScaler=E6=B7=BB=E5=8A=A0=E5=88=B0config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Framework/Manager/ServerConfigManager.lua | 1 + .../~Lua/Framework/Manager/UIManager.lua | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 1f102697f1..7bd86cfb58 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -7,6 +7,7 @@ ServerConfigManager.SettingConfig = { ThinkAnalysis_GetDeviceID = "ThinkAnalysis_GetDeviceID", -- 数数获取DeviceID方法 LayoutBuilderWrap = "LayoutBuilderWrap", -- 强制刷新layout组件大小的方法修改到lua中调用 LanguagePackager = "LanguagePackager", -- 本地化处理 + UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 本地化处理 } diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua index 475b5d3823..bf4819d036 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua @@ -62,7 +62,10 @@ function UIManager.Initialize() gameObj.name = "UIRoot" this.eventSystem = GameObject.Find("EventSystem") this.uiRoot = gameObj - this.canvasScaler = gameObj.transform:Find("UIRoot"):GetComponent("CanvasScaler") + this.isCanvasScaler = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.UI_Layout_CanvasScaler) + if this.isCanvasScaler then + this.canvasScaler = gameObj.transform:Find("UIRoot"):GetComponent("CanvasScaler") + end this.uiNode = gameObj.transform:Find("UIRoot/UINode") this.fullNode = gameObj.transform:Find("UIRoot/FullNode") this.fixedNode = gameObj.transform:Find("UIRoot/FixedNode") @@ -122,8 +125,9 @@ function UIManager.Adapter() -- 屏幕大小 UIManager.width = Screen.width UIManager.height = Screen.height - - this.canvasScaler.matchWidthOrHeight = 0.5 + if this.isCanvasScaler then + this.canvasScaler.matchWidthOrHeight = 0.5 + end -- 计算屏幕比例的比值,用于部分界面进行屏幕适配的缩放 UIManager.adapterScale = (1920/1080)/(Screen.height / Screen.width) @@ -166,7 +170,10 @@ function UIManager.Adapter() elseif n < standard then -- 计算屏幕比例的比值,用于部分界面进行屏幕适配的缩放 UIManager.adapterScale = 1 - this.canvasScaler.matchWidthOrHeight = 1 + + if this.isCanvasScaler then + this.canvasScaler.matchWidthOrHeight = 1 + end -- 实际分辨率 = 屏幕分辨率 / 比例因子 From 8650cfe6a7e13793fb5753c50db2f8e2f9b37050 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 2 Apr 2021 15:19:20 +0800 Subject: [PATCH 3/7] =?UTF-8?q?language=E8=A1=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_execl/Language_data/LanguageLua.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 641beffc79..425dd7777f 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2276,3 +2276,5 @@ 12276,ƪ 12277,ԣ 12278,ɹ%s%s +12279,ƶ +12280, From 7bea1cf11ad7668e686f8012cd22361eba12a291 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 2 Apr 2021 15:42:36 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E3=80=91=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArenaTopMatch/ArenaTopMatchManager.lua | 40 ++++++++++++++++++- .../ArenaTopMatch/View/ATM_GuessView.lua | 4 +- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index 0345c0ad34..f4a7812115 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -105,7 +105,45 @@ end function this.UpdateTopMatchStage(msg) -- 没有数据或者未开启时重新获取数据 if not this.baseInfo or not this.baseInfo.progress or this.baseInfo.progress <= 0 then - this.RequestTopMatchBaseInfo() + + local fun = function() + -- 获取新的阶段信息 + this.baseInfo.progress = msg.progress + this.baseInfo.endTime = msg.endTime + this.BaseDataEndTimeCountDown() + Log(string.format("巅峰战阶段刷新 state = %s, progress = %s, endTime = %s, myrank = %s", + this.baseInfo.joinState, this.baseInfo.progress, this.baseInfo.endTime, this.baseInfo.myrank)) + + -- 刷新基础信息 + this.RefreshBaseInfo() + -- Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate) + -- --刷新排行信息 + -- Game.GlobalEvent:DispatchEvent(GameEvent.ATM_RankView.OnRankChange) + LogGreen("this.baseInfo.battleState "..this.baseInfo.battleState) + + -- 切换到准备阶段刷新一遍数据 + -- if this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_READY then + -- this.RequestTopMatchBaseInfo() + -- --this.RequestBetBaseInfo() + -- -- 竞猜阶段刷新竞猜数据 + -- else + if this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_GUESS then + this.RequestTopMatchBaseInfo() + this.RequestBetBaseInfo() + -- 战斗阶段不刷新 + --elseif this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_GUESS then + -- 切换到结算阶段刷新一遍所有数据 + elseif this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END then + this.RequestTopMatchBaseInfo() + this.RequestBetBaseInfo(nil,true) + end + + Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate) + --刷新排行信息 + Game.GlobalEvent:DispatchEvent(GameEvent.ATM_RankView.OnRankChange) + end + + this.RequestTopMatchBaseInfo(fun) return end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index 4e208c6740..35276dc5c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -196,12 +196,12 @@ function this.OnShowRefresh() isShow = isActive and (battleStage == TOP_MATCH_STAGE.ELIMINATION or battleStage == TOP_MATCH_STAGE.CHOOSE) and progress ~= -2 -- LogGreen("battleStage "..battleStage.." isActive "..tostring(isActive).." progress "..progress.." isShow "..tostring(isShow)) this.guessPanel:SetActive(isShow) - commonInfo.SetActive(isShow) + -- commonInfo.SetActive(isShow) this.emptyPanel:SetActive(not isShow) end function this.RefreshBaseShow() local IsCanBet = ArenaTopMatchManager.IsCanBet() - -- LogGreen("IsCanBet "..tostring(IsCanBet)) + LogGreen("IsCanBet "..tostring(IsCanBet)) if IsCanBet then -- 判断是否有竞猜信息 local betBattleInfo = ArenaTopMatchManager.GetBetBattleInfo() this.emptyPanel:SetActive(false) From c45d20f9da0fde9014854dcca2cf9ba52d14cc35 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 2 Apr 2021 15:47:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E3=80=91=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/ArenaTopMatch/View/ATM_MainMatchView.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index a225cfddbb..92866d29d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -59,14 +59,14 @@ function ATM_MainMatchView:BindEvent() end --添加事件监听(用于子类重写) function ATM_MainMatchView:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.OnOpen, this) + Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.OnOpenData) Game.GlobalEvent:AddEvent(GameEvent.ATM_RankView.OnOpenBattle, this.battleDetailBtnClick) end --移除事件监听(用于子类重写) function ATM_MainMatchView:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.OnOpen, this) + Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.OnOpenData) Game.GlobalEvent:RemoveEvent(GameEvent.ATM_RankView.OnOpenBattle, this.battleDetailBtnClick) end @@ -75,7 +75,10 @@ function ATM_MainMatchView:OnOpen(...) local isActive = ArenaTopMatchManager.IsTopMatchActive() this.StateChange(isActive) end - +function this.OnOpenData() + local isActive = ArenaTopMatchManager.IsTopMatchActive() + this.StateChange(isActive) +end -- 状态切换 local isJoin = nil local isOver = nil From a73924a275e4aba8303e5da442e9d7018a5a48ab Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 2 Apr 2021 15:47:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E5=9D=90?= =?UTF-8?q?=E9=AA=91=E6=97=B6=E8=A3=85=E3=80=91=E5=8F=96=E6=B6=88=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/View/PlayerLiveView.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index e6e49fb210..67fa30303f 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -98,7 +98,7 @@ end --加载三个立绘(称号 坐骑 皮肤) function PlayerLiveView:OnShowLive() - LogBlue("self.rideLiveGo "..self.rideLiveGo.name) + -- LogBlue("self.rideLiveGo "..self.rideLiveGo.name) self.rideLiveGo:SetActive(false) self.playerLiveGo:SetActive(false) self.titleLiveGo:SetActive(false) @@ -262,14 +262,14 @@ function PlayerLiveView:SetWalkDir(dir) end function PlayerLiveView:SetWalkDirInfo(playerDir,RideDir) if playerDir and (self.oldPlayerDirAnimation ~= playerDir.animation or self.oldPlayerDiry ~= playerDir.y) then - LogBlue("PlayerLiveView playerDir : "..playerDir.animation .." ".. playerDir.y) + -- LogBlue("PlayerLiveView playerDir : "..playerDir.animation .." ".. playerDir.y) self.playerLiveSkeletonGraphic.transform.localEulerAngles = Vector3.New(0, playerDir.y, 0) self.playerLiveSkeletonGraphic.AnimationState:SetAnimation(0, playerDir.animation, true) self.oldPlayerDirAnimation = playerDir.animation self.oldPlayerDiry = playerDir.y end if RideDir and (self.oldRideDirAnimation ~= RideDir.animation or self.oldRideDiry ~= RideDir.y) then - LogBlue("PlayerLiveView RideDir : "..RideDir.animation .." ".. RideDir.y) + -- LogBlue("PlayerLiveView RideDir : "..RideDir.animation .." ".. RideDir.y) self.rideLivSkeletonGraphic.transform.localEulerAngles = Vector3.New(0, RideDir.y, 0) self.rideLivSkeletonGraphic.AnimationState:SetAnimation(0, RideDir.animation, true) self.oldRideDirAnimation = RideDir.animation From 855c7159b810fb7652afae89e8fd469556d0c4e9 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 2 Apr 2021 16:01:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E3=80=91=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/ArenaTopMatch/View/ATM_MainMatchView.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index 92866d29d3..b0ccb50527 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -77,6 +77,7 @@ function ATM_MainMatchView:OnOpen(...) end function this.OnOpenData() local isActive = ArenaTopMatchManager.IsTopMatchActive() + -- LogBlue("isActive "..tostring(isActive)) this.StateChange(isActive) end -- 状态切换 @@ -84,14 +85,16 @@ local isJoin = nil local isOver = nil local baseData function this.StateChange(isOpen) + local isOpen = ArenaTopMatchManager.IsTopMatchActive() + -- LogBlue("isOpen "..tostring(isOpen)) baseData = ArenaTopMatchManager.GetBaseData() -- 没开启或者开启没参赛都属于未参赛 isJoin = baseData.joinState == 1 isOver = baseData.progress == -2 - LogGreen("isOpen "..tostring(isOpen).." "..tostring(isJoin).." "..tostring(isOver).." "..baseData.joinState) + -- LogGreen("isOpen "..tostring(isOpen).." "..tostring(isJoin).." "..tostring(isOver).." "..baseData.joinState) local battleInfo = ArenaTopMatchManager.GetBattleInfo() - LogGreen("battleInfo.result "..battleInfo.result.." baseData.battleState "..baseData.battleState) - LogGreen("baseData.loser "..tostring(baseData.loser)) + -- LogGreen("battleInfo.result "..battleInfo.result.." baseData.battleState "..baseData.battleState) + -- LogGreen("baseData.loser "..tostring(baseData.loser)) if isOpen then if isJoin then this.SetPlayerInfo()