【神将来袭】加战斗了
parent
ecb948a613
commit
86d190572a
|
@ -2142,6 +2142,7 @@ BATTLE_TYPE = {
|
||||||
Xuanyuan = 13, -- 轩辕宝镜
|
Xuanyuan = 13, -- 轩辕宝镜
|
||||||
GuildTranscript = 14, -- 公会副本
|
GuildTranscript = 14, -- 公会副本
|
||||||
ARENA = 15, -- 竞技场
|
ARENA = 15, -- 竞技场
|
||||||
|
XINJIANG = 16, --新将来袭
|
||||||
}
|
}
|
||||||
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||||
[2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
[2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||||
|
|
|
@ -20,6 +20,12 @@ SELETSUBREWARDPOOLRESPONSE = protobuf.Descriptor();
|
||||||
SPECICALMONSTERCHOOSEREQUEST = protobuf.Descriptor();
|
SPECICALMONSTERCHOOSEREQUEST = protobuf.Descriptor();
|
||||||
SPECICALMONSTERCHOOSEREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
SPECICALMONSTERCHOOSEREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||||
SPECICALMONSTERCHOOSEREQUEST_SELECTID_FIELD = protobuf.FieldDescriptor();
|
SPECICALMONSTERCHOOSEREQUEST_SELECTID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
NEWGENERALATTACKREQUEST = protobuf.Descriptor();
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
NEWGENERALATTACKRESPONSE = protobuf.Descriptor();
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||||
|
|
||||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
|
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
|
||||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemRequest.itemId"
|
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemRequest.itemId"
|
||||||
|
@ -162,11 +168,69 @@ SPECICALMONSTERCHOOSEREQUEST.enum_types = {}
|
||||||
SPECICALMONSTERCHOOSEREQUEST.fields = {SPECICALMONSTERCHOOSEREQUEST_ACTIVITYID_FIELD, SPECICALMONSTERCHOOSEREQUEST_SELECTID_FIELD}
|
SPECICALMONSTERCHOOSEREQUEST.fields = {SPECICALMONSTERCHOOSEREQUEST_ACTIVITYID_FIELD, SPECICALMONSTERCHOOSEREQUEST_SELECTID_FIELD}
|
||||||
SPECICALMONSTERCHOOSEREQUEST.is_extendable = false
|
SPECICALMONSTERCHOOSEREQUEST.is_extendable = false
|
||||||
SPECICALMONSTERCHOOSEREQUEST.extensions = {}
|
SPECICALMONSTERCHOOSEREQUEST.extensions = {}
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackRequest.activityId"
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.number = 1
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.index = 0
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.label = 1
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.has_default_value = false
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.default_value = 0
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.type = 5
|
||||||
|
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.name = "privilageTypeId"
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackRequest.privilageTypeId"
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.number = 2
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.index = 1
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.label = 1
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.has_default_value = false
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.default_value = 0
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.type = 5
|
||||||
|
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
NEWGENERALATTACKREQUEST.name = "NewGeneralAttackRequest"
|
||||||
|
NEWGENERALATTACKREQUEST.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackRequest"
|
||||||
|
NEWGENERALATTACKREQUEST.nested_types = {}
|
||||||
|
NEWGENERALATTACKREQUEST.enum_types = {}
|
||||||
|
NEWGENERALATTACKREQUEST.fields = {NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD, NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD}
|
||||||
|
NEWGENERALATTACKREQUEST.is_extendable = false
|
||||||
|
NEWGENERALATTACKREQUEST.extensions = {}
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.name = "fightData"
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackResponse.fightData"
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.number = 1
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.index = 0
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.label = 1
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.has_default_value = false
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.default_value = nil
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.message_type = CommonProto_pb.FIGHTDATA
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.type = 11
|
||||||
|
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.cpp_type = 10
|
||||||
|
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.name = "drop"
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackResponse.drop"
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.number = 2
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.index = 1
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.label = 1
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.has_default_value = false
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.default_value = nil
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.type = 11
|
||||||
|
NEWGENERALATTACKRESPONSE_DROP_FIELD.cpp_type = 10
|
||||||
|
|
||||||
|
NEWGENERALATTACKRESPONSE.name = "NewGeneralAttackResponse"
|
||||||
|
NEWGENERALATTACKRESPONSE.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackResponse"
|
||||||
|
NEWGENERALATTACKRESPONSE.nested_types = {}
|
||||||
|
NEWGENERALATTACKRESPONSE.enum_types = {}
|
||||||
|
NEWGENERALATTACKRESPONSE.fields = {NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD, NEWGENERALATTACKRESPONSE_DROP_FIELD}
|
||||||
|
NEWGENERALATTACKRESPONSE.is_extendable = false
|
||||||
|
NEWGENERALATTACKRESPONSE.extensions = {}
|
||||||
|
|
||||||
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
|
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
|
||||||
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
|
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
|
||||||
GetShejiAwardRequest = protobuf.Message(GETSHEJIAWARDREQUEST)
|
GetShejiAwardRequest = protobuf.Message(GETSHEJIAWARDREQUEST)
|
||||||
GetShejiAwardResponse = protobuf.Message(GETSHEJIAWARDRESPONSE)
|
GetShejiAwardResponse = protobuf.Message(GETSHEJIAWARDRESPONSE)
|
||||||
|
NewGeneralAttackRequest = protobuf.Message(NEWGENERALATTACKREQUEST)
|
||||||
|
NewGeneralAttackResponse = protobuf.Message(NEWGENERALATTACKRESPONSE)
|
||||||
SeletSubRewardPoolRequest = protobuf.Message(SELETSUBREWARDPOOLREQUEST)
|
SeletSubRewardPoolRequest = protobuf.Message(SELETSUBREWARDPOOLREQUEST)
|
||||||
SeletSubRewardPoolResponse = protobuf.Message(SELETSUBREWARDPOOLRESPONSE)
|
SeletSubRewardPoolResponse = protobuf.Message(SELETSUBREWARDPOOLRESPONSE)
|
||||||
SpecicalMonsterChooseRequest = protobuf.Message(SPECICALMONSTERCHOOSEREQUEST)
|
SpecicalMonsterChooseRequest = protobuf.Message(SPECICALMONSTERCHOOSEREQUEST)
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -273,6 +273,9 @@ function this.InitPanelData()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if fightType== BATTLE_TYPE.XINJIANG then
|
||||||
|
PopupTipPanel.ShowTip("这是新将战斗")
|
||||||
|
end
|
||||||
|
|
||||||
this.InitOption()
|
this.InitOption()
|
||||||
end
|
end
|
||||||
|
|
|
@ -61,7 +61,15 @@ function XinJiangLaiXi:BindEvent()
|
||||||
|
|
||||||
Util.AddClick(this.fightBtn,function()
|
Util.AddClick(this.fightBtn,function()
|
||||||
if allData.fightTime > 0 then
|
if allData.fightTime > 0 then
|
||||||
PopupTipPanel.ShowTip("开始战斗!!!!~")
|
NetManager.NewGeneralAttackRequest(allData.activityId,2012,function(msg)
|
||||||
|
PrivilegeManager.RefreshPrivilegeUsedTimes(2012, 1)--更新特权
|
||||||
|
local fightData = BattleManager.GetBattleServerData(msg,0)
|
||||||
|
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.XINJIANG,function ()
|
||||||
|
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function ()
|
||||||
|
this:Refresh()
|
||||||
|
end)
|
||||||
|
end)
|
||||||
|
end)
|
||||||
else
|
else
|
||||||
if allData.buyTime > 0 then
|
if allData.buyTime > 0 then
|
||||||
local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP,10036, 1)
|
local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP,10036, 1)
|
||||||
|
@ -179,7 +187,7 @@ function XinJiangLaiXi:StoreShow()
|
||||||
if not this.shopView then
|
if not this.shopView then
|
||||||
this.shopView = SubUIManager.Open(SubUIConfig.ShopView, this.content.transform)
|
this.shopView = SubUIManager.Open(SubUIConfig.ShopView, this.content.transform)
|
||||||
end
|
end
|
||||||
this.shopView:ShowShop(SHOP_TYPE.ACTIVITY_SHOP,sortingOrder)
|
this.shopView:ShowShop(SHOP_TYPE.XINJIANG_SHOP,sortingOrder)
|
||||||
end
|
end
|
||||||
|
|
||||||
function XinJiangLaiXi:OnClose()
|
function XinJiangLaiXi:OnClose()
|
||||||
|
|
|
@ -4781,4 +4781,20 @@ function this.ChengeMonsterChooseRequest(activityId,selectId,func)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--新将来袭挑战
|
||||||
|
function this.NewGeneralAttackRequest(activityId,privilageTypeId,func)
|
||||||
|
local data = ActivityProto_pb.NewGeneralAttackRequest()
|
||||||
|
data.activityId = activityId
|
||||||
|
data.privilageTypeId = privilageTypeId
|
||||||
|
local msg = data:SerializeToString()
|
||||||
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.NewGeneralAttackRequest, MessageTypeProto_pb.NewGeneralAttackResponse, msg, function(buffer)
|
||||||
|
local data = buffer:DataByte()
|
||||||
|
local msg = ActivityProto_pb.NewGeneralAttackResponse()
|
||||||
|
msg:ParseFromString(data)
|
||||||
|
if func then
|
||||||
|
func(msg)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end
|
||||||
return this
|
return this
|
Loading…
Reference in New Issue