diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua index 498b6fa6e7..dcdd94dbec 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua @@ -276,7 +276,7 @@ LIFESTONEUPREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); LIFESTONEUPREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor(); LIFESTONEUPREQUEST_GRIDINDEX_FIELD = protobuf.FieldDescriptor(); LIFESTONEUPREQUEST_CURGEMID_FIELD = protobuf.FieldDescriptor(); -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD = protobuf.FieldDescriptor(); +LIFESTONEUPREQUEST_SELECTNUM_FIELD = protobuf.FieldDescriptor(); LIFESTONEUPRESPONSE = protobuf.Descriptor(); LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD = protobuf.FieldDescriptor(); LIFEGRIDCHANGEREQUEST = protobuf.Descriptor(); @@ -2751,22 +2751,21 @@ LIFESTONEUPREQUEST_CURGEMID_FIELD.default_value = 0 LIFESTONEUPREQUEST_CURGEMID_FIELD.type = 5 LIFESTONEUPREQUEST_CURGEMID_FIELD.cpp_type = 1 -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.name = "costStoneList" -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.full_name = ".rpc.protocols.LifeStoneUpRequest.costStoneList" -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.number = 5 -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.index = 4 -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.label = 3 -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.has_default_value = false -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.default_value = {} -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.message_type = CommonProto_pb.LIFESTONEINFO -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.type = 11 -LIFESTONEUPREQUEST_COSTSTONELIST_FIELD.cpp_type = 10 +LIFESTONEUPREQUEST_SELECTNUM_FIELD.name = "selectNum" +LIFESTONEUPREQUEST_SELECTNUM_FIELD.full_name = ".rpc.protocols.LifeStoneUpRequest.selectNum" +LIFESTONEUPREQUEST_SELECTNUM_FIELD.number = 5 +LIFESTONEUPREQUEST_SELECTNUM_FIELD.index = 4 +LIFESTONEUPREQUEST_SELECTNUM_FIELD.label = 1 +LIFESTONEUPREQUEST_SELECTNUM_FIELD.has_default_value = false +LIFESTONEUPREQUEST_SELECTNUM_FIELD.default_value = 0 +LIFESTONEUPREQUEST_SELECTNUM_FIELD.type = 5 +LIFESTONEUPREQUEST_SELECTNUM_FIELD.cpp_type = 1 LIFESTONEUPREQUEST.name = "LifeStoneUpRequest" LIFESTONEUPREQUEST.full_name = ".rpc.protocols.LifeStoneUpRequest" LIFESTONEUPREQUEST.nested_types = {} LIFESTONEUPREQUEST.enum_types = {} -LIFESTONEUPREQUEST.fields = {LIFESTONEUPREQUEST_TYPE_FIELD, LIFESTONEUPREQUEST_GRIDID_FIELD, LIFESTONEUPREQUEST_GRIDINDEX_FIELD, LIFESTONEUPREQUEST_CURGEMID_FIELD, LIFESTONEUPREQUEST_COSTSTONELIST_FIELD} +LIFESTONEUPREQUEST.fields = {LIFESTONEUPREQUEST_TYPE_FIELD, LIFESTONEUPREQUEST_GRIDID_FIELD, LIFESTONEUPREQUEST_GRIDINDEX_FIELD, LIFESTONEUPREQUEST_CURGEMID_FIELD, LIFESTONEUPREQUEST_SELECTNUM_FIELD} LIFESTONEUPREQUEST.is_extendable = false LIFESTONEUPREQUEST.extensions = {} LIFESTONEUPRESPONSE_LIFEGRIDINFO_FIELD.name = "lifeGridInfo" diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua index e72614cb7b..d2d4443ab5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua @@ -38,10 +38,10 @@ function Gem:BindEvent() NetManager.LifeStoneUpRequest(2) end) Util.AddClick(self.fast, function() - NetManager.LifeStoneUpRequest(4,45079) + NetManager.LifeStoneUpRequest(4,nil,nil,45079) end) Util.AddClick(self.more, function() - NetManager.LifeStoneUpRequest(2,45071) + NetManager.LifeStoneUpRequest(2,nil,nil,45071,6) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 213234b88b..bec246493a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6242,15 +6242,13 @@ function NetManager.ContinueBuyItemRequest(_goodId,fun) end --命石合成 -function this.LifeStoneUpRequest(_type,_gridId,_gridIndex,_curGemId,_costStoneList,func) - local data = HeroInfoProto_pb.RidingSwardRewardRequest() +function this.LifeStoneUpRequest(_type,_gridId,_gridIndex,_curGemId,_selectNum,func) + local data = HeroInfoProto_pb.LifeStoneUpRequest() data.type = _type data.gridId = _gridId data.gridIndex = _gridIndex data.curGemId = _curGemId - for i = 1, #_costStoneList do - data.costStoneList:append(_costStoneList[i]) - end + data.selectNum = _selectNum local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.LifeStoneUpRequest , MessageTypeProto_pb.LifeStoneUpResponse , msg, function(buffer) local data = buffer:DataByte() @@ -6267,7 +6265,7 @@ end --命石穿戴 function this.LifeGridChangeRequest(_type,_gridId,_gridIndex,_curGemId,func) - local data = HeroInfoProto_pb.RidingSwardRewardRequest() + local data = HeroInfoProto_pb.LifeGridChangeRequest() data.type = _type data.position = _gridId data.index = _gridIndex