zhangqiang 2020-10-22 10:03:46 +08:00
parent 11ccf2ab6f
commit 83088ea429
13 changed files with 164 additions and 35 deletions

View File

@ -5195,7 +5195,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5896937377902743802
RectTransform:
m_ObjectHideFlags: 0
@ -5304,6 +5304,7 @@ GameObject:
- component: {fileID: 3262271685940142859}
- component: {fileID: 5979528672487799334}
- component: {fileID: 1005589561380988526}
- component: {fileID: 1333952508827543610}
m_Layer: 5
m_Name: compoundBtn
m_TagString: Untagged
@ -5368,6 +5369,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &1333952508827543610
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6083797274778971746}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1005589561380988526}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &6104686310985505130
GameObject:
m_ObjectHideFlags: 0

View File

@ -9777,6 +9777,26 @@ MonoBehaviour:
extension: .png
resPathIndex: 60
resAbNameIndex: 29
- resName: r_hero_jinengdian01
extension: .png
resPathIndex: 60
resAbNameIndex: 29
- resName: r_hero_jinengdian02
extension: .png
resPathIndex: 60
resAbNameIndex: 29
- resName: r_hero_jinengdian03
extension: .png
resPathIndex: 60
resAbNameIndex: 29
- resName: r_hero_jinengdian04
extension: .png
resPathIndex: 60
resAbNameIndex: 29
- resName: r_hero_jinengdian05
extension: .png
resPathIndex: 60
resAbNameIndex: 29
- resName: r_hero_jinjie-jiahao
extension: .png
resPathIndex: 60
@ -38309,6 +38329,14 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 230
resAbNameIndex: 2293
- resName: PokemonAllSkillInfoPopup
extension: .prefab
resPathIndex: 231
resAbNameIndex: 2293
- resName: PokemonGetInfoPopup
extension: .prefab
resPathIndex: 231
resAbNameIndex: 2293
- resName: PokemonInfoPanel
extension: .prefab
resPathIndex: 231
@ -38321,10 +38349,22 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 231
resAbNameIndex: 2293
- resName: PokemonSkillInfoPopup
extension: .prefab
resPathIndex: 231
resAbNameIndex: 2293
- resName: PokemonSummonOneResultPanel
extension: .prefab
resPathIndex: 231
resAbNameIndex: 2293
- resName: PokemonSummonPanel
extension: .prefab
resPathIndex: 231
resAbNameIndex: 2293
- resName: PokemonSummonTenResultPanel
extension: .prefab
resPathIndex: 231
resAbNameIndex: 2293
- resName: PokemonUpStarSuccessPanel
extension: .prefab
resPathIndex: 231

View File

@ -464,7 +464,9 @@ PanelType = {
TimelimitCall={87,16}, --限时召唤
QianKunBox={1002,1003,16},--乾坤包囊
HeroReplace={14,16,92},--神将置换
LingShou={14,16,21}--灵兽
LingShou={14,16,21},--灵兽
LingShouUpLv={14,16,1202},--灵兽升级
LingShouUpStar={14,16,1203},--灵兽升星
}

View File

