diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua index 3d5a45b04a..8a92d59e97 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua @@ -46,8 +46,11 @@ function XunBaoMiZongMap:BindEvent() self.effect:GetComponent("RectTransform").localScale = Vector2.one * 1.5 self.effect:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(self.rewardPos.x, self.rewardPos.y, 10) self.effect:SetActive(true) + self.btnGet.gameObject:GetComponent("Button").interactable = false + cantWalk = true Timer.New(function () self.effect:SetActive(false) + self.effectBtnGet:SetActive(false) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() SwitchPanel.OpenPanel(nil,function () self:ClosePanel() @@ -75,10 +78,15 @@ function XunBaoMiZongMap:OnShow() if self.liveNode then self.liveNode:OnClose() end + cantWalk = true + self.btnGet.gameObject:GetComponent("Button").interactable = true self.liveNode = PlayerLiveView:New(self.roleRoot,1) self.liveNode:OnOpen(300,Vector3.zero,WALK_DIR.IDLE_FRONT) self.liveNode:SetTitleHide() self:LoadMapData() + Timer.New(function () + cantWalk = false + end,2):Start() end function XunBaoMiZongMap:LoadMapData() @@ -164,7 +172,7 @@ function this.OnClickTile(u, v,fuv) -- Log(string.format("点击位置坐标(%s, %s)", u, v)) -- Log(tostring(targetPos)) if this.CheckArena(pointList,targetPos) then - this:SetRoleWalk(targetPos) + this:SetRoleWalk(targetPos,fuv) end end @@ -183,15 +191,16 @@ function this.CheckArena(list,point) end --角色行走 -function XunBaoMiZongMap:SetRoleWalk(_targetPos) +function XunBaoMiZongMap:SetRoleWalk(_targetPos,_fuv) local targetPos = Vector3.New(_targetPos.x,_targetPos.y,10) local pos = Vector3.New(self.oldPos.x,self.oldPos.y,10) - if not self.liveNode then return end - self.liveNode.leader.transform:DOLocalMove(targetPos, math.distanceXY(targetPos,pos)/500, false):OnStart(function () + local duration = math.distanceXY(targetPos,pos)/500 + TileMapView.CameraTween(_fuv.x,26,duration) + self.liveNode.leader.transform:DOLocalMove(targetPos, duration, false):OnStart(function () self:SetRoleDirAction(targetPos.x, targetPos.y, pos.x, pos.y) end):OnUpdate(function() --TODO:测试速度 cantWalk = true @@ -207,7 +216,8 @@ end function XunBaoMiZongMap:DoCheckDistance() local distance = math.distanceXY(self.rewardPos,self.liveNode.leader.transform.localPosition) - if distance <= 100 then + local banjing = ConfigManager.GetConfigData(ConfigName.SpecialConfig,125).Value + if distance <= tonumber(banjing) then self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu") self.liveNode:SetSelfDirectingTag(false) self.effectBtnGet:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua index 688794d03d..9cf6d3f1b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua @@ -49,6 +49,7 @@ function XunBaoMiZong:BindEvent() NetManager.XunBaoMiZongEnterMap(function (msg) if msg.isEnter then --判断进入地图时是否是完整地图,不是需要播放特效 + self.btnGO:GetComponent("Button").interactable = false if CompleteMap then SwitchPanel.OpenPanel(UIName.XunBaoMiZongMapPanel,nil,self.actData) else @@ -56,7 +57,7 @@ function XunBaoMiZong:BindEvent() self.ImagePic3:SetActive(true) Timer.New(function () SwitchPanel.OpenPanel(UIName.XunBaoMiZongMapPanel,nil,self.actData) - end,1):Start() + end,0.3):Start() end else PopupTipPanel.ShowTip("宝图碎片不足,无法开启寻宝!") @@ -90,6 +91,7 @@ function XunBaoMiZong:OnShow(_sortingOrder) self.sortingOrder = _sortingOrder Util.SetParticleSortLayer(self.effect, self.sortingOrder + 1) self:Refresh() + self.btnGO:GetComponent("Button").interactable = true end --刷新