456

assets/data/data.ts

@@ -429,6 +429,8 @@ export class event_item{
     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;//多场景-跳转指定页数事件
+
+    public event_item_event_group_data:event_group_event_item = null;// 事件组
 }
 export class base_event_item{
 
@@ -546,6 +548,10 @@ export class event_item_more_scene_jump_assigned_page_event extends base_event_i
     static defaultIntervalTime():number{ return 0.7 }
 }
 
+export class event_group_event_item extends base_event_item{ // 事件组
+    public list = []
+}
+
 export class event_widget_more_event_item extends base_event_item {
     public binding_widget_id:number = -1; //绑定事件
     public binding_widget_remark:string = ''; //备注

assets/edit_game.scene

@@ -163864,7 +163864,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -2028.5000000000002,
+      "y": -2098.5,
       "z": 0
     },
     "_lrot": {
@@ -177043,7 +177043,6 @@
     "__type__": "15202jfnA9P4JbxFRX7n6Bb",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 4480
     },
@@ -177875,7 +177874,6 @@
     "__type__": "d2d99A0tkVBfpmYBewJBSP+",
     "_name": "",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "node": {
       "__id__": 543
     },

assets/script/config.ts

@@ -82,6 +82,7 @@ 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.event_group,"事件组")
         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,"激活交互")
@@ -259,6 +260,7 @@ export class config {
         more_scene_is_show_arrow_event:21, //多场景-是否显示箭头事件
         more_scene_jump_assigned_page_event:22, //多场景-跳转指定页数事件
 
+        event_group:100, //事件组
     }
 
     static top_view_type_map:Map<number,string> = new Map();

assets/script/edit/attributes/attributes_count_down.ts

