角色信息修改提交
parent
91b57b253e
commit
722476d6f1
|
@ -215,7 +215,7 @@ MonoBehaviour:
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 35
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
@ -2254,7 +2254,7 @@ MonoBehaviour:
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 35
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
@ -2487,7 +2487,7 @@ MonoBehaviour:
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 35
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
@ -2721,7 +2721,7 @@ MonoBehaviour:
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 35
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
@ -3370,7 +3370,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 5, y: 38}
|
m_SizeDelta: {x: 0, y: 38}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1956147086
|
--- !u!222 &1956147086
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -4025,7 +4025,7 @@ MonoBehaviour:
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 35
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
@ -6942,7 +6942,7 @@ MonoBehaviour:
|
||||||
m_Spacing: 0
|
m_Spacing: 0
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 1
|
||||||
m_ChildControlHeight: 0
|
m_ChildControlHeight: 0
|
||||||
--- !u!1 &2228420591284176194
|
--- !u!1 &2228420591284176194
|
||||||
GameObject:
|
GameObject:
|
||||||
|
@ -8065,7 +8065,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 5, y: 38}
|
m_SizeDelta: {x: 0, y: 38}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2693996707610523090
|
--- !u!222 &2693996707610523090
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -9740,7 +9740,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 5, y: 38}
|
m_SizeDelta: {x: 0, y: 38}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2542047827926666277
|
--- !u!222 &2542047827926666277
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -9998,7 +9998,7 @@ MonoBehaviour:
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
m_FontSize: 35
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
|
@ -15181,7 +15181,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 49, y: 46}
|
m_SizeDelta: {x: 0, y: 46}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!222 &8123468436595037891
|
--- !u!222 &8123468436595037891
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -102,9 +102,11 @@ function this:OnOpen(...)
|
||||||
end
|
end
|
||||||
if curSkillData.needStar and curSkillData.needStar~=1 then
|
if curSkillData.needStar and curSkillData.needStar~=1 then
|
||||||
LogError("urSkillData.needStar=="..curSkillData.needStar)
|
LogError("urSkillData.needStar=="..curSkillData.needStar)
|
||||||
if curSkillData.needStar==16 then
|
if curSkillData.needStar==15 then
|
||||||
--this.hintTxt.text=" ".."飞升3解锁"
|
--this.hintTxt.text=" ".."飞升3解锁"
|
||||||
des1="<color=red>".."飞升5解锁".."</color>".."\n"..des1
|
des1="<color=red>".."飞升5解锁".."</color>".."\n"..des1
|
||||||
|
elseif curSkillData.needStar==13 then
|
||||||
|
des1="<color=red>".."飞升3解锁".."</color>".."\n"..des1
|
||||||
else
|
else
|
||||||
--this.hintTxt.text=" "..
|
--this.hintTxt.text=" "..
|
||||||
des1="<color=red>"..NumToSimplenessFont[curSkillData.needStar].."星解锁\n".."</color>"..des1
|
des1="<color=red>"..NumToSimplenessFont[curSkillData.needStar].."星解锁\n".."</color>"..des1
|
||||||
|
@ -126,7 +128,7 @@ function this:OnOpen(...)
|
||||||
if curSkillData.isOpen then
|
if curSkillData.isOpen then
|
||||||
--LogError("skillList[i].needStar=="..skillList[i].needStar)
|
--LogError("skillList[i].needStar=="..skillList[i].needStar)
|
||||||
this.hintTxt.gameObject:SetActive(false)
|
this.hintTxt.gameObject:SetActive(false)
|
||||||
if curSkillData.needStar==14 then
|
if curSkillData.needStar==13 then
|
||||||
this.hintTxt.text=" ".."飞升3解锁"
|
this.hintTxt.text=" ".."飞升3解锁"
|
||||||
else
|
else
|
||||||
this.hintTxt.text=" "..NumToSimplenessFont[curSkillData.needStar].."星解锁"
|
this.hintTxt.text=" "..NumToSimplenessFont[curSkillData.needStar].."星解锁"
|
||||||
|
|
|
@ -418,8 +418,10 @@ function this.SkillInfo()
|
||||||
sText.fontSize = GetCurLanguage() ~= 2 and 30 or 25
|
sText.fontSize = GetCurLanguage() ~= 2 and 30 or 25
|
||||||
Util.SetGray(go,skillList[i].isOpen)
|
Util.SetGray(go,skillList[i].isOpen)
|
||||||
if skillList[i].isOpen then
|
if skillList[i].isOpen then
|
||||||
if skillList[i].needStar==16 then
|
if skillList[i].needStar==15 then
|
||||||
sText.text="飞升5解锁"
|
sText.text="飞升5解锁"
|
||||||
|
elseif skillList[i].needStar==13 then
|
||||||
|
sText.text="飞升3解锁"
|
||||||
else
|
else
|
||||||
sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁"
|
sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁"
|
||||||
end
|
end
|
||||||
|
@ -573,11 +575,11 @@ function this.GetSkillsData()
|
||||||
-- LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum)
|
-- LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum)
|
||||||
heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||||
heroSkill.state = 1
|
heroSkill.state = 1
|
||||||
if curHeroData.star == 12 then
|
if curHeroData.star == 11 then
|
||||||
heroSkill.Icon = "r_tongyong_feisheng_icon1" --飞升一
|
heroSkill.Icon = "r_tongyong_feisheng_icon1" --飞升一
|
||||||
heroSkill.Type = 8
|
heroSkill.Type = 8
|
||||||
heroSkill.quality = 1
|
heroSkill.quality = 1
|
||||||
elseif curHeroData.star == 13 then
|
elseif curHeroData.star == 12 then
|
||||||
heroSkill.Icon = "r_tongyong_feisheng_icon2" --飞升二
|
heroSkill.Icon = "r_tongyong_feisheng_icon2" --飞升二
|
||||||
heroSkill.Type = 8
|
heroSkill.Type = 8
|
||||||
heroSkill.quality = 1
|
heroSkill.quality = 1
|
||||||
|
@ -585,10 +587,10 @@ function this.GetSkillsData()
|
||||||
heroSkill.Icon = "r_tongyong_feisheng_icon3" --飞升三
|
heroSkill.Icon = "r_tongyong_feisheng_icon3" --飞升三
|
||||||
heroSkill.Type = 8
|
heroSkill.Type = 8
|
||||||
heroSkill.quality = 1
|
heroSkill.quality = 1
|
||||||
elseif curHeroData.star == 11 then
|
-- elseif curHeroData.star == 11 then
|
||||||
heroSkill.Icon = "r_tongyong_tianfu_icon" --觉醒
|
-- heroSkill.Icon = "r_tongyong_tianfu_icon" --觉醒
|
||||||
heroSkill.Type = 7
|
-- heroSkill.Type = 7
|
||||||
heroSkill.quality = 1
|
-- heroSkill.quality = 1
|
||||||
elseif curHeroData.heroConfig.Natural <= 5 then
|
elseif curHeroData.heroConfig.Natural <= 5 then
|
||||||
heroSkill.Icon = "r_tongyong_feisheng_icon" --9星以下
|
heroSkill.Icon = "r_tongyong_feisheng_icon" --9星以下
|
||||||
heroSkill.Type = 5
|
heroSkill.Type = 5
|
||||||
|
@ -666,8 +668,8 @@ function this.UpdateHeroUpStarProUpSkillShowOld(skillGridGO,skillTabs,passiveSki
|
||||||
this.skillList[i].icon.sprite=this.spLoader:LoadSprite(GetResourcePath(this.skillData[i].skillConfig.Icon))--被动技
|
this.skillList[i].icon.sprite=this.spLoader:LoadSprite(GetResourcePath(this.skillData[i].skillConfig.Icon))--被动技
|
||||||
if this.skillData[i].state == 0 then
|
if this.skillData[i].state == 0 then
|
||||||
local str = NumToChinese[this.skillData[i].star].."星"
|
local str = NumToChinese[this.skillData[i].star].."星"
|
||||||
if this.skillData[i].star > 11 then
|
if this.skillData[i].star > 10 then
|
||||||
str = "飞升"..NumToChinese[this.skillData[i].star - 11]
|
str = "飞升"..NumToChinese[this.skillData[i].star - 10]
|
||||||
end
|
end
|
||||||
this.skillList[i].skillName.text = str.."解锁"
|
this.skillList[i].skillName.text = str.."解锁"
|
||||||
Util.SetGray(this.skillList[i].go,true)
|
Util.SetGray(this.skillList[i].go,true)
|
||||||
|
|
Loading…
Reference in New Issue