root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【森罗幻境】暂时还原

dev_chengFeng
ZhangBiao 2021-04-15 14:24:40 +08:00
parent 5d47d0b42e
commit d5879c2445
6 changed files with 52 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/ManagedResources/~Lua/Message/ChatProto_pb.lua
View File

@ -23,7 +23,6 @@ CHATINFO_PRIORITYLEVEL_FIELD = protobuf.FieldDescriptor();
CHATINFO_FREQUENCY_FIELD = protobuf.FieldDescriptor();
CHATINFO_SPEED_FIELD = protobuf.FieldDescriptor();
CHATINFO_MULTIPLE_FIELD = protobuf.FieldDescriptor();
CHATINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
GETCHATMESSAGEINFOREQUEST = protobuf.Descriptor();
GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD = protobuf.FieldDescriptor();
GETCHATMESSAGEINFOREQUEST_MESSAGEID_FIELD = protobuf.FieldDescriptor();
@ -229,21 +228,11 @@ CHATINFO_MULTIPLE_FIELD.default_value = 0
CHATINFO_MULTIPLE_FIELD.type = 5
CHATINFO_MULTIPLE_FIELD.cpp_type = 1
CHATINFO_USERTITLE_FIELD.name = "userTitle"
CHATINFO_USERTITLE_FIELD.full_name = ".rpc.protocols.ChatInfo.userTitle"
CHATINFO_USERTITLE_FIELD.number = 22
CHATINFO_USERTITLE_FIELD.index = 19
CHATINFO_USERTITLE_FIELD.label = 1
CHATINFO_USERTITLE_FIELD.has_default_value = false
CHATINFO_USERTITLE_FIELD.default_value = 0
CHATINFO_USERTITLE_FIELD.type = 5
CHATINFO_USERTITLE_FIELD.cpp_type = 1
CHATINFO.name = "ChatInfo"
CHATINFO.full_name = ".rpc.protocols.ChatInfo"
CHATINFO.nested_types = {}
CHATINFO.enum_types = {}
CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD, CHATINFO_USERTITLE_FIELD}
CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD}
CHATINFO.is_extendable = false
CHATINFO.extensions = {}
GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD.name = "chatType"

26
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
View File

@ -457,7 +457,6 @@ TEAMONEINFO_HEADFRAME_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO_GUILDNAME_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO_TEAM_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO_ISAPPLYED_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
MONSTERRANKINFO = protobuf.Descriptor();
MONSTERRANKINFO_NAME_FIELD = protobuf.FieldDescriptor();
MONSTERRANKINFO_SCORE_FIELD = protobuf.FieldDescriptor();
@ -557,7 +556,6 @@ REDONEDETAIL_TIME_FIELD = protobuf.FieldDescriptor();
REDONEDETAIL_COUNT_FIELD = protobuf.FieldDescriptor();
REDONEDETAIL_ITEMID_FIELD = protobuf.FieldDescriptor();
REDONEDETAIL_POSITION_FIELD = protobuf.FieldDescriptor();
REDONEDETAIL_USERTITLE_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO = protobuf.Descriptor();
EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor();
@ -4984,21 +4982,11 @@ TEAMONEINFO_ISAPPLYED_FIELD.default_value = 0
TEAMONEINFO_ISAPPLYED_FIELD.type = 5
TEAMONEINFO_ISAPPLYED_FIELD.cpp_type = 1
TEAMONEINFO_USERTITLE_FIELD.name = "userTitle"
TEAMONEINFO_USERTITLE_FIELD.full_name = ".rpc.protocols.TeamOneInfo.userTitle"
TEAMONEINFO_USERTITLE_FIELD.number = 9
TEAMONEINFO_USERTITLE_FIELD.index = 8
TEAMONEINFO_USERTITLE_FIELD.label = 1
TEAMONEINFO_USERTITLE_FIELD.has_default_value = false
TEAMONEINFO_USERTITLE_FIELD.default_value = 0
TEAMONEINFO_USERTITLE_FIELD.type = 5
TEAMONEINFO_USERTITLE_FIELD.cpp_type = 1
TEAMONEINFO.name = "TeamOneInfo"
TEAMONEINFO.full_name = ".rpc.protocols.TeamOneInfo"
TEAMONEINFO.nested_types = {}
TEAMONEINFO.enum_types = {}
TEAMONEINFO.fields = {TEAMONEINFO_UID_FIELD, TEAMONEINFO_LEVEL_FIELD, TEAMONEINFO_NAME_FIELD, TEAMONEINFO_HEAD_FIELD, TEAMONEINFO_HEADFRAME_FIELD, TEAMONEINFO_GUILDNAME_FIELD, TEAMONEINFO_TEAM_FIELD, TEAMONEINFO_ISAPPLYED_FIELD, TEAMONEINFO_USERTITLE_FIELD}
TEAMONEINFO.fields = {TEAMONEINFO_UID_FIELD, TEAMONEINFO_LEVEL_FIELD, TEAMONEINFO_NAME_FIELD, TEAMONEINFO_HEAD_FIELD, TEAMONEINFO_HEADFRAME_FIELD, TEAMONEINFO_GUILDNAME_FIELD, TEAMONEINFO_TEAM_FIELD, TEAMONEINFO_ISAPPLYED_FIELD}
TEAMONEINFO.is_extendable = false
TEAMONEINFO.extensions = {}
MONSTERRANKINFO_NAME_FIELD.name = "name"
@ -5942,21 +5930,11 @@ REDONEDETAIL_POSITION_FIELD.default_value = 0
REDONEDETAIL_POSITION_FIELD.type = 5
REDONEDETAIL_POSITION_FIELD.cpp_type = 1
REDONEDETAIL_USERTITLE_FIELD.name = "userTitle"
REDONEDETAIL_USERTITLE_FIELD.full_name = ".rpc.protocols.RedOneDetail.userTitle"
REDONEDETAIL_USERTITLE_FIELD.number = 9
REDONEDETAIL_USERTITLE_FIELD.index = 8
REDONEDETAIL_USERTITLE_FIELD.label = 1
REDONEDETAIL_USERTITLE_FIELD.has_default_value = false
REDONEDETAIL_USERTITLE_FIELD.default_value = 0
REDONEDETAIL_USERTITLE_FIELD.type = 5
REDONEDETAIL_USERTITLE_FIELD.cpp_type = 1
REDONEDETAIL.name = "RedOneDetail"
REDONEDETAIL.full_name = ".rpc.protocols.RedOneDetail"
REDONEDETAIL.nested_types = {}
REDONEDETAIL.enum_types = {}
REDONEDETAIL.fields = {REDONEDETAIL_UID_FIELD, REDONEDETAIL_HEAD_FIELD, REDONEDETAIL_HEADFRAME_FIELD, REDONEDETAIL_NAME_FIELD, REDONEDETAIL_TIME_FIELD, REDONEDETAIL_COUNT_FIELD, REDONEDETAIL_ITEMID_FIELD, REDONEDETAIL_POSITION_FIELD, REDONEDETAIL_USERTITLE_FIELD}
REDONEDETAIL.fields = {REDONEDETAIL_UID_FIELD, REDONEDETAIL_HEAD_FIELD, REDONEDETAIL_HEADFRAME_FIELD, REDONEDETAIL_NAME_FIELD, REDONEDETAIL_TIME_FIELD, REDONEDETAIL_COUNT_FIELD, REDONEDETAIL_ITEMID_FIELD, REDONEDETAIL_POSITION_FIELD}
REDONEDETAIL.is_extendable = false
REDONEDETAIL.extensions = {}
EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD.name = "heroTid"

67
Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
View File

@ -15,7 +15,6 @@ TRIALHEROINFO_STAR_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_HEROHP_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor();
DIFFICULTMAPOPTION = protobuf.Descriptor();
DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor();
DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor();
@ -153,11 +152,8 @@ ENDLESSSETTEAMINDICATION_INFO_FIELD = protobuf.FieldDescriptor();
ENDLESSMAPCHANGE = protobuf.Descriptor();
ENDLESSMAPCHANGE_MAPID_FIELD = protobuf.FieldDescriptor();
ENDLESSMAPCHANGE_WORLDLEVEL_FIELD = protobuf.FieldDescriptor();
TRIALSAVEHERO = protobuf.Descriptor();
TRIALSAVEHERO_HEROID_FIELD = protobuf.FieldDescriptor();
TRIALSAVEHERO_POSITION_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFOSAVEREQUEST = protobuf.Descriptor();
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD = protobuf.FieldDescriptor();
TRIALHEROINFOSAVERESPONSE = protobuf.Descriptor();
TRIALHEROINFOSAVERESPONSE_HEROES_FIELD = protobuf.FieldDescriptor();
GETTRIALBOXREWARDREQUEST = protobuf.Descriptor();
@ -329,21 +325,11 @@ TRIALHEROINFO_SKINID_FIELD.default_value = 0
TRIALHEROINFO_SKINID_FIELD.type = 5
TRIALHEROINFO_SKINID_FIELD.cpp_type = 1
TRIALHEROINFO_POSITION_FIELD.name = "position"
TRIALHEROINFO_POSITION_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.position"
TRIALHEROINFO_POSITION_FIELD.number = 7
TRIALHEROINFO_POSITION_FIELD.index = 6
TRIALHEROINFO_POSITION_FIELD.label = 1
TRIALHEROINFO_POSITION_FIELD.has_default_value = false
TRIALHEROINFO_POSITION_FIELD.default_value = 0
TRIALHEROINFO_POSITION_FIELD.type = 5
TRIALHEROINFO_POSITION_FIELD.cpp_type = 1
TRIALHEROINFO.name = "TrialHeroInfo"
TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo"
TRIALHEROINFO.nested_types = {}
TRIALHEROINFO.enum_types = {}
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD}
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD}
TRIALHEROINFO.is_extendable = false
TRIALHEROINFO.extensions = {}
DIFFICULTMAPOPTION_ID_FIELD.name = "Id"
@ -1633,49 +1619,21 @@ ENDLESSMAPCHANGE.enum_types = {}
ENDLESSMAPCHANGE.fields = {ENDLESSMAPCHANGE_MAPID_FIELD, ENDLESSMAPCHANGE_WORLDLEVEL_FIELD}
ENDLESSMAPCHANGE.is_extendable = false
ENDLESSMAPCHANGE.extensions = {}
TRIALSAVEHERO_HEROID_FIELD.name = "heroId"
TRIALSAVEHERO_HEROID_FIELD.full_name = ".rpc.protocols.TrialSaveHero.heroId"
TRIALSAVEHERO_HEROID_FIELD.number = 1
TRIALSAVEHERO_HEROID_FIELD.index = 0
TRIALSAVEHERO_HEROID_FIELD.label = 1
TRIALSAVEHERO_HEROID_FIELD.has_default_value = false
TRIALSAVEHERO_HEROID_FIELD.default_value = ""
TRIALSAVEHERO_HEROID_FIELD.type = 9
TRIALSAVEHERO_HEROID_FIELD.cpp_type = 9
TRIALSAVEHERO_POSITION_FIELD.name = "position"
TRIALSAVEHERO_POSITION_FIELD.full_name = ".rpc.protocols.TrialSaveHero.position"
TRIALSAVEHERO_POSITION_FIELD.number = 2
TRIALSAVEHERO_POSITION_FIELD.index = 1
TRIALSAVEHERO_POSITION_FIELD.label = 1
TRIALSAVEHERO_POSITION_FIELD.has_default_value = false
TRIALSAVEHERO_POSITION_FIELD.default_value = 0
TRIALSAVEHERO_POSITION_FIELD.type = 5
TRIALSAVEHERO_POSITION_FIELD.cpp_type = 1
TRIALSAVEHERO.name = "TrialSaveHero"
TRIALSAVEHERO.full_name = ".rpc.protocols.TrialSaveHero"
TRIALSAVEHERO.nested_types = {}
TRIALSAVEHERO.enum_types = {}
TRIALSAVEHERO.fields = {TRIALSAVEHERO_HEROID_FIELD, TRIALSAVEHERO_POSITION_FIELD}
TRIALSAVEHERO.is_extendable = false
TRIALSAVEHERO.extensions = {}
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.name = "heroes"
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest.heroes"
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.number = 1
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.index = 0
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.label = 3
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.has_default_value = false
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.default_value = {}
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.message_type = TRIALSAVEHERO
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.type = 11
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.cpp_type = 10
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.name = "heroIds"
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest.heroIds"
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.number = 1
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.index = 0
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.label = 3
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.has_default_value = false
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.default_value = {}
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.type = 9
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.cpp_type = 9
TRIALHEROINFOSAVEREQUEST.name = "TrialHeroInfoSaveRequest"
TRIALHEROINFOSAVEREQUEST.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest"
TRIALHEROINFOSAVEREQUEST.nested_types = {}
TRIALHEROINFOSAVEREQUEST.enum_types = {}
TRIALHEROINFOSAVEREQUEST.fields = {TRIALHEROINFOSAVEREQUEST_HEROES_FIELD}
TRIALHEROINFOSAVEREQUEST.fields = {TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD}
TRIALHEROINFOSAVEREQUEST.is_extendable = false
TRIALHEROINFOSAVEREQUEST.extensions = {}
TRIALHEROINFOSAVERESPONSE_HEROES_FIELD.name = "heroes"
@ -2419,7 +2377,6 @@ TowerRewardResponse = protobuf.Message(TOWERREWARDRESPONSE)
TrialHeroInfo = protobuf.Message(TRIALHEROINFO)
TrialHeroInfoSaveRequest = protobuf.Message(TRIALHEROINFOSAVEREQUEST)
TrialHeroInfoSaveResponse = protobuf.Message(TRIALHEROINFOSAVERESPONSE)
TrialSaveHero = protobuf.Message(TRIALSAVEHERO)
UseAddHpItemRequest = protobuf.Message(USEADDHPITEMREQUEST)
UseTowerBuffRequest = protobuf.Message(USETOWERBUFFREQUEST)
UseTowerBuffResponse = protobuf.Message(USETOWERBUFFRESPONSE)

