future hai 1 ano
pai
achega
21ed5ff2ae

+ 4 - 0
assets/data/data.ts

@@ -403,6 +403,7 @@ export class event_item{
     public success:event_item_success = new event_item_success;
     public event_item_play_ani_data:event_item_play_ani = null; //播放动画
     public event_item_top_view_data:event_item_top_view = null; //弹窗
+    public event_item_top_view_hide_data:event_item_top_view_hide = null; //弹窗隐藏
     public event_item_text_sound_data:event_item_text_sound = null; //出现文字及语音
     public event_item_change_one_item_status_data:event_item_change_one_item_status = null; //改变指定道具资源
     public event_item_show_new_item_data:event_item_show_new_item = null; //出现新道具
@@ -481,6 +482,9 @@ export class event_item_play_ani extends base_event_item{ // 播放动画
 export class event_item_top_view extends base_event_item{ // 弹窗
     public binding_ui_id:number = -1; //绑定某一个UI
 }
+export class event_item_top_view_hide extends base_event_item{ // 弹窗隐藏
+    public binding_ui_id:number = -1; //绑定某一个UI
+}
 export class event_item_text_sound extends base_event_item{ //出现文字及语音
     public binding_widget_id:number = -1; //绑定某一个UI
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1037 - 305
assets/resources/prefab/edit_event.prefab


+ 2 - 0
assets/script/config.ts

@@ -92,6 +92,7 @@ export class config {
         config.event_type_map.set(config.event_type.play_sound,"播放音效")
         config.event_type_map.set(config.event_type.show_question_select,"出现问题选择")
         config.event_type_map.set(config.event_type.top_view,"弹窗")
+        config.event_type_map.set(config.event_type.top_view_hide,"弹窗隐藏")
         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,"改变指定道具资源")
@@ -261,6 +262,7 @@ export class config {
         switch_scene_event:20, //多场景-切换场景事件
         more_scene_is_show_arrow_event:21, //多场景-是否显示箭头事件
         more_scene_jump_assigned_page_event:22, //多场景-跳转指定页数事件
+        top_view_hide:23,//弹窗隐藏
 
         event_group:100, //事件组
     }

+ 6 - 0
assets/script/edit/event/edit_event.ts

@@ -27,12 +27,14 @@ 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';
+import { event_top_view_hide_view } from './event_top_view_hide_view';
 const { ccclass, property } = _decorator;
 
 @ccclass('edit_event')
 export class edit_event extends Component {
     @property(Node) play_ani:Node = null;
     @property(Node) top_view:Node = null;
+    @property(Node) top_view_hide:Node = null;
     @property(Node) text_sound:Node = null;
     @property(Node) change_one_item_status:Node = null;
     @property(Node) show_new_item:Node = null;
@@ -171,6 +173,7 @@ export class edit_event extends Component {
     initMap(){
         this.widget_map.set(config.event_type.play_ani,this.play_ani)
         this.widget_map.set(config.event_type.top_view,this.top_view)
+        this.widget_map.set(config.event_type.top_view_hide,this.top_view_hide)
         this.widget_map.set(config.event_type.text_sound,this.text_sound)
         this.widget_map.set(config.event_type.change_one_item_status,this.change_one_item_status)
         this.widget_map.set(config.event_type.show_new_item,this.show_new_item)
@@ -215,6 +218,9 @@ export class edit_event extends Component {
             case config.event_type.top_view:
                 this.top_view.getComponent(event_top_view_view).initView(this.m_data.event_item_top_view_data)
             break;
+            case config.event_type.top_view_hide:
+                this.top_view_hide.getComponent(event_top_view_hide_view).initView(this.m_data.event_item_top_view_hide_data)
+            break;
             case config.event_type.text_sound:
                 this.text_sound.getComponent(event_text_sound).initView(this.m_data.event_item_text_sound_data)
             break;

+ 43 - 0
assets/script/edit/event/event_top_view_hide_view.ts

@@ -0,0 +1,43 @@
+import { _decorator, Component, Label, Node } from 'cc';
+import { Attributes } from '../Attributes';
+import { config } from '../../config';
+import { attributes_data, event_item_top_view_hide, widget_item_data } from '../../../data/data';
+import { tools } from '../../tools';
+import { ClientEvent } from '../../clientEvent';
+const { ccclass, property } = _decorator;
+
+@ccclass('event_top_view_hide_view')
+export class event_top_view_hide_view extends Component {
+    private m_data:event_item_top_view_hide = null;
+    @property(Node) btn_select_ui:Node = null;
+    @property(Node) lab_name:Node = null;
+    public initView(data:event_item_top_view_hide){
+        this.m_data = data;
+        this.btn_select_ui.on(Node.EventType.TOUCH_END,()=>{
+            let list =  Attributes.Singleton.get_cur_scene_widget_by_type(config.Widget_Type_List.UI_TOP)
+            if(list.length<=0){
+                return tools.showToast("当前场景没有添加弹窗!")
+            }
+            tools.show_select_widget_list(list,(item:widget_item_data)=>{
+                this.m_data.binding_ui_id = item.att.id;
+                this.updateStatus()
+            },this.m_data.binding_ui_id)
+          
+        })
+        this.updateStatus()
+        ClientEvent.on(config.Event.UpdateAttributesToView,this.UpdateAttributesToView,this)
+    }
+    protected onDestroy(): void {
+        ClientEvent.off(config.Event.UpdateAttributesToView,this.UpdateAttributesToView,this)
+    }
+    UpdateAttributesToView(data:attributes_data,update_type:string){
+        if(this.m_data.binding_ui_id===data.id&&update_type===config.attributes_list_type.delete){
+            this.m_data.binding_ui_id = -1;
+            this.updateStatus()
+        }
+    }
+    updateStatus(){
+        this.lab_name.getComponent(Label).string =  this.m_data.binding_ui_id===-1?"添加弹窗隐藏":`当前绑定的弹窗隐藏id:${this.m_data.binding_ui_id}`
+    }
+}
+

+ 9 - 0
assets/script/edit/event/event_top_view_hide_view.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "1326810c-1741-4e27-a105-f2ee8ed53ace",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 13 - 0
assets/script/edit/search/search_node.ts

@@ -64,6 +64,10 @@ export class search_node extends Component {
             c_title = '弹窗'
             c_text = `${c_event_item.event_item_top_view_data.binding_ui_id}`
             break;
+            case config.event_type.top_view_hide: //23弹窗隐藏
+            c_title = '弹窗隐藏'
+            c_text = `${c_event_item.event_item_top_view_hide_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}`
@@ -270,6 +274,15 @@ export class search_node extends Component {
                     }
                 break;
 
+                case config.event_type.top_view_hide:
+                    if(event.event_item_top_view_hide_data.binding_ui_id===widget_id){
+                        let item = instantiate(this.item_prefab)
+                        item.parent = this.content;
+                        item.getComponent(Label).color = Color.BLUE
+                        item.getComponent(Label).string = `${event.event_name}-id:${event.event_id}绑定`
+                    }
+                break;
+
 
                 case config.event_type.text_sound:
                     if(event.event_item_text_sound_data.binding_widget_id===widget_id){

+ 4 - 1
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, event_group_event_item } 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, event_item_top_view_hide } 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';
@@ -223,6 +223,9 @@ export class scene_task extends Component {
             case config.event_type.top_view:
                 new_event.event_item_top_view_data = new event_item_top_view
             break;
+            case config.event_type.top_view_hide:
+                new_event.event_item_top_view_hide_data = new event_item_top_view_hide
+            break;
             case config.event_type.text_sound:
                 new_event.event_item_text_sound_data = new event_item_text_sound
             break;

+ 3 - 0
assets/script/run/TaskSchedule/taskServce.ts

@@ -144,6 +144,9 @@ export class taskServce {
             case config.event_type.top_view:
                 ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,event.event_item_top_view_data.binding_ui_id,event)
             break;
+            case config.event_type.top_view_hide:
+                ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,event.event_item_top_view_hide_data.binding_ui_id,event)
+            break;
             case config.event_type.text_sound:
                 ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,event.event_item_text_sound_data.binding_widget_id,event)
             break;

+ 8 - 1
assets/script/run/ui_layer.ts

@@ -124,12 +124,19 @@ export class ui_layer extends Component {
 
     beActive(widgetId:number,event:event_item){
         if(event.type===config.event_type.top_view){
-            let ui =  this.mUIList.get(widgetId)
+            let ui = this.mUIList.get(widgetId)
             if(ui){
                 ui.getComponent(ui_base).show()
             }else{
                 tools.showToast(`配置弹窗错误!${widgetId}`)
             }
+        }else if(event.type===config.event_type.top_view_hide){
+            let ui = this.mUIList.get(widgetId)
+            if(ui){
+                ui.getComponent(ui_base).hide()
+            }else{
+                tools.showToast(`配置弹窗错误!${widgetId}`)
+            }
         }else if(event.type===config.event_type.active_event){
             let time_count = this.mCountDownLlist.get(widgetId)
             if(time_count!=null){

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio