diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 12285c26b7..050b4addb8 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -519,6 +519,7 @@ EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD = protobuf.FieldDescriptor(); EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor(); EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD = protobuf.FieldDescriptor(); +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD = protobuf.FieldDescriptor(); EXPEDITIONTEAMINFO = protobuf.Descriptor(); EXPEDITIONTEAMINFO_HERO_FIELD = protobuf.FieldDescriptor(); EXPEDITIONTEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor(); @@ -5508,11 +5509,21 @@ EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD.default_value = 0.0 EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD.type = 1 EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD.cpp_type = 5 +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.name = "position" +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.full_name = ".com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo.position" +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.number = 5 +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.index = 4 +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.label = 1 +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.has_default_value = false +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.default_value = 0 +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.type = 5 +EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.cpp_type = 1 + EXPEDITIONSIMPLEBOSSINFO.name = "ExpeditionSimpleBossInfo" EXPEDITIONSIMPLEBOSSINFO.full_name = ".com.ljsd.jieling.protocols.ExpeditionSimpleBossInfo" EXPEDITIONSIMPLEBOSSINFO.nested_types = {} EXPEDITIONSIMPLEBOSSINFO.enum_types = {} -EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD} +EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD} EXPEDITIONSIMPLEBOSSINFO.is_extendable = false EXPEDITIONSIMPLEBOSSINFO.extensions = {} EXPEDITIONTEAMINFO_HERO_FIELD.name = "hero" diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 43fe2fd5b6..eb7595d7ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -34,9 +34,8 @@ function this.InitExpeditionData(msg) singleNodeInfo.state = nodeInfo.state--节点状态 0未开启 1未通过 2未领取圣物 3已完成 singleNodeInfo.bossTeaminfo = {}--节点队伍信息 singleNodeInfo.bossTeaminfo.hero = {}--节点队伍信息 英雄 - --LogGreen("-----||||服务端初始化节点信息 "..singleNodeInfo.sortId.." "..singleNodeInfo.state.." "..singleNodeInfo.lay ) + -- LogGreen("-----||||服务端初始化节点信息 "..singleNodeInfo.sortId.." "..singleNodeInfo.state.." "..singleNodeInfo.lay ) if nodeInfo.bossTeaminfo then - --Log("nodeInfo.bossTeaminfo.hero "..#nodeInfo.bossTeaminfo.hero) if nodeInfo.bossTeaminfo.hero and #nodeInfo.bossTeaminfo.hero > 0 then for k = 1, #nodeInfo.bossTeaminfo.hero do local singleHero = {} @@ -44,6 +43,7 @@ function this.InitExpeditionData(msg) singleHero.star = nodeInfo.bossTeaminfo.hero[k].star singleHero.level = nodeInfo.bossTeaminfo.hero[k].level singleHero.remainHp = nodeInfo.bossTeaminfo.hero[k].remainHp + singleHero.position = nodeInfo.bossTeaminfo.hero[k].position table.insert(singleNodeInfo.bossTeaminfo.hero,singleHero) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua index 01e74dbfb2..e817bd76db 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua @@ -95,9 +95,7 @@ function this:FormationAdapter() elseif type == 2 then this.sureBtnText.text = Language[10512] end - LogBlue("curNodeConFig.type "..curNodeConFig.type) if curNodeConFig then - LogBlue("curNodeConFig.type 1 "..curNodeConFig.type) if curNodeConFig.type == ExpeditionNodeType.Common then this.titleText.text=Language[10513] elseif curNodeConFig.type == ExpeditionNodeType.Jy then @@ -108,17 +106,16 @@ function this:FormationAdapter() end if monsterData == nil then LogError(Language[10511]) return end this.power.text = monsterData.bossTeaminfo.totalForce - + for i = 1, #heroListGo do + heroListGo[i]:SetActive(false) + end for i = 1, #heroListGo do if(monsterData.bossTeaminfo.hero[i]) then + local pos = monsterData.bossTeaminfo.hero[i].position if monsterData.bossTeaminfo.hero[i].remainHp > 0 then - this.SetCardSingleData(heroListGo[i],monsterData.bossTeaminfo.hero[i],i) - heroListGo[i]:SetActive(true) - else - heroListGo[i]:SetActive(false) + this.SetCardSingleData(heroListGo[pos],monsterData.bossTeaminfo.hero[i],pos) + heroListGo[pos]:SetActive(true) end - else - heroListGo[i]:SetActive(false) end end FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)