diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab index 31755a7d0d..34d43ce741 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab @@ -2170,7 +2170,7 @@ RectTransform: m_GameObject: {fileID: 4864250674772076596} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: - {fileID: 8623671869353108748} m_Father: {fileID: 8772249491636870108} @@ -4991,7 +4991,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -111.79996, y: -2.2999725} + m_AnchoredPosition: {x: -186.1, y: -2.2999725} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249490571615140 @@ -5029,7 +5029,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -5740,7 +5740,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 156.9, y: -2.2999725} + m_AnchoredPosition: {x: 146.2, y: -4.6} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249491387197022 @@ -5778,7 +5778,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index 79d0779c11..8b8e943a9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -443,7 +443,7 @@ function this.RequestSendGuildTranscript(func) -- 构建字符串 local channel = CHAT_CHANNEL.FAMILY local guildData = MyGuildManager.GetMyGuildInfo() - local content = string.format("【%s】发起了集结号角,请全体公会成员前往挑战副本首领!",PlayerManager.nickName) + local content = string.format("%s发起了集结号角,请全体公会成员前往挑战副本首领!",PlayerManager.nickName) this.RequestSendChatMsg(channel, content, function() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index a46412da87..9158df68eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -85,7 +85,7 @@ function ZhenQiYiBaoPage:SortData() local aboughtNum = a.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, a.Id) > 0 and 2 or 1 local bboughtNum = b.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, b.Id) > 0 and 2 or 1 if aboughtNum == bboughtNum then - return a.Id < b.Id + return a.Price < b.Price else return aboughtNum > bboughtNum end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua index 935752f8d1..be1994f5f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua @@ -103,7 +103,8 @@ function GuildTranscriptMainPopup:BindEvent() PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) return end - MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起扫荡?",finalNum,itemName), nil, function() + --是否花费XX妖晶购买1次扫荡次数,本次扫荡伤害为XXXXXX + MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次扫荡次数,本次扫荡伤害为%s?",finalNum,itemName,GuildTranscriptManager.damage), nil, function() --买东西 ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() PopupTipPanel.ShowTip("成功购买1次扫荡次数!") @@ -114,7 +115,7 @@ function GuildTranscriptMainPopup:BindEvent() end) end else - MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行挑战吗?",GuildTranscriptManager.damage), nil, function() + MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行扫荡吗?",GuildTranscriptManager.damage), nil, function() this.QuickWar() end) end @@ -126,10 +127,14 @@ function GuildTranscriptMainPopup:BindEvent() PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) return end + if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then + PopupTipPanel.ShowTip(Language[11705]) + return + end MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数?",finalNum,itemName), nil, function() --买东西 ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() - PopupTipPanel.ShowTip("成功购买1次扫荡次数!") + PopupTipPanel.ShowTip("成功购买1次挑战次数!") PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权 this.ShowEndNumInfo() end) @@ -173,6 +178,10 @@ function GuildTranscriptMainPopup:BindEvent() local itemId = curguildCheckpointConfig.AttributePromotePrice[1][1] local buyNum = curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex] local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name + if not buyNum then + PopupTipPanel.ShowTip("强攻效果已到达最高!") + return + end if buyNum > BagManager.GetItemCountById(itemId) then PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) return @@ -267,6 +276,7 @@ function this.SingleChapterDataShow(go,data) lock:SetActive(true) mask:SetActive(true) end + this.SelectImage:SetActive(false) if cutOpenIndex == data.Id then this.SetSelectImagePos(go) end @@ -347,6 +357,9 @@ function this.ShowBossInfo() this.bossHerobg.sprite = Util.LoadSprite(GetHeroCardStarBg[curheroConfig.Star]) this.bossHerohpPass.fillAmount = GuildTranscriptManager.GetBlood()/10000 this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%" + if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then + this.bossHerohpPassText.text = "已通关" + end local liveName = GetResourcePath(curheroConfig.Live) local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id) local scale = roleConfig.play_liveScale @@ -378,19 +391,19 @@ function this.ShowRewardInfo() reward2Data[2] = {96,cutOpenIndexConFig.LegionExp} for i = 1, #reward1Data do if itemList[this.reward1.name][i] then - itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.6,false,false,false,sorting) + itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.7,false,false,false,sorting) else itemList[this.reward1.name][i] = SubUIManager.Open(SubUIConfig.ItemView, this.reward1.transform) - itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.6,false,false,false,sorting) + itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.7,false,false,false,sorting) end itemList[this.reward1.name][i].gameObject:SetActive(true) end for i = 1, #reward2Data do if itemList[this.reward2.name][i] then - itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting) + itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.7,false,false,false,sorting) else itemList[this.reward2.name][i] = SubUIManager.Open(SubUIConfig.ItemView, this.reward2.transform) - itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting) + itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.7,false,false,false,sorting) end itemList[this.reward2.name][i].gameObject:SetActive(true) end @@ -437,9 +450,12 @@ function this.ShowBuffData() attackBuffNum = math.floor(addNum[1][2]/100) end local GetbuffTime = GuildTranscriptManager.GetbuffTime() > 0 and GuildTranscriptManager.GetbuffTime() - PlayerManager.serverTime or 0 - Util.SetGray(this.attackInfoTextGo,attackBuffNum == 0) - LogGreen("attackBuffNum "..GetbuffTime) - this.attackInfoText.text = string.format("全军团成员攻击力+ %s ",attackBuffNum).."%" + if attackBuffNum == 0 then + --%s + this.attackInfoText.text = "全公会成员攻击力+0%(未激活) " + else + this.attackInfoText.text = string.format("全公会成员攻击力+ %s ",attackBuffNum).."%" + end this.RemainTimeDown(this.attackInfoTime, GetbuffTime) end this.timer = Timer.New() @@ -486,11 +502,12 @@ function this.TimeStampToDateString(second) local minute = math.floor(second / 60) % 60 local sec = math.floor( second % 60) local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - return string.format("(%s:%s:%s:后失效)", hour, minute, sec) + return string.format("(%s:%s:后失效)", minute, sec) end function this.SetSelectImagePos(parent) Util.SetGray(this.SelectImage,false) + this.SelectImage:SetActive(true) this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform) this.SelectImage:GetComponent("RectTransform").localPosition = Vector3.zero this.SelectImage:GetComponent("RectTransform").localScale = Vector3.New(1,1,1) diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 1e621c3d06..6b358a95f8 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2212,7 +2212,7 @@ 12212,ֽ 12213,޿ɷֽⱦ 12214,ѡ%s -12215,ѡҪֽı! +12215,ѡҪֽı! 12216, 12217,޷ѭķ 12218,δ @@ -2270,8 +2270,8 @@ 12270, 12271,(ע⣺γ۰ɫɫװ) 12272,Ϊ0 -12273,ォֽΪ꣬ǿֽǿ;ȼ100%ɲϡ -12274,(ע⣺γ۰ɫɫ) +12273,ォֽΪ +12274,(ע⣺γ۰ɫɫ) 12275,ֽã 12276,񽫹Ԫɹ\ȼΪ1 12277,δѯװ @@ -2291,3 +2291,4 @@ 12291,ѡҪϳɵ 12292,%sͬӪ 12293,Ϸ񼴿ȡ +12294,ǿֽǿ;ȼ100%ɲϡ