From 5bd6093c1840118c47ba180f1612931b3bb90463 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 2 Jun 2021 21:29:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E7=A7=B0=E5=8F=B7]=3D=3D=3D=3D=E6=96=B0?= =?UTF-8?q?=E7=A7=B0=E5=8F=B7shader=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/PublicArtRes/Shaders/Add Lv4_1.shader | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/PublicArtRes/Shaders/Add Lv4_1.shader b/Assets/ManagedResources/PublicArtRes/Shaders/Add Lv4_1.shader index bb184969a5..f373519d82 100644 --- a/Assets/ManagedResources/PublicArtRes/Shaders/Add Lv4_1.shader +++ b/Assets/ManagedResources/PublicArtRes/Shaders/Add Lv4_1.shader @@ -21,6 +21,10 @@ Category { // ---- Fragment program cards SubShader { + Stencil{ + Ref 1 + Comp equal + } Pass { CGPROGRAM From d4cea59040911f3f2a2bdd440c0d25334495f13a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 2 Jun 2021 21:32:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=A7=E6=83=85=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index c10b935b33..de3352db40 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -157,7 +157,6 @@ function StoryMapPanel:OnShow() end table.insert(this.triggerEvent,event) end - isSkip = false this.callList:Clear() for i = #this.triggerEvent,1,-1 do this.callList:Push(function() @@ -201,7 +200,9 @@ function this:CheckTrigger(data,go) -- end if data.eventType ~= 3 then this:StackPop() + return end + isSkip = false -- MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function() -- if this.callList:Count() > 0 then -- this.callList:Clear() @@ -213,7 +214,6 @@ function this:CheckTrigger(data,go) -- this:ClosePanel() -- end,"取消","确认") end - isSkip = false this.go = go this.curEvent = data if data.eventType == 1 then -- 1 对话 2跑图 3假战斗