456

assets/script/edit/event/edit_event.ts

@@ -139,10 +139,15 @@ export class edit_event extends Component {
         })
 
         this.btn_set_next_event.on(Node.EventType.TOUCH_START,()=>{
-            if(this.btn_fail.active==false){
+            if(this.btn_win.active==false){
                 this.btn_fail.active = true;
                 this.btn_win.active = true;
                 this.lab_set_next_event.getComponent(Label).string ="收起"
+                if(this.m_type ==config.event_type.switch_scene_event) {
+                    this.btn_fail.active = false;
+                    this.btn_win.getChildByName('is_finish_game').active = false
+                    this.btn_win.getChildByName('is_next_scene').active = false
+                }
             }else{
                 this.btn_fail.active = false;
                 this.btn_win.active = false; 

assets/script/run/TaskSchedule/taskServce.ts

@@ -453,7 +453,6 @@ export class taskServce {
     }
 
     public static exeNextDelayEvent(event:event_item){
-
         if(event!=null){
             if(event.success.is_finish_game){
                 return gameManager.Singleton.gameOver()
@@ -474,6 +473,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

@@ -456,8 +456,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

@@ -5,7 +5,6 @@ import { scene_page_dir } from './scene_page_dir';
 import { ClientEvent } from '../clientEvent';
 import { config } from '../config';
 import { gameManager } from './gameManager';
-import { taskServce } from './TaskSchedule/taskServce';
 const { ccclass, property } = _decorator;
 
 class EventTarget{
@@ -218,15 +217,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);