|
@@ -1,5 +1,5 @@
|
|
import { _decorator, Component, Node } from 'cc';
|
|
import { _decorator, Component, Node } from 'cc';
|
|
-import { da_guai_item_data, event_active_event_item, event_collect_event_item, event_collect_event_score_item, event_item, event_start_event_item, task_data, zhao_xi_jie_data, zhao_xi_jie_item_data } from '../../../data/data';
|
|
|
|
|
|
+import { da_guai_item_data, event_collect_event_item, event_collect_event_score_item, event_collect_widget_score_item, event_item, event_start_event_item, task_data, zhao_xi_jie_data, zhao_xi_jie_item_data } from '../../../data/data';
|
|
import { config } from '../../config';
|
|
import { config } from '../../config';
|
|
import { tools } from '../../tools';
|
|
import { tools } from '../../tools';
|
|
import { ClientEvent } from '../../clientEvent';
|
|
import { ClientEvent } from '../../clientEvent';
|
|
@@ -18,6 +18,8 @@ export class taskServce {
|
|
private static cur_only_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:event_item = null;
|
|
private static cur_collect_event_score_total_score:number = 0;
|
|
private static cur_collect_event_score_total_score:number = 0;
|
|
|
|
+ private static cur_collect_widget_score:event_item = null;
|
|
|
|
+ private static cur_collect_widget_score_total_score:number = 0;
|
|
public static guo_ju_qing_binding_event_id:number = -1;
|
|
public static guo_ju_qing_binding_event_id:number = -1;
|
|
private static isFinishZhaoXiJieTask:boolean = false;
|
|
private static isFinishZhaoXiJieTask:boolean = false;
|
|
private static finishZhaoXiJieLastEventId:number = -1;
|
|
private static finishZhaoXiJieLastEventId:number = -1;
|
|
@@ -63,6 +65,8 @@ export class taskServce {
|
|
taskServce.cur_only_collect_event = null;
|
|
taskServce.cur_only_collect_event = null;
|
|
taskServce.cur_collect_event_score = null;
|
|
taskServce.cur_collect_event_score = null;
|
|
taskServce.cur_collect_event_score_total_score = 0;
|
|
taskServce.cur_collect_event_score_total_score = 0;
|
|
|
|
+ taskServce.cur_collect_widget_score = null;
|
|
|
|
+ taskServce.cur_collect_widget_score_total_score = 0;
|
|
taskServce.guo_ju_qing_binding_event_id = -1;
|
|
taskServce.guo_ju_qing_binding_event_id = -1;
|
|
taskServce.isFinishZhaoXiJieTask = false;
|
|
taskServce.isFinishZhaoXiJieTask = false;
|
|
taskServce.finishZhaoXiJieLastEventId = -1;
|
|
taskServce.finishZhaoXiJieLastEventId = -1;
|
|
@@ -226,6 +230,26 @@ export class taskServce {
|
|
const element = event_score_id_list[index];
|
|
const element = event_score_id_list[index];
|
|
taskServce.cur_collect_event_score.event_item_collect_event_score_data.event_id_list.push(element)
|
|
taskServce.cur_collect_event_score.event_item_collect_event_score_data.event_id_list.push(element)
|
|
}
|
|
}
|
|
|
|
+ // console.log("收集事件-分数 ",taskServce.cur_collect_event_score.event_item_collect_event_score_data.event_id_list)
|
|
|
|
+ // 不再执行后续事件
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ case config.event_type.collect_widget_score:
|
|
|
|
+ let widget_score_id_list = event.event_item_collect_widget_score_data.widget_id_list
|
|
|
|
+ if(widget_score_id_list.length>0) {
|
|
|
|
+ taskServce.cur_collect_widget_score_total_score = 0
|
|
|
|
+
|
|
|
|
+ taskServce.cur_collect_widget_score = new event_item;
|
|
|
|
+ taskServce.cur_collect_widget_score.event_id = event.event_id
|
|
|
|
+ taskServce.cur_collect_widget_score.type = event.type
|
|
|
|
+ taskServce.cur_collect_widget_score.event_item_collect_widget_score_data = new event_collect_widget_score_item
|
|
|
|
+ taskServce.cur_collect_widget_score.event_item_collect_widget_score_data.total_score = event.event_item_collect_widget_score_data.total_score
|
|
|
|
+ for (let index = 0; index < widget_score_id_list.length; index++) {
|
|
|
|
+ const element = widget_score_id_list[index];
|
|
|
|
+ taskServce.cur_collect_widget_score.event_item_collect_widget_score_data.widget_id_list.push(element)
|
|
|
|
+ }
|
|
|
|
+ // console.log("收集控件-分数 ",taskServce.cur_collect_widget_score.event_item_collect_widget_score_data.widget_id_list)
|
|
// 不再执行后续事件
|
|
// 不再执行后续事件
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -434,13 +458,56 @@ export class taskServce {
|
|
taskServce.finishDaGuai.set(widget_id,true)
|
|
taskServce.finishDaGuai.set(widget_id,true)
|
|
ClientEvent.dispatchEvent(config.EventRun.ON_BOSS_HURT,d_1.hurt)
|
|
ClientEvent.dispatchEvent(config.EventRun.ON_BOSS_HURT,d_1.hurt)
|
|
taskServce.checkFinishDaBossTask()
|
|
taskServce.checkFinishDaBossTask()
|
|
-
|
|
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ public static onWidgetQuestionSelectFinishEvent(widget_id:number, score:number) {
|
|
|
|
+ this.calculateCurrentCollectWidgetScore(widget_id, score)
|
|
}
|
|
}
|
|
|
|
|
|
public static onWidgetDragOtherFinishEvent(widget_id:number, score:number) {
|
|
public static onWidgetDragOtherFinishEvent(widget_id:number, score:number) {
|
|
|
|
+ this.calculateCurrentCollectEventScore(widget_id, score)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 计算当前收集控件分数
|
|
|
|
+ private static calculateCurrentCollectWidgetScore(widget_id:number, score:number) {
|
|
|
|
+ // console.log('widget_id=',widget_id,'score=',score)
|
|
|
|
+ if(taskServce.cur_collect_widget_score==null) {
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if(taskServce.mTaskData==null){
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ let e_index = taskServce.cur_collect_widget_score.event_item_collect_widget_score_data.widget_id_list.indexOf(widget_id)
|
|
|
|
+ if(e_index!=-1){
|
|
|
|
+ taskServce.cur_collect_widget_score_total_score += score
|
|
|
|
+ taskServce.cur_collect_widget_score.event_item_collect_widget_score_data.widget_id_list.splice(e_index,1)
|
|
|
|
+ // console.log('当前收控件分数=',taskServce.cur_collect_widget_score_total_score)
|
|
|
|
+ if(taskServce.cur_collect_widget_score.event_item_collect_widget_score_data.widget_id_list.length<=0) {
|
|
|
|
+ ClientEvent.dispatchEvent(config.EventRun.ON_WIDGET_FINISH_COLLECT_EVENT,taskServce.cur_collect_widget_score.event_id)
|
|
|
|
+ let collect_widget_score = taskServce.getEventById(taskServce.cur_collect_widget_score.event_id)
|
|
|
|
+ // console.log('collect_event_score=',collect_widget_score)
|
|
|
|
+ if(taskServce.cur_collect_widget_score_total_score>=taskServce.cur_collect_widget_score.event_item_collect_widget_score_data.total_score) {
|
|
|
|
+ if(collect_widget_score.success.trigger_event_id!=-1){
|
|
|
|
+ console.log('收集-控件-分数 成功')
|
|
|
|
+ taskServce.exeNextDelayEvent(collect_widget_score)
|
|
|
|
+ taskServce.cur_collect_event_score = null //置为null
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ if(collect_widget_score.fail.trigger_event_id!=-1){
|
|
|
|
+ console.log('收集-控件-分数 失败')
|
|
|
|
+ taskServce.exeNextDelayEvent(collect_widget_score, false)
|
|
|
|
+ taskServce.cur_collect_event_score = null //置为null
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 计算当前收集事件分数
|
|
|
|
+ private static calculateCurrentCollectEventScore(widget_id:number, score:number) {
|
|
|
|
+ // console.log('widget_id=',widget_id,'score=',score)
|
|
if(taskServce.cur_collect_event_score==null) {
|
|
if(taskServce.cur_collect_event_score==null) {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -454,18 +521,20 @@ export class taskServce {
|
|
taskServce.cur_collect_event_score_total_score += score
|
|
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)
|
|
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)
|
|
|
|
|
|
+ // 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) {
|
|
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)
|
|
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)
|
|
let collect_event_score = taskServce.getEventById(taskServce.cur_collect_event_score.event_id)
|
|
// console.log('collect_event_score=',collect_event_score)
|
|
// 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(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){
|
|
if(collect_event_score.success.trigger_event_id!=-1){
|
|
|
|
+ console.log('收集-事件-分数 成功')
|
|
taskServce.exeNextDelayEvent(collect_event_score)
|
|
taskServce.exeNextDelayEvent(collect_event_score)
|
|
taskServce.cur_collect_event_score = null //置为null
|
|
taskServce.cur_collect_event_score = null //置为null
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if(collect_event_score.fail.trigger_event_id!=-1){
|
|
if(collect_event_score.fail.trigger_event_id!=-1){
|
|
|
|
+ console.log('收集-事件-分数 失败')
|
|
taskServce.exeNextDelayEvent(collect_event_score, false)
|
|
taskServce.exeNextDelayEvent(collect_event_score, false)
|
|
taskServce.cur_collect_event_score = null //置为null
|
|
taskServce.cur_collect_event_score = null //置为null
|
|
}
|
|
}
|