灵兽提交

zhangqiang 2020-10-22 12:41:44 +08:00
parent 83088ea429
commit 0270d54e10
16 changed files with 16799 additions and 15363 deletions

View File

@ -5030,9 +5030,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -217.975}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842123276967952598
@ -5069,9 +5069,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -87.475}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842123277321908025
@ -5108,9 +5108,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -152.725}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842123277430703535
@ -5147,9 +5147,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -22.225}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842429099848531319
@ -5911,7 +5911,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -173.7, y: 7}
m_SizeDelta: {x: 30, y: 40}
m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5626763215187076980
CanvasRenderer:
@ -5941,7 +5941,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3}
m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -6219,7 +6219,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -173.7, y: 7}
m_SizeDelta: {x: 30, y: 40}
m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5626763215969958574
CanvasRenderer:
@ -6249,7 +6249,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3}
m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -6451,7 +6451,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -173.7, y: 7}
m_SizeDelta: {x: 30, y: 40}
m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5626763216410705863
CanvasRenderer:
@ -6481,7 +6481,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3}
m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -6525,7 +6525,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -173.7, y: 7}
m_SizeDelta: {x: 30, y: 40}
m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5626763216727025216
CanvasRenderer:
@ -6555,7 +6555,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3}
m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -6981,7 +6981,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -173.7, y: 7}
m_SizeDelta: {x: 30, y: 40}
m_SizeDelta: {x: 57, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4621510325363028657
CanvasRenderer:
@ -7011,7 +7011,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2b92d6d48daf77543af79b37bdee3f1b, type: 3}
m_Sprite: {fileID: 21300000, guid: 797c177fc203c974aa5ae27044d45450, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -10147,9 +10147,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -283.225}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7654655047400709787

View File

@ -4518,14 +4518,14 @@ RectTransform:
m_GameObject: {fileID: 5308272568967409916}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2330869915964145961}
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: -308.9, y: 1.97}
m_AnchoredPosition: {x: -273, y: -56}
m_SizeDelta: {x: 254.65, y: 254.65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6778870542754512569
@ -5187,6 +5187,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5896937377902743802}
- component: {fileID: 4591073668131858928}
- component: {fileID: 5896422140432012604}
- component: {fileID: 6006158650865376104}
m_Layer: 0
@ -5195,7 +5196,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5896937377902743802
RectTransform:
m_ObjectHideFlags: 0
@ -5218,6 +5219,14 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4591073668131858928
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5965298164875569454}
m_CullTransparentMesh: 0
--- !u!223 &5896422140432012604
Canvas:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -1826,6 +1826,7 @@ GENERAL_POPUP_TYPE={
PokemonUpZhenAddPro = 24, --灵兽战力加成
PokemonResolve = 25,--灵兽涅槃
PokemonRestore = 26,--灵兽还原
PokemonCompound = 27,--灵兽合成
}
--抽卡类型

View File

@ -400,5 +400,8 @@ GameEvent = {
},
CloseUI={
OnClose="CloseUI.OnClose"
},
Pokemon={
PokemonCompound="Pokemon.PokemonCompound"
}
}

View File

