From c62a2937404fa8b73213f82f92b41d2a12588164 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 14 May 2021 16:02:14 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/ActivityMainPanel.lua | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 77776510b5..ce46cd228a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -43,12 +43,16 @@ end --添加事件监听(用于子类重写) function ActivityMainPanel:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, this.OnShow) + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, function() + this:OnOpen(this.activityType,_CurPageIndex) + end) end --移除事件监听(用于子类重写) function ActivityMainPanel:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, this.OnShow) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, function() + this:OnOpen(this.activityType,_CurPageIndex) + end) end function ActivityMainPanel:CheckActOpen(_index) @@ -88,27 +92,14 @@ end --界面打开时调用(用于子类重写) function ActivityMainPanel:OnOpen(_activityType,_index) + LogGreen("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index)) this.activityType = _activityType DynamicActivityManager.curActivityType = this.activityType tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType) - -- _CurPageIndex = 0 - -- if _index and _index > 0 then - -- self:CheckActOpen(_index) - -- end - -- for index = 1, #tabs do - -- if _CurPageIndex < 1 then - -- self:CheckActOpen(index) - -- else - -- break - -- end - -- end - _CurPageIndex = _index or 0 -end - --- 打开,重新打开时回调 -function ActivityMainPanel:OnShow() - if _CurPageIndex and _CurPageIndex > 0 then - self:CheckActOpen(_CurPageIndex) + _CurPageIndex = 0 + LogGreen("_index:"..tostring(_index)) + if _index and _index > 0 then + self:CheckActOpen(_index) end for index = 1, #tabs do if _CurPageIndex < 1 then @@ -117,7 +108,7 @@ function ActivityMainPanel:OnShow() break end end - if _CurPageIndex == 0 then + if _CurPageIndex < 1 then DynamicActivityManager.RemoveUIList() if #DynamicActivityManager.OpenUIList > 0 then JumpManager.GoJump(DynamicActivityManager.OpenUIList[#DynamicActivityManager.OpenUIList],function() @@ -127,6 +118,11 @@ function ActivityMainPanel:OnShow() this:ClosePanel() end end + LogGreen("_CurPageIndex:".._CurPageIndex) +end + +-- 打开,重新打开时回调 +function ActivityMainPanel:OnShow() orginLayer = self.sortingOrder if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then _CurPageIndex = #tabs From 896a52a6a1661948f1f54634512f58dfe3cdb762 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 14 May 2021 19:06:12 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=B9=BE=E5=9D=A4=E5=AE=9D=E7=9B=92?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index ad860fdc79..418d9a3719 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -170,7 +170,7 @@ function QianKunBox:refreshBtnShow() local recrutId = n == 1 and self.singleRecruit.Id or self.tenRecruit.Id local recrutNum = n == 1 and 1 or 10 local uiName = n == 1 and UIName.QianKunBoxBuyOnePanel or UIName.QianKunBoxBuyTenPanel - if state==0 and d[1] == 16 and not isFree then + if state==0 and itemId == 16 and not isFree then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,recrutId,function() self:Recruit(recrutNum,recrutId,uiName) end) From 6a13a569029fd578293fd0cfe55a89e3667f65ed Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 14 May 2021 19:09:35 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2bd439879bc1408a11efeb0cade775ca4a47a0e7) --- .../ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab | 2 +- .../ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab index ac71440e3f..51c4d8e24d 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab @@ -496,7 +496,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u9650\u8D2D\uFF1A0/1" + m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A1" LanguageIndex: 0 --- !u!1 &2969215487700477814 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab index 1d4050055c..2069551793 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab @@ -1323,7 +1323,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u9650\u8D2D\uFF1A0/1" + m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A1" LanguageIndex: 0 --- !u!1 &7024708985962774764 GameObject: From 9ccd6f9002a3202fff4d8abcfc7a46d88b703a73 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 15 May 2021 14:40:43 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=E5=80=92=E8=AE=A1=E6=97=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/BattlePanel.lua | 6 ++++-- .../~Lua/Modules/Popup/BattleFailPopup.lua | 7 ++++--- .../ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 3dfc9c078c..2db48bf597 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -562,8 +562,10 @@ function this.ShowBattleResultByCarDeleayType() Timer.New(function() local bestData, allDamage= BattleRecordManager.GetBattleBestData() if bestData then - --车迟挑战cd计时 - GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Challenge) + if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then + --车迟挑战cd计时 + GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Challenge) + end -- 胜利显示本场比赛的表现最好的英雄 UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup) -- 打开关卡奖励界面 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index eb99f1a334..8a4daa3c22 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -99,6 +99,10 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) else this.btnBattleBack:SetActive(true) end + if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟 + --车迟抢夺cd计时 + GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot) + end end @@ -119,9 +123,6 @@ function this.ClosePanelRefreshData() if fightType then if fightType == BATTLE_TYPE.EXECUTE_FIGHT then--远征 this.ShowBattleResultByExpedition() - elseif fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟 - --车迟抢夺cd计时 - GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot) elseif fightType == BATTLE_TYPE.XIAOYAOYOU then--逍遥游 this.ShowBattleResultByXYY() --新回放功能 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index 3e9f8f7c90..53a1714bee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -152,8 +152,10 @@ end function this.ShowBattleResultByCarDeleayType(drop) local bestData, allDamage= BattleRecordManager.GetBattleBestData() if bestData then - --车迟抢夺cd计时 - GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot) + if m_fightType == BATTLE_TYPE.GUILD_CAR_DELAY then + --车迟抢夺cd计时 + GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot) + end -- 胜利显示本场比赛的表现最好的英雄 UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup) -- 打开关卡奖励界面 From 502eb112c0d996eb012f6655e69ffb3d86f8d9dc Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 15 May 2021 15:50:52 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=90=E7=BA=A2=E5=8C=85=E3=80=91?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BA=A2=E5=8C=85=E8=B4=AD=E4=B9=B0=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua index 2920db860a..860a3413da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua @@ -258,7 +258,7 @@ function this.RechargeSuccessFunc(id) OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.DirectPurchaseGift, id) local redpack=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,curIndex) this.SetInfo(curIndex) - PopupTipPanel.ShowTip(string.format( Language[11051],GetLanguageStrById(redpack.Name))) + -- PopupTipPanel.ShowTip(string.format( Language[11051],GetLanguageStrById(redpack.Name))) ChatManager.RequestSendRedPacket(curIndex) end From 96e08c702582630deb290cb0dafa1c46abcc6294 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 15 May 2021 16:07:45 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E3=80=90=E7=BA=A2=E5=8C=85=E3=80=91?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=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 --- .../~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua index 860a3413da..fdcd628bda 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua @@ -258,7 +258,7 @@ function this.RechargeSuccessFunc(id) OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.DirectPurchaseGift, id) local redpack=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,curIndex) this.SetInfo(curIndex) - -- PopupTipPanel.ShowTip(string.format( Language[11051],GetLanguageStrById(redpack.Name))) + PopupTipPanel.ShowTip(string.format("成功发送%s",GetLanguageStrById(redpack.Name))) ChatManager.RequestSendRedPacket(curIndex) end From 8e1da10b521ea9b19f9774b3f972e8835a8f7e26 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 15 May 2021 17:06:04 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E3=80=90=E5=89=A7=E6=83=85=E3=80=91?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua index 3533726842..d8e1ff4cd3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapManager.lua @@ -2,7 +2,7 @@ local this = StoryMapManager this.groupConfigs = {} this.isShowStory = 0 ---local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig) +local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig) --初始化 function this.Initialize() From c3c485b209ca0e695ddabbaf05bcb2ef6c311720 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 15 May 2021 17:36:47 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E3=80=91?= =?UTF-8?q?=E4=BA=91=E6=B8=B8=E5=95=86=E4=BA=BA=E8=B5=84=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/y_yosr_icon1_zh.png | Bin 28836 -> 28802 bytes .../ArtFont/y_yosr_icon2_zh.png | Bin 27852 -> 27821 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon1_zh.png index 2d23ede46ca568a19e958da8ed81272d5f677499..d8f518110229244d318249045e950c48f8b221c0 100644 GIT binary patch delta 4117 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 k=7Jp!J`XN7732_n=BpT@_s@ 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 Rvj5%#07E@f-D)TT^M8u{+&};T diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/y_yosr_icon2_zh.png index 56e6943cd9d104065c6567426b386fc3ece1ac49..bac0f36d0c584ac5f79f9c575ce5c4c064b6d177 100644 GIT binary patch delta 2476 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 Date: Sat, 15 May 2021 17:38:58 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E3=80=90gm=E3=80=91=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Main/GMPanel.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 1372ee06e6..401d0ff177 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -90,7 +90,7 @@ function GMPanel:InitComponent() {type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "跳转测试", inputTip = {"输入跳转ID"}, callBack = this.TestJump}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = "获取", inputTip = {"天宫秘宝积分"}, callBack = nil}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = "逍遥游", inputTip = {"类型#mapId#bossId"}, callBack = nil}, - {type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "功能引导测试", inputTip = {"请输入引导ID"}, callBack = this.TestFuncGuide}, + {type = GMType.Function, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "功能引导测试", inputTip = {"请输入功能ID", "1去主界面2去挂机界面"}, callBack = this.TestFuncGuide}, {type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "红点Debug", inputTip = {""}, callBack = this.OpenRedDebug}, @@ -319,9 +319,20 @@ function this.TestJump(text) JumpManager.GoJump(tonumber(text)) end -- 测试功能引导 -function this.TestFuncGuide(text) +function this.TestFuncGuide(text, goType) + local gid = tonumber(text) - GuideManager.AddFuncGuide(gid) + -- 判断要前往的界面 + if goType == "1" then + GuideManager.AddFuncGuide(gid) + this:ClosePanel() + elseif goType == "2" then + GuideManager.AddFuncGuide(gid) + UIManager.OpenPanel(UIName.FightPointPassMainPanel) + else + PopupTipPanel.ShowTip("请输入要前往的界面") + end + end -- 红点Debug function this.OpenRedDebug() From 533fd17972416fecc5ce8ebb71e24d126ebba9b3 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 15 May 2021 18:03:25 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E3=80=91?= =?UTF-8?q?=E6=BB=A1=E7=BA=A7=E6=98=BE=E7=A4=BA=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/GuildInfoPopup.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua index 4c5029abe5..daf2d133ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua @@ -348,14 +348,20 @@ function this.RefreshBaseInfoShow() local curGuildlv = guildData.levle local curGuildLevelInfo = ConfigManager.GetConfigData(ConfigName.GuildLevelConfig, curGuildlv) local masterInfo = MyGuildManager.GetMyGuildMasterInfo() - + -- 判断是否满级 + local expTxt = "已满级" + local expVal = 1 + if ConfigManager.TryGetConfigData(ConfigName.GuildLevelConfig, curGuildlv+1) then + expTxt = string.format("%s/%s", guildData.exp, curGuildLevelInfo.Exp) + expVal = guildData.exp/curGuildLevelInfo.Exp + end this.guildName.text = guildData.name this.guildAnnounce.text = GetLanguageStrById(guildData.annouce) this.guildLevel.text = curGuildlv..Language[10065] this.guildMaster.text = masterInfo.userName this.guildMember.text = string.format("(%s/%s)", guildData.totalNum, curGuildLevelInfo.Num) - this.expText.text = string.format("%s/%s", guildData.exp, curGuildLevelInfo.Exp) - this.expSlider.value = guildData.exp/curGuildLevelInfo.Exp + this.expText.text = expTxt + this.expSlider.value = expVal local pos = MyGuildManager.GetMyPositionInGuild() this.guildCharge:SetActive(pos ~= GUILD_GRANT.MEMBER)