神石改为芯片
parent
e2e523db7c
commit
cb397e1099
|
|
@ -2893,7 +2893,7 @@ ItemTypeName = {
|
||||||
[30] = "意念碎片",
|
[30] = "意念碎片",
|
||||||
[31] = "命石",
|
[31] = "命石",
|
||||||
[32] = "挂机时长资源包",
|
[32] = "挂机时长资源包",
|
||||||
[33] = "神石",
|
[33] = "芯片",
|
||||||
[34] = "神印",
|
[34] = "神印",
|
||||||
[35] = "好感度碎片",
|
[35] = "好感度碎片",
|
||||||
[36] = "装备碎片",
|
[36] = "装备碎片",
|
||||||
|
|
@ -2911,7 +2911,7 @@ ItemTypeName = {
|
||||||
[48] = "限时仙充卡",
|
[48] = "限时仙充卡",
|
||||||
[49] = "大额直充卡",
|
[49] = "大额直充卡",
|
||||||
[50] = "万能碎片",
|
[50] = "万能碎片",
|
||||||
[51] = "神石",
|
[51] = "芯片",
|
||||||
[52] = "置换卡",
|
[52] = "置换卡",
|
||||||
[53] = "超级武器",
|
[53] = "超级武器",
|
||||||
[54] = "超级武器碎片",
|
[54] = "超级武器碎片",
|
||||||
|
|
@ -2932,7 +2932,7 @@ ItemBaseTypeName = {
|
||||||
[10] = "神印",
|
[10] = "神印",
|
||||||
[11] = "奥义卡",
|
[11] = "奥义卡",
|
||||||
[12] = "意念",
|
[12] = "意念",
|
||||||
[13] = "神石",
|
[13] = "芯片",
|
||||||
[14] = "主角礼物",
|
[14] = "主角礼物",
|
||||||
[15] = "英雄礼物",
|
[15] = "英雄礼物",
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -118,12 +118,12 @@ function RewardTalismanSingleShowPopup2:BindEvent()
|
||||||
if self.position>6 then
|
if self.position>6 then
|
||||||
if equipConfigData.Profession~=0 then
|
if equipConfigData.Profession~=0 then
|
||||||
if self.curHeroData.heroConfig.Profession~=equipConfigData.Profession then
|
if self.curHeroData.heroConfig.Profession~=equipConfigData.Profession then
|
||||||
PopupTipPanel.ShowTip("该英雄无法装备此神石")
|
PopupTipPanel.ShowTip("该英雄无法装备此芯片")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then
|
if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then
|
||||||
PopupTipPanel.ShowTip("该英雄无法装备此神石")
|
PopupTipPanel.ShowTip("该英雄无法装备此芯片")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -198,11 +198,11 @@ function RewardTalismanSingleShowPopup2:BindEvent()
|
||||||
if self.position>6 then
|
if self.position>6 then
|
||||||
if equipConfigData.Profession~=0 then
|
if equipConfigData.Profession~=0 then
|
||||||
if self.curHeroData.heroConfig.Profession~=equipConfigData.Profession then
|
if self.curHeroData.heroConfig.Profession~=equipConfigData.Profession then
|
||||||
PopupTipPanel.ShowTip("该英雄无法装备此神石")
|
PopupTipPanel.ShowTip("该英雄无法装备此芯片")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then
|
if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then
|
||||||
PopupTipPanel.ShowTip("该英雄无法装备此神石")
|
PopupTipPanel.ShowTip("该英雄无法装备此芯片")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -327,7 +327,7 @@ function RewardTalismanSingleShowPopup2:OnShow()
|
||||||
--计算战力
|
--计算战力
|
||||||
local Power = 0
|
local Power = 0
|
||||||
if itemConfigData.ItemType==ItemType.FaXiang then
|
if itemConfigData.ItemType==ItemType.FaXiang then
|
||||||
self.equipType.text = "道具种类:神石"
|
self.equipType.text = "道具种类:芯片"
|
||||||
self.skillNameInfo.text="技能详情"
|
self.skillNameInfo.text="技能详情"
|
||||||
Power = equipConfigData.Score
|
Power = equipConfigData.Score
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ function RoleInfoPopup:InitComponent()
|
||||||
--宝物、 法相
|
--宝物、 法相
|
||||||
this.specialEquipInfo=Util.GetGameObject(this.transform, "Panel/Scroll View/Viewport/Content/specialEquipInfo")
|
this.specialEquipInfo=Util.GetGameObject(this.transform, "Panel/Scroll View/Viewport/Content/specialEquipInfo")
|
||||||
this.babyTitle=Util.GetGameObject(this.specialEquipInfo,"BG/BabyTitle")
|
this.babyTitle=Util.GetGameObject(this.specialEquipInfo,"BG/BabyTitle")
|
||||||
Util.GetGameObject(this.specialEquipInfo,"BG/BabyTitle/Text"):GetComponent("Text").text="神石"
|
Util.GetGameObject(this.specialEquipInfo,"BG/BabyTitle/Text"):GetComponent("Text").text="芯片"
|
||||||
Util.GetGameObject(this.specialEquipInfo,"BG/EquipTitle/Text"):GetComponent("Text").text="饰品"
|
Util.GetGameObject(this.specialEquipInfo,"BG/EquipTitle/Text"):GetComponent("Text").text="饰品"
|
||||||
--宝物
|
--宝物
|
||||||
this.babyGrid=Util.GetGameObject(this.specialEquipInfo, "Grid/BabyGrid")
|
this.babyGrid=Util.GetGameObject(this.specialEquipInfo, "Grid/BabyGrid")
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ function this:InitComponent()
|
||||||
this.spLoader = SpriteLoader.New()
|
this.spLoader = SpriteLoader.New()
|
||||||
this.backBtn = Util.GetGameObject(this.gameObject, "BackBtn")
|
this.backBtn = Util.GetGameObject(this.gameObject, "BackBtn")
|
||||||
this.Title = Util.GetGameObject(this.gameObject, "Title"):GetComponent("Text")
|
this.Title = Util.GetGameObject(this.gameObject, "Title"):GetComponent("Text")
|
||||||
this.Title.text="神石图鉴"
|
this.Title.text="芯片图鉴"
|
||||||
this.mask = Util.GetGameObject(this.gameObject, "mask")
|
this.mask = Util.GetGameObject(this.gameObject, "mask")
|
||||||
for i = 1, 5 do
|
for i = 1, 5 do
|
||||||
tabs[i] = Util.GetGameObject(this.gameObject, "Tabs/Btn" .. i)
|
tabs[i] = Util.GetGameObject(this.gameObject, "Tabs/Btn" .. i)
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ function FaXiangStrongPopup:BindEvent()
|
||||||
--如果强化界面 强化到最高等级谈提示 精炼界面 就切界面
|
--如果强化界面 强化到最高等级谈提示 精炼界面 就切界面
|
||||||
if type==1 then
|
if type==1 then
|
||||||
if isMax then
|
if isMax then
|
||||||
PopupTipPanel.ShowTip("神石已达最大等级")
|
PopupTipPanel.ShowTip("芯片已达最大等级")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
@ -139,7 +139,7 @@ function FaXiangStrongPopup:BindEvent()
|
||||||
--如果精炼界面 精炼到最高等级谈提示 否 强化界面 就切界面
|
--如果精炼界面 精炼到最高等级谈提示 否 强化界面 就切界面
|
||||||
if type==2 then
|
if type==2 then
|
||||||
if isMax then
|
if isMax then
|
||||||
PopupTipPanel.ShowTip("神石已达最大星级")
|
PopupTipPanel.ShowTip("芯片已达最大星级")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
@ -318,7 +318,7 @@ function FaXiangStrongPopup:SetWindShow(_index)
|
||||||
curEquipData = FaXiangManager.GetSingleEquipTreasreData(curEquipData.idDyn)
|
curEquipData = FaXiangManager.GetSingleEquipTreasreData(curEquipData.idDyn)
|
||||||
local items, propertyShow
|
local items, propertyShow
|
||||||
if _index == 1 then
|
if _index == 1 then
|
||||||
this.titleTxt.text = "神石升级"
|
this.titleTxt.text = "芯片升级"
|
||||||
this.btnRefine:SetActive(false)
|
this.btnRefine:SetActive(false)
|
||||||
this.btnStrong:SetActive(true)
|
this.btnStrong:SetActive(true)
|
||||||
this.btnShenying:SetActive(false)
|
this.btnShenying:SetActive(false)
|
||||||
|
|
@ -345,15 +345,15 @@ function FaXiangStrongPopup:SetWindShow(_index)
|
||||||
des= des..ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,skillId[i]).Desc
|
des= des..ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,skillId[i]).Desc
|
||||||
end
|
end
|
||||||
this.hintTxt.text="已提升至最大等级"
|
this.hintTxt.text="已提升至最大等级"
|
||||||
this.skillInfo.text= "<color=#4BAB60>".."神石技能: ".."</color>"..des
|
this.skillInfo.text= "<color=#4BAB60>".."芯片技能: ".."</color>"..des
|
||||||
elseif _index == 2 then
|
elseif _index == 2 then
|
||||||
this.titleTxt.text="神石升星"
|
this.titleTxt.text="芯片升星"
|
||||||
this.btnRefine:SetActive(true)
|
this.btnRefine:SetActive(true)
|
||||||
this.btnStrong:SetActive(false)
|
this.btnStrong:SetActive(false)
|
||||||
this.btnShenying:SetActive(false)
|
this.btnShenying:SetActive(false)
|
||||||
this.SetBtnSelect(this.btn_refinePage)
|
this.SetBtnSelect(this.btn_refinePage)
|
||||||
isMax=curEquipData.refineLv==curEquipData.maxRefineLv
|
isMax=curEquipData.refineLv==curEquipData.maxRefineLv
|
||||||
this.properList[0].leftTxt.text = "神石星级"
|
this.properList[0].leftTxt.text = "芯片星级"
|
||||||
if isMax then
|
if isMax then
|
||||||
this.properList[0].rightTxt.text = Language[11062]
|
this.properList[0].rightTxt.text = Language[11062]
|
||||||
this.btnRefine.gameObject:SetActive(false)
|
this.btnRefine.gameObject:SetActive(false)
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ local typeTab = {
|
||||||
[3] = Language[10393],
|
[3] = Language[10393],
|
||||||
[4] = Language[10394],
|
[4] = Language[10394],
|
||||||
[5] = "饰品",
|
[5] = "饰品",
|
||||||
[6] = "神石"}
|
[6] = "芯片"}
|
||||||
local tabs = {}
|
local tabs = {}
|
||||||
local redTabs = {}
|
local redTabs = {}
|
||||||
local openThisPanel
|
local openThisPanel
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue