From 49a4b32138b1555f5b5fc70a8f7199c035fe4c57 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 1 Sep 2021 10:43:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E7=AC=AC=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FourElementMonsterCampPanel.prefab | 10 +- .../~Lua/Message/ActivityProto_pb.lua | 13 +- .../~Lua/Modules/Bag/BagManager.lua | 4 +- .../FourElementMonsterCampPanel.lua | 6 +- .../~Lua/Modules/Net/NetManager.lua | 8 +- .../Modules/SacredTree/SacredTreePanel.lua | 191 +++++++++--------- 6 files changed, 125 insertions(+), 107 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index c4b1f1447b..4245b8f88f 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -4979,7 +4979,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -102, y: -319.6} + m_AnchoredPosition: {x: -102, y: -319.59998} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.49999994, y: 0.5} --- !u!222 &5275389917384150032 @@ -5096,7 +5096,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101.5, y: -185.7} + m_AnchoredPosition: {x: -101.5, y: -185.70001} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4269923484805502012 @@ -7034,7 +7034,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101.5, y: -80.61} + m_AnchoredPosition: {x: -101.5, y: -80.60986} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1883945852554000627 @@ -7304,7 +7304,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -42.799988, y: 114.9} + m_AnchoredPosition: {x: -42.80005, y: 114.9} m_SizeDelta: {x: 40, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1534964552133398209 @@ -7543,7 +7543,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4E00\u952E\u626B\u8361" + m_Text: "\u5FEB\u901F\u6311\u6218" --- !u!1 &4749431587513265945 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua index bf933aab32..b73aab2d24 100644 --- a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua @@ -27,6 +27,7 @@ NEWGENERALATTACKRESPONSE = protobuf.Descriptor(); NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor(); NEWGENERALATTACKRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); UPGRADEGODTREEREQUEST = protobuf.Descriptor(); +UPGRADEGODTREEREQUEST_COUNT_FIELD = protobuf.FieldDescriptor(); UPGRADEGODTREERESPONSE = protobuf.Descriptor(); GOODLUCKREQUEST = protobuf.Descriptor(); GOODLUCKREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor(); @@ -257,11 +258,21 @@ NEWGENERALATTACKRESPONSE.enum_types = {} NEWGENERALATTACKRESPONSE.fields = {NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD, NEWGENERALATTACKRESPONSE_DROP_FIELD} NEWGENERALATTACKRESPONSE.is_extendable = false NEWGENERALATTACKRESPONSE.extensions = {} +UPGRADEGODTREEREQUEST_COUNT_FIELD.name = "count" +UPGRADEGODTREEREQUEST_COUNT_FIELD.full_name = ".rpc.protocols.UpgradeGodTreeRequest.count" +UPGRADEGODTREEREQUEST_COUNT_FIELD.number = 1 +UPGRADEGODTREEREQUEST_COUNT_FIELD.index = 0 +UPGRADEGODTREEREQUEST_COUNT_FIELD.label = 1 +UPGRADEGODTREEREQUEST_COUNT_FIELD.has_default_value = false +UPGRADEGODTREEREQUEST_COUNT_FIELD.default_value = 0 +UPGRADEGODTREEREQUEST_COUNT_FIELD.type = 5 +UPGRADEGODTREEREQUEST_COUNT_FIELD.cpp_type = 1 + UPGRADEGODTREEREQUEST.name = "UpgradeGodTreeRequest" UPGRADEGODTREEREQUEST.full_name = ".rpc.protocols.UpgradeGodTreeRequest" UPGRADEGODTREEREQUEST.nested_types = {} UPGRADEGODTREEREQUEST.enum_types = {} -UPGRADEGODTREEREQUEST.fields = {} +UPGRADEGODTREEREQUEST.fields = {UPGRADEGODTREEREQUEST_COUNT_FIELD} UPGRADEGODTREEREQUEST.is_extendable = false UPGRADEGODTREEREQUEST.extensions = {} UPGRADEGODTREERESPONSE.name = "UpgradeGodTreeResponse" diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index f648cf2d14..88729ffe8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -162,14 +162,12 @@ end function this.HeroLvUpUpdateItemsNum(_itemId, deleteNum) if this.bagDatas[_itemId] then this.bagDatas[_itemId].num = this.bagDatas[_itemId].num - deleteNum - Log("扣东西啦" .. _itemId .. " " .. deleteNum) if this.bagDatas[_itemId].num < 0 then this.bagDatas[_itemId].num = 0 - Log("东西扣多了啦" .. _itemId .. " " .. deleteNum) end Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) else - Log("扣了不存在的item" .. _itemId .. " " .. deleteNum) + LogError("扣了不存在的item" .. _itemId .. " " .. deleteNum) end end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 0da997d2fd..b9ae7e8971 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -16,7 +16,7 @@ local freeTimes = 0 local buyTimes = 0 local storeDataId = 0 local callBack - +local screenwidth local redTrailType = { [1] = RedPointType.PersonTrailHelp, [2] = RedPointType.BuddishTrailHelp, @@ -25,6 +25,7 @@ local redTrailType = { } --初始化组件(用于子类重写) function FourElementMonsterCampPanel:InitComponent() + screenwidth=self.gameObject.transform.rect.width this.spLoader = SpriteLoader.New() this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) @@ -75,7 +76,7 @@ function FourElementMonsterCampPanel:BindEvent() return else if BagManager.GetItemCountById(itemId) < costNum then - PopupTipPanel.ShowTip(string.format(Language[10343], itemConfig[itemId].Name)) + PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name)) return end MsgPanel.ShowTwo(string.format("是否花费%s%s购买一次扫荡次数?",costNum,itemConfig[itemId].Name),function() end,function() @@ -176,6 +177,7 @@ end function this.SingleDataShow(go, data) local singledata = FourElementSingleWave:New(go) + go:GetComponent("RectTransform").sizeDelta=Vector2.New(screenwidth,380) singledata:InitComponent(go,data,curType) singledata:OnOpen() return singledata diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 8305a834b3..12ec4e8682 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5042,8 +5042,11 @@ function this.MissingRoomLockRequest(missionId,lock,func) end) end -function this.UpgradeGodTreeRequest(func) - Network:SendMessageWithCallBack(MessageTypeProto_pb.UpgradeGodTreeRequest, MessageTypeProto_pb.UpgradeGodTreeResponse, nil, function(buffer) +function this.UpgradeGodTreeRequest(num,func) + local data = ActivityProto_pb.UpgradeGodTreeRequest() + data.count = num + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.UpgradeGodTreeRequest, MessageTypeProto_pb.UpgradeGodTreeResponse, msg, function(buffer) local configs = ConfigManager.GetConfig(ConfigName.JewelConfig) local maxlv = 0 for k,v in ConfigPairs(configs) do @@ -5051,7 +5054,6 @@ function this.UpgradeGodTreeRequest(func) maxlv = v.GodHoodMaxlv end end - SacredTreeManager.treeLevel = SacredTreeManager.treeLevel + 1 > maxlv and maxlv or SacredTreeManager.treeLevel + 1 EquipTreasureManager.ChangeTreeLv() if func then func() diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index db437c8c2c..637e9f5bc4 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -30,90 +30,95 @@ function SacredTreePanel:InitComponent() self.trigger = Util.GetEventTriggerListener(self.upgradeBtn.donImg) self.OnPointerDo = function(go, data) - self:OnPointerDown(go, data, i) + self:OnPointerDown(go, data) end self.OnPointerUp = function(go, data) self:OnPointerUp(go,data) end - -- self.trigger.onPointerDown = self.trigger.onPointerDown + self.OnPointerDo - -- self.trigger.onPointerUp = self.trigger.onPointerUp + self.OnPointerUp - -- self.itemNum = BagManager.GetTotalItemNum(treeLevelConfig[curTreeLevel].LvupCost[1]) + self.trigger.onPointerDown = self.trigger.onPointerDown + self.OnPointerDo + self.trigger.onPointerUp = self.trigger.onPointerUp + self.OnPointerUp + self.itemNum = BagManager.GetTotalItemNum(treeLevelConfig[curTreeLevel].LvupCost[1]) + self.isPressed = false + self.num = 0 end --- function SacredTreePanel:OnPointerDown() --- if curTreeLevel >= length then --- PopupTipPanel.ShowTip("神树已达最大等级~") --- return --- end --- if self.itemNum < treeLevelConfig[curTreeLevel].LvupCost[2] then --- PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name)) --- return --- end --- self.isPressed = true --- end +function SacredTreePanel:OnPointerDown() + if curTreeLevel >= length then + PopupTipPanel.ShowTip("神树已达最大等级~") + return + end + if self.itemNum < treeLevelConfig[curTreeLevel].LvupCost[2] then + PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name)) + return + end + self.isPressed = true +end --- function SacredTreePanel:OnPointerUp() --- if self.isPressed then --- self.isPressed = false --- self:RefreshBottom(true) --- end --- end +function SacredTreePanel:OnPointerUp() + if self.isPressed then + self.isPressed = false + self:Refresh(true) + end +end --- function SacredTreePanel:OnUpdate() --- if self.isPressed then --- if self.numCount > t then --- self.isShortPress = false --- self:Refresh(false) --- self.numCount = 0 --- else --- self.isShortPress = true --- end --- self.numCount = self.numCount + 1 --- end --- end +function SacredTreePanel:OnUpdate() + if self.isPressed then + if self.numCount > t then + self.isShortPress = false + self:Refresh(false) + self.numCount = 0 + else + self.isShortPress = true + end + self.numCount = self.numCount + 1 + end +end --- function SacredTreePanel:Refresh(isSend) --- if isSend then --- self.isPressed = false --- self.isShortPress = false --- self.numCount = 0 --- if self.num < 1 then --- self.num = 1 --- end --- self:RequestDonate(self.num) --- else --- self.num = self.num + 1 --- self.itemNum = self.itemNum - 1 --- if self.itemNum < treeLevelConfig[curTreeLevel].LvupCost[2] then --- self.isPressed = false --- self:Refresh(true) --- return --- end --- if curTreeLevel == 0 then --- PopupTipPanel.ShowTip("成功解锁神树~") --- end --- local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) --- SacredTreeManager.OnPowerChange(oldPower) --- if curTreeLevel >= length then --- self.isPressed = false --- self:Refresh(true) --- return --- end --- self:OnShow() --- end --- end +function SacredTreePanel:Refresh(isSend) + if isSend then + self.isPressed = false + if self.isShortPress then + self.num = 1 + SacredTreeManager.treeLevel = SacredTreeManager.treeLevel + 1 + end + self.isShortPress = false + self.numCount = 0 + self:RequestDonate(self.num) + else + self.num = self.num + 1 + BagManager.HeroLvUpUpdateItemsNum(treeLevelConfig[curTreeLevel].LvupCost[1],treeLevelConfig[curTreeLevel].LvupCost[2]) + if curTreeLevel == 0 then + PopupTipPanel.ShowTip("成功解锁神树~") + end + SacredTreeManager.treeLevel = SacredTreeManager.treeLevel + 1 + curTreeLevel = curTreeLevel + 1 + local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + SacredTreeManager.OnPowerChange(oldPower) + self:OnShow() --- function SacredTreePanel:RequestDonate(num) --- if num <= 0 then --- PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name)) --- return --- end --- NetManager.UpgradeGodTreeRequest(function () --- self.num = 0 --- self:OnShow() --- end) --- self.num = 0 --- end + if self.itemNum < treeLevelConfig[curTreeLevel].LvupCost[2] then + self.isPressed = false + self:Refresh(true) + return + end + if curTreeLevel >= length then + self.isPressed = false + self:Refresh(true) + return + end + end +end + +function SacredTreePanel:RequestDonate(num) + if num <= 0 then + PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name)) + return + end + NetManager.UpgradeGodTreeRequest(num,function () + self.num = 0 + self:OnShow() + end) +end function SacredTreePanel:BindEvent() Util.AddClick(self.backBtn, function() @@ -125,25 +130,25 @@ function SacredTreePanel:BindEvent() Util.AddClick(self.attriBtn, function() UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ShenYingShuXing) end) - Util.AddClick(self.upgradeBtn, function() - if curTreeLevel >= length then - PopupTipPanel.ShowTip("神树已达最大等级~") - else - local num = BagManager.GetTotalItemNum(treeLevelConfig[curTreeLevel].LvupCost[1]) - if num < treeLevelConfig[curTreeLevel].LvupCost[2] then - PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name)) - else - local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) - NetManager.UpgradeGodTreeRequest(function () - if curTreeLevel == 0 then - PopupTipPanel.ShowTip("成功解锁神树~") - end - SacredTreeManager.OnPowerChange(oldPower) - SacredTreePanel:OnShow() - end) - end - end - end) + -- Util.AddClick(self.upgradeBtn, function() + -- if curTreeLevel >= length then + -- PopupTipPanel.ShowTip("神树已达最大等级~") + -- else + -- local num = BagManager.GetTotalItemNum(treeLevelConfig[curTreeLevel].LvupCost[1]) + -- if num < treeLevelConfig[curTreeLevel].LvupCost[2] then + -- PopupTipPanel.ShowTip(string.format("%s不足!",itemConfig[treeLevelConfig[curTreeLevel].LvupCost[1]].Name)) + -- else + -- local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + -- NetManager.UpgradeGodTreeRequest(function () + -- if curTreeLevel == 0 then + -- PopupTipPanel.ShowTip("成功解锁神树~") + -- end + -- SacredTreeManager.OnPowerChange(oldPower) + -- SacredTreePanel:OnShow() + -- end) + -- end + -- end + -- end) BindRedPointObject(RedPointType.Sacred,self.treeRed) end