助阵修改
parent
18c063340c
commit
f876b44ee1
|
@ -410,6 +410,9 @@ ASSISTUPDOWNREQUEST = protobuf.Descriptor();
|
|||
ASSISTUPDOWNREQUEST_ID_FIELD = protobuf.FieldDescriptor();
|
||||
ASSISTUPDOWNREQUEST_HEROID_FIELD = protobuf.FieldDescriptor();
|
||||
ASSISTUPDOWNREQUEST_OPERATE_FIELD = protobuf.FieldDescriptor();
|
||||
ASSISTBATCHUPDOWNREQUEST = protobuf.Descriptor();
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD = protobuf.FieldDescriptor();
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD = protobuf.FieldDescriptor();
|
||||
QUERYBOOKIMAGEREQUEST = protobuf.Descriptor();
|
||||
QUERYBOOKIMAGEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
QUERYBOOKIMAGERESPONSE = protobuf.Descriptor();
|
||||
|
@ -4109,6 +4112,34 @@ ASSISTUPDOWNREQUEST.enum_types = {}
|
|||
ASSISTUPDOWNREQUEST.fields = {ASSISTUPDOWNREQUEST_ID_FIELD, ASSISTUPDOWNREQUEST_HEROID_FIELD, ASSISTUPDOWNREQUEST_OPERATE_FIELD}
|
||||
ASSISTUPDOWNREQUEST.is_extendable = false
|
||||
ASSISTUPDOWNREQUEST.extensions = {}
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.name = "boxs"
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.full_name = ".rpc.protocols.AssistBatchUpDownRequest.boxs"
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.number = 1
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.index = 0
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.label = 3
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.has_default_value = false
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.default_value = {}
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.message_type = CommonProto_pb.ASSISTBOX
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.type = 11
|
||||
ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD.cpp_type = 10
|
||||
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.name = "operate"
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.full_name = ".rpc.protocols.AssistBatchUpDownRequest.operate"
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.number = 3
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.index = 1
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.label = 1
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.has_default_value = false
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.default_value = 0
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.type = 5
|
||||
ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD.cpp_type = 1
|
||||
|
||||
ASSISTBATCHUPDOWNREQUEST.name = "AssistBatchUpDownRequest"
|
||||
ASSISTBATCHUPDOWNREQUEST.full_name = ".rpc.protocols.AssistBatchUpDownRequest"
|
||||
ASSISTBATCHUPDOWNREQUEST.nested_types = {}
|
||||
ASSISTBATCHUPDOWNREQUEST.enum_types = {}
|
||||
ASSISTBATCHUPDOWNREQUEST.fields = {ASSISTBATCHUPDOWNREQUEST_BOXS_FIELD, ASSISTBATCHUPDOWNREQUEST_OPERATE_FIELD}
|
||||
ASSISTBATCHUPDOWNREQUEST.is_extendable = false
|
||||
ASSISTBATCHUPDOWNREQUEST.extensions = {}
|
||||
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.name = "type"
|
||||
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.QueryBookImageRequest.type"
|
||||
QUERYBOOKIMAGEREQUEST_TYPE_FIELD.number = 1
|
||||
|
@ -4145,6 +4176,7 @@ QUERYBOOKIMAGERESPONSE.is_extendable = false
|
|||
QUERYBOOKIMAGERESPONSE.extensions = {}
|
||||
|
||||
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
|
||||
AssistBatchUpDownRequest = protobuf.Message(ASSISTBATCHUPDOWNREQUEST)
|
||||
AssistInfoRequest = protobuf.Message(ASSISTINFOREQUEST)
|
||||
AssistInfoResponse = protobuf.Message(ASSISTINFORESPONSE)
|
||||
AssistUpDownRequest = protobuf.Message(ASSISTUPDOWNREQUEST)
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -33,6 +33,9 @@ function this.AddOrRemoveHero(_pos,_type,_id)
|
|||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function this.CheckRedPoint()
|
||||
for i = 1, #this.HelpFightList do
|
||||
local isCan=this.CheckRedPointByPosition(i)
|
||||
|
|
|
@ -19,8 +19,8 @@ function HelpFightPanel:InitComponent()
|
|||
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollRect.transform,self.prefab, self.ScrollBar, Vector2.New(v2.width, v2.height), 1, 4, Vector2.New(75,20))
|
||||
self.ScrollView.moveTween.MomentumAmount = 1
|
||||
self.ScrollView.moveTween.Strength = 1
|
||||
|
||||
|
||||
self.btn_up=Util.GetGameObject(self.gameObject, "btn_up")
|
||||
self.btn_down=Util.GetGameObject(self.gameObject, "btn_down")
|
||||
end
|
||||
|
||||
|
||||
|
@ -34,9 +34,28 @@ function HelpFightPanel:BindEvent()
|
|||
UIManager.OpenPanel(UIName.HelpPopup, 146,0,0)
|
||||
end)
|
||||
|
||||
|
||||
Util.AddClick(self.btn_up,function()
|
||||
local selectList={}
|
||||
local heroList=HelpFightManager.HelpFightList
|
||||
local dataList={}
|
||||
for key,v in ConfigPairs(assConfig) do
|
||||
if heroList[key].state==1 then
|
||||
local heroList=HeroManager.GetHeroDatasByNaturalAndProfessionNoListHero(v.Quality,v.ProfessionLimit,selectList)
|
||||
if heroList and #heroList>0 then
|
||||
local idDyn=heroList[1].dynamicId
|
||||
table.insert(selectList,idDyn)
|
||||
dataList[key]=idDyn
|
||||
end
|
||||
end
|
||||
end
|
||||
NetManager.AssistBatchUpDownRequest(dataList,1,function()
|
||||
|
||||
end)
|
||||
end)
|
||||
|
||||
|
||||
Util.AddClick(self.btn_down,function()
|
||||
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
|
@ -79,6 +98,7 @@ function HelpFightPanel:OnShow()
|
|||
data.hero=HeroManager.GetSingleHeroData(heroList[key].heroId)
|
||||
end
|
||||
data.state=heroList[key].state
|
||||
LogError("key===================="..key.." state======"..data.state)
|
||||
list[key]=data
|
||||
end
|
||||
LogError("list len==============="..#list)
|
||||
|
|
|
@ -613,6 +613,31 @@ end
|
|||
|
||||
|
||||
|
||||
--获取所有英雄信息不包含list里的英雄
|
||||
function this.GetHeroDatasByNaturalAndProfessionNoListHero(_qua,_pro,_list)
|
||||
|
||||
local heros = {}
|
||||
for i, v in pairs(heroDatas) do
|
||||
if v.heroConfig.Natural == _qua and v.heroConfig.PropertyName==_pro and CheckListIsContainValue1(_list,v.dynamicId)==false then
|
||||
table.insert(heros, v)
|
||||
end
|
||||
end
|
||||
table.sort(
|
||||
heros,
|
||||
function(a, b)
|
||||
if a.star == b.star then
|
||||
return a.lv>b.lv
|
||||
else
|
||||
return a.star > b.star
|
||||
end
|
||||
|
||||
end
|
||||
)
|
||||
return heros
|
||||
end
|
||||
|
||||
|
||||
|
||||
--获取该静态id sortid最小的英雄信息
|
||||
function this.GetHeroDataByHeroSIdAndMinSortId(_heroSId)
|
||||
local heroData = {}
|
||||
|
|
|
@ -7921,6 +7921,7 @@ function NetManager.SoldierFightCheckRequest(_type,_func)
|
|||
end)
|
||||
end
|
||||
|
||||
|
||||
--助阵*****************
|
||||
--获取助战信息
|
||||
function NetManager.AssistInfoRequest(_func)
|
||||
|
@ -7945,7 +7946,7 @@ function NetManager.AssistInfoRequest(_func)
|
|||
end)
|
||||
end
|
||||
|
||||
--上下阵助战
|
||||
--上下阵助阵
|
||||
function NetManager.AssistUpDownRequest(_id,_heroId,_type, _func)
|
||||
local data=HeroInfoProto_pb.AssistUpDownRequest()
|
||||
data.id=_id
|
||||
|
@ -7970,6 +7971,42 @@ function NetManager.AssistUpDownRequest(_id,_heroId,_type, _func)
|
|||
end)
|
||||
end
|
||||
|
||||
--一键上下阵助阵
|
||||
function NetManager.AssistBatchUpDownRequest(_list,_type, _func)
|
||||
local data=HeroInfoProto_pb.AssistBatchUpDownRequest()
|
||||
data.boxs={}
|
||||
-- for i = 1, # do
|
||||
-- local c = data.heroes:add()--后端提交后放开
|
||||
-- c.heroId = heros[i].heroId--后端提交后放开
|
||||
-- c.position = heros[i].position--后端提交后放开
|
||||
-- end
|
||||
for k, v in pairs(_list) do
|
||||
local c=data.boxs:add()
|
||||
c.id=k
|
||||
c.heroId=v
|
||||
end
|
||||
data.operate=_type
|
||||
local oldWarPower=FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.AssistBatchUpDownRequest,MessageTypeProto_pb.AssistBatchUpDownResponse,msg,function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
for k, v in pairs(_list) do
|
||||
HelpFightManager.AddOrRemoveHero(k,_type,v)
|
||||
end
|
||||
|
||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HelpFight)
|
||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
if oldWarPower ~= tempPower then
|
||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||
end
|
||||
--HelpFightManager.InitData(msg)
|
||||
if _func then
|
||||
_func()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
--礼物升星
|
||||
function NetManager.GiftEquipUpStarRequest(_id,func)
|
||||
|
@ -8245,7 +8282,6 @@ function NetManager.AnewRechargeOrderRequest(func)
|
|||
Network:SendMessageWithCallBack(MessageTypeProto_pb.AnewRechargeOrderRequest,MessageTypeProto_pb.AnewRechargeOrderResponse,msg,function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.AnewRechargeOrderResponse()
|
||||
LogError("111111111111111111111111111111111111111111111")
|
||||
msg:ParseFromString(data)
|
||||
if func then
|
||||
func(msg)
|
||||
|
|
Loading…
Reference in New Issue