future 1 year ago
parent
commit
10941904e8

+ 9 - 9
assets/resources/prefab/edit_event.prefab

@@ -2352,7 +2352,7 @@
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
       "x": 0,
       "x": 0,
-      "y": -60,
+      "y": -50,
       "z": 0
       "z": 0
     },
     },
     "_lrot": {
     "_lrot": {
@@ -2642,7 +2642,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 1920,
+      "width": 900,
       "height": 100
       "height": 100
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -2798,7 +2798,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 1920,
+      "width": 900,
       "height": 100
       "height": 100
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -2913,7 +2913,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 1920,
+      "width": 900,
       "height": 100
       "height": 100
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -3792,7 +3792,7 @@
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
       "x": 0,
       "x": 0,
-      "y": 60,
+      "y": -50,
       "z": 0
       "z": 0
     },
     },
     "_lrot": {
     "_lrot": {
@@ -4082,7 +4082,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 1920,
+      "width": 900,
       "height": 100
       "height": 100
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -4238,7 +4238,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 1920,
+      "width": 900,
       "height": 100
       "height": 100
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -4353,7 +4353,7 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 1920,
+      "width": 900,
       "height": 100
       "height": 100
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
@@ -23106,7 +23106,7 @@
     "_lpos": {
     "_lpos": {
       "__type__": "cc.Vec3",
       "__type__": "cc.Vec3",
       "x": 0,
       "x": 0,
-      "y": -300,
+      "y": -150,
       "z": 0
       "z": 0
     },
     },
     "_lrot": {
     "_lrot": {

+ 4 - 0
assets/script/edit/scene_select_list.ts

@@ -57,11 +57,15 @@ export class scene_select_list extends Component {
             move_index = c_index - 1
             move_index = c_index - 1
             if(item.getSelect()) {
             if(item.getSelect()) {
                 this.cur_select_index -=1
                 this.cur_select_index -=1
+            } else {
+                this.cur_select_index +=1
             }
             }
         } else {
         } else {
             move_index = c_index + 1
             move_index = c_index + 1
             if(item.getSelect()) {
             if(item.getSelect()) {
                 this.cur_select_index +=1
                 this.cur_select_index +=1
+            } else {
+                this.cur_select_index -=1
             }
             }
         }
         }
         if(move_index == -1) {return}
         if(move_index == -1) {return}

+ 86 - 85
assets/script/edit/search/search_node.ts

@@ -49,93 +49,94 @@ export class search_node extends Component {
     }
     }
 
 
     private showBinding(search_data) {
     private showBinding(search_data) {
-        let c_event_item = search_data.event
+        let c_event_item:event_item = search_data.event
+        if(c_event_item==null){
+            return
+        }
         let c_title = ""
         let c_title = ""
         let c_text = ""
         let c_text = ""
-        if(c_event_item!=null) {
-            switch (c_event_item.type) {
-                case config.event_type.play_ani: //0播放动画
-                c_title = '播放动画'
-                c_text = `${c_event_item.event_item_play_ani_data.binding_widget_id}`
-                break;
-                case config.event_type.top_view: //1弹窗
-                c_title = '弹窗'
-                c_text = `${c_event_item.event_item_top_view_data.binding_ui_id}`
-                break;
-                case config.event_type.text_sound: //2出现文字及语音
-                c_title = '出现文字及语音'
-                c_text = `${c_event_item.event_item_text_sound_data.binding_widget_id}`
-                break;
-                case config.event_type.change_one_item_status: //3改变指定道具资源
-                c_title = '改变指定道具资源'
-                c_text = `${c_event_item.event_item_change_one_item_status_data.binding_widget_id}`
-                break;
-                case config.event_type.show_new_item://4出现新道具
-                c_title = '出现新道具'
-                c_text = `${c_event_item.event_item_show_new_item_data.binding_widget_id}`
-                break;
-                case config.event_type.show_question_select://5出现问题选择
-                c_title = '出现问题选择'
-                c_text = `${c_event_item.event_item_show_question_select_data.binding_widget_id}`
-                break;
-                case config.event_type.start_event://6开始事件
-                c_title = '开始事件'
-                c_text = `${c_event_item.event_item_start_event_data.binding_event_id}`
-                break;
-                case config.event_type.collect_event://7收集事件 多组件完成触发
-                c_title = ''
-                c_text = `收集事件 多组件完成触发`
-                break;
-                case config.event_type.active_event://8激活
-                c_title = '激活'
-                c_text = `${c_event_item.event_item_active_event_data.binding_widget_id}`
-                break;
-                case config.event_type.stop_active_event://9停用交互
-                c_title = '停用交互'
-                c_text = `${c_event_item.event_item_stop_active_event_data.binding_widget_id}`
-                break;
-                case config.event_type.countdown_over://10倒计时结束
-                c_title = '倒计时结束'
-                c_text = `${c_event_item.event_item_countdown_over_data.binding_widget_id}`
-                break;
-                case config.event_type.be_event: //11被动触发事件
-                c_title = '被动触发事件'
-                c_text = `${c_event_item.event_item_be_event_data.binding_widget_id}`
-                break;
-                case config.event_type.hide://12触发让控件隐藏
-                c_title = '触发让控件隐藏'
-                c_text = `${c_event_item.event_item_hide_data.binding_widget_id}`
-                break;
-                case config.event_type.delay_exe_event://13延迟多久执行一个事件
-                c_title = '延迟多久执行一个事件'
-                c_text = `${c_event_item.event_item_delay_exe_data.binding_event_id}`
-                break;
-                case config.event_type.fail_event://14失败
-                c_title = ''
-                c_text = `失败`
-                break;
-                case config.event_type.play_sound://15播放一个音效
-                c_title = ''
-                c_text = `播放一个音效`
-                break;
-                case config.event_type.show_scene_title://16显示场景的标签
-                c_title = '显示场景的标签'
-                c_text = `${c_event_item.event_item_show_scene_title_data.title}`
-                break;
-                case config.event_type.scene_ani://17场景动画
-                c_title = '场景动画'
-                c_text = `${c_event_item.event_item_scene_ani.ani_id}`
-                break;
-                case config.event_type.delete_drag_other_data://18删除其他拖拽目标的属性
-                c_title = '删除其他拖拽目标的属性'
-                c_text = `${c_event_item.event_item_delete_drag_other_data.widget_id}`
-                break;
-                case config.event_type.stop_play_loop_sound://19停止一个音效
-                c_title = '停止一个音效'
-                c_text = `${c_event_item.event_item_stop_play_loop_sound_data.res}`
-                break;
-            }   
-        }
+        switch (c_event_item.type) {
+            case config.event_type.play_ani: //0播放动画
+            c_title = '播放动画'
+            c_text = `${c_event_item.event_item_play_ani_data.binding_widget_id}`
+            break;
+            case config.event_type.top_view: //1弹窗
+            c_title = '弹窗'
+            c_text = `${c_event_item.event_item_top_view_data.binding_ui_id}`
+            break;
+            case config.event_type.text_sound: //2出现文字及语音
+            c_title = '出现文字及语音'
+            c_text = `${c_event_item.event_item_text_sound_data.binding_widget_id}`
+            break;
+            case config.event_type.change_one_item_status: //3改变指定道具资源
+            c_title = '改变指定道具资源'
+            c_text = `${c_event_item.event_item_change_one_item_status_data.binding_widget_id}`
+            break;
+            case config.event_type.show_new_item://4出现新道具
+            c_title = '出现新道具'
+            c_text = `${c_event_item.event_item_show_new_item_data.binding_widget_id}`
+            break;
+            case config.event_type.show_question_select://5出现问题选择
+            c_title = '出现问题选择'
+            c_text = `${c_event_item.event_item_show_question_select_data.binding_widget_id}`
+            break;
+            case config.event_type.start_event://6开始事件
+            c_title = '开始事件'
+            c_text = `${c_event_item.event_item_start_event_data.binding_event_id}`
+            break;
+            case config.event_type.collect_event://7收集事件 多组件完成触发
+            c_title = ''
+            c_text = `收集事件 多组件完成触发`
+            break;
+            case config.event_type.active_event://8激活
+            c_title = '激活'
+            c_text = `${c_event_item.event_item_active_event_data.binding_widget_id}`
+            break;
+            case config.event_type.stop_active_event://9停用交互
+            c_title = '停用交互'
+            c_text = `${c_event_item.event_item_stop_active_event_data.binding_widget_id}`
+            break;
+            case config.event_type.countdown_over://10倒计时结束
+            c_title = '倒计时结束'
+            c_text = `${c_event_item.event_item_countdown_over_data.binding_widget_id}`
+            break;
+            case config.event_type.be_event: //11被动触发事件
+            c_title = '被动触发事件'
+            c_text = `${c_event_item.event_item_be_event_data.binding_widget_id}`
+            break;
+            case config.event_type.hide://12触发让控件隐藏
+            c_title = '触发让控件隐藏'
+            c_text = `${c_event_item.event_item_hide_data.binding_widget_id}`
+            break;
+            case config.event_type.delay_exe_event://13延迟多久执行一个事件
+            c_title = '延迟多久执行一个事件'
+            c_text = `${c_event_item.event_item_delay_exe_data.binding_event_id}`
+            break;
+            case config.event_type.fail_event://14失败
+            c_title = ''
+            c_text = `失败`
+            break;
+            case config.event_type.play_sound://15播放一个音效
+            c_title = ''
+            c_text = `播放一个音效`
+            break;
+            case config.event_type.show_scene_title://16显示场景的标签
+            c_title = '标签内容'
+            c_text = `${c_event_item.event_item_show_scene_title_data.title}`
+            break;
+            case config.event_type.scene_ani://17场景动画
+            c_title = '场景动画'
+            c_text = `${c_event_item.event_item_scene_ani.ani_id}`
+            break;
+            case config.event_type.delete_drag_other_data://18删除其他拖拽目标的属性
+            c_title = '删除其他拖拽目标的属性'
+            c_text = `${c_event_item.event_item_delete_drag_other_data.widget_id}`
+            break;
+            case config.event_type.stop_play_loop_sound://19停止一个音效
+            c_title = '停止一个音效'
+            c_text = `${c_event_item.event_item_stop_play_loop_sound_data.res}`
+            break;
+        }   
         if(c_text!="") {
         if(c_text!="") {
             let item = instantiate(this.item_prefab)
             let item = instantiate(this.item_prefab)
             item.parent = this.content;
             item.parent = this.content;