From 4dbff0ab751fea495967efe609e1ad3ad597faff Mon Sep 17 00:00:00 2001 From: "DESKTOP-RH64908\\Administrator" Date: Tue, 19 Aug 2025 10:45:35 +0800 Subject: [PATCH] 1 --- .../LingMaiMiJing/LingMaiMiJingManager.lua | 14 ++-- .../LingMaiMiJing/LingMaiMiJingPanel.lua | 79 ++++++++++--------- 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua index e218cb302e..16bdf5286e 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua @@ -52,7 +52,7 @@ function this.GetData() data.lingmaiData[i].headFrame = this.lingmaiData[i].headFrame else data.lingmaiData[i].uid = 0 - data.lingmaiData[i].name = "空岛" + data.lingmaiData[i].name = Language[11688] data.lingmaiData[i].servername = "" data.lingmaiData[i].head = 0 data.lingmaiData[i].headFrame = 0 @@ -111,16 +111,16 @@ function this.CheckPrivilage(func) if PrivilegeManager.GetPrivilegeRemainValue(2031) > 0 then local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP,10044, 1) local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name - MsgPanel.ShowTwo(string.format( Language[10516],finalNum,itemName), nil, function() + MsgPanel.ShowTwo(string.format( Language[10627],finalNum,GetLanguageStrById(itemName)), nil, function() --买东西 ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,10044,1,function() - PopupTipPanel.ShowTip(Language[10517]) + PopupTipPanel.ShowTip(Language[10628]) PrivilegeManager.RefreshPrivilegeUsedTimes(2031, 1)--更新特权 func() end,0) end) else - PopupTipPanel.ShowTip("今日已无挑战次数!") + PopupTipPanel.ShowTip(Language[11689]) end else func() @@ -181,16 +181,16 @@ function this.CheckQiJieJump(funcType,SettingNum,func) --判断世界等级是否够 local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerLodeSetting,SettingNum).WorldLevel if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足 - PopupTipPanel.ShowTip(string.format("世界等级到达%s后开启!",conFigWorldLevel)) + PopupTipPanel.ShowTip(string.format(Language[10089],conFigWorldLevel)) return end -- 跨服相关判断 --JumpServerManager.GetWorldArenaInfoRequest(1,function() if not JumpServerManager.GetQiJieIsStart() then - PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).OpenWeek)) + PopupTipPanel.ShowTip(string.format(Language[10091],ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).OpenWeek)) return elseif not JumpServerManager.GetHightLadderDataIsGroup() then - PopupTipPanel.ShowTip("未划分跨服分组,无法参与!") + PopupTipPanel.ShowTip(Language[10092]) return end if func then diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index f99c83999f..a1f6b4a5b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -2,21 +2,21 @@ require("Base/BasePanel") local LingMaiMiJingPanel = Inherit(BasePanel) local lodeConfig = ConfigManager.GetConfig(ConfigName.LodeConfig) local TEXTLIST = { - [1] = "距抢夺期结束:", - [2] = "距开启:", - [3] = "距关闭:", + [1] = Language[11690], + [2] = Language[11691], + [3] = Language[11692], } local veinName = { - [3] = "l_lmmj_huangjilingmai", - [4] = "l_lmmj_xuanjilingmai", - [5] = "l_lmmj_dijilingmai", - [6] = "l_lmmj_tianjilingmai", + [3] = Language[11693], + [4] = Language[11694], + [5] = Language[11695], + [6] = Language[11696], } local fakeName = { - [3] = "黄级", - [4] = "玄级", - [5] = "地级", - [6] = "天级", + [3] = Language[11697], + [4] = Language[11698], + [5] = Language[11699], + [6] = Language[11700], } local effectName = { [6] = "ui-tianmen-huang", @@ -35,7 +35,8 @@ function LingMaiMiJingPanel:InitComponent() --top self.topBar = Util.GetGameObject(self.gameObject,"topBar") self.leftTime = Util.GetGameObject(self.topBar,"Text"):GetComponent("Text") - self.leftDesTime = Util.GetGameObject(self.topBar,"text"):GetComponent("Text") + + self.leftTime2 = Util.GetGameObject(self.gameObject,"topBar2/Text"):GetComponent("Text") --bottom self.bottom = Util.GetGameObject(self.gameObject,"bottomBar") self.time = Util.GetGameObject(self.bottom,"time") @@ -48,20 +49,20 @@ function LingMaiMiJingPanel:InitComponent() self.jumpBtn = Util.GetGameObject(self.jump,"btnJump") self.battleTime = Util.GetGameObject(self.jump,"Time/Text"):GetComponent("Text") self.buyTime = Util.GetGameObject(self.jump,"Time2/Text"):GetComponent("Text") - Util.GetGameObject(self.jump,"Time"):SetActive(false) - Util.GetGameObject(self.jump,"Time2"):SetActive(false) + --Util.GetGameObject(self.jump,"Time"):SetActive(false) + --Util.GetGameObject(self.jump,"Time2"):SetActive(false) self.inputField = Util.GetGameObject(self.jump, "Input/Text"):GetComponent("Text") --rightBtns self.rightBtns = Util.GetGameObject(self.gameObject,"rightBtns") self.sortBtn = Util.GetGameObject(self.rightBtns,"sortBtn") - self.sortBtn:SetActive(false) + self.sortBtn:SetActive(true) self.rewardBtn = Util.GetGameObject(self.rightBtns,"rewardBtn") - self.rewardBtn:SetActive(false) + self.rewardBtn:SetActive(true) self.recordBtn = Util.GetGameObject(self.rightBtns,"recordBtn") self.recordRed = Util.GetGameObject(self.recordBtn,"red") self.storeBtn = Util.GetGameObject(self.rightBtns,"storeBtn") - self.storeBtn:SetActive(false) + self.storeBtn:SetActive(true) --contentgrid self.contentGrid = Util.GetGameObject(self.gameObject,"ContentGrid") self.veinList = {} @@ -144,14 +145,14 @@ function LingMaiMiJingPanel:OnShow() self:SetVeins() self.groupList = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.LodeConfig,"Group",lodeConfig[self.data.lingmaiData[1].Id].Group) self.lastBtn:SetActive(LingMaiMiJingManager.curPage - 1 > 0) - self.nextBtn:SetActive(LingMaiMiJingManager.curPage + 1 <= 100) - self.inputField.text = string.format("第%s页",LingMaiMiJingManager.curPage) + self.nextBtn:SetActive(LingMaiMiJingManager.curPage + 1 <= 40) + self.inputField.text = string.format(Language[11701],LingMaiMiJingManager.curPage) end) end function LingMaiMiJingPanel:SetMydata() if self.data.myPlaceId > 0 then - self.time:SetActive(true) + self.time:SetActive(false) self.TextTip:SetActive(false) self.rewardGrid:SetActive(true) local configData = lodeConfig[self.data.myPlaceId] @@ -166,7 +167,7 @@ function LingMaiMiJingPanel:SetMydata() end item:SetActive(true) Util.GetGameObject(item,"icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.RewardList[j][1])) - Util.GetGameObject(item,"Text"):GetComponent("Text").text = string.format( "%s/分",configData.RewardList[j][2]) + Util.GetGameObject(item,"Text"):GetComponent("Text").text = string.format( Language[11702],configData.RewardList[j][2]) end else self.time:SetActive(false) @@ -178,8 +179,8 @@ function LingMaiMiJingPanel:SetMydata() self.TextTip:SetActive(false) self.rewardGrid:SetActive(false) end - self.buyTime.text = string.format("剩余购买次数:%s",PrivilegeManager.GetPrivilegeRemainValue(2031)) - self.battleTime.text = string.format("剩余挑战次数:%s",PrivilegeManager.GetPrivilegeRemainValue(2030)) + self.buyTime.text = string.format(Language[10398],PrivilegeManager.GetPrivilegeRemainValue(2031)) + self.battleTime.text = string.format(Language[11703],PrivilegeManager.GetPrivilegeRemainValue(2030)) ForceRebuildLayout(self.bottom.transform) end @@ -188,7 +189,7 @@ function LingMaiMiJingPanel:SetVeins() local go = self.veinList[i] local data = self.data.lingmaiData[i] local num = Util.GetGameObject(go,"title/Num"):GetComponent("Text") - local nameImg = Util.GetGameObject(go,"title/NameImg"):GetComponent("Image") + local nameImg = Util.GetGameObject(go,"title/NameImg"):GetComponent("Text") local obtain = Util.GetGameObject(go,"obtain") local obtainImg = Util.GetGameObject(go,"obtain"):GetComponent("Image") local name = Util.GetGameObject(go,"obtain/name"):GetComponent("Text") @@ -198,9 +199,11 @@ function LingMaiMiJingPanel:SetVeins() rewardPre:SetActive(false) obtain:SetActive(LingMaiMiJingManager.state == 1) - -- local img = data.uid == PlayerManager.uid and "l_lmmj_lingmaixinxidi01" or "l_lmmj_lingmaixinxidi" - -- obtainImg.sprite = self.spLoader:LoadSprite(img) - nameImg.sprite = self.spLoader:LoadSprite(veinName[data.Quality]) + local img = data.uid == PlayerManager.uid and "l_lmmj_lingmaixinxidi01" or "l_lmmj_lingmaixinxidi" + obtainImg.sprite = self.spLoader:LoadSprite(img) + local configData = lodeConfig[self.data.lingmaiData[i].Id] + --nameImg.text = veinName[data.Quality]--self.spLoader:LoadSprite() + nameImg.text = GetLanguageStrById(configData.Name) num.text = data.No server.text = data.servername == "" and fakeName[data.Quality] or data.servername name.text = data.name @@ -219,14 +222,14 @@ function LingMaiMiJingPanel:SetVeins() item:SetActive(true) local Obj = Util.GetGameObject(item,"GameObject") Util.GetGameObject(Obj,"icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data.RewardList[j][1])) - Util.GetGameObject(Obj,"Text"):GetComponent("Text").text = string.format( "%s/分",data.RewardList[j][2]) + Util.GetGameObject(Obj,"Text"):GetComponent("Text").text = string.format( Language[11702],data.RewardList[j][2]) ForceRebuildLayout(Obj.transform) end Util.AddOnceClick(go,function () if LingMaiMiJingManager.state == 1 then UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.servername and data.servername or nil,data) else - PopupTipPanel.ShowTip("未开启!") + PopupTipPanel.ShowTip(Language[11704]) end end) @@ -234,11 +237,11 @@ function LingMaiMiJingPanel:SetVeins() Util.GetGameObject(go,effectName[i]):SetActive(false) end local effect1 = Util.GetGameObject(go,effectName[data.Quality]) - Util.SetParticleSortLayer(effect1, self.sortingOrder + 1) + --Util.SetParticleSortLayer(effect1, self.sortingOrder + 1) effect1:SetActive(data.uid == PlayerManager.uid) local effect2 = Util.GetGameObject(go,"title/saoguang-lingmai") - Util.SetParticleSortLayer(effect2, self.sortingOrder + 1) + --Util.SetParticleSortLayer(effect2, self.sortingOrder + 1) effect2:SetActive(data.Quality == 6) end @@ -253,7 +256,7 @@ function LingMaiMiJingPanel:SetTime() local timeStayAtHere = GetTimeStamp() - self.data.startTime local allStayTime=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,158).Value) --我已占领了多久 - self.mytime.text = string.format("%s/%s分",math.floor(timeStayAtHere/60),allStayTime/60) + self.mytime.text = string.format(Language[11705],math.floor(timeStayAtHere/60),allStayTime/60) --判断上方时间显示文字 local text = TEXTLIST[self.data.state] if self.data.state == 2 and CalculateSecondsNowTo_N_OClock(24) <= 10800 then @@ -261,21 +264,19 @@ function LingMaiMiJingPanel:SetTime() else end - --self.leftTime.text = string.format("",TimeToHMS(time)) - - self.leftTime.text = TimeToHMS(time) - self.leftDesTime.text = text + self.leftTime.text = text -- string.format(text,TimeToHMS(time)) + self.leftTime2.text = TimeToHMS(time) self.timer = Timer.New(function () time = time - 1 timeStayAtHere = timeStayAtHere + 1 - self.leftTime.text =TimeToHMS(time) - self.mytime.text = string.format("%s/%s分",math.floor(timeStayAtHere/60),allStayTime/60) + self.leftTime2.text = TimeToHMS(time) + self.mytime.text = string.format(Language[11705],math.floor(timeStayAtHere/60),allStayTime/60) self.recordRed:SetActive(LingMaiMiJingManager.CheckRecord()) if time <= 0 or (self.data.startTime>0 and timeStayAtHere>allStayTime) then self:OnShow() self.data.startTime=0 end - end, 1, -1, true) + end, 10, -1, true) self.timer:Start() end