456

assets/data/data.ts

@@ -400,6 +400,8 @@ export class event_item{
     public event_item_stop_play_loop_sound_data:event_item_stop_play_loop_sound = null; //停止播放一个音效资源
 
     public event_item_switch_scene_event_data:event_item_switch_scene_event = null; // 切换场景事件
+    public event_item_more_scene_is_show_arrow_event_data:event_item_more_scene_is_show_arrow_event = null;//多场景-是否显示箭头事件
+    public event_item_more_scene_jump_assigned_page_event_data:event_item_more_scene_jump_assigned_page_event = null;//多场景-跳转指定页数事件
 }
 export class base_event_item{
 
@@ -507,6 +509,14 @@ export class event_item_switch_scene_event extends base_event_item { // 切换
     public delay_time:number = 0;
 }
 
+export class event_item_more_scene_is_show_arrow_event extends base_event_item {
+    public is_show:boolean = false;
+}
+
+export class event_item_more_scene_jump_assigned_page_event extends base_event_item {
+    public page_number:number = -1;
+}
+
 export class event_widget_more_event_item extends base_event_item {
     public binding_widget_id:number = -1; //绑定事件
     public binding_widget_remark:string = ''; //备注

assets/script/config.ts

@@ -82,6 +82,8 @@ export class config {
         config.clcik_type_map.set(config.clcik_type.click_not_auto_finish,"单击(不自动完成)")
 
         //event_type_map
+        // config.event_type_map.set(config.event_type.more_scene_is_show_arrow_event,"多场景-是否显示箭头事件")
+        // config.event_type_map.set(config.event_type.more_scene_jump_assigned_page_event,"多场景-跳转指定页数事件")
         config.event_type_map.set(config.event_type.be_event,"被动触发事件")
         config.event_type_map.set(config.event_type.delay_exe_event,"延迟时间调用一个事件")
         config.event_type_map.set(config.event_type.active_event,"激活交互")
@@ -94,7 +96,7 @@ export class config {
         config.event_type_map.set(config.event_type.stop_active_event,"停用交互")
         config.event_type_map.set(config.event_type.collect_event,"收集事件")
         config.event_type_map.set(config.event_type.change_one_item_status,"改变指定道具资源")
-        config.event_type_map.set(config.event_type.switch_scene_event,"切换场景事件")
+        config.event_type_map.set(config.event_type.switch_scene_event,"多场景-切换场景事件")
         config.event_type_map.set(config.event_type.show_scene_title,"显示场景标签")
         config.event_type_map.set(config.event_type.start_event,"开始事件")
         config.event_type_map.set(config.event_type.fail_event,"失败事件")
@@ -252,7 +254,10 @@ export class config {
         scene_ani:17,//场景动画
         delete_drag_other_data:18,//删除其他拖拽目标的属性
         stop_play_loop_sound:19,//停止一个音效
-        switch_scene_event:20, //切换场景事件
+        switch_scene_event:20, //多场景-切换场景事件
+        more_scene_is_show_arrow_event:21, //多场景-是否显示箭头事件
+        more_scene_jump_assigned_page_event:22, //多场景-跳转指定页数事件
+
     }
 
     static top_view_type_map:Map<number,string> = new Map();

assets/script/edit/event/edit_event.ts

@@ -24,6 +24,8 @@ import { event_delete_drag_other_data_view } from './event_delete_drag_other_dat
 import { event_stop_play_loop_sound } from './event_stop_play_loop_sound';
 import { event_stop_active_event } from './event_stop_active_event';
 import { event_switch_scene_event } from './event_switch_scene_event';
+import { event_more_scene_jump_assigned_page_event } from './event_more_scene_jump_assigned_page_event';
+import { event_more_scene_is_show_arrow_event } from './event_more_scene_is_show_arrow_event';
 const { ccclass, property } = _decorator;
 
 @ccclass('edit_event')
@@ -46,6 +48,8 @@ export class edit_event extends Component {
     @property(Node) hide:Node = null;
     @property(Node) delay_exe_event:Node = null;
     @property(Node) switch_scene_event:Node = null;
+    @property(Node) more_scene_is_show_arrow_event:Node = null;
+    @property(Node) more_scene_jump_assigned_page_event:Node = null;
 
     @property(Node) scene_ani:Node = null;
 
@@ -178,6 +182,8 @@ export class edit_event extends Component {
         this.widget_map.set(config.event_type.hide,this.hide)
         this.widget_map.set(config.event_type.delay_exe_event,this.delay_exe_event)
         this.widget_map.set(config.event_type.switch_scene_event,this.switch_scene_event)
+        this.widget_map.set(config.event_type.more_scene_is_show_arrow_event,this.more_scene_is_show_arrow_event)
+        this.widget_map.set(config.event_type.more_scene_jump_assigned_page_event,this.more_scene_jump_assigned_page_event)
 
         this.widget_map.set(config.event_type.fail_event,this.fail_event)
         this.widget_map.set(config.event_type.play_sound,this.play_sound)
@@ -261,6 +267,12 @@ export class edit_event extends Component {
             case config.event_type.switch_scene_event:
                 this.switch_scene_event.getComponent(event_switch_scene_event).initView(this.m_data.event_item_switch_scene_event_data)
             break;
+            case config.event_type.more_scene_is_show_arrow_event:
+                this.more_scene_is_show_arrow_event.getComponent(event_more_scene_is_show_arrow_event).initView(this.m_data.event_item_more_scene_is_show_arrow_event_data)
+            break;
+            case config.event_type.more_scene_jump_assigned_page_event:
+                this.more_scene_jump_assigned_page_event.getComponent(event_more_scene_jump_assigned_page_event).initView(this.m_data.event_item_more_scene_jump_assigned_page_event_data)
+            break;
         }
     }
 

assets/script/edit/event/event_delete_drag_other_data_view.ts

@@ -70,7 +70,7 @@ export class event_delete_drag_other_data_view extends Component {
             }  
             this.btn_select_select_other.active = true;
             this.lab_cur_select_widget.getComponent(Label).string = `选择控件id:${this.m_data.widget_id}`
-            if(this.m_data.delete_drag_other_index==-1){
+            if(this.m_data.delete_drag_other_index==-1||this.m_data.delete_drag_other_index==undefined){
             }else{
                 this.edit_other.string = this.m_data.delete_drag_other_index.toString()
             }

assets/script/edit/event/event_more_scene_is_show_arrow_event.ts

@@ -0,0 +1,16 @@
+import { _decorator, Component, Node } from 'cc';
+import { event_item_more_scene_is_show_arrow_event } from '../../../data/data';
+const { ccclass, property } = _decorator;
+
+@ccclass('event_more_scene_is_show_arrow_event')
+export class event_more_scene_is_show_arrow_event extends Component {
+    start() {
+
+    }
+
+    initView(data:event_item_more_scene_is_show_arrow_event) {
+
+    }
+
+}
+

assets/script/edit/event/event_more_scene_is_show_arrow_event.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "03f7c96a-f64f-487e-8e58-4416faeab5f9",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/script/edit/event/event_more_scene_jump_assigned_page_event.ts

@@ -0,0 +1,15 @@
+import { _decorator, Component, Node } from 'cc';
+import { event_item_more_scene_jump_assigned_page_event } from '../../../data/data';
+const { ccclass, property } = _decorator;
+
+@ccclass('event_more_scene_jump_assigned_page_event')
+export class event_more_scene_jump_assigned_page_event extends Component {
+    start() {
+
+    }
+
+    initView(data:event_item_more_scene_jump_assigned_page_event) {
+
+    }
+}
+

assets/script/edit/event/event_more_scene_jump_assigned_page_event.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "f1fb97c7-e5d4-423c-ace8-3cf4ff516499",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/script/edit/search/search_node.ts

@@ -137,7 +137,7 @@ export class search_node extends Component {
             c_text = `${c_event_item.event_item_stop_play_loop_sound_data.res}`
             break;
             case config.event_type.switch_scene_event://20切换场景
-            c_title = '切换场景按钮'
+            c_title = '多场景-切换场景按钮'
             let direction = c_event_item.event_item_switch_scene_event_data.direction
             let direction_str = '按钮-无'
             if(direction == config.switch_scene_page_direction.up) {
@@ -152,6 +152,14 @@ export class search_node extends Component {
             let executeOnlyOnce_string = c_event_item.event_item_switch_scene_event_data.executeOnlyOnce ? '是' : '否'
             c_text = `方向:${direction_str} 页数:${c_event_item.event_item_switch_scene_event_data.binding_page_index+1} 仅执行一次:${executeOnlyOnce_string}`
             break;
+            case config.event_type.more_scene_is_show_arrow_event://21多场景-是否显示箭头
+            c_title = '多场景-是否显示箭头'
+            c_text = c_event_item.event_item_more_scene_is_show_arrow_event_data.is_show ? '是' : '否'
+            break;
+            case config.event_type.more_scene_jump_assigned_page_event://22多场景-跳转指定页数事件
+            c_title = '多场景-跳转指定页数事件'
+            c_text = `页数:${c_event_item.event_item_more_scene_jump_assigned_page_event_data.page_number}`
+            break;
 
         }   
         if(c_text!="") {

assets/script/edit/task/scene_task.ts

@@ -3,7 +3,7 @@ import { tools } from '../../tools';
 import { edit_scene } from '../edit_scene';
 import { ClientEvent } from '../../clientEvent';
 import { config } from '../../config';
-import { da_guai_data, event_active_event_item, event_collect_event_item, event_item, event_item_be_event, event_item_change_one_item_status, event_item_countdown_over, event_item_delay_exe_event, event_item_delete_drag_other, event_item_fail, event_item_fail_event, event_item_hide, event_item_play_ani, event_item_play_sound, event_item_scene_ani, event_item_show_new_item, event_item_show_question_select, event_item_show_scene_title, event_item_stop_play_loop_sound, event_item_success, event_item_text_sound, event_item_top_view, event_stop_active_event_item, event_start_event_item, guo_ju_qing_data, scene_item_data, task_data, zhao_xi_jie_data, zhao_xi_jie_item_data, guo_ju_qing_not_rule_data, event_item_switch_scene_event, guo_ju_qing_dai_dao_ju } from '../../../data/data';
+import { da_guai_data, event_active_event_item, event_collect_event_item, event_item, event_item_be_event, event_item_change_one_item_status, event_item_countdown_over, event_item_delay_exe_event, event_item_delete_drag_other, event_item_fail, event_item_fail_event, event_item_hide, event_item_play_ani, event_item_play_sound, event_item_scene_ani, event_item_show_new_item, event_item_show_question_select, event_item_show_scene_title, event_item_stop_play_loop_sound, event_item_success, event_item_text_sound, event_item_top_view, event_stop_active_event_item, event_start_event_item, guo_ju_qing_data, scene_item_data, task_data, zhao_xi_jie_data, zhao_xi_jie_item_data, guo_ju_qing_not_rule_data, event_item_switch_scene_event, guo_ju_qing_dai_dao_ju, event_item_more_scene_is_show_arrow_event, event_item_more_scene_jump_assigned_page_event } from '../../../data/data';
 import { event_item_view } from '../event/event_item_view';
 import { task_zhao_xi_jie } from './task_zhao_xi_jie';
 import { task_guo_ren_wu } from './task_guo_ren_wu';
@@ -273,6 +273,12 @@ export class scene_task extends Component {
             case config.event_type.switch_scene_event:
                 new_event.event_item_switch_scene_event_data = new event_item_switch_scene_event
             break;
+            case config.event_type.more_scene_is_show_arrow_event:
+                new_event.event_item_more_scene_is_show_arrow_event_data = new event_item_more_scene_is_show_arrow_event
+            break;
+            case config.event_type.more_scene_jump_assigned_page_event:
+                new_event.event_item_more_scene_jump_assigned_page_event_data = new event_item_more_scene_jump_assigned_page_event
+            break;
         }
         this.addEventItemView(type,new_event)
         task_data.event_list.push(new_event)

assets/script/run/TaskSchedule/taskServce.ts

@@ -237,9 +237,11 @@ export class taskServce {
                 ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,-11,event)
             break;
             case config.event_type.switch_scene_event:
-                
             break;
-
+            case config.event_type.more_scene_is_show_arrow_event:
+            break;
+            case config.event_type.more_scene_jump_assigned_page_event:
+            break;
         }
         taskServce.exeNextDelayEvent(event)
     }