@ -73,6 +73,11 @@ HERO_LOCKSTATE_FIELD = protobuf.FieldDescriptor();
HERO_JEWELS_FIELD = protobuf.FieldDescriptor();
HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor();
HERO_CHANGEID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO = protobuf.Descriptor();
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_STAR_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO = protobuf.Descriptor();
FIGHTUNITINFO_UNITID_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO_UNITSKILLIDS_FIELD = protobuf.FieldDescriptor();
@ -131,11 +136,6 @@ TEAMPOSINFO_TEAMHEROINFOS_FIELD = protobuf.FieldDescriptor();
POKEMONCOMONPENT = protobuf.Descriptor();
POKEMONCOMONPENT_ID_FIELD = protobuf.FieldDescriptor();
POKEMONCOMONPENT_LEVEL_FIELD = protobuf.FieldDescriptor();
POKEMONINFO = protobuf.Descriptor();
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_STAR_FIELD = protobuf.FieldDescriptor();
RINGFIREINFO = protobuf.Descriptor();
RINGFIREINFO_ID_FIELD = protobuf.FieldDescriptor();
RINGFIREINFO_STAGE_FIELD = protobuf.FieldDescriptor();
@ -1266,6 +1266,53 @@ HERO.enum_types = {}
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD}
HERO.is_extendable = false
HERO.extensions = {}
POKEMONINFO_TEMPID_FIELD.name = "tempId"
POKEMONINFO_TEMPID_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.tempId"
POKEMONINFO_TEMPID_FIELD.number = 1
POKEMONINFO_TEMPID_FIELD.index = 0
POKEMONINFO_TEMPID_FIELD.label = 1
POKEMONINFO_TEMPID_FIELD.has_default_value = false
POKEMONINFO_TEMPID_FIELD.default_value = 0
POKEMONINFO_TEMPID_FIELD.type = 5
POKEMONINFO_TEMPID_FIELD.cpp_type = 1
POKEMONINFO_ID_FIELD.name = "id"
POKEMONINFO_ID_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.id"
POKEMONINFO_ID_FIELD.number = 2
POKEMONINFO_ID_FIELD.index = 1
POKEMONINFO_ID_FIELD.label = 1
POKEMONINFO_ID_FIELD.has_default_value = false
POKEMONINFO_ID_FIELD.default_value = ""
POKEMONINFO_ID_FIELD.type = 9
POKEMONINFO_ID_FIELD.cpp_type = 9
POKEMONINFO_LEVEL_FIELD.name = "level"
POKEMONINFO_LEVEL_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.level"
POKEMONINFO_LEVEL_FIELD.number = 3
POKEMONINFO_LEVEL_FIELD.index = 2
POKEMONINFO_LEVEL_FIELD.label = 1
POKEMONINFO_LEVEL_FIELD.has_default_value = false
POKEMONINFO_LEVEL_FIELD.default_value = 0
POKEMONINFO_LEVEL_FIELD.type = 5
POKEMONINFO_LEVEL_FIELD.cpp_type = 1
POKEMONINFO_STAR_FIELD.name = "star"
POKEMONINFO_STAR_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.star"
POKEMONINFO_STAR_FIELD.number = 4
POKEMONINFO_STAR_FIELD.index = 3
POKEMONINFO_STAR_FIELD.label = 1
POKEMONINFO_STAR_FIELD.has_default_value = false
POKEMONINFO_STAR_FIELD.default_value = 0
POKEMONINFO_STAR_FIELD.type = 5
POKEMONINFO_STAR_FIELD.cpp_type = 1
POKEMONINFO.name = "PokemonInfo"
POKEMONINFO.full_name = ".com.ljsd.jieling.protocols.PokemonInfo"
POKEMONINFO.nested_types = {}
POKEMONINFO.enum_types = {}
POKEMONINFO.fields = {POKEMONINFO_TEMPID_FIELD, POKEMONINFO_ID_FIELD, POKEMONINFO_LEVEL_FIELD, POKEMONINFO_STAR_FIELD}
POKEMONINFO.is_extendable = false
POKEMONINFO.extensions = {}
FIGHTUNITINFO_UNITID_FIELD.name = "unitId"
FIGHTUNITINFO_UNITID_FIELD.full_name = ".com.ljsd.jieling.protocols.FightUnitInfo.unitId"
FIGHTUNITINFO_UNITID_FIELD.number = 1
@ -1668,7 +1715,7 @@ DROP_POKEMON_FIELD.index = 4
DROP_POKEMON_FIELD.label = 3
DROP_POKEMON_FIELD.has_default_value = false
DROP_POKEMON_FIELD.default_value = {}
DROP_POKEMON_FIELD.message_type = _POKEMONINFO
DROP_POKEMON_FIELD.message_type = POKEMONINFO
DROP_POKEMON_FIELD.type = 11
DROP_POKEMON_FIELD.cpp_type = 10
@ -1815,53 +1862,6 @@ POKEMONCOMONPENT.enum_types = {}
POKEMONCOMONPENT.fields = {POKEMONCOMONPENT_ID_FIELD, POKEMONCOMONPENT_LEVEL_FIELD}
POKEMONCOMONPENT.is_extendable = false
POKEMONCOMONPENT.extensions = {}
POKEMONINFO_TEMPID_FIELD.name = "tempId"
POKEMONINFO_TEMPID_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.tempId"
POKEMONINFO_TEMPID_FIELD.number = 1
POKEMONINFO_TEMPID_FIELD.index = 0
POKEMONINFO_TEMPID_FIELD.label = 1
POKEMONINFO_TEMPID_FIELD.has_default_value = false
POKEMONINFO_TEMPID_FIELD.default_value = 0
POKEMONINFO_TEMPID_FIELD.type = 5
POKEMONINFO_TEMPID_FIELD.cpp_type = 1
POKEMONINFO_ID_FIELD.name = "id"
POKEMONINFO_ID_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.id"
POKEMONINFO_ID_FIELD.number = 2
POKEMONINFO_ID_FIELD.index = 1
POKEMONINFO_ID_FIELD.label = 1
POKEMONINFO_ID_FIELD.has_default_value = false
POKEMONINFO_ID_FIELD.default_value = ""
POKEMONINFO_ID_FIELD.type = 9
POKEMONINFO_ID_FIELD.cpp_type = 9
POKEMONINFO_LEVEL_FIELD.name = "level"
POKEMONINFO_LEVEL_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.level"
POKEMONINFO_LEVEL_FIELD.number = 3
POKEMONINFO_LEVEL_FIELD.index = 2
POKEMONINFO_LEVEL_FIELD.label = 1
POKEMONINFO_LEVEL_FIELD.has_default_value = false
POKEMONINFO_LEVEL_FIELD.default_value = 0
POKEMONINFO_LEVEL_FIELD.type = 5
POKEMONINFO_LEVEL_FIELD.cpp_type = 1
POKEMONINFO_STAR_FIELD.name = "star"
POKEMONINFO_STAR_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonInfo.star"
POKEMONINFO_STAR_FIELD.number = 4
POKEMONINFO_STAR_FIELD.index = 3
POKEMONINFO_STAR_FIELD.label = 1
POKEMONINFO_STAR_FIELD.has_default_value = false
POKEMONINFO_STAR_FIELD.default_value = 0
POKEMONINFO_STAR_FIELD.type = 5
POKEMONINFO_STAR_FIELD.cpp_type = 1
POKEMONINFO.name = "PokemonInfo"
POKEMONINFO.full_name = ".com.ljsd.jieling.protocols.PokemonInfo"
POKEMONINFO.nested_types = {}
POKEMONINFO.enum_types = {}
POKEMONINFO.fields = {POKEMONINFO_TEMPID_FIELD, POKEMONINFO_ID_FIELD, POKEMONINFO_LEVEL_FIELD, POKEMONINFO_STAR_FIELD}
POKEMONINFO.is_extendable = false
POKEMONINFO.extensions = {}
RINGFIREINFO_ID_FIELD.name = "id"
RINGFIREINFO_ID_FIELD.full_name = ".com.ljsd.jieling.protocols.RingFireInfo.id"
RINGFIREINFO_ID_FIELD.number = 1

