diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 242332d0a0..a7f2dcfc48 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -618,6 +618,7 @@ HELPFIGHTLIST_USERNAME_FIELD = protobuf.FieldDescriptor(); HELPFIGHTLIST_GUILDNAME_FIELD = protobuf.FieldDescriptor(); HELPFIGHTLIST_TRAILTYPE_FIELD = protobuf.FieldDescriptor(); HELPFIGHTLIST_HERO_FIELD = protobuf.FieldDescriptor(); +HELPFIGHTLIST_STATE_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode" @@ -6472,11 +6473,21 @@ HELPFIGHTLIST_HERO_FIELD.message_type = HERO HELPFIGHTLIST_HERO_FIELD.type = 11 HELPFIGHTLIST_HERO_FIELD.cpp_type = 10 +HELPFIGHTLIST_STATE_FIELD.name = "state" +HELPFIGHTLIST_STATE_FIELD.full_name = ".rpc.protocols.HelpFightList.state" +HELPFIGHTLIST_STATE_FIELD.number = 6 +HELPFIGHTLIST_STATE_FIELD.index = 5 +HELPFIGHTLIST_STATE_FIELD.label = 1 +HELPFIGHTLIST_STATE_FIELD.has_default_value = false +HELPFIGHTLIST_STATE_FIELD.default_value = 0 +HELPFIGHTLIST_STATE_FIELD.type = 5 +HELPFIGHTLIST_STATE_FIELD.cpp_type = 1 + HELPFIGHTLIST.name = "HelpFightList" HELPFIGHTLIST.full_name = ".rpc.protocols.HelpFightList" HELPFIGHTLIST.nested_types = {} HELPFIGHTLIST.enum_types = {} -HELPFIGHTLIST.fields = {HELPFIGHTLIST_UID_FIELD, HELPFIGHTLIST_USERNAME_FIELD, HELPFIGHTLIST_GUILDNAME_FIELD, HELPFIGHTLIST_TRAILTYPE_FIELD, HELPFIGHTLIST_HERO_FIELD} +HELPFIGHTLIST.fields = {HELPFIGHTLIST_UID_FIELD, HELPFIGHTLIST_USERNAME_FIELD, HELPFIGHTLIST_GUILDNAME_FIELD, HELPFIGHTLIST_TRAILTYPE_FIELD, HELPFIGHTLIST_HERO_FIELD, HELPFIGHTLIST_STATE_FIELD} HELPFIGHTLIST.is_extendable = false HELPFIGHTLIST.extensions = {} diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua index 429e6bcc47..5896d0509d 100644 --- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua @@ -64,7 +64,6 @@ GETPLAYERINFORESPONSE_WORLDLEVE_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD = protobuf.FieldDescriptor(); -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD = protobuf.FieldDescriptor(); GETITEMINFOREQUEST = protobuf.Descriptor(); GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor(); GETITEMINFORESPONSE = protobuf.Descriptor(); @@ -487,7 +486,6 @@ USEHELPHEROREQUEST = protobuf.Descriptor(); USEHELPHEROREQUEST_HEROID_FIELD = protobuf.FieldDescriptor(); USEHELPHEROREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); USEHELPHEROREQUEST_STATUS_FIELD = protobuf.FieldDescriptor(); -USEHELPHERORESPONSE = protobuf.Descriptor(); GETFOURCHALLENGERECORDREQUEST = protobuf.Descriptor(); GETFOURCHALLENGERECORDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); GETFOURCHALLENGERECORDREQUEST_TIER_FIELD = protobuf.FieldDescriptor(); @@ -1091,21 +1089,11 @@ GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD.message_type = CommonProto_pb.HELPFIGH GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD.type = 11 GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD.cpp_type = 10 -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.name = "isUseHelpHero" -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.isUseHelpHero" -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.number = 38 -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.index = 37 -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.label = 3 -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.has_default_value = false -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.default_value = {} -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.type = 5 -GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD.cpp_type = 1 - GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse" GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse" GETPLAYERINFORESPONSE.nested_types = {} GETPLAYERINFORESPONSE.enum_types = {} -GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD, GETPLAYERINFORESPONSE_ISUSEHELPHERO_FIELD} +GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD} GETPLAYERINFORESPONSE.is_extendable = false GETPLAYERINFORESPONSE.extensions = {} GETITEMINFOREQUEST_INDEX_FIELD.name = "index" @@ -4950,13 +4938,6 @@ USEHELPHEROREQUEST.enum_types = {} USEHELPHEROREQUEST.fields = {USEHELPHEROREQUEST_HEROID_FIELD, USEHELPHEROREQUEST_TYPE_FIELD, USEHELPHEROREQUEST_STATUS_FIELD} USEHELPHEROREQUEST.is_extendable = false USEHELPHEROREQUEST.extensions = {} -USEHELPHERORESPONSE.name = "UseHelpHeroResponse" -USEHELPHERORESPONSE.full_name = ".rpc.protocols.UseHelpHeroResponse" -USEHELPHERORESPONSE.nested_types = {} -USEHELPHERORESPONSE.enum_types = {} -USEHELPHERORESPONSE.fields = {} -USEHELPHERORESPONSE.is_extendable = false -USEHELPHERORESPONSE.extensions = {} GETFOURCHALLENGERECORDREQUEST_TYPE_FIELD.name = "type" GETFOURCHALLENGERECORDREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.GetFourChallengeRecordRequest.type" GETFOURCHALLENGERECORDREQUEST_TYPE_FIELD.number = 1 @@ -5192,7 +5173,6 @@ UseAndPriceItemResponse = protobuf.Message(USEANDPRICEITEMRESPONSE) UseHeadFrameRequest = protobuf.Message(USEHEADFRAMEREQUEST) UseHeadFrameResponse = protobuf.Message(USEHEADFRAMERESPONSE) UseHelpHeroRequest = protobuf.Message(USEHELPHEROREQUEST) -UseHelpHeroResponse = protobuf.Message(USEHELPHERORESPONSE) UserForceChangeRequest = protobuf.Message(USERFORCECHANGEREQUEST) ViewHeroInfoRequest = protobuf.Message(VIEWHEROINFOREQUEST) ViewHeroInfoResponse = protobuf.Message(VIEWHEROINFORESPONSE) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index d31a1b13d0..5ca4ae3270 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -380,8 +380,10 @@ end --获取我的助战 function this.GetFriendHelpHero(trailType) if this.myHelpHeroData[trailType] then + LogGreen(this.myHelpHeroData[trailType].dynamicId) return this.myHelpHeroData[trailType] end + LogGreen("没有选择助战") return nil end ------------------------------四灵试炼 红点--------------------------------------- diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 38e14290fc..1b0abe2425 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4857,4 +4857,20 @@ function NetManager.SetHelpHeroRequest(did,func) end) end +function NetManager.UseHelpHeroRequest(heroId,type,status,func) + local data = PlayerInfoProto_pb.UseHelpHeroRequest() + data.heroId = heroId + data.type = type + data.status = status + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.UseHelpHeroRequest, MessageTypeProto_pb.UseHelpHeroResponse, msg, function(buffer) + local data = buffer:DataByte() + local msg = PlayerInfoProto_pb.UseHelpHeroResponse() + msg:ParseFromString(data) + if func then + func(msg) + end + end) +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua index e858d1c4fc..e6a4403b63 100644 --- a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua +++ b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua @@ -55,7 +55,7 @@ function FourTrailSingleHelpHero:OnOpen(curType,...) end self.tip.text = "来自"..from..""..player.userName.."" self.tip.gameObject:SetActive(true) - self:SetIcon1(heroData) + self:SetIcon1(heroData,player) else self.tip.gameObject:SetActive(false) self:SetIcon2(heroData) @@ -65,60 +65,66 @@ function FourTrailSingleHelpHero:OnOpen(curType,...) end) end -function FourTrailSingleHelpHero:SetIcon1(heroData) +function FourTrailSingleHelpHero:SetIcon1(heroData,player) local tempData = MonsterCampManager.GetFriendHelpHero(self.curType) if tempData and heroData.dynamicId == tempData.hero.dynamicId then if tempData.state == 1 then self.select.sprite = Util.LoadSprite("s_silingshilian_yishiyong") self.selectText.text = "" + self.btn:GetComponent("Button").enabled = false + else + self.select.sprite = Util.LoadSprite("r_hero_button_001") + self.selectText.text = "取消选择" + Util.AddOnceClick(self.btn, function() + NetManager.UseHelpHeroRequest(heroData.dynamicId,self.curType,0,function() + MonsterCampManager.SetFriendHelpHero(nil,self.curType) + self:SetIcon1(heroData) + end) + end) end - self.select.sprite = Util.LoadSprite("r_hero_button_003") - self.selectText.text = "取消选择" - Util.AddOnceClick(self.btn, function() - --发协议 - MonsterCampManager.SetFriendHelpHero(nil,self.curType) - self:SetIcon1(heroData) - end) elseif self.heifhtPower < heroData.warPower then self.select.sprite = Util.LoadSprite("s_silingshilian_zhanliguogao") self.selectText.text = "" - Util.AddOnceClick(self.btn, function() - --发协议 - MonsterCampManager.SetFriendHelpHero(nil,self.curType) - self:SetIcon1(heroData) - end) + self.btn:GetComponent("Button").enabled = false else self.select.sprite = Util.LoadSprite("r_hero_button_001") self.selectText.text = "选择神将" + self.btn:GetComponent("Button").enabled = true Util.AddOnceClick(self.btn, function() if tempData and tempData.state == 0 then PopupTipPanel.ShowTip("已选择其他神将!") elseif tempData and tempData.state == 1 then PopupTipPanel.ShowTip("今日已无使用助战次数!") else - MonsterCampManager.SetFriendHelpHero(msg,self.curType) - self:SetIcon1(heroData) + NetManager.UseHelpHeroRequest(heroData.dynamicId,self.curType,1,function() + MonsterCampManager.SetFriendHelpHero(player,self.curType) + self:SetIcon1(heroData) + end) end end) end end function FourTrailSingleHelpHero:SetIcon2(heroData) + LogGreen(heroData.dynamicId) local tempData = MonsterCampManager.GetFriendHelpHero(self.curType) + LogGreen(heroData.dynamicId) if tempData and heroData.dynamicId == tempData.dynamicId then self.select.sprite = Util.LoadSprite("s_silingshilian_zhiyuanzhong") + self.select:SetNativeSize() self.selectText.text = "" Util.AddOnceClick(self.btn, function() end) else self.select.sprite = Util.LoadSprite("r_hero_button_001") + self.select:SetNativeSize() self.selectText.text = "选择神将" Util.AddOnceClick(self.btn, function() if tempData then PopupTipPanel.ShowTip("已选择支援神将!") else NetManager.SetHelpHeroRequest(heroData.dynamicId,function(msg) - MonsterCampManager.SetMyHelpHeroData(self.curType,heroData) + MonsterCampManager.SetMyHelpHeroData(self.curType,heroData,nil) UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1) self:SetIcon2(heroData) end)