From 3bb09068657e0c7ca3d225383648784b8bd8235b Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Thu, 6 Aug 2020 10:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E5=BD=92=E5=85=83=E4=B8=AD?=
=?UTF-8?q?=E6=96=87=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManagedResources/~Lua/Common/Language.lua | 7 +++
.../View/GeneralPopup_TalismanResolve.lua | 12 ++--
.../Modules/Resolve/View/Resolve_Talisman.lua | 59 ++++++-------------
data_execl/Language_data/LanguageLua.csv | 7 +++
4 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index 13ca73f5d0..8f8cf06a13 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -2281,4 +2281,11 @@
[12280] = "巅峰赛阵容",
[12281] = "属性提升",
[12282] = "解锁天赋",
+ [12283] = "请选择一个",
+ [12284] = "需要法宝归元的神将",
+ [12285] = "无可归元的法宝!",
+ [12286] = "法宝归元成功!",
+ [12287] = "确定归元",
+ [12288] = "%s的法宝会重置为1,并返还进阶时消耗的金币和陨铁,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:",
+ [12289] = "请选择一个需要归元的法宝神将!",
}
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua
index 5c603df5ec..570dee60d0 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua
@@ -37,7 +37,7 @@ function this:BindEvent()
for i = 1, #data do
HeroManager.SetTalismanLv(data[i], 1)
end
- PopupTipPanel.ShowTip("法宝归元成功!")
+ PopupTipPanel.ShowTip(Language[12286])
parent:ClosePanel()
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
ResolvePanel.SwitchView(3)
@@ -60,10 +60,14 @@ function this:OnShow(_parent,...)
selectHeroData=args[2]
this.root.transform:GetComponent("RectTransform"):DOAnchorPosX(0, 0)
- this.titleText.text="确定归元"
+ this.titleText.text=Language[12287]
+ local heroReadingName = ReadingName
+ for key, value in pairs(selectHeroData) do
+ heroReadingName = value.heroConfig.ReadingName
+ end
--返还比
- local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/100
- this.bodyText.text = string.format("%s的法宝会重置为1阶,并返还进阶时消耗的金币和陨铁,是否确认归元?", num, "%")
+ -- local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/100
+ this.bodyText.text = string.format(Language[12288],heroReadingName)
local _data={}
for i=1,#dropList do
diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
index 8a0cffb6e2..6204fa1904 100644
--- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
@@ -12,9 +12,11 @@ function this:InitComponent(gameObject)
this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition
this.confirmBtn=Util.GetGameObject(gameObject,"Content/Resolve_Talisman/ConfirmBtn")
--道具数量信息
- Util.GetGameObject(gameObject,"Content/Resolve_Talisman/UseProps/Info"):GetComponent("Text").text = "请选择一个"
- Util.GetGameObject(gameObject,"Content/Resolve_Talisman/UseProps/Info (1)"):GetComponent("Text").text = "需要法宝归元的神将"
- Util.GetGameObject(gameObject,"Content/Resolve_Talisman/Empty/Bg/Text"):GetComponent("Text").text = "无可归元的法宝!"
+ this.info1 = Util.GetGameObject(gameObject,"Content/Resolve_Talisman/UseProps/Info")
+ this.info1:GetComponent("Text").text = Language[12283]
+ this.info2 = Util.GetGameObject(gameObject,"Content/Resolve_Talisman/UseProps/Info (1)")
+ this.info2:GetComponent("Text").text = Language[12284]
+ Util.GetGameObject(gameObject,"Content/Resolve_Talisman/Empty/Bg/Text"):GetComponent("Text").text = Language[12285]
this.empty=Util.GetGameObject(gameObject,"Content/Resolve_Talisman/Empty")
@@ -33,7 +35,7 @@ function this:BindEvent()
end)
Util.AddClick(this.confirmBtn,function()
if tonumber(LengthOfTable(selectHeroData))==0 then
- PopupTipPanel.ShowTip(Language[11792])
+ PopupTipPanel.ShowTip(Language[12289])
else
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TalismanResolve,
HeroManager.GetHeroReturnItems(selectHeroData,GENERAL_POPUP_TYPE.TalismanResolve),selectHeroData)
@@ -130,44 +132,17 @@ function this.SingleHeroDataShow(go,_heroData)
oldChoosed:SetActive(false)
end
if oldChoosed==choosed then
- --LogColor("green",Language[11794])
oldChoosed:SetActive(LengthOfTable(selectHeroData)==0)
oldChoosed=nil
selectHeroData={}
-
else
- --LogColor("red",Language[11795])
choosed:SetActive(true)
oldChoosed=choosed
-
selectHeroData = {}
selectHeroData[heroData.dynamicId]=heroData
- --英雄消耗道具数量
- local heroUseCount=0
- local heroUseItemId=0
-
- --等表配全后再启用
- for k,v in pairs(selectHeroData) do
- local pId
- local curHeroData =HeroManager.GetSingleHeroData(v.dynamicId)
- if not curHeroData then return end
- if curHeroData.breakId == 0 then
- pId=0
- else
- pId= heroRankupConfig[curHeroData.breakId].Phase[2]
- end
- local heroReturnConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroReturn,"HeroId",curHeroData.id,"Star",pId)
- if not heroReturnConfig then
- LogRed("HeroId"..curHeroData.id.." Star"..pId.." curHeroData.breakId"..curHeroData.breakId)
- heroUseCount= 50
- heroUseItemId = 16
- else
- heroUseCount= heroReturnConfig.ReturnConsume[1][2]
- heroUseItemId = heroReturnConfig.ReturnConsume[1][1]
- end
- break
- end
end
+ this.info1:SetActive( not (LengthOfTable(selectHeroData) > 0))
+ this.info2:SetActive( not (LengthOfTable(selectHeroData) > 0))
end)
Util.AddOnceClick(formationMask, function()
@@ -214,18 +189,18 @@ function this.SortHeroDatas(_heroDatas)
end
if a.isFormation == "" and b.isFormation == "" then
if a.lockState == b.lockState then
- if a.heroConfig.Natural ==b.heroConfig.Natural then
- if a.star == b.star then
- if a.lv == b.lv then
- return a.heroConfig.Id > b.heroConfig.Id
+ if a.talismanList == b.talismanList then
+ if a.star == b.star then
+ if a.lv == b.lv then
+ return a.heroConfig.Id > b.heroConfig.Id
+ else
+ return a.lv < b.lv
+ end
else
- return a.lv < b.lv
+ return a.star < b.star
end
- else
- return a.star < b.star
- end
else
- return a.heroConfig.Natural < b.heroConfig.Natural
+ return a.talismanList < b.talismanList
end
else
return a.lockState < b.lockState
diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv
index 1b700bb18d..12abad9016 100644
--- a/data_execl/Language_data/LanguageLua.csv
+++ b/data_execl/Language_data/LanguageLua.csv
@@ -2280,3 +2280,10 @@
12280,۷
12281,
12282,츳
+12283,ѡһ
+12284,ҪԪ
+12285,ɹԪķ
+12286,Ԫɹ
+12287,ȷԪ
+12288,%sķΪ1ʱĵĽҺǷȷϹԪ\n\n\t\t\t\t\t\t\tԪã
+12289,ѡһҪԪķ!