@@ -108,6 +108,9 @@ export class attributes_count_down extends Component {
     }
     public update_att(data:att_count_down){
         this.m_data = data;        
+        console.log(' this.m_data.time_count=', this.m_data.time_count)
+        console.log(' this.m_data.font_info.font_size=', this.m_data.font_info.font_size)
+
         this.ProgressBar_Bg.getComponent(question_btn_info).initView(this.m_data.ProgressBar_Bg,1,null,config.attributes_list_type.count_down)
         this.ProgressBar_Bar.getComponent(question_btn_info).initView(this.m_data.ProgressBar_Bar,2,null,config.attributes_list_type.count_down)
         this.img_text.getComponent(question_btn_info).initView(this.m_data.img_text,3,null,config.attributes_list_type.count_down)
@@ -117,6 +120,13 @@ export class attributes_count_down extends Component {
         this.lab_fail_event.getComponent(Label).string = this.m_data.fail_event_id!=-1?`绑定的id${this.m_data.fail_event_id}`:"无"
         this.lab_start_event.getComponent(Label).string = this.m_data.start_event_id!=-1?`绑定的id${this.m_data.start_event_id}`:"无"
         if(this.m_data.font_info!=undefined&&this.m_data.font_info!=null){
+            if(this.m_data.font_info.font_size==undefined||
+                this.m_data.font_info.font_size==null||
+                isNaN(this.m_data.font_info.font_size)) {
+                this.m_data.font_info.font_size = 20
+            } else {
+                this.m_data.font_info.font_size = parseInt(this.font_size.getComponent(EditBox).string)
+            }
             let color = this.m_data.font_info.font_color;
             this.font_color.getComponent(Sprite).color = new Color(color.r,color.g,color.b);
             this.font_size.getComponent(EditBox).string = this.m_data.font_info.font_size.toString()
@@ -130,7 +140,13 @@ export class attributes_count_down extends Component {
         this.m_data.is_show_time = this.toggle_enbale_time.getComponent(Toggle).isChecked ;
         let down_count_time = this.edit_down_count_time.getComponent(EditBox).string
         if(this.m_data.font_info!=undefined&&this.m_data.font_info!=null){
-            this.m_data.font_info.font_size = parseInt(this.font_size.getComponent(EditBox).string)
+            if(this.m_data.font_info.font_size==undefined||
+                this.m_data.font_info.font_size==null||
+                isNaN(this.m_data.font_info.font_size)) {
+                this.m_data.font_info.font_size = 20
+            }  else {
+                this.m_data.font_info.font_size = parseInt(this.font_size.getComponent(EditBox).string)
+            }
         }
         if(down_count_time.length>0) {
             this.m_data.time_count = parseInt(down_count_time);

assets/script/edit/event/edit_event.ts

@@ -26,6 +26,7 @@ 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';
+import { event_group } from './event_group';
 const { ccclass, property } = _decorator;
 
 @ccclass('edit_event')
@@ -50,6 +51,7 @@ export class edit_event extends Component {
     @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) event_group:Node = null; 
 
     @property(Node) scene_ani:Node = null;
 
@@ -191,6 +193,8 @@ export class edit_event extends Component {
         this.widget_map.set(config.event_type.scene_ani,this.scene_ani)
         this.widget_map.set(config.event_type.delete_drag_other_data,this.delete_drag_other_data)
         this.widget_map.set(config.event_type.stop_play_loop_sound,this.stop_play_loop_sound)
+
+        this.widget_map.set(config.event_type.event_group,this.event_group)
     }
     hideAllWidget(){
         this.widget_map.forEach((v,k)=>{
@@ -264,15 +268,18 @@ export class edit_event extends Component {
             case config.event_type.stop_play_loop_sound: //
                 this.stop_play_loop_sound.getComponent(event_stop_play_loop_sound).initView(this.m_data.event_item_stop_play_loop_sound_data)
             break;
-            case config.event_type.switch_scene_event:
+            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:
+            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:
+            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;
+            case config.event_type.event_group://事件组
+                this.event_group.getComponent(event_group).initView(this.m_data.event_item_event_group_data)
+            break;
         }
     }
 

assets/script/edit/event/event_group.ts

@@ -0,0 +1,18 @@
+import { _decorator, Component, Node } from 'cc';
+import { event_group_event_item } from '../../../data/data';
+const { ccclass, property } = _decorator;
+
+@ccclass('event_group')
+export class event_group extends Component {
+    @property(Node) btn_add_event:Node = null;
+    start() {
+        this.btn_add_event.on(Node.EventType.TOUCH_END, ()=>{
+
+        })
+    }
+
+    initView(data:event_group_event_item) {
+        console.log('事件组 data=',data)
+    }
+}
+

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

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "686dad13-0bf6-4f9f-a0f0-6e3daa568721",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/script/edit/search/search_node.ts

@@ -160,6 +160,10 @@ export class search_node extends Component {
             c_title = '多场景-跳转指定页数事件'
             c_text = `页数:${c_event_item.event_item_more_scene_jump_assigned_page_event_data.page_number}`
             break;
+            case config.event_type.event_group://100事件组
+            c_title = '事件组'
+            c_text = `~~~~~~~`
+            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, event_item_more_scene_is_show_arrow_event, event_item_more_scene_jump_assigned_page_event } 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, event_group_event_item } 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';
@@ -279,6 +279,9 @@ export class scene_task extends Component {
             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;
+            case config.event_type.event_group:
+                new_event.event_item_event_group_data = new event_group_event_item
+            break;
         }
         this.addEventItemView(type,new_event)
         task_data.event_list.push(new_event)

assets/script/run/TaskSchedule/taskServce.ts

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

assets/script/run/scene_page.ts

@@ -120,6 +120,8 @@ export class scene_page extends Component {
         }else if(event.type===config.event_type.hide) {
             let data = event.event_item_hide_data
             this.eventMoreBindingWidgetList(data, event)
+        }else if(event.type===config.event_type.event_group) {
+            console.log('开始执行 事件组')
         }
     }
     eventMoreBindingWidgetList(data, event:event_item) {