future 1 jaar geleden
bovenliggende
commit
7a6b775620

+ 6 - 0
assets/data/data.ts

@@ -86,6 +86,7 @@ export class att_drag_data{
     public other_widget_finish_listen_list:other_widget_finish_listen_item[] = [];
     public index:number = -1; //当前索引
     public remark:string = ''; //备注
+    public score:number = 0; //分数
     public is_show_inTheEditor:boolean = true; //在编辑器中,是否显示
 }
 
@@ -422,6 +423,7 @@ export class event_item{
 
     public event_item_start_event_data:event_start_event_item = null; //
     public event_item_collect_event_data:event_collect_event_item = null; // 
+    public event_item_collect_event_score_data:event_collect_event_score_item = null; // 
     public event_item_active_event_data:event_active_event_item = null; //
     public event_item_stop_active_event_data:event_stop_active_event_item = null; //
 
@@ -534,6 +536,10 @@ export class event_collect_event_item extends base_event_item{ // 收集多个
     public event_id_list:number[] = []
     public is_alone:boolean = false; //是否单独一个
 }
+export class event_collect_event_score_item extends base_event_item { // 收集多个事件分数
+    public event_id_list:number[] = []
+    public total_score:number = 0; //分数
+}
 export class event_item_countdown_over extends base_event_item{ //倒计时结束
     public binding_widget_id:number = -1; //绑定某一个UI
     public binding_fail_event_id:number = -1; //失败事件

File diff suppressed because it is too large
+ 446 - 124
assets/resources/prefab/edit_event.prefab


File diff suppressed because it is too large
+ 779 - 89
assets/resources/prefab/task/other_drag_list_item.prefab


+ 6 - 1
assets/script/config.ts

@@ -5,7 +5,7 @@ const { ccclass, property } = _decorator;
 export class config {
     static debug = true;
     static domain = "https://zcapi.xwrun.com";
-    static version = '调试 v2.0.4'
+    static version = '调试 v2.0.5'
     static is_MAC_edit = false; //目前临时处理:如果是Mac并且浏览器打开了检查时设置为true,正式打包需要设置为false
     static select_res_and_control_type = {
         RES_TYPE:0,
@@ -96,6 +96,7 @@ export class config {
         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.collect_event_score,"收集事件-分数")
         config.event_type_map.set(config.event_type.change_one_item_status,"改变指定道具资源")
         config.event_type_map.set(config.event_type.event_group,"事件组")
         config.event_type_map.set(config.event_type.switch_scene_event,"多场景-切换场景事件")
@@ -264,6 +265,7 @@ export class config {
         more_scene_is_show_arrow_event:21, //多场景-是否显示箭头事件
         more_scene_jump_assigned_page_event:22, //多场景-跳转指定页数事件
         top_view_hide:23,//弹窗隐藏
+        collect_event_score:24, //收集事件-分数
         event_group:100, //事件组
     }
 
@@ -320,6 +322,8 @@ export class config {
                 break;
             case config.event_type.event_group: string = '事件组' 
                 break;
+            case config.event_type.collect_event_score: string = '收集事件-分数'
+                break;
             default:
                 break;
         }
@@ -380,6 +384,7 @@ export class config {
         WIDGET_FINISH:"WIDGET_FINISH", //控件完成了自己本身的任务
         WIDGET_FAIL:"WIDGET_FAIL", //失败
         WIDGET_HIDE:"WIDGET_HIDE", //隐藏
+        WIDGET_DRAG_OTHER_FINISH:"WIDGET_DRAG_OTHER_FINISH", //控件拖拽其他完成
         SHOW_ZHAO_BU_TONG_FINISH_STATUS:"SHOW_ZHAO_BU_TONG_FINISH_STATUS", //
         ON_ZHAO_BU_TONG_ALL_FINISH:"ON_ZHAO_BU_TONG_ALL_FINISH", //找细节所有完成
         TOP_VIEW_CLOSE:"TOP_VIEW_CLOSE", //弹窗关闭

+ 10 - 1
assets/script/edit/attributes/other_drag_list_item.ts

@@ -17,6 +17,7 @@ export class other_drag_list_item extends Component {
     @property(Node) lab_finish_logic:Node = null;
     @property(Node) btn_delete:Node = null;
     @property(EditBox) editBox_remark:EditBox = null;
+    @property(EditBox) editBox_score:EditBox = null;
     @property(Node) btn_is_show:Node = null;
     @property(Node) btn_up:Node = null;
     @property(Node) btn_down:Node = null;
@@ -50,6 +51,7 @@ export class other_drag_list_item extends Component {
         this.drag_y.node.on('editing-did-ended', this.change, this);
 
         this.editBox_remark.node.on('editing-did-ended', this.change, this);
+        this.editBox_score.node.on(EditBox.EventType.EDITING_DID_ENDED, this.change, this)
 
         this.btn_is_show.on('toggle', ()=> {
             this.m_data.is_show_inTheEditor = !this.m_data.is_show_inTheEditor
@@ -91,7 +93,9 @@ export class other_drag_list_item extends Component {
         this.m_data.drag_size_height = parseInt(this.drag_height.string);
 
         this.m_data.remark = this.editBox_remark.string;
-       
+
+        this.m_data.score = parseInt(this.editBox_score.string)
+
         ClientEvent.dispatchEvent(config.Event.UpdateAttributesToView, Attributes.Singleton.get_cur_att_data(),config.attributes_list_type.drag)
     }
 
@@ -108,6 +112,11 @@ export class other_drag_list_item extends Component {
         }
         this.editBox_remark.string = data.remark
 
+        if(data.score==undefined) {
+            data.score = 0
+        }
+        this.editBox_score.string = data.score.toString()
+
         if(data.is_show_inTheEditor==undefined) {
             data.is_show_inTheEditor = true
         }

+ 27 - 5
assets/script/edit/event/edit_event.ts

@@ -28,6 +28,7 @@ import { event_more_scene_jump_assigned_page_event } from './event_more_scene_ju
 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';
+import { event_collect_event_score } from './event_collect_event_score';
 const { ccclass, property } = _decorator;
 
 @ccclass('edit_event')
@@ -47,6 +48,7 @@ export class edit_event extends Component {
     @property(Node) stop_active_event:Node = null;
     @property(Node) start_event:Node =null;
     @property(Node) collect_event:Node = null;
+    @property(Node) collect_event_score:Node = null;
     @property(Node) be_event:Node = null;
     @property(Node) hide:Node = null;
     @property(Node) delay_exe_event:Node = null;
@@ -84,7 +86,8 @@ export class edit_event extends Component {
 
     @property(Node) btn_close:Node = null;
 
-    @property(Node) btn_clear_event:Node = null;
+    @property(Node) btn_finish_clear_event:Node = null;
+    @property(Node) btn_fail_clear_event:Node = null;
 
     private widget_map:Map<number,Node> = new Map;
     private m_data:event_item = null;
@@ -108,9 +111,23 @@ export class edit_event extends Component {
                 })
             }
         })
-        this.btn_clear_event.on(Node.EventType.TOUCH_END,()=>{
-            this.m_data.success.trigger_event_id = -1;
-            this.lab_finish_trigger_event_id.getComponent(Label).string = "暂未设置触发下个事件的id"
+        this.btn_finish_clear_event.on(Node.EventType.TOUCH_END,()=>{
+            if(this.m_data.success.trigger_event_id==-1) {
+                return
+            }
+            tools.show_dialog("是否删除事件?",()=>{
+                this.m_data.success.trigger_event_id = -1
+                this.lab_finish_trigger_event_id.getComponent(Label).string = "暂未设置触发下个事件的id"
+            })
+        })
+        this.btn_fail_clear_event.on(Node.EventType.TOUCH_END, ()=>{
+            if(this.m_data.fail.trigger_event_id==-1) {
+                return
+            }
+            tools.show_dialog("是否删除事件?",()=>{
+                this.m_data.fail.trigger_event_id = -1
+                this.lab_fail_trigger_event_id.getComponent(Label).string = "暂未设置失败事件的id"
+            })
         })
         this.btn_close.on(Node.EventType.TOUCH_END,()=>{
             this.node.removeFromParent()
@@ -125,7 +142,7 @@ export class edit_event extends Component {
         
         this.is_relife.getComponent(Toggle).isChecked = this.m_data.fail.is_relife;
         this.is_restart.getComponent(Toggle).isChecked = this.m_data.fail.is_restart;
-        this.lab_fail_trigger_event_id.getComponent(Label).string = this.m_data.fail.trigger_event_id==-1?"暂未设置失败事件的id":`败事件的id":${this.m_data.fail.trigger_event_id}`
+        this.lab_fail_trigger_event_id.getComponent(Label).string = this.m_data.fail.trigger_event_id==-1?"暂未设置失败事件的id":`败事件的id${this.m_data.fail.trigger_event_id}`
     
         this.is_finish_game.on('toggle',this.change.bind(this))
         this.is_next_scene.on('toggle',this.change.bind(this))
@@ -182,6 +199,7 @@ export class edit_event extends Component {
 
         this.widget_map.set(config.event_type.start_event,this.start_event)
         this.widget_map.set(config.event_type.collect_event,this.collect_event)
+        this.widget_map.set(config.event_type.collect_event_score,this.collect_event_score)
         this.widget_map.set(config.event_type.active_event,this.active_event)
         this.widget_map.set(config.event_type.stop_active_event,this.stop_active_event)
         this.widget_map.set(config.event_type.be_event,this.be_event)
@@ -199,6 +217,7 @@ export class edit_event extends Component {
         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)=>{
@@ -242,6 +261,9 @@ export class edit_event extends Component {
             case config.event_type.collect_event: //收集多个事件
                 this.collect_event.getComponent(event_collect_event).initView(this.m_data.event_item_collect_event_data,this.m_data.event_id)
             break;
+            case config.event_type.collect_event_score: //收集多个事件分数
+                this.collect_event_score.getComponent(event_collect_event_score).initView(this.m_data.event_item_collect_event_score_data,this.m_data.event_id)
+            break;
             case config.event_type.active_event: //激活一个控件
                 this.active_event.getComponent(event_active_event).initView(this.m_data.event_item_active_event_data)
             break;

+ 62 - 0
assets/script/edit/event/event_collect_event_score.ts

@@ -0,0 +1,62 @@
+import { _decorator, Component, EditBox, instantiate, Node, Prefab } from 'cc';
+import { event_collect_event_score_item } from '../../../data/data';
+import { Attributes } from '../Attributes';
+import { tools } from '../../tools';
+import { collect_event_item } from './collect_event_item';
+const { ccclass, property } = _decorator;
+
+@ccclass('event_collect_event_score')
+export class event_collect_event_score extends Component {
+    private m_data:event_collect_event_score_item = null;
+    @property(Node) btn_select_collect_event:Node = null;
+    @property(EditBox) editbox_score:EditBox = null;
+    @property(Node) content:Node = null;
+    @property(Prefab) item_prefab:Prefab = null;
+    private _self_event_id:number = 0;
+    start() {
+        this.editbox_score.node.on(EditBox.EventType.EDITING_DID_ENDED, ()=>{
+            if(this.editbox_score.string.length<=0) {
+                this.editbox_score.string = '0'
+            }
+            this.m_data.total_score = parseInt(this.editbox_score.string)
+            this.updateScoreStatus()
+        })
+    }
+
+    public initView(data:event_collect_event_score_item,self_event_id:number){
+        this.m_data = data;
+        this._self_event_id = self_event_id;
+        this.btn_select_collect_event.on(Node.EventType.TOUCH_END,()=>{
+            let list =  Attributes.Singleton.getBeActionEventList()
+            if(list.length<=0){
+                return tools.showToast("没有可添加的事件")
+            }
+            tools.select_collect_event(list,(event_list:number[])=>{
+                this.m_data.event_id_list =event_list;
+                this.updateStatus()
+            },this._self_event_id,this.m_data.event_id_list)
+          
+        })
+        this.updateScoreStatus()
+        this.updateStatus()
+    }
+
+    updateScoreStatus() {
+        if(this.m_data.total_score==undefined||this.m_data.total_score==null) {
+            this.m_data.total_score = 0
+        }
+        this.editbox_score.string = this.m_data.total_score.toString()
+    }
+
+    updateStatus(){
+        this.content.removeAllChildren()
+        for (let index = 0; index <  this.m_data.event_id_list.length; index++) {
+            const id =  this.m_data.event_id_list[index];
+            let item = instantiate(this.item_prefab);
+            item.parent = this.content;
+            item.getComponent(collect_event_item).initView(id)
+        }
+    }
+
+}
+

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

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "aff5dbba-b623-4c2d-8155-9209c032e383",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 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, event_item_top_view_hide } 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, event_collect_event_score_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';
@@ -259,6 +259,9 @@ export class scene_task extends Component {
             case config.event_type.collect_event:
                 new_event.event_item_collect_event_data = new event_collect_event_item
             break;
+            case config.event_type.collect_event_score:
+                new_event.event_item_collect_event_score_data = new event_collect_event_score_item
+            break;
             case config.event_type.start_event:
                 new_event.event_item_start_event_data = new event_start_event_item
             break;

+ 64 - 6
assets/script/run/TaskSchedule/taskServce.ts

@@ -1,5 +1,5 @@
 import { _decorator, Component, Node } from 'cc';
-import { da_guai_item_data, event_active_event_item, event_collect_event_item, event_item, event_start_event_item, event_stop_active_event_item, task_data, zhao_xi_jie_data, zhao_xi_jie_item_data } from '../../../data/data';
+import { da_guai_item_data, event_active_event_item, event_collect_event_item, event_collect_event_score_item, event_item, event_start_event_item, event_stop_active_event_item, task_data, zhao_xi_jie_data, zhao_xi_jie_item_data } from '../../../data/data';
 import { config } from '../../config';
 import { event_start_event } from '../../edit/event/event_start_event';
 import { tools } from '../../tools';
@@ -17,6 +17,8 @@ export class taskServce {
     private static finishDaGuai:Map<number,boolean> = new Map;
     private static cur_collect_event:event_item = null;
     private static cur_only_collect_event:event_item = null;
+    private static cur_collect_event_score:event_item = null;
+    private static cur_collect_event_score_total_score:number = 0;
     public static guo_ju_qing_binding_event_id:number = -1;
     private static isFinishZhaoXiJieTask:boolean = false;
     private static finishZhaoXiJieLastEventId:number = -1;
@@ -60,6 +62,8 @@ export class taskServce {
         taskServce.finishZhaoXiJie.clear();
         taskServce.cur_collect_event = null;
         taskServce.cur_only_collect_event = null;
+        taskServce.cur_collect_event_score = null;
+        taskServce.cur_collect_event_score_total_score = 0;
         taskServce.guo_ju_qing_binding_event_id = -1;
         taskServce.isFinishZhaoXiJieTask = false;
         taskServce.finishZhaoXiJieLastEventId = -1;
@@ -209,9 +213,24 @@ export class taskServce {
                 //     console.log("event_data--",event_data)
                 // }
             break;
-            // case config.event_type.start_event:
-
-            // break;
+            case config.event_type.collect_event_score:
+                let event_score_id_list = event.event_item_collect_event_score_data.event_id_list
+                if(event_score_id_list.length>0) {
+                    taskServce.cur_collect_event_score_total_score = 0
+
+                    taskServce.cur_collect_event_score = new event_item;
+                    taskServce.cur_collect_event_score.event_id = event.event_id
+                    taskServce.cur_collect_event_score.type = event.type
+                    taskServce.cur_collect_event_score.event_item_collect_event_score_data = new event_collect_event_score_item
+                    taskServce.cur_collect_event_score.event_item_collect_event_score_data.total_score = event.event_item_collect_event_score_data.total_score
+                    for (let index = 0; index < event_score_id_list.length; index++) {
+                        const element = event_score_id_list[index];
+                        taskServce.cur_collect_event_score.event_item_collect_event_score_data.event_id_list.push(element)
+                    }
+                    // 不再执行后续事件
+                    return
+                }
+            break;
             case config.event_type.active_event:
                 ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,event.event_item_active_event_data.binding_widget_id,event)
             break;
@@ -421,6 +440,40 @@ export class taskServce {
 
     }
 
+    public static onWidgetDragOtherFinishEvent(widget_id:number, score:number) {
+        if(taskServce.cur_collect_event_score==null) {
+            return
+        }
+        if(taskServce.mTaskData==null){
+            return
+        }
+        let event = this.exeWidgeTaskDic.get(widget_id)
+        if(event!=null) {
+            let e_index = taskServce.cur_collect_event_score.event_item_collect_event_score_data.event_id_list.indexOf(event.event_id)
+            if(e_index!=-1){
+                taskServce.cur_collect_event_score_total_score += score
+                taskServce.cur_collect_event_score.event_item_collect_event_score_data.event_id_list.splice(e_index,1)
+            }
+            // console.log('当前分数=',taskServce.cur_collect_event_score_total_score)
+            if(taskServce.cur_collect_event_score.event_item_collect_event_score_data.event_id_list.length<=0) {
+                ClientEvent.dispatchEvent(config.EventRun.ON_WIDGET_FINISH_COLLECT_EVENT,taskServce.cur_collect_event_score.event_id)
+                let collect_event_score = taskServce.getEventById(taskServce.cur_collect_event_score.event_id)
+                // console.log('collect_event_score=',collect_event_score)
+                if(taskServce.cur_collect_event_score_total_score>=taskServce.cur_collect_event_score.event_item_collect_event_score_data.total_score) {
+                    if(collect_event_score.success.trigger_event_id!=-1){
+                        taskServce.exeNextDelayEvent(collect_event_score)
+                        taskServce.cur_collect_event_score = null //置为null
+                    }
+                } else {
+                    if(collect_event_score.fail.trigger_event_id!=-1){
+                        taskServce.exeNextDelayEvent(collect_event_score, false)
+                        taskServce.cur_collect_event_score = null //置为null
+                    }
+                }
+            }
+        }
+    }
+
     public static checkFinishDaBossTask(){
         let isFinish  = true;
         if(!taskServce.mTaskData._da_guai){
@@ -568,7 +621,7 @@ export class taskServce {
        taskServce.DistributedEvent(event)
     }
 
-    public static exeNextDelayEvent(event:event_item){
+    public static exeNextDelayEvent(event:event_item, is_success_trigger:boolean=true){
         if(event!=null){
             if(event.success.is_finish_game){
                 return gameManager.Singleton.gameOver()
@@ -577,7 +630,12 @@ export class taskServce {
                     return gameManager.Singleton.nextScene()
                 }
             }
-            let id = event.success.trigger_event_id;
+            let id = -1
+            if(is_success_trigger) {
+                id = event.success.trigger_event_id
+            } else {
+                id = event.fail.trigger_event_id
+            }
             if(id!=-1){
                 let _event:event_item =  this.getEventById(id)
                 if(_event===null){

+ 7 - 0
assets/script/run/gameManager.ts

@@ -237,6 +237,7 @@ export class gameManager extends Component {
         ClientEvent.offAll(config.EventRun.NOTICE_EVENT)
         ClientEvent.offAll(config.EventRun.WIDGET_FINISH)
         ClientEvent.offAll(config.EventRun.WIDGET_FAIL)
+        ClientEvent.offAll(config.EventRun.WIDGET_DRAG_OTHER_FINISH)
         ClientEvent.offAll(config.EventRun.ON_WIDGET_FINISH_COLLECT_EVENT)
         ClientEvent.offAll(config.EventRun.WIDGET_HIDE)
         ClientEvent.offAll(config.EventRun.SHOW_ZHAO_BU_TONG_FINISH_STATUS)
@@ -252,6 +253,7 @@ export class gameManager extends Component {
 
         ClientEvent.on(config.EventRun.WIDGET_FINISH,this.onWidgetFinishEvent.bind(this),this)
         ClientEvent.on(config.EventRun.WIDGET_FAIL,this.onWidgetFailEvent.bind(this),this)
+        ClientEvent.on(config.EventRun.WIDGET_DRAG_OTHER_FINISH,this.onWidgetDragOtherFinishEvent.bind(this),this)
         ClientEvent.on(config.EventRun.TOP_VIEW_CLOSE,this.onUiCloseEvent.bind(this),this)
         ClientEvent.on(config.EventRun.TOP_VIEW_FINISH,this.onUiFinishEvent.bind(this),this)
         ClientEvent.on(config.EventRun.TOP_VIEW_FAIL,this.onUiFailEvent.bind(this),this)
@@ -313,6 +315,7 @@ export class gameManager extends Component {
 
     protected onDestroy(): void {
         ClientEvent.off(config.EventRun.WIDGET_FINISH,this.onWidgetFinishEvent.bind(this),this)
+        ClientEvent.off(config.EventRun.WIDGET_DRAG_OTHER_FINISH,this.onWidgetDragOtherFinishEvent.bind(this),this)
     }
 
     public startLevelGame(callback=null){
@@ -459,6 +462,10 @@ export class gameManager extends Component {
         taskServce.onWidgetFailEvent(widget_id)
     }
 
+    onWidgetDragOtherFinishEvent(widget_id:number, score:number) {
+        taskServce.onWidgetDragOtherFinishEvent(widget_id, score)
+    }
+
     onUiCloseEvent(event_id:number){
         taskServce.extEventByEventId(event_id)
     }

+ 4 - 0
assets/script/run/widget/widget_drag.ts

@@ -2,6 +2,8 @@ import { _decorator, Component, EventTouch, Node, Rect, Sprite, UITransform, v2,
 import { widget_base } from './widget_base';
 import { att_drag_data, widget_item_data } from '../../../data/data';
 import { gameManager } from '../gameManager';
+import { ClientEvent } from '../../clientEvent';
+import { config } from '../../config';
 const { ccclass, property } = _decorator;
 
 @ccclass('widget_drag')
@@ -27,6 +29,7 @@ export class widget_drag extends widget_base {
                 item.other_event_id = element.other_event_id;
                 item.drag_size_width = element.drag_size_width;
                 item.drag_size_height = element.drag_size_height;
+                item.score = element.score;
                 this.other_drag_list.push(item)
             }
         }
@@ -95,6 +98,7 @@ export class widget_drag extends widget_base {
                     if(item_data.other_event_id!=-1){
                         this.offEvent()
                         console.log("item_data.other_event_id",item_data.other_event_id)
+                        ClientEvent.dispatchEvent(config.EventRun.WIDGET_DRAG_OTHER_FINISH,this.mData.att.id,item_data.score)
                         gameManager.Singleton.exeEvent(item_data.other_event_id)
                         isCheck = true;
                         break;

Some files were not shown because too many files changed in this diff