From d9e3aa939dd995faa00a302fc1614820b75317b0 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 30 Mar 2021 22:37:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E5=9D=90?= =?UTF-8?q?=E9=AA=91=E6=97=B6=E8=A3=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua | 56 ++++++++++++------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index b84ebf75e3..09a6891338 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -251,7 +251,8 @@ function this.MoveTT(targetIndex,_data) this.MapMove(allGridData[curGridIndex].x,0.3) if curGridIndex==targetIndex then Log("待机动画") - this.SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + -- this.SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + this.liveNode:SetWalkDir(WALK_DIR.IDLE_FRONT) this.startBtn:GetComponent("Button").enabled=true this.EventTrigger(_data) if curGridIndex>=#allGridData then @@ -443,40 +444,50 @@ local npc local scale ---加载跑图角色 function this.LoadTT() - local mapNpc = "live2d_npc_map" - local mapNpc2 = "live2d_npc_map_nv" - npc = NameManager.roleSex == ROLE_SEX.BOY and mapNpc or mapNpc2 - scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one * 0.25 or Vector3.one * 0.12 - if not this.liveNode then - this.liveNode = poolManager:LoadLive(npc, this.TT.transform, scale, Vector3.New(0,-42.4,0)) - end - this.SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic") - if this.SkeletonGraphic then - this.SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + -- local mapNpc = "live2d_npc_map" + -- local mapNpc2 = "live2d_npc_map_nv" + -- npc = NameManager.roleSex == ROLE_SEX.BOY and mapNpc or mapNpc2 + -- scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one * 0.25 or Vector3.one * 0.12 + -- if not this.liveNode then + -- this.liveNode = poolManager:LoadLive(npc, this.TT.transform, scale, Vector3.New(0,-42.4,0)) + -- end + -- this.SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic") + -- if this.SkeletonGraphic then + -- this.SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + -- end + if this.liveNode then + this.liveNode:OnClose() end + this.liveNode = PlayerLiveView:New(this.TT,1) + this.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale7,Vector3.New(0,0,0),WALK_DIR.IDLE_FRONT) end --设置跑图角色方向 function this.SetTTDirection() - if not this.SkeletonGraphic then + if not this.liveNode then return end local nexIndex=curGridIndex+1 if nexIndex>#allGridData then - this.SkeletonGraphic.AnimationState:SetAnimation(0, "touch", true) + -- this.SkeletonGraphic.AnimationState:SetAnimation(0, "touch", true) + this.liveNode:SetWalkDir(WALK_DIR.TOUCH) return end if allGridData[curGridIndex].y==allGridData[nexIndex].y then - this.SkeletonGraphic.AnimationState:SetAnimation(0, "move2", true) + -- this.SkeletonGraphic.AnimationState:SetAnimation(0, "move2", true) if allGridData[curGridIndex].x Date: Tue, 30 Mar 2021 22:42:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=A6=8F=E6=98=9F=E9=AB=98?= =?UTF-8?q?=E7=85=A7=E3=80=91=E4=B8=8D=E5=85=B3=E9=97=AD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expert/PatFaceManager.lua | 16 +++++++++------- .../Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua | 4 ++-- .../~Lua/Modules/Main/MainPanel.lua | 3 +++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 30a7608688..f14a95944d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -223,13 +223,15 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) table.insert(patFaceAllData,v) end end - -- elseif v.Type == 12 then--福星高照活动 - -- local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) - -- if ActData then - -- if RedPointManager.PlayerPrefsGetStr(v.Id..PlayerManager.level.."TimeLimitSkin") == "0" then - -- table.insert(patFaceAllData,v) - -- end - -- end + elseif v.Type == 12 then--福星高照活动 + local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) + local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") + local time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() + if time >0 then + if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then + table.insert(patFaceAllData,v) + end + end else if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then table.insert(patFaceAllData,v) diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 9ed96d1515..a265bbe09c 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -117,7 +117,7 @@ function FuXingGaoZhao:SetTime() self.timer = nil end local time = data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp() - self.time.text = string.format("剩余接受时间:%s",TimeToFelaxible(time)) + self.time.text = string.format("剩余结束时间:%s",TimeToFelaxible(time)) self.timer = Timer.New(function() time = time - 1 if time < 1 then @@ -125,7 +125,7 @@ function FuXingGaoZhao:SetTime() self.timer = nil self:ClosePanel() end - self.time.text = string.format("剩余接受时间:%s",TimeToFelaxible(time)) + self.time.text = string.format("剩余结束时间:%s",TimeToFelaxible(time)) end, 1, -1, true) self.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 4451ce6ad7..9d385e80dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1000,6 +1000,9 @@ function this.TimeFormat() local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") local time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() activityTabs[k].timeText.text = TimeToFelaxible(time) + if time <= 0 then + activityTabs[k].go.gameObject:SetActive(false) + end end else activityTabs[k].go.gameObject:SetActive(false)