|
|
@@ -15,6 +15,7 @@ export class taskServce {
|
|
|
private static finishZhaoXiJie:Map<number,boolean> = new Map;
|
|
|
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;
|
|
|
public static guo_ju_qing_binding_event_id:number = -1;
|
|
|
private static isFinishZhaoXiJieTask:boolean = false;
|
|
|
private static finishZhaoXiJieLastEventId:number = -1;
|
|
|
@@ -57,6 +58,7 @@ export class taskServce {
|
|
|
taskServce.finishDaGuai.clear()
|
|
|
taskServce.finishZhaoXiJie.clear();
|
|
|
taskServce.cur_collect_event = null;
|
|
|
+ taskServce.cur_only_collect_event = null;
|
|
|
taskServce.guo_ju_qing_binding_event_id = -1;
|
|
|
taskServce.isFinishZhaoXiJieTask = false;
|
|
|
taskServce.finishZhaoXiJieLastEventId = -1;
|
|
|
@@ -162,14 +164,35 @@ export class taskServce {
|
|
|
ClientEvent.dispatchEvent(config.EventRun.NOTICE_EVENT,event.event_item_show_question_select_data.binding_widget_id,event)
|
|
|
break;
|
|
|
case config.event_type.collect_event:
|
|
|
- taskServce.cur_collect_event = new event_item;
|
|
|
- taskServce.cur_collect_event.event_id = event.event_id;
|
|
|
- taskServce.cur_collect_event.type = event.type;
|
|
|
- taskServce.cur_collect_event.event_item_collect_event_data = new event_collect_event_item
|
|
|
- for (let index = 0; index < event.event_item_collect_event_data.event_id_list.length; index++) {
|
|
|
- const element = event.event_item_collect_event_data.event_id_list[index];
|
|
|
- taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.push(element)
|
|
|
+ let event_id_list = event.event_item_collect_event_data.event_id_list
|
|
|
+ let is_alone = event.event_item_collect_event_data.is_alone
|
|
|
+ if(is_alone==undefined||is_alone==null) {
|
|
|
+ is_alone =false
|
|
|
}
|
|
|
+ if(is_alone) {
|
|
|
+ taskServce.cur_only_collect_event = new event_item;
|
|
|
+ taskServce.cur_only_collect_event.event_id = event.event_id;
|
|
|
+ taskServce.cur_only_collect_event.type = event.type;
|
|
|
+ taskServce.cur_only_collect_event.event_item_collect_event_data = new event_collect_event_item
|
|
|
+ for (let index = 0; index < event_id_list.length; index++) {
|
|
|
+ const element = event_id_list[index];
|
|
|
+ taskServce.cur_only_collect_event.event_item_collect_event_data.event_id_list.push(element)
|
|
|
+ }
|
|
|
+ // console.log('唯一 收集事件:',taskServce.cur_only_collect_event.event_item_collect_event_data.event_id_list)
|
|
|
+
|
|
|
+ } else {
|
|
|
+ taskServce.cur_collect_event = new event_item;
|
|
|
+ taskServce.cur_collect_event.event_id = event.event_id;
|
|
|
+ taskServce.cur_collect_event.type = event.type;
|
|
|
+ taskServce.cur_collect_event.event_item_collect_event_data = new event_collect_event_item
|
|
|
+ for (let index = 0; index < event_id_list.length; index++) {
|
|
|
+ const element = event_id_list[index];
|
|
|
+ taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.push(element)
|
|
|
+ }
|
|
|
+ // console.log('普通 收集事件:',taskServce.cur_collect_event.event_item_collect_event_data.event_id_list
|
|
|
+ }
|
|
|
+
|
|
|
+ // 之前的
|
|
|
// console.log("collect_event--",taskServce.cur_collect_event)
|
|
|
// for (let index = 0; index < taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.length; index++) {
|
|
|
// const element = taskServce.cur_collect_event.event_item_collect_event_data.event_id_list[index];
|
|
|
@@ -337,22 +360,33 @@ export class taskServce {
|
|
|
return
|
|
|
}
|
|
|
let event = this.exeWidgeTaskDic.get(widget_id)
|
|
|
- if(taskServce.cur_collect_event!=null){
|
|
|
- if(event!=null){
|
|
|
- let e_index = taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.indexOf(event.event_id)
|
|
|
- if(e_index!=-1){
|
|
|
- taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.splice(e_index,1)
|
|
|
+ if(taskServce.cur_only_collect_event!=null && event!=null ) {
|
|
|
+ let e_index = taskServce.cur_only_collect_event.event_item_collect_event_data.event_id_list.indexOf(event.event_id)
|
|
|
+ if(e_index!=-1){
|
|
|
+ taskServce.cur_only_collect_event.event_item_collect_event_data.event_id_list.splice(e_index,1)
|
|
|
+ }
|
|
|
+ if(taskServce.cur_only_collect_event.event_item_collect_event_data.event_id_list.length<=0){
|
|
|
+ ClientEvent.dispatchEvent(config.EventRun.ON_WIDGET_FINISH_COLLECT_EVENT,taskServce.cur_only_collect_event.event_id)
|
|
|
+ let collect_event = taskServce.getEventById(taskServce.cur_only_collect_event.event_id)
|
|
|
+ if(collect_event.success.trigger_event_id!=-1){
|
|
|
+ taskServce.exeNextDelayEvent(collect_event)
|
|
|
}
|
|
|
- if(taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.length<=0){
|
|
|
- ClientEvent.dispatchEvent(config.EventRun.ON_WIDGET_FINISH_COLLECT_EVENT,taskServce.cur_collect_event.event_id)
|
|
|
- let collect_event = taskServce.getEventById(taskServce.cur_collect_event.event_id)
|
|
|
- if(collect_event.success.trigger_event_id!=-1){
|
|
|
- taskServce.extEventByEventId(collect_event.success.trigger_event_id)
|
|
|
- }
|
|
|
- console.log("ON_WIDGET_FINISH_COLLECT_EVENT event",collect_event)
|
|
|
+ console.log("唯一 ON_WIDGET_FINISH_COLLECT_EVENT event",collect_event)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(taskServce.cur_collect_event!=null && event!=null){
|
|
|
+ let e_index = taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.indexOf(event.event_id)
|
|
|
+ if(e_index!=-1){
|
|
|
+ taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.splice(e_index,1)
|
|
|
+ }
|
|
|
+ if(taskServce.cur_collect_event.event_item_collect_event_data.event_id_list.length<=0){
|
|
|
+ ClientEvent.dispatchEvent(config.EventRun.ON_WIDGET_FINISH_COLLECT_EVENT,taskServce.cur_collect_event.event_id)
|
|
|
+ let collect_event = taskServce.getEventById(taskServce.cur_collect_event.event_id)
|
|
|
+ if(collect_event.success.trigger_event_id!=-1){
|
|
|
+ taskServce.extEventByEventId(collect_event.success.trigger_event_id)
|
|
|
}
|
|
|
+ console.log("普通 ON_WIDGET_FINISH_COLLECT_EVENT event",collect_event)
|
|
|
}
|
|
|
- // console.log("event", taskServce.cur_collect_event.event_item_collect_event_data.event_id_list)
|
|
|
}
|
|
|
|
|
|
let id = taskServce.exeNextEvent(event)
|
future