zhangqiang 2020-10-19 10:56:55 +08:00
parent 711986c6a9
commit 92b2c3d6fb
7 changed files with 232 additions and 17 deletions

View File

@ -217,7 +217,7 @@ RectTransform:
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: -21.6, y: -122.8}
m_AnchoredPosition: {x: -21.6, y: -71.9999}
m_SizeDelta: {x: 146.08, y: 41.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8080941242191458009
@ -459,7 +459,7 @@ RectTransform:
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: -1.2474976, y: 150.09998}
m_AnchoredPosition: {x: -1.2474976, y: 200.90009}
m_SizeDelta: {x: 300.59998, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3336180687425469855
@ -892,6 +892,81 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 66
--- !u!1 &1218180567845096517
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6465772955820987258}
- component: {fileID: 2884065789514641711}
- component: {fileID: 2128912341873699062}
m_Layer: 5
m_Name: compoundBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6465772955820987258
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1218180567845096517}
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:
- {fileID: 1455704520031845860}
m_Father: {fileID: 4425865525862329901}
m_RootOrder: 8
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: -1, y: -274.1999}
m_SizeDelta: {x: 234.31, y: 66.69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2884065789514641711
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1218180567845096517}
m_CullTransparentMesh: 0
--- !u!114 &2128912341873699062
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1218180567845096517}
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: f615ecdbbffd77f4b89afe678ee4d8d5, 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 &1391802068404695482
GameObject:
m_ObjectHideFlags: 0
@ -1089,7 +1164,7 @@ RectTransform:
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: 173, y: 31.800003}
m_AnchoredPosition: {x: 173, y: 82.60011}
m_SizeDelta: {x: 231.6, y: 231.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &740305381989103292
@ -1237,7 +1312,7 @@ RectTransform:
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: 4.4, y: 30.2}
m_AnchoredPosition: {x: 4.4, y: 81.00011}
m_SizeDelta: {x: 64, y: 64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &982695155942524767
@ -3263,13 +3338,14 @@ RectTransform:
- {fileID: 2505044342917770345}
- {fileID: 2844794182144934836}
- {fileID: 4659352769634968244}
- {fileID: 6465772955820987258}
m_Father: {fileID: 5742798183766346997}
m_RootOrder: 2
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: -1655, y: 615.9}
m_SizeDelta: {x: 856.49, y: 555.2}
m_AnchoredPosition: {x: -1655, y: 552.2}
m_SizeDelta: {x: 856.5, y: 682.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4540916608189867764
GameObject:
@ -4005,6 +4081,85 @@ MonoBehaviour:
m_Spacing: {x: -5.77, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &5574210183219768109
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1455704520031845860}
- component: {fileID: 5742909880603972675}
- component: {fileID: 8889391339577042497}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1455704520031845860
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5574210183219768109}
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: 6465772955820987258}
m_RootOrder: 0
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: 0, y: -2.6}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5742909880603972675
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5574210183219768109}
m_CullTransparentMesh: 0
--- !u!114 &8889391339577042497
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5574210183219768109}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, 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_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6FC0\u6D3B\u7F81\u7ECA"
--- !u!1 &5594483994041820823
GameObject:
m_ObjectHideFlags: 0
@ -4816,7 +4971,7 @@ RectTransform:
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: 0, y: -275.4}
m_AnchoredPosition: {x: 0, y: -334.1999}
m_SizeDelta: {x: 992.3, y: 4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3627026224009323063
@ -5337,7 +5492,7 @@ RectTransform:
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: -0.61500025, y: 239.19989}
m_AnchoredPosition: {x: -0.61500025, y: 290}
m_SizeDelta: {x: 855.24, y: 76.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6699818621707665628
@ -5414,7 +5569,7 @@ RectTransform:
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: 36.05, y: -226.24}
m_AnchoredPosition: {x: 36.05, y: -175.4399}
m_SizeDelta: {x: 704.4, y: 116.47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5226535461196126773
@ -6441,7 +6596,7 @@ RectTransform:
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: -156.4, y: 31.8}
m_AnchoredPosition: {x: -156.4, y: 82.60011}
m_SizeDelta: {x: 231.6, y: 231.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &499025051608862724

View File

@ -172,6 +172,8 @@ local ManagerNames = {
"TreasureOfHeaven/TreasureOfHeavenManager",
"Carbon/XuanYuanMirrorManager",
"Mission/QinglongSerectTreasureManager",
--灵兽
"Pokemon/PokemonManager",
--!!!!红点管理(尽量放在最后)!!!!--
"Player/RedpotManager",

View File

@ -338,8 +338,11 @@ UIName = {
PokemonInfoPanel = 341, --灵兽升级升星
PokemonSummonPanel = 339, --灵兽召唤
PokemonUpStarSuccessPanel = 343, --灵兽升级成功
PokemonSummonOneResultPanel=350, --灵兽单抽结果
PokemonSummonTenResultPanel=351,--灵兽十连结果
PokemonSummonOneResultPanel=349, --灵兽单抽结果
PokemonSummonTenResultPanel=350,--灵兽十连结果
PokemonAllSkillInfoPopup=351,--灵兽所有技能详情
PokemonGetInfoPopup=352,--灵兽详情
PokemonSkillInfoPopup=353,--灵兽当前技能详情
}
SubUIConfig = {

View File

@ -1686,6 +1686,26 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end
--end
--灵兽
-- local pokemonAddPro = PokemonManager.GetAllPokemonFetterAddPros()
--if pokemonAddPro and LengthOfTable(pokemonAddPro) > 0 then
-- for i, v in pairs(pokemonAddPro) do
-- if v > 0 then
-- LogError("灵兽加成 "..i.." "..v)
-- end
-- end
--end
--灵兽羁绊
local pokemonFetterAddPro = PokemonManager.GetAllPokemonFetterAddPros()
--if pokemonFetterAddPro and LengthOfTable(pokemonFetterAddPro) > 0 then
-- for i, v in pairs(pokemonFetterAddPro) do
-- if v > 0 then
-- LogError("灵兽羁绊加成 "..i.." "..v)
-- end
-- end
--end
--单体所有属性合并
this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro)
this.DoubleTableCompound(allAddProVal, guildSkillAllProAdd)
@ -1705,6 +1725,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
this.DoubleTableCompound(allHeroProVal,allHeroSoulPrintProVal)
this.DoubleTableCompound(allHeroProVal, heroSkillAllHeroProVal)
this.DoubleTableCompound(allHeroProVal, teamAddPro)
this.DoubleTableCompound(allHeroProVal, pokemonFetterAddPro)
end
-- for index, value in pairs(allHeroProVal) do
-- if value > 0 then

View File

@ -42,11 +42,12 @@ function this.GetSinglePokemonData(_did)
return nil
end
end
--获取当前所有灵兽数据
function this.GetSinglePokemonData(_isZhen)
--获取当前可上阵的所有灵兽数据
function this.GetCanUpZhenPokemonDatas()
local upZhenSidList = this.GetAllPokemonFormationSids()
local curAllPokemonList = {}
for key, value in pairs(pokemons) do
if value.isZhen == _isZhen then
if value.isZhen == false and not upZhenSidList[value.id] then
table.insert(curAllPokemonList,value)
end
end
@ -209,6 +210,19 @@ function this.UpdatePokemonFormationDatas(_msgPokemonFormationList)
table.insert(pokemonFormatipn, teamInfo)
end
end
--获取编队灵兽静态id list
function this.GetAllPokemonFormationSids()
local formationSids = {}
for i = 1, #pokemonFormatipn do
if pokemons[pokemonFormatipn[i].pokemonDid] then
formationSids[pokemons[pokemonFormatipn[i].pokemonDid].id] = pokemons[pokemonFormatipn[i].pokemonDid]
end
end
return formationSids
end
--获取灵兽编队属性
function this.GetPokemonFormationAddPro()
local allPro = {}
for key, value in pairs(pokemonFormatipn) do

View File

@ -101,6 +101,9 @@ function this.SingleItemDataShow(_go,_fetterData)
singlePro:SetActive(false)
end
end
Util.AddOnceClick(Util.GetGameObject(_go.transform,"compoundBtn"), function()
end)
end
function this:OnClose()

View File

@ -2,6 +2,7 @@
local this = {}
local sortingOrder=0
local polemonList = {}
local spiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal)
function this:InitComponent(gameObject)
Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/name"):GetComponent("Text").text = "选择出战灵兽"
@ -33,6 +34,22 @@ function this:OnSortingOrderChange(_sortingOrder)
end
function this:OnShow(...)
polemonList = PokemonManager.GetCanUpZhenPokemonDatas()
table.sort(polemonList, function(a,b)
if spiritAnimal[a.id].Quality == spiritAnimal[b.id].Quality then
if a.star == b.star then
if a.lv == b.lv then
return a.id < b.id
else
return a.lv > b.lv
end
else
return a.star > b.star
end
else
return spiritAnimal[a.id].Quality > spiritAnimal[b.id].Quality
end
end)
this.ScrollView:SetData(polemonList, function (index, go)
this.SingleItemDataShow(go, polemonList[index])
end)
@ -55,9 +72,9 @@ function this.SingleItemDataShow(_go,_itemData)
SetHeroStars(starGrid, _itemData.star,1,starSize,-5,Vector2.New(0.5,0.5))
Util.AddOnceClick(Util.GetGameObject(_go.transform,"upZhen"), function()
end)
end)
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData)
end)
end