@ -91,6 +91,7 @@ POKENMONUPLEVELRESPONSE = protobuf.Descriptor();
POKENMONUPLEVELRESPONSE_LEVEL_FIELD = protobuf.FieldDescriptor();
POKEMONADVANCEDREQUEST = protobuf.Descriptor();
POKEMONADVANCEDREQUEST_POKEMONID_FIELD = protobuf.FieldDescriptor();
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD = protobuf.FieldDescriptor();
RINGFIRELOADREQUEST = protobuf.Descriptor();
RINGFIRELOADREQUEST_POKEMONID_FIELD = protobuf.FieldDescriptor();
RINGFIRELOADREQUEST_COMONPENTID_FIELD = protobuf.FieldDescriptor();
@ -929,15 +930,25 @@ POKEMONADVANCEDREQUEST_POKEMONID_FIELD.number = 1
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.index = 0
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.label = 1
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.has_default_value = false
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.default_value = 0
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.type = 5
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.cpp_type = 1
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.default_value = ""
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.type = 9
POKEMONADVANCEDREQUEST_POKEMONID_FIELD.cpp_type = 9
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.name = "consumePokemonIds"
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.PokemonAdvancedRequest.consumePokemonIds"
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.number = 2
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.index = 1
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.label = 3
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.has_default_value = false
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.default_value = {}
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.type = 9
POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD.cpp_type = 9
POKEMONADVANCEDREQUEST.name = "PokemonAdvancedRequest"
POKEMONADVANCEDREQUEST.full_name = ".com.ljsd.jieling.protocols.PokemonAdvancedRequest"
POKEMONADVANCEDREQUEST.nested_types = {}
POKEMONADVANCEDREQUEST.enum_types = {}
POKEMONADVANCEDREQUEST.fields = {POKEMONADVANCEDREQUEST_POKEMONID_FIELD}
POKEMONADVANCEDREQUEST.fields = {POKEMONADVANCEDREQUEST_POKEMONID_FIELD, POKEMONADVANCEDREQUEST_CONSUMEPOKEMONIDS_FIELD}
POKEMONADVANCEDREQUEST.is_extendable = false
POKEMONADVANCEDREQUEST.extensions = {}
RINGFIRELOADREQUEST_POKEMONID_FIELD.name = "pokemonId"

View File

@ -294,8 +294,10 @@ end
--通过物品类型获得物品list
function this.GetDataByItemType(_itemType)
local items = {}
LogPink("通过物品类型获得物品list".._itemType)
for i, v in pairs(this.bagDatas) do
if v.itemConfig.ItemType == _itemType and v.num > 0 and v.itemConfig.BackpackOrNot then
if v.itemConfig.ItemType == _itemType and v.num > 0 then
LogPink("通过物品类型获得物品list "..v.id.." "..v.num)
table.insert(items,v)
end
end

View File

