From 3027e991c9f6e7d64fa9e24f7d0da7909c976205 Mon Sep 17 00:00:00 2001 From: JLIOSM1 <774727341@qq.com> Date: Wed, 21 Jul 2021 14:55:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90IOS=E6=8F=90=E5=AE=A1=E3=80=91?= =?UTF-8?q?=E6=8F=90=E5=AE=A1=E6=9C=8D=E5=85=B3=E9=97=AD=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BA=A2=E5=8C=85=EF=BC=8C=E6=97=A0=E5=B0=BD=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 4 ++-- Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua | 4 ++-- .../ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index c2a0767a33..2a3758ea44 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local _GuildBuildConfig = { [GUILD_MAP_BUILD_TYPE.HOUSE] = { @@ -283,7 +283,7 @@ function GuildMainCityPanel:OnShow() this._TimeCounter:Start() end - if not RECHARGEABLE then--(是否开启充值) + if not RECHARGEABLE or SERVER_VERSION == 1 then--(是否开启充值) this.btnRedPacket:SetActive(false) end this.LiveName = "live2d_huyao" diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 43c0c456dd..43e8741f92 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") require("Modules/Map/Logic/TileMapController") require("Modules/Map/Logic/TileMapView") require("Modules/Map/View/MapPointView") @@ -273,7 +273,7 @@ function this:SetActiveGameObj() this.btnRank.gameObject:SetActive(isShow) this.btnReward.gameObject:SetActive(isShow) this.shiQi.gameObject:SetActive(not isShow) - this.endLessTreasure.gameObject:SetActive(not isShow) + this.endLessTreasure.gameObject:SetActive(not isShow and SERVER_VERSION == 0) this.TargetRoot.gameObject:SetActive(not isShow) this.leftDown.gameObject:SetActive(isShow) this.heroGridtip1.gameObject:SetActive(not isShow) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 009e02663c..f5b64b5a4b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -1,4 +1,4 @@ ---- 无尽副本 +--- 无尽副本 --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by aaa. --- DateTime: 2019/7/30 16:30 @@ -551,7 +551,7 @@ function EndLessMapView:InitCompShow(carbonType) this.selectHeroGrid.gameObject:SetActive(true) this.enemyInfo.gameObject:SetActive(false) this.shiQi.gameObject:SetActive(true) - this.endLessTreasure.gameObject:SetActive(true) + this.endLessTreasure.gameObject:SetActive(SERVER_VERSION == 0) end -- ================================================ -- ============ 初始化设置 =========================