Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
7d51465cf4
|
@ -1600,7 +1600,7 @@ Language = {
|
||||||
[11599] = GetLanguageStrById("确认花费%s妖晶抽取10次乾坤宝盒?"),
|
[11599] = GetLanguageStrById("确认花费%s妖晶抽取10次乾坤宝盒?"),
|
||||||
[11600] = GetLanguageStrById("包含4星或更高星级的英雄"),
|
[11600] = GetLanguageStrById("包含4星或更高星级的英雄"),
|
||||||
[11601] = GetLanguageStrById("确认送神"),
|
[11601] = GetLanguageStrById("确认送神"),
|
||||||
[11602] = GetLanguageStrById("恭送英雄会获得仙缘余尘,若英雄已升级,突破或进阶,还会返还%s%s消耗的金币、成长护符和九转金丹,是否确定恭送所选英雄?\n\n\t\t\t\t\t\t\t送神后获得:"),
|
[11602] = GetLanguageStrById("退役英雄会获得仙缘余尘,若英雄已升级,突破或进阶,还会返还%s%s消耗的金币、成长护符和九转金丹,是否确定退役所选英雄?\n\n\t\t\t\t\t\t\t送神后获得:"),
|
||||||
[11603] = GetLanguageStrById("宝物分解"),
|
[11603] = GetLanguageStrById("宝物分解"),
|
||||||
[11604] = GetLanguageStrById("宝物将分解为"),
|
[11604] = GetLanguageStrById("宝物将分解为"),
|
||||||
[11605] = GetLanguageStrById(",若宝物已强化、精炼或神应,分解后将清空强化、精炼等级和神应等级,并100%返还养成材料。"),
|
[11605] = GetLanguageStrById(",若宝物已强化、精炼或神应,分解后将清空强化、精炼等级和神应等级,并100%返还养成材料。"),
|
||||||
|
@ -1734,7 +1734,7 @@ Language = {
|
||||||
[11733] = GetLanguageStrById("英雄归元"),
|
[11733] = GetLanguageStrById("英雄归元"),
|
||||||
[11734] = GetLanguageStrById("生命卡归元"),
|
[11734] = GetLanguageStrById("生命卡归元"),
|
||||||
[11735] = GetLanguageStrById("圣器分解"),
|
[11735] = GetLanguageStrById("圣器分解"),
|
||||||
[11736] = GetLanguageStrById("请选择需要恭送的英雄!"),
|
[11736] = GetLanguageStrById("请选择需要退役的英雄!"),
|
||||||
[11737] = GetLanguageStrById("最多选择%s个英雄!"),
|
[11737] = GetLanguageStrById("最多选择%s个英雄!"),
|
||||||
[11738] = GetLanguageStrById("此英雄已在"),
|
[11738] = GetLanguageStrById("此英雄已在"),
|
||||||
[11739] = GetLanguageStrById("队伍内,是否前往编队界面将其下阵?"),
|
[11739] = GetLanguageStrById("队伍内,是否前往编队界面将其下阵?"),
|
||||||
|
|
|
@ -54,6 +54,7 @@ function PokemonInfoPanel:InitComponent()
|
||||||
this.pokemonIcon = Util.GetGameObject(self.gameObject, "curObj/pokemonIcon")
|
this.pokemonIcon = Util.GetGameObject(self.gameObject, "curObj/pokemonIcon")
|
||||||
this.rightpokemonIcon = Util.GetGameObject(self.gameObject, "rightObj/rightpokemonIcon")
|
this.rightpokemonIcon = Util.GetGameObject(self.gameObject, "rightObj/rightpokemonIcon")
|
||||||
this.nirvanaBtn=Util.GetGameObject(self.transform,"nirvanaBtn")
|
this.nirvanaBtn=Util.GetGameObject(self.transform,"nirvanaBtn")
|
||||||
|
Util.GetGameObject(self.transform,"nirvanaBtn/Image/Text"):GetComponent("Text").text="重塑"
|
||||||
this.replaceBtn=Util.GetGameObject(self.transform,"rightBtnList/replaceBtn")
|
this.replaceBtn=Util.GetGameObject(self.transform,"rightBtnList/replaceBtn")
|
||||||
this.restBtn=Util.GetGameObject(self.transform,"rightBtnList/restBtn")
|
this.restBtn=Util.GetGameObject(self.transform,"rightBtnList/restBtn")
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ function this:OnShow(_parent,...)
|
||||||
this.titleText.text=Language[11601]
|
this.titleText.text=Language[11601]
|
||||||
--返还比
|
--返还比
|
||||||
local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,35).Value)/100
|
local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,35).Value)/100
|
||||||
this.bodyText.text=string.format("恭送英雄会获得仙缘余尘,若英雄已升级,\n 突破或进阶,还会返还%s%s的消耗。\n是否确定恭送所选英雄?",num,"%")
|
this.bodyText.text=string.format("退役英雄会获得仙缘余尘,若英雄已升级,\n 突破或进阶,还会返还%s%s的消耗。\n是否确定退役所选英雄?",num,"%")
|
||||||
|
|
||||||
local data={}
|
local data={}
|
||||||
for i, v in pairs(dropList) do
|
for i, v in pairs(dropList) do
|
||||||
|
|
|
@ -13,6 +13,7 @@ function this:InitComponent(gameObject)
|
||||||
this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition
|
this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition
|
||||||
--回溯按钮
|
--回溯按钮
|
||||||
this.confirmBtn=Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/ConfirmBtn")
|
this.confirmBtn=Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/ConfirmBtn")
|
||||||
|
Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/ConfirmBtn/Image/Text"):GetComponent("Text").text="退役"
|
||||||
Util.GetGameObject(this.confirmBtn,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_ls_03")
|
Util.GetGameObject(this.confirmBtn,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_ls_03")
|
||||||
this.shopBtn=Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/shopBtn")
|
this.shopBtn=Util.GetGameObject(gameObject,"Content/Resolve_Dismantle/shopBtn")
|
||||||
this.shopBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_shenjiang_32")
|
this.shopBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_shenjiang_32")
|
||||||
|
|
Loading…
Reference in New Issue