|
@@ -18,8 +18,6 @@ export class taskServce {
|
|
|
private static cur_collect_event:event_item = null;
|
|
|
public static guo_ju_qing_binding_event_id:number = -1;
|
|
|
|
|
|
- private static curZhaoXiJieIsFinishAll:boolean = false;//当前找细节是否全部完成
|
|
|
-
|
|
|
//子场景
|
|
|
private static mChildSceneData:task_data = null;
|
|
|
private static childSceneZhaoXiJie:Map<number,zhao_xi_jie_item_data> = new Map;
|
|
@@ -58,7 +56,6 @@ export class taskServce {
|
|
|
taskServce.finishZhaoXiJie.clear();
|
|
|
taskServce.cur_collect_event = null;
|
|
|
taskServce.guo_ju_qing_binding_event_id = -1;
|
|
|
- taskServce.curZhaoXiJieIsFinishAll = false;
|
|
|
}
|
|
|
|
|
|
public static initZhaoXiJieTask(){
|
|
@@ -414,12 +411,16 @@ export class taskServce {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- taskServce.curZhaoXiJieIsFinishAll = isFinish
|
|
|
if(isFinish){
|
|
|
- let id =taskServce.mTaskData._zhao_xi_jie_data.finish_event_id;
|
|
|
+ let zhaoxijie_data = taskServce.mTaskData._zhao_xi_jie_data
|
|
|
+ let id = zhaoxijie_data.finish_event_id
|
|
|
+ let dalay_time = 0
|
|
|
+ if( zhaoxijie_data.finish_all_hide_answer_dalay_time!=undefined) {
|
|
|
+ dalay_time = zhaoxijie_data.finish_all_hide_answer_dalay_time
|
|
|
+ }
|
|
|
gameManager.Singleton.scheduleOnce(()=>{
|
|
|
- ClientEvent.dispatchEvent(config.EventRun.ON_ZHAO_BU_TONG_ALL_FINISH, taskServce.mTaskData._zhao_xi_jie_data)
|
|
|
- },0.2)
|
|
|
+ ClientEvent.dispatchEvent(config.EventRun.ON_ZHAO_BU_TONG_ALL_FINISH, zhaoxijie_data)
|
|
|
+ },dalay_time)
|
|
|
if(id==-1){
|
|
|
return tools.showToast("未设置全部找完任务的下一个事件!")
|
|
|
}else{
|
|
@@ -428,16 +429,6 @@ export class taskServce {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public static checkFinishAllZhaoXiJieTask() {
|
|
|
- // '显示文字和语音'结束后,检查找到所有完成细节任务,隐藏红圈
|
|
|
- // if(taskServce.mTaskData.type!=config.task_type.zhao_xi_jie) {
|
|
|
- // return
|
|
|
- // }
|
|
|
- // if(taskServce.curZhaoXiJieIsFinishAll) {
|
|
|
- // ClientEvent.dispatchEvent(config.EventRun.ON_ZHAO_BU_TONG_ALL_FINISH, taskServce.mTaskData._zhao_xi_jie_data)
|
|
|
- // }
|
|
|
- }
|
|
|
-
|
|
|
// public static onWidgetHideEvent(widget_id:number){
|
|
|
// let event = this.exeHideWidgeTaskDic.get(widget_id)
|
|
|
// if(!event){
|