View File

@ -714,8 +714,8 @@ function this.GetTableByBackDropData(drop)
itemdata.configData = ConfigManager.GetConfigData(ConfigName.SpiritAnimal, drop.pokemon[i].tempId)
local itemConfig = itemConfig[drop.pokemon[i].tempId]
itemdata.name = itemConfig.ReadingName
itemdata.frame = GetHeroQuantityImageByquality(itemConfig.Quality)
itemdata.icon = GetResourcePath(itemdata.Icon)
itemdata.frame = GetHeroQuantityImageByquality(itemConfig.ResourceID)
itemdata.icon = GetResourcePath(itemConfig.Icon)
itemdata.num = 1
table.insert(itemDataList, itemdata)
PokemonManager.UpdatePokemonDatas(itemdata.backData,true)
@ -828,6 +828,25 @@ function this.GetItemListFromTempBag(drop, isSave)
end
end
end
if drop.pokemon ~= nil and #drop.pokemon > 0 then
Log("drop.pokemon " .. #drop.pokemon)
for i = 1, #drop.pokemon do
local itemdata = {}
itemdata.itemType = 6
itemdata.sId = drop.pokemon[i].tempId
itemdata.backData = drop.pokemon[i]
itemdata.configData = ConfigManager.GetConfigData(ConfigName.SpiritAnimal, drop.pokemon[i].tempId)
local itemConfig = itemConfig[drop.pokemon[i].tempId]
itemdata.name = itemConfig.ReadingName
itemdata.frame = GetHeroQuantityImageByquality(itemConfig.Quantity)
itemdata.icon = GetResourcePath(itemConfig.ResourceID)
itemdata.num = 1
table.insert(itemDataList, itemdata)
if isSave then
PokemonManager.UpdatePokemonDatas(itemdata.backData,true)
end
end
end
return itemDataList
end

View File

@ -61,12 +61,12 @@ function this:BindEvent()
end
function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.MissionDaily.OnMissionDailyChanged, this.OnShowData)
Game.GlobalEvent:AddEvent(GameEvent.CloseUI.OnClose, this.ClosePanel)
Game.GlobalEvent:AddEvent(GameEvent.Pokemon.PokemonCompound, this.ClosePanel)
end
function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.MissionDaily.OnMissionDailyChanged,this.OnShowData)
Game.GlobalEvent:RemoveEvent(GameEvent.CloseUI.OnClose, this.ClosePanel)
Game.GlobalEvent:RemoveEvent(GameEvent.Pokemon.PokemonCompound, this.ClosePanel)
end
function this:OnShow(_parent,...)

