Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
commit
82d6754cd0
|
|
@ -3002,6 +3002,7 @@ RectTransform:
|
||||||
- {fileID: 1851014547266412745}
|
- {fileID: 1851014547266412745}
|
||||||
- {fileID: 6915837880485352805}
|
- {fileID: 6915837880485352805}
|
||||||
- {fileID: 3626162591770995568}
|
- {fileID: 3626162591770995568}
|
||||||
|
- {fileID: 2661708877108765237}
|
||||||
m_Father: {fileID: 224894693585688482}
|
m_Father: {fileID: 224894693585688482}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -3812,6 +3813,80 @@ MonoBehaviour:
|
||||||
m_Spacing: {x: 75.84, y: 0}
|
m_Spacing: {x: 75.84, y: 0}
|
||||||
m_Constraint: 0
|
m_Constraint: 0
|
||||||
m_ConstraintCount: 2
|
m_ConstraintCount: 2
|
||||||
|
--- !u!1 &7870780450444370186
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2661708877108765237}
|
||||||
|
- component: {fileID: 3141264076836826176}
|
||||||
|
- component: {fileID: 4867232710349333458}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2661708877108765237
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7870780450444370186}
|
||||||
|
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_Children: []
|
||||||
|
m_Father: {fileID: 5819935826418809479}
|
||||||
|
m_RootOrder: 5
|
||||||
|
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: 248.22, y: 966}
|
||||||
|
m_SizeDelta: {x: 184, y: 74}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3141264076836826176
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7870780450444370186}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4867232710349333458
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7870780450444370186}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 3e0c7b4b0a58db545ac603291d4a6c34, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &7955066085516436793
|
--- !u!1 &7955066085516436793
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,7 @@ function this.UpdateHeroData(id)
|
||||||
table.sort(this.HeroData,function(a,b)
|
table.sort(this.HeroData,function(a,b)
|
||||||
return a.goodsIndex > b.goodsIndex
|
return a.goodsIndex > b.goodsIndex
|
||||||
end)
|
end)
|
||||||
return #this.HeroData,this.HeroData[1].remainTime
|
return this.HeroData[1].remainTime--#this.HeroData,this.HeroData[1].remainTime
|
||||||
end
|
end
|
||||||
|
|
||||||
-- type 1初始化 2添加 boss
|
-- type 1初始化 2添加 boss
|
||||||
|
|
@ -285,7 +285,7 @@ function this.GetMonsterDataReMainTimesAndTime()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.SortMonster(this.MonsterData)
|
this.SortMonster(this.MonsterData)
|
||||||
return #this.MonsterData,this.MonsterData[1].remainTime
|
return this.MonsterData[1].remainTime--#this.MonsterData,this.MonsterData[1].remainTime
|
||||||
end
|
end
|
||||||
|
|
||||||
--开始战斗
|
--开始战斗
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||||
local FreeTravelStore=ConfigManager.GetConfig(ConfigName.FreeTravelStore)
|
local FreeTravelStore=ConfigManager.GetConfig(ConfigName.FreeTravelStore)
|
||||||
local HeroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
local HeroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||||
local artResourceConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
local artResourceConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||||
|
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||||
|
|
||||||
local curHeroData = {}
|
local curHeroData = {}
|
||||||
local curIndex = 1
|
local curIndex = 1
|
||||||
|
|
@ -48,6 +49,8 @@ function XiaoyaoHeroGetPopup:InitComponent()
|
||||||
|
|
||||||
this.leftBtn= Util.GetGameObject(self.transform,"Panel/leftBtn")
|
this.leftBtn= Util.GetGameObject(self.transform,"Panel/leftBtn")
|
||||||
this.rightBtn = Util.GetGameObject(self.transform,"Panel/rightBtn")
|
this.rightBtn = Util.GetGameObject(self.transform,"Panel/rightBtn")
|
||||||
|
|
||||||
|
this.zhekouImage = Util.GetGameObject(self.transform,"Panel/buyPanel/Image"):GetComponent("Image")
|
||||||
end
|
end
|
||||||
|
|
||||||
local triggerCallBack
|
local triggerCallBack
|
||||||
|
|
@ -105,7 +108,46 @@ end
|
||||||
function XiaoyaoHeroGetPopup:RemoveListener()
|
function XiaoyaoHeroGetPopup:RemoveListener()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStarVal)
|
||||||
|
local allAddProVal = {}
|
||||||
|
for i, v in ConfigPairs(propertyConfig) do
|
||||||
|
allAddProVal[i] = 0
|
||||||
|
end
|
||||||
|
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum)
|
||||||
|
local curLvNum=1
|
||||||
|
local breakId = 0
|
||||||
|
local upStarId = 0
|
||||||
|
if isCalculateStarVal then
|
||||||
|
--等级
|
||||||
|
curLvNum = heroRankupConfig.OpenLevel
|
||||||
|
--解锁天赋
|
||||||
|
for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroRankupConfig)) do
|
||||||
|
if v.OpenStar == _starNum and v.Star==heroConFigData.Star then
|
||||||
|
if v.Type == 1 then
|
||||||
|
breakId = v.Id
|
||||||
|
end
|
||||||
|
if v.Type == 2 then
|
||||||
|
upStarId = v.Id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if breakId==0 then
|
||||||
|
breakId=6
|
||||||
|
end
|
||||||
|
end
|
||||||
|
allAddProVal[HeroProType.Attack]=HeroManager.CalculateProVal(heroConFigData.Attack, curLvNum, breakId,upStarId,HeroProType.Attack)
|
||||||
|
allAddProVal[HeroProType.Hp]=HeroManager.CalculateProVal(heroConFigData.Hp, curLvNum, breakId,upStarId,HeroProType.Hp)
|
||||||
|
allAddProVal[HeroProType.PhysicalDefence]=HeroManager.CalculateProVal(heroConFigData.PhysicalDefence, curLvNum, breakId,upStarId,HeroProType.PhysicalDefence)
|
||||||
|
allAddProVal[HeroProType.MagicDefence]=HeroManager.CalculateProVal(heroConFigData.MagicDefence, curLvNum, breakId,upStarId,HeroProType.MagicDefence)
|
||||||
|
Util.AddOnceClick(this.talentBtn,function()
|
||||||
|
UIManager.OpenPanel(UIName.RoleTalentPopup,heroConFigData,breakId,upStarId)
|
||||||
|
end)
|
||||||
|
if heroConFigData.OpenPassiveSkillRules then
|
||||||
|
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId)
|
||||||
|
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#heroConFigData.OpenPassiveSkillRules - compoundNum
|
||||||
|
end
|
||||||
|
return allAddProVal
|
||||||
|
end
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function XiaoyaoHeroGetPopup:OnOpen()
|
function XiaoyaoHeroGetPopup:OnOpen()
|
||||||
this.titleText = "东海寻仙"
|
this.titleText = "东海寻仙"
|
||||||
|
|
@ -131,7 +173,6 @@ function XiaoyaoHeroGetPopup:OnShow()
|
||||||
end
|
end
|
||||||
|
|
||||||
this:SetSelectHero(curHeroData)
|
this:SetSelectHero(curHeroData)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:TimerDown()
|
function this:TimerDown()
|
||||||
|
|
@ -204,6 +245,9 @@ function this:SetSelectHero(curHeroData)
|
||||||
this.selectKuang.transform:SetParent(pointPrefabs[curIndex].transform)
|
this.selectKuang.transform:SetParent(pointPrefabs[curIndex].transform)
|
||||||
this.selectKuang:GetComponent("RectTransform").localPosition = Vector3.zero
|
this.selectKuang:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||||
this.ShowHeroBuyInfo(curHeroData)
|
this.ShowHeroBuyInfo(curHeroData)
|
||||||
|
|
||||||
|
this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
|
||||||
|
|
||||||
this:TimerDown()
|
this:TimerDown()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -235,6 +279,7 @@ function this.ShowHeroBuyInfo(_heroSConfigData)
|
||||||
else
|
else
|
||||||
this.costNum.text = "<color=#C8AD83>" .. costNum .. "</color>"
|
this.costNum.text = "<color=#C8AD83>" .. costNum .. "</color>"
|
||||||
end
|
end
|
||||||
|
this.zhekouImage.sprite = Util.LoadSprite(heroBuyInfo.Discount)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue