Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-06-02 21:40:26 +08:00
commit 68b865c000
2 changed files with 6 additions and 2 deletions

View File

@ -21,6 +21,10 @@ Category {
// ---- Fragment program cards // ---- Fragment program cards
SubShader { SubShader {
Stencil{
Ref 1
Comp equal
}
Pass { Pass {
CGPROGRAM CGPROGRAM

View File

@ -157,7 +157,6 @@ function StoryMapPanel:OnShow()
end end
table.insert(this.triggerEvent,event) table.insert(this.triggerEvent,event)
end end
isSkip = false
this.callList:Clear() this.callList:Clear()
for i = #this.triggerEvent,1,-1 do for i = #this.triggerEvent,1,-1 do
this.callList:Push(function() this.callList:Push(function()
@ -201,7 +200,9 @@ function this:CheckTrigger(data,go)
-- end -- end
if data.eventType ~= 3 then if data.eventType ~= 3 then
this:StackPop() this:StackPop()
return
end end
isSkip = false
-- MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function() -- MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function()
-- if this.callList:Count() > 0 then -- if this.callList:Count() > 0 then
-- this.callList:Clear() -- this.callList:Clear()
@ -213,7 +214,6 @@ function this:CheckTrigger(data,go)
-- this:ClosePanel() -- this:ClosePanel()
-- end,"取消","确认") -- end,"取消","确认")
end end
isSkip = false
this.go = go this.go = go
this.curEvent = data this.curEvent = data
if data.eventType == 1 then -- 1 对话 2跑图 3假战斗 if data.eventType == 1 then -- 1 对话 2跑图 3假战斗