View File

@ -149,7 +149,7 @@ function this.GetCurStarSkillId(_sid,_star)
local skillId = nil
if curConFig then
for i = 1, #curConFig.SkillArray do
if curConFig.SkillArray[i][1] == _star + 1 then
if curConFig.SkillArray[i][1] == _star then
skillId = curConFig.SkillArray[i][2]
end
end
@ -279,8 +279,8 @@ end
function this.GetPokemonFormationAddPro()
local allPro = {}
for key, value in pairs(pokemonFormation) do
if pokemons[key] then
local curPokemonAddPro = this.GetNoUpLvPokemonData(key)
if value.pokemonId and pokemons[value.pokemonId] then
local curPokemonAddPro = this.GetSinglePokemonAddProData(value.pokemonId)
HeroManager.DoubleTableCompound(allPro, curPokemonAddPro)
end
end

View File

@ -62,15 +62,17 @@ function this:BindEvent()
end)
--长按升级按下状态
this._onPointerDown = function(Pointgo, data)
isTriggerLongClick = false
-- isTriggerLongClick = false
_isClicked = true
this.timePressStarted = Time.realtimeSinceStartup
oldLv = curPokemonData.lv
end
--长按升级抬起状态
this._onPointerUp = function(Pointgo, data)
if _isLongPress and isTriggerLongClick then
LogPink("连续升级抬起请求升级 "..tostring(_isLongPress))
if _isLongPress then--and isTriggerLongClick
--连续升级抬起请求升级
LogPink("连续升级抬起请求升级 ")
this.LongLvUpClick(oldLv)
end
_isClicked = false
@ -100,6 +102,7 @@ function this.OnUpdate()
if _isClicked then
if Time.realtimeSinceStartup - this.timePressStarted > 0.4 then
_isLongPress = true
LogPink("_isReqLvUp "..tostring(_isReqLvUp))
if not _isReqLvUp then
_isReqLvUp = true
this.LvUpClick(false)
@ -132,6 +135,7 @@ function this.ShowPokemonInfo()
end
--技能
local curSkillId = PokemonManager.GetCurStarSkillId(curPokemonData.id,curPokemonData.star)
LogPink("curPokemonData.star "..curPokemonData.star)
local skillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
if skillConFig then
this.skillIcon.sprite = Util.LoadSprite(GetResourcePath(skillConFig.Icon))
@ -166,8 +170,8 @@ function this.ShowPokemonInfo()
end
--长按升级结束后请求协议
function this.LongLvUpClick(oldLv)
NetManager.HeroLvUpEvent(curPokemonData.dynamicId,curPokemonData.lv,oldLv,function (msg)
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,msg.targetLevel,curPokemonData.star)
NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv,oldLv,function (msg)
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,msg.level,curPokemonData.star)
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
this.ShowPokemonInfo()
_isReqLvUp = false

