456

assets/script/run/TaskSchedule/taskServce.ts

@@ -452,7 +452,6 @@ export class taskServce {
     }
 
     public static exeNextDelayEvent(event:event_item){
-
         if(event!=null){
             if(event.success.is_finish_game){
                 return gameManager.Singleton.gameOver()
@@ -473,6 +472,17 @@ export class taskServce {
             }
         }
     }
+
+    public static exeSwitchSceneNextevent(trigger_event_id: number) {
+        if(trigger_event_id == -1) {
+            return
+        }
+        let event = taskServce.getEventById(trigger_event_id)
+        if(event == null) {
+            return
+        }
+        taskServce.extEventByEventId(event.event_id)
+    }
 }
 
 

assets/script/run/gameManager.ts

@@ -608,8 +608,8 @@ export class gameManager extends Component {
         taskServce.extEventByEventId(event_id)
     }
 
-    onMoreSceneDirectionButtonClickEvent(event_id:number){
-        taskServce.extEventByEventId(event_id)
+    onMoreSceneDirectionButtonClickEvent(trigger_event_id:number){
+        taskServce.exeSwitchSceneNextevent(trigger_event_id)
     }
 
     showFindRuleTips(){

assets/script/run/scene_layer.ts

@@ -163,29 +163,33 @@ export class scene_layer extends Component {
     }
 
     onUp(){
+        let cur_page = this.mCurPage
         let up_page = this.mCurPage -1;
         if(up_page>=0){
             gameManager.Singleton.onLaunch(()=>{
                 this.changePage(up_page)
+                this.onClickCurPageDirectionButton(cur_page, true)
             })
         }
     }
 
     onNext(){
+        let cur_page = this.mCurPage
         let next_page = this.mCurPage +1;
         if(next_page<this.mScenePages.length){
             gameManager.Singleton.onLaunch(()=>{
                 this.changePage(next_page)
+                this.onClickCurPageDirectionButton(cur_page, false)
             })
         }
     }
 
-    onClickCurPageDirectionButton(isUp:boolean) {
+    onClickCurPageDirectionButton(curPage:number, isUp:boolean) {
         if(this.mSceneTask == null) {
             return
         }
         let event_id = -1
-        var key = this.mCurPage + ''
+        var key = curPage + ''
         if(isUp) { 
             key = key + this.up_id_string 
         } else {
@@ -197,9 +201,7 @@ export class scene_layer extends Component {
         }
         // console.log('event_id=',event_id)
         if(event_id != -1) {
-            this.scheduleOnce(()=>{ // 切换场景有延时0.7
-                this.checkDelayTimeNextEvent(event_id, eventTarget)
-            },0.7)
+            this.checkDelayTimeNextEvent(event_id, eventTarget)
         }
     }
 
@@ -211,15 +213,13 @@ export class scene_layer extends Component {
         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
+        if(trigger_event_id == -1) {
+            return
         }
         // 延迟时间
         let call = (()=> {
-            ClientEvent.dispatchEvent(config.EventRun.MORE_SCENE_DIRECTION_BUTTON_CLICK_FINISH, next_event_id)
+            ClientEvent.dispatchEvent(config.EventRun.MORE_SCENE_DIRECTION_BUTTON_CLICK_FINISH, trigger_event_id)
         })
         if(switch_scene_event_data.delay_time > 0) {
             this.scenePageDir.getComponent(scene_page_dir).hideAllBtn()

assets/script/run/ui_layer.ts

@@ -112,7 +112,7 @@ export class ui_layer extends Component {
 
 
     initCountDownList(list:widget_item_data[]){
-        this.mCountDownLlist.clear()
+        // this.mCountDownLlist.clear()
         for (let index = 0; index < list.length; index++) {
             const widget = list[index];
             this.mCountDownLlist.set(widget.att.id,widget);