@ -4503,14 +4503,18 @@ function this.UpPokemonLevelRequest(pokemonDId, upLv,oldLv, func)
end)
end
--请求灵兽升星
function this.UpPokemonStarRequest(pokemonDId, func)
local data = HeroInfoProto_pb.PokenmonUpLevelRequest()
function this.UpPokemonStarRequest(pokemonDId,curUpStarSelectPokemonData, func)
local data = HeroInfoProto_pb.PokemonAdvancedRequest()
LogPink("pokemonDId " .. pokemonDId)
data.pokemonId = pokemonDId
for i = 1, #curUpStarSelectPokemonData do
LogPink("升星消耗的灵兽 "..curUpStarSelectPokemonData[i])
data.consumePokemonIds:append(curUpStarSelectPokemonData[i])
end
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.POKEMON_COMONPENT_LEVELUP_REQUEST, MessageTypeProto_pb.POKEMON_COMONPENT_LEVELUP_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
msg:ParseFromString(data)
Network:SendMessageWithCallBack(MessageTypeProto_pb.POKEMON_ADVANCED_REQUEST, MessageTypeProto_pb.POKEMON_ADVANCED_RESPONSE, msg, function(buffer)
-- local data = buffer:DataByte()
-- msg:ParseFromString(data)
if func then
func(msg)
end

View File

@ -38,7 +38,9 @@ function this.SetBasicValues(giftGoodsList)
giftGoodsInfoList[v] = {}
end
for _, giftGoodsInfo in ipairs(giftGoodsList) do
if giftGoodsInfo.goodsId <= 0 then
return
end
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
-- LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID".. giftGoodsInfo.goodsId .." 已购:"

View File

@ -19,9 +19,9 @@ function PokemonGetInfoPopup:InitComponent()
proList[i] = Util.GetGameObject(self.transform,"bg/PokemonInfo/pro/singlePro ("..i..")")
end
self.skillName=Util.GetGameObject(self.transform,"bg/PokemonInfo/nameText"):GetComponent("Text")
self.skillLv=Util.GetGameObject(self.transform,"bg/PokemonInfo/skillImage/LvText"):GetComponent("Text")
self.skillIcon=Util.GetGameObject(self.transform,"bg/PokemonInfo/icon"):GetComponent("Image")
self.skillName=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/nameText"):GetComponent("Text")
self.skillLv=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage/skillLv"):GetComponent("Text")
self.skillIcon=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/icon"):GetComponent("Image")
end
local triggerCallBack
--绑定事件(用于子类重写)
@ -44,8 +44,7 @@ end
--界面打开时调用(用于子类重写)
function PokemonGetInfoPopup:OnOpen(_isGet,data)--data 未获得的时候为灵兽静态ID 获得的时候为本地数据
local data={...}
isGet=data[1]
isGet=_isGet
if isGet then
pokemonBackData = data
else
@ -79,18 +78,17 @@ function this.NoGetShowPanelData()
--星级
SetHeroStars(this.starGrid, 0,2,Vector2.New(60,60),-11.92)
--属性
local allAddProVal = {}--this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
local allAddProVal = PokemonManager.GetSinglePokemonAddProDataBySid(pokemonSid) --this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
for i = 1, 5 do
Util.GetGameObject(proList[i].transform,"proName"):GetComponent("Text").text = ""
Util.GetGameObject(proList[i].transform,"proValue"):GetComponent("Text").text = ""
Util.GetGameObject(proList[i].transform,"Image"):GetComponent("Image").sprite =
Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,onePokemonSid).ResourceID))
Util.GetGameObject(proList[i].transform,"proName"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.PropertyConfig,i).Info
Util.GetGameObject(proList[i].transform,"proValue"):GetComponent("Text").text = allAddProVal[i]
Util.GetGameObject(proList[i].transform,"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyTypeIconDef[i])
end
end
function this.ShowPokemonLive(_heroSConfigData)
this.testLiveGO = poolManager:LoadLive(GetResourcePath(_heroSConfigData.Live), this.liveRoot.transform,
Vector3.one * _heroSConfigData.Scale*0.7, Vector3.New(_heroSConfigData.PositionView[1], _heroSConfigData.PositionView[2], 0))
Vector3.one * _heroSConfigData.Scale*0.3, Vector3.New(_heroSConfigData.Position[1], _heroSConfigData.Position[2], 0))
local SkeletonGraphic = this.testLiveGO:GetComponent("SkeletonGraphic")
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle

View File

@ -225,9 +225,9 @@ function this.SwitchView(index)
end
--区分显示
if index==1 then
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.LingShouUpLv})
elseif index==2 then
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.LingShouUpStar})
end
--执行子模块初始化
this.contents[index].view:OnShow(this,curPokemonData)
@ -267,7 +267,7 @@ function this.OnShowData()
end
curPokemonConFigData = spiritAnimal[curPokemonData.id]
this.UpdateHeroInfoData()
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.RoleInfo })
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LingShouUpLv })
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
end

View File

@ -130,6 +130,19 @@ function this.GetSinglePokemonAddProData(_did)
end
return addEndAllProVal
end
--获取单个灵兽属性 (灵兽属性/编队人数 灵兽属性会平分给上阵的所有神将)
function this.GetSinglePokemonAddProDataBySid(_sid)
local addAllProVal = {}
local curPokemonConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,_sid)
--基础
addAllProVal[HeroProType.Hp] = curPokemonConFig.Hp
addAllProVal[HeroProType.Attack] = curPokemonConFig.Attack
addAllProVal[HeroProType.PhysicalDefence] = curPokemonConFig.PhysicalDefence
addAllProVal[HeroProType.MagicDefence] = curPokemonConFig.MagicDefence
return addAllProVal
end
--根据星级获得技能id
function this.GetCurStarSkillId(_sid,_star)
local curConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,_sid)

View File

