|
@@ -23,7 +23,6 @@ export class scene_layer extends Component {
|
|
|
protected mScenePages:scene_item_data[] =[]
|
|
|
private mCurPage:number = 0;
|
|
|
private mAudioList:Map<string,Node> = new Map;
|
|
|
- private mIsClickDirectionButton:boolean = false;
|
|
|
protected start(): void {
|
|
|
this.node.addComponent(AudioSource)
|
|
|
}
|
|
@@ -48,7 +47,6 @@ export class scene_layer extends Component {
|
|
|
this.mCurPage = 0
|
|
|
this.mAudioList.clear()
|
|
|
this.unscheduleAllCallbacks()
|
|
|
- this.mIsClickDirectionButton = false
|
|
|
ClientEvent.off(config.EventRun.NOTICE_EVENT,this.beActive.bind(this),this)
|
|
|
}
|
|
|
|
|
@@ -114,6 +112,10 @@ export class scene_layer extends Component {
|
|
|
changePage(page:number){
|
|
|
this.mCurPage = page;
|
|
|
this.onChangeUpdatePages()
|
|
|
+ this.changeUpNextBtn()
|
|
|
+ }
|
|
|
+
|
|
|
+ changeUpNextBtn() {
|
|
|
if(this.mScenePages.length>1){
|
|
|
this.scenePageDir.getComponent(scene_page_dir).showAllBtn()
|
|
|
if(this.mCurPage<=0){
|
|
@@ -123,7 +125,6 @@ export class scene_layer extends Component {
|
|
|
this.scenePageDir.getComponent(scene_page_dir).hideNextBtn()
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
onChangeUpdatePages(){
|
|
@@ -188,7 +189,6 @@ export class scene_layer extends Component {
|
|
|
if(this.mSceneTask == null) {
|
|
|
return
|
|
|
}
|
|
|
- this.mIsClickDirectionButton = true
|
|
|
let event_id = -1
|
|
|
var key = this.mCurPage + ''
|
|
|
if(isUp) {
|
|
@@ -203,46 +203,61 @@ export class scene_layer extends Component {
|
|
|
// console.log('event_id=',event_id)
|
|
|
if(event_id != -1) {
|
|
|
this.scheduleOnce(()=>{ // 切换场景有延时0.7
|
|
|
- ClientEvent.dispatchEvent(config.EventRun.MORE_SCENE_DIRECTION_BUTTON_CLICK_FINISH, event_id)
|
|
|
- this.checkNextDelayEventUncompleted(eventTarget)
|
|
|
+ this.checkDelayTimeNextEvent(event_id, eventTarget)
|
|
|
},0.7)
|
|
|
- } else {
|
|
|
- this.mIsClickDirectionButton = false
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- checkNextDelayEventUncompleted(eventTarget:EventTarget) {
|
|
|
- if(eventTarget == null) {
|
|
|
- this.mIsClickDirectionButton = false
|
|
|
- return
|
|
|
+ checkDelayTimeNextEvent(event_id:number, eventTarget:EventTarget) {
|
|
|
+ if(eventTarget == null) {
|
|
|
+ return
|
|
|
}
|
|
|
- let trigger_event_id = eventTarget.event_item.success.trigger_event_id
|
|
|
- if(trigger_event_id!=-1) {
|
|
|
- let _event:event_item = taskServce.getEventById(trigger_event_id)
|
|
|
- if(_event!=null && _event.type == config.event_type.delay_exe_event) {
|
|
|
- let delay_time = _event.event_item_delay_exe_data.delay_time
|
|
|
- // console.log('下一个是延迟事件 延迟时间=',delay_time)
|
|
|
- if(delay_time > 0) {
|
|
|
- this.scheduleOnce(()=> {
|
|
|
- if(this.mIsClickDirectionButton) {
|
|
|
- if(eventTarget.event_item.event_item_switch_scene_event_data.executeOnlyOnce) {
|
|
|
- eventTarget.is_finish = true
|
|
|
- }
|
|
|
- } else {
|
|
|
- // 取消 延迟事件 定时器
|
|
|
- gameManager.Singleton.unscheduleAllCallbacks()
|
|
|
- }
|
|
|
- this.mIsClickDirectionButton = false
|
|
|
- },delay_time)
|
|
|
- } else {
|
|
|
- this.mIsClickDirectionButton = false
|
|
|
+ // 当前数据
|
|
|
+ let event_item:event_item = eventTarget.event_item
|
|
|
+ let switch_scene_event_data:event_item_switch_scene_event = event_item.event_item_switch_scene_event_data
|
|
|
+ // 下一个事件成功的id
|
|
|
+ var next_event_id = -1
|
|
|
+ let trigger_event_id = event_item.success.trigger_event_id
|
|
|
+ if(trigger_event_id != -1) {
|
|
|
+ let next_event = taskServce.getEventById(trigger_event_id)
|
|
|
+ next_event_id = next_event.event_id
|
|
|
+ }
|
|
|
+ // 延迟时间
|
|
|
+ let call = (()=> {
|
|
|
+ ClientEvent.dispatchEvent(config.EventRun.MORE_SCENE_DIRECTION_BUTTON_CLICK_FINISH, next_event_id)
|
|
|
+ })
|
|
|
+ if(switch_scene_event_data.delay_time > 0) {
|
|
|
+ this.scenePageDir.getComponent(scene_page_dir).hideAllBtn()
|
|
|
+ let delay_time = switch_scene_event_data.delay_time
|
|
|
+ this.scheduleOnce(()=> {
|
|
|
+ if(event_item.event_item_switch_scene_event_data.executeOnlyOnce) {
|
|
|
+ eventTarget.is_finish = true
|
|
|
}
|
|
|
- } else {
|
|
|
- this.mIsClickDirectionButton = false
|
|
|
- }
|
|
|
+ call()
|
|
|
+ this.changeUpNextBtn()
|
|
|
+ },delay_time)
|
|
|
} else {
|
|
|
- this.mIsClickDirectionButton = false
|
|
|
+ call()
|
|
|
}
|
|
|
+
|
|
|
+ // 用于下一个是:"延迟时间调用一个事件"
|
|
|
+ // ClientEvent.dispatchEvent(config.EventRun.MORE_SCENE_DIRECTION_BUTTON_CLICK_FINISH, event_id)
|
|
|
+ // let trigger_event_id = eventTarget.event_item.success.trigger_event_id
|
|
|
+ // if(trigger_event_id!=-1) {
|
|
|
+ // let _event:event_item = taskServce.getEventById(trigger_event_id)
|
|
|
+ // if(_event!=null && _event.type == config.event_type.delay_exe_event) {
|
|
|
+ // let delay_time = _event.event_item_delay_exe_data.delay_time
|
|
|
+ // // console.log('下一个是延迟事件 延迟时间=',delay_time)
|
|
|
+ // this.scenePageDir.getComponent(scene_page_dir).hideAllBtn()
|
|
|
+ // this.scheduleOnce(()=> {
|
|
|
+ // this.changeUpNextBtn()
|
|
|
+ // if(eventTarget.event_item.event_item_switch_scene_event_data.executeOnlyOnce) {
|
|
|
+ // eventTarget.is_finish = true
|
|
|
+ // }
|
|
|
+ // this.changeUpNextBtn()
|
|
|
+ // },delay_time)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
getTaskSwitchSceneEventList() {
|