View File

@ -66,6 +66,7 @@ function this.OnShowData()
--curPokemonData
local curUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star)
local nextUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1)
LogPink("curPokemonData.star + 1) "..curPokemonData.star + 1)
if not nextUpStarConfig then
this.upStar:SetActive(false)
this.noUpStarText:SetActive(true)
@ -81,6 +82,7 @@ function this.OnShowData()
local curSkillId = 0
local nextSkillId = 0
local nextSkillConFig
local skillArray = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,curPokemonData.id).SkillArray
for i = 1, #skillArray do
if skillArray[i][1] == curUpStarConfig.Star then
@ -88,22 +90,18 @@ function this.OnShowData()
end
if skillArray[i][1] == nextUpStarConfig.Star then
nextSkillId = skillArray[i][2]
nextSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,nextSkillId)
this.skill2Icon.sprite = Util.LoadSprite(GetResourcePath(nextSkillConFig.Icon))
this.skill2Lv.text = nextSkillId%10
end
end
local nextSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,nextSkillId)
this.skill1Icon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId).Icon))
this.skill1Lv.text = curSkillId%10
this.skill2Icon.sprite = Util.LoadSprite(GetResourcePath(nextSkillConFig.Icon))
this.skill2Lv.text = nextSkillId%10
-- local skillstr = ""
-- for i = 1, #nextSkillConFig.DescValue do
-- if skillstr == "" then
-- skillstr = nextSkillConFig.DescValue[i]
-- else
-- skillstr = skillstr .. "," .. nextSkillConFig.DescValue[i]
-- end
-- end
this.skillTip.text = "提升预览:"--.. string.format(nextSkillConFig.Desc,nextSkillConFig.DescValue)
if nextSkillId > 0 then
this.skillTip.text = "提升预览:"..nextSkillConFig.Name
else
this.skillTip.text = "已满星"
end
local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum},curUpStarConfig.ConsumeRes[1]}
isUpStarMaterials = 0

View File

@ -49,9 +49,12 @@ function this:BindEvent()
end
function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Pokemon.PokemonCompound, this.OnClickTabBtn,2)
end
function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Pokemon.PokemonCompound,this.OnClickTabBtn,2)
end
@ -69,6 +72,7 @@ function this:OnSortingOrderChange(_sortingOrder)
end
function this.OnClickTabBtn(_curIndex)
curIndex = _curIndex
LogPink("curIndex "..curIndex)
if curIndex == 1 then
this.ScrollParentView1:SetActive(true)
this.ScrollParentView2:SetActive(false)
@ -105,7 +109,7 @@ end
function this.SingPokemonDataShow(_go,_itemData)
Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
-- Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[_itemData.id].ResourceID))
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=itemConfig[_itemData.id].Name
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
@ -126,15 +130,7 @@ function this.SingPokemonChipDataShow(_go,_itemData)
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=_itemData.itemConfig.Name
Util.GetGameObject(_go.transform,"num/Text"):GetComponent("Text").text = BagManager.GetItemCountById(_itemData.id).."/".._itemData.itemConfig.UsePerCount
Util.AddOnceClick(Util.GetGameObject(_go.transform,"compoundBtn"), function()
local item={}
item.itemId=_itemData.itemConfig.Id
item.itemNum=1
LogPink("sssssssssssssss "..item.itemId.." "..item.itemNum)
NetManager.HeroComposeRequest(item,function (drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function ()
this.OnClickTabBtn(curIndex)
end,nil,nil,nil,true)
end)
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonCompound,_itemData)
end)
end
function this.PokemonDataSort(pokemonList)

View File

@ -54,6 +54,8 @@ local contentScripts = {
[25]={view = require("Modules/Popup/View/GeneralPopup_PokemonResolve"), panelName = "GeneralPopup_PokemonResolve",type=GENERAL_POPUP_TYPE.PokemonResolve},
--灵兽还原
[26]={view = require("Modules/Popup/View/GeneralPopup_PokemonRestore"), panelName = "GeneralPopup_PokemonRestore",type=GENERAL_POPUP_TYPE.PokemonResolve},
--灵兽碎片合成
[27]={view = require("Modules/Popup/View/GeneralPopup_PokemonChipCompound"), panelName = "GeneralPopup_PokemonChipCompound",type=GENERAL_POPUP_TYPE.PokemonCompound},
}
--子模块预设
local contentPrefabs={}

View File

@ -0,0 +1,101 @@
----- 灵兽合成 -----
local this = {}
--传入父脚本模块
local sortingOrder
local parent
local compoundNum
local compoundMaxNum
local itemData
local itemViewPre
function this:InitComponent(gameObject)
Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text").text = "碎片合成"
this.itemParent = Util.GetGameObject(gameObject,"itemParent")
this.Slider =Util.GetGameObject(gameObject, "Slider")
this.addBtn = Util.GetGameObject(gameObject, "addBtn")
this.jianBtn = Util.GetGameObject(gameObject, "jianBtn")
this.btnCompound = Util.GetGameObject(gameObject, "btnCompound")
this.numText = Util.GetGameObject(gameObject, "Slider/numText"):GetComponent("Text")
this.numText2 = Util.GetGameObject(gameObject, "Slider/numText2"):GetComponent("Text")
end
function this:BindEvent()
Util.AddSlider(this.Slider, function(go, value)
this.ShowCompoundNumData(value)
end)
Util.AddClick(this.addBtn, function()
if compoundNum<compoundMaxNum then
compoundNum=compoundNum+1
this.ShowCompoundNumData(compoundNum)
end
end)
Util.AddClick(this.jianBtn, function()
if compoundNum>=2 then
compoundNum=compoundNum-1
this.ShowCompoundNumData(compoundNum)
end
end)
Util.AddClick(this.btnCompound, function()
if compoundNum>0 then
local item={}
item.itemId=itemData.id
item.itemNum=compoundNum*itemData.itemConfig.UsePerCount
Log("sssssssssssssss "..item.itemId.." "..item.itemNum)
NetManager.HeroComposeRequest(item,function (drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function ()
parent:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonCompound)
end,nil,nil,nil,true)
end)
else
PopupTipPanel.ShowTip(Language[10200])
end
end)
end
function this:AddListener()
end
function this:RemoveListener()
end
function this:OnShow(_parent,...)
parent=_parent
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local _args = {...}
itemData=_args[1]
this.RefreshPanel()
end
function this:OnClose()
end
function this:OnDestroy()
end
--刷新面板
function this.RefreshPanel()
compoundNum = 1
compoundMaxNum = math.floor(itemData.num / itemData.itemConfig.UsePerCount)
if not itemViewPre then
itemViewPre = SubUIManager.Open(SubUIConfig.ItemView, this.itemParent.transform)
end
itemViewPre:OnOpen(false, { itemData.id,itemData.num }, 0.97)
compoundNum= compoundNum>=compoundMaxNum and compoundMaxNum or compoundNum
Log("compoundNum "..compoundNum)
this.Slider:GetComponent("Slider").value=compoundNum
this.Slider:GetComponent("Slider").minValue=0
this.Slider:GetComponent("Slider").maxValue=compoundMaxNum
this.ShowCompoundNumData(compoundNum)
end
function this.ShowCompoundNumData(value)
Log(Language[10215]..value)
compoundNum=value
this.Slider:GetComponent("Slider").value=value
this.numText2.text = value
this.numText.text= Language[10216]..value*itemData.itemConfig.UsePerCount..Language[10217]..value..Language[10218].. string.gsub(itemData.itemConfig.Name,Language[10219],"")
end
return this

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 37337bd342b7fb940b0f0288ddadf738
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -42,12 +42,9 @@ end
--刷新面板
function this.RefreshPanel()
allProData = {}
for i = 1, 4 do
allProData[i] = 0
end
local curallProData = PokemonManager.GetPokemonFormationAddPro()
HeroManager.DoubleTableCompound(allProData, curallProData)
allProData = PokemonManager.GetPokemonFormationAddPro()
-- local curallProData = PokemonManager.GetPokemonFormationAddPro()
-- HeroManager.DoubleTableCompound(allProData, curallProData)
for i = 1, #allProPre do
local go= allProPre[i]
if PropertyTypeIconDef[i] then