@ -176,8 +176,9 @@ end
--升级按钮点击事件处理
function this.LvUpClick(isSingleLvUp)
--各种判断能否升级
LogPink("isMaterial "..isMaterial)
if isMaterial ~= 0 then
PopupTipPanel.ShowTip(""..ConfigManager.GetConfigData(ConfigName.ItemConfig,isMaterial).."】不足!")
PopupTipPanel.ShowTip(""..ConfigManager.GetConfigData(ConfigName.ItemConfig,isMaterial).Name.."】不足!")
return
end
if isLvEnd then

View File

@ -122,7 +122,8 @@ function this.OnShowData()
curMaterialBagNum = LengthOfTable(NoUpLvPokemonData)
for i = 1, #NoUpLvPokemonData do
if i <= configMaterialNum then
table.insert(curUpStarSelectPokemonData,NoUpLvPokemonData[i])
LogPink("NoUpLvPokemonData[i].dynamicId "..NoUpLvPokemonData[i].dynamicId)
table.insert(curUpStarSelectPokemonData,NoUpLvPokemonData[i].dynamicId)
end
end
elseif i == 2 then--需要的材料
@ -151,7 +152,7 @@ end
function this.DeleteUpStarMaterials()
if curUpStarSelectPokemonData then
for i = 1, #curUpStarSelectPokemonData do
PokemonManager.RemoveSinglePokemonData(curUpStarSelectPokemonData[i].dynamicId)
PokemonManager.RemoveSinglePokemonData(curUpStarSelectPokemonData[i])
end
end
end
@ -159,15 +160,16 @@ end
--进阶按钮点击事件处理
function this.StarUpClick()
LogPink("isUpStarMaterials "..isUpStarMaterials)
if isUpStarMaterials ~= 0 then
PopupTipPanel.ShowTip(""..ConfigManager.GetConfigData(ConfigName.ItemConfig,isUpStarMaterials).."】不足!")
PopupTipPanel.ShowTip(""..ConfigManager.GetConfigData(ConfigName.ItemConfig,isUpStarMaterials).Name.."】不足!")
return
end
NetManager.UpPokemonStarRequest(curPokemonData.dynamicId, function()
NetManager.UpPokemonStarRequest(curPokemonData.dynamicId,curUpStarSelectPokemonData, function()
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,curPokemonData.lv,curPokemonData.star + 1)
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
this.DeleteUpStarMaterials()
this.ShowPokemonInfo()
this.OnShowData()
end)
end

View File

@ -14,6 +14,7 @@ local _TabImagePos = { default = -3,
local curIndex = 0
local pokemonList = {}
local pokemonChipList = {}
local AllPokemonFormationDids = {}
function this:InitComponent(gameObject)
this.ChipItemList={}--存储itemview 重复利用
Util.GetGameObject(gameObject, "PokemonListPanel_List/name"):GetComponent("Text").text = "灵兽列表"
@ -73,6 +74,8 @@ function this.OnClickTabBtn(_curIndex)
this.ScrollParentView2:SetActive(false)
pokemonList = PokemonManager.GetPokemonDatas()
this.PokemonDataSort(pokemonList)
AllPokemonFormationDids = {}
AllPokemonFormationDids = PokemonManager.GetAllPokemonFormationDids()
this.ScrollView:SetData(pokemonList, function (index, go)
this.SingPokemonDataShow(go, pokemonList[index])
end)
@ -106,7 +109,7 @@ function this.SingPokemonDataShow(_go,_itemData)
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
Util.GetGameObject(_go.transform,"pokemonStateText"):GetComponent("Text").text="休息中"
Util.GetGameObject(_go.transform,"pokemonStateText"):GetComponent("Text").text = AllPokemonFormationDids[_itemData.dynamicId] and string.format("<color=#00FF06>%s</color>","已出战") or string.format("<color=#FF0000>%s</color>","休息中")
local starSize = Vector2.New(50,50)
SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5))
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()
@ -123,7 +126,15 @@ 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)
end)
end
function this.PokemonDataSort(pokemonList)