41
Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
View File

@ -75,28 +75,35 @@ function FormationEditPopup:BindEvent()
Util.AddClick(this.BtnSure, function()
local go=function()
local heros={}
--后端提交后删除
for i, v in ipairs(choosedList) do
local hero = {}
hero.heroId = v.did
hero.position = #choosedList + 1
table.insert(heros,hero)
end
table.sort(heros,function (a,b)
return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower
end)
for i = 1, #heros do
heros[i].position = i
table.insert(heros,v.did)
end
--后端提交后放开
-- for i, v in ipairs(choosedList) do
-- local hero = {}
-- hero.heroId = v.did
-- hero.position = #choosedList + 1
-- table.insert(heros,hero)
-- end
-- table.sort(heros,function (a,b)
-- return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower
-- end)
-- for i = 1, #heros do
-- heros[i].position = i
-- end
if #choosedList <= maxNum and #choosedList > 0 then
NetManager.TrialHeroInfoSaveRequest(heros,function(msg)
PopupTipPanel.ShowTip(Language[10670])
local heros = msg.heroes
if heros and #heros > 1 then
table.sort(heros,function (a,b)
return a.position < b.position
end)
end
MapManager.trialHeroInfo = heros
--后端提交后放开
-- local heros = msg.heroes
-- if heros and #heros > 1 then
-- table.sort(heros,function (a,b)
-- return a.position < b.position
-- end)
-- end
-- MapManager.trialHeroInfo = heros
MapManager.trialHeroInfo = msg.heroes
if func~=nil then --保存完毕后 将英雄did合集传递过去 此时我拥有这些英雄 不用担心英雄已被删除
func(heros)
end

39
Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
View File

@ -362,13 +362,6 @@ function this.InitTrialMission()
end
-- -- 刷新临时背包数据
-- function this.OnTempBagChanged()
-- if CarbonManager.difficulty == 2 then
-- this.RefreshBombNum()
-- end
-- end
-- 刷新砸炸弹、回春散数量
function this.RefreshBombNum()
-- 试炼副本才执行
@ -412,22 +405,7 @@ function this.InitTrial()
MapTrialManager.canMove = true
MapManager.isRemoving = false
MapManager.deadTime = 0
-- if not MapManager.isOpen then
-- this.TrialMissionStart()
-- end
end
-- -- 试炼副本进图流程
-- function this.TrialMissionStart()
-- NetManager.CarbonMissionStartRequest(function(msg)
-- Log("服务器返回消息")
-- local showStr = "试炼副本" .. MapTrialManager.curTowerLevel .."层"
-- UIManager.OpenPanel(UIName.CurlingTipPanel, showStr)
-- MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos)
-- PlayerManager.startTime = PlayerManager.serverTime
-- MissionManager.missionTime = 0
-- MapManager.isOpen = true
-- end)
-- end
-- 试炼副本显示时间
function this.TrialShowTime()
@ -498,14 +476,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
local itemId=trialSetting[1].HealingId[1]
local itemNum=trialSetting[1].HealingId[2]
this.selectHero:SetActive((true) and (MapManager.curCarbonType == CarBonTypeId.TRIAL))
-- local d={}
-- if isFirstIn then--若是第一次进 此时我必有该英雄 不用担心是已删除英雄 通过HeroDid去获取数据
-- for n, did in ipairs(isFirstData) do
-- local h=HeroManager.GetSingleHeroData(did)
-- table.insert(MapManager.trialHeroInfo,{heroId=h.dynamicId,tmpId=h.id,star=h.star,heroHp=10000,level=h.lv,skinId = h.skinId})
-- end
-- end
-- d = MapManager.trialHeroInfo
local d = MapManager.trialHeroInfo
for k = 1, this.s_grid.transform.childCount do
this.s_grid.transform:GetChild(k-1).gameObject:SetActive(false)
@ -518,9 +488,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
end
end
end
-- table.sort(d,function (a,b)
-- return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower
-- end)
for i, v in ipairs(d) do
if MapTrialManager.selectHeroDid ~= "" then
if MapTrialManager.selectHeroDid==v.heroId and v.heroHp <= 0 then
@ -546,12 +513,6 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
local choosed=Util.GetGameObject(o,"choosed")
local hpExp=Util.GetGameObject(o,"hpExp"):GetComponent("Slider")
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig[v.tmpId].Quality, v.star))
-- if not v.skinId or v.skinId == 0 then
-- icon.sprite= Util.LoadSprite(GetResourcePath(heroConfig[v.tmpId].Icon))
-- else
-- local heroSkinData = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",v.skinId)
-- icon.sprite= Util.LoadSprite(GetResourcePath(heroSkinData.Icon))
-- end
SetHeroIcon(v,icon,heroConfig[v.tmpId])
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[v.tmpId].PropertyName))
lv.text=v.level

23
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
View File

@ -367,13 +367,15 @@ function this.MapInfoRequest(mapModeId,func)
msg:ParseFromString(data)
MapManager.curMapId = msg.mapId
local heros = msg.infos
if heros then
table.sort(heros,function (a,b)
return a.position < b.position
end)
end
MapManager.trialHeroInfo = heros
----后端提交后放开
-- local heros = msg.infos
-- if heros then
-- table.sort(heros,function (a,b)
-- return a.position < b.position
-- end)
-- end
-- MapManager.trialHeroInfo = heros
MapManager.trialHeroInfo = msg.infos
MapTrialManager.curTowerLevel = msg.curTower
MapTrialManager.bombUsed = msg.bombUsed
MapTrialManager.killCount=msg.killCount
@ -4185,9 +4187,10 @@ end
function NetManager.TrialHeroInfoSaveRequest(heros,func)
local data = MapInfoProto_pb.TrialHeroInfoSaveRequest()
for i = 1, #heros do
local c = data.heroes:add()
c.heroId = heros[i].heroId
c.position = heros[i].position
-- local c = data.heroes:add()--后端提交后放开
-- c.heroId = heros[i].heroId--后端提交后放开
-- c.position = heros[i].position--后端提交后放开
data.heros:append(heros[i])
end
local msg = data:SerializeToString()