diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 541fdfc39f..984f523216 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -67,7 +67,7 @@ function GMPanel:InitComponent() {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = Language[11176], inputTip = {Language[11177]}, callBack = this.SetSunLongScroe}, -- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "13#%s#0", btnTip = "解锁", inputTip = {"外敌ID"}, callBack = nil}, {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "11#%s#0", btnTip = Language[10732], inputTip = {Language[11178]}, callBack = this.SetVip}, - {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "7#%s#0", btnTip = Language[11179],inputTip = {Language[11180]}, callBack = nil}, + {type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "7#%s#0", btnTip = Language[11179],inputTip = {Language[11180]}, callBack = this.LVPlayer}, -- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "10#4#%s", btnTip = "设置服务器时间", inputTip = {"例:20170801190000"}, callBack = nil}, -- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "10#%s#0", btnTip = "搜索地图", inputTip = {"输入地图Id"}, callBack = nil}, {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "1#%s", btnTip = Language[11181], inputTip = {Language[11182]}, callBack = nil}, @@ -120,6 +120,12 @@ function GMPanel:InitComponent() this._GMItem = Util.GetGameObject(self.gameObject, "item") end +function GMPanel.LVPlayer(lv) + NetManager.GMEvent(string.format("7#%s#0",lv)) + Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnLevelChange) +end + + --绑定事件(用于子类重写) function GMPanel:BindEvent() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 257f53a78b..0547837940 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -233,12 +233,12 @@ function this.AllBookEnableResponse(func) local data = buffer:DataByte() local msg = HeroInfoProto_pb.GetAllPropertyInfoResponse() msg:ParseFromString(data) - if msg.allBook then - LogGreen("#msg.allBook:"..#msg.allBook) - for k,v in ipairs(msg.allBook) do + if msg.allBookEnabled then + LogGreen("#msg.allBook:"..#msg.allBookEnabled) + for k,v in ipairs(msg.allBookEnabled) do LogGreen("msg.allBook:k"..k.." data:"..v) end - TianShuMiJuanManger.UpdateFetterId(msg.allBook) + TianShuMiJuanManger.UpdateFetterId(msg.allBookEnabled) end if msg.equipGot then LogGreen("#msg.equipGot:"..#msg.equipGot) @@ -4641,7 +4641,7 @@ function this.PokemonBookEnableRequest(id,func) local data = HeroInfoProto_pb.AllBookEnableRequest() data.bookId = id local msg = data:SerializeToString() - Network:SendMessageWithCallBack(MessageTypeProto_pb.ALL_BOOK_ENABLE_REQUEST , MessageTypeProto_pb.ALL_BOOK_ENABLE_REPONSE , msg, function(buffer) + Network:SendMessageWithCallBack(MessageTypeProto_pb.ALL_BOOK_ENABLE_REQUEST, MessageTypeProto_pb.ALL_BOOK_ENABLE_REPONSE, msg, function(buffer) local data = buffer:DataByte() local msg = HeroInfoProto_pb.PokemonBookEnableResponse() msg:ParseFromString(data) diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua index ad2cc618b5..b487465fa2 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua @@ -39,7 +39,6 @@ function this.CreatSingleConfigData(configData) data.activeParaTip = data.activeParaTip..config.Info.."+"..value .. " " end data.activeParaTip = rtrim(data.activeParaTip) - LogGreen("id:"..data.id.." tip:"..data.activeParaTip) data.activeForce = configData.ActiveForce data.fetterType = configData.FetterType data.reward = configData.Reward @@ -110,6 +109,7 @@ end --根据type获取羁绊数据 function this.GetFetterDataByFetterType(fetterType) + LogGreen("fetterType:"..fetterType) local data = {} for k,v in pairs(this.fetterData) do if v.fetterType == fetterType and v.enabled ~= -2 then