future 1 жил өмнө
parent
commit
1f5eb2167b

+ 1 - 0
assets/data/data.ts

@@ -390,6 +390,7 @@ export class zhao_xi_jie_data{
     public tip_type:number = config.zhao_xi_jie_tip_type.select_tips;
     public widget_id_list:zhao_xi_jie_item_data[] = []
     public finish_event_id:number = -1; //全部找到之后执行的事件
+    public finish_all_hide_answer_dalay_time = 0;//找到所有隐藏答案延迟时间
 }
 export class guo_ju_qing_not_rule_data { //先创建数据模型,目前没有属性
 }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 639 - 81
assets/edit_game.scene


+ 16 - 1
assets/script/edit/task/task_zhao_xi_jie.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Label, Node } from 'cc';
+import { _decorator, Component, EditBox, Label, Node } from 'cc';
 import { tools } from '../../tools';
 import { event_item, zhao_xi_jie_data } from '../../../data/data';
 import { Attributes } from '../Attributes';
@@ -12,7 +12,17 @@ export class task_zhao_xi_jie extends Component {
     @property(Node) lab_setting_finish_event:Node = null;
     @property(Node) btn_select_type:Node = null;
     @property(Node) lab_select_type:Node = null;
+    @property(EditBox) editbox_delay_time:EditBox = null;
     protected m_data:zhao_xi_jie_data = null;
+    protected start(): void {
+        this.editbox_delay_time.node.on(EditBox.EventType.EDITING_DID_ENDED,()=>{
+            if(this.editbox_delay_time.string.length<=0) {
+                this.m_data.finish_all_hide_answer_dalay_time = 0
+                this.editbox_delay_time.string = this.m_data.finish_all_hide_answer_dalay_time.toString()
+            }
+            this.m_data.finish_all_hide_answer_dalay_time = parseFloat(this.editbox_delay_time.string)
+        })
+    }
     public updateView(data:zhao_xi_jie_data){
         this.m_data = data;
         this.btn_setting.off(Node.EventType.TOUCH_END);
@@ -46,6 +56,11 @@ export class task_zhao_xi_jie extends Component {
         }
         this.lab_select_type.getComponent(Label).string = config.zhao_xi_jie_tip_type_map.get(this.m_data.tip_type)
         this.lab_setting_finish_event.getComponent(Label).string =  this.m_data.finish_event_id==-1?"暂未设置完成事件":`事件id:${this.m_data.finish_event_id}`
+
+        if(this.m_data.finish_all_hide_answer_dalay_time==undefined) {
+            this.m_data.finish_all_hide_answer_dalay_time = 0
+        }
+        this.editbox_delay_time.string = this.m_data.finish_all_hide_answer_dalay_time.toString()
     }
 }
 

+ 8 - 17
assets/script/run/TaskSchedule/taskServce.ts

@@ -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){

+ 0 - 2
assets/script/run/ui/sound_text_content.ts

@@ -3,7 +3,6 @@ import { att_text_sound_data, event_item } from '../../../data/data';
 import { gameManager } from '../gameManager';
 import { ClientEvent } from '../../clientEvent';
 import { config } from '../../config';
-import { taskServce } from '../TaskSchedule/taskServce';
 const { ccclass, property } = _decorator;
 
 @ccclass('sound_text_content')
@@ -79,7 +78,6 @@ export class sound_text_content extends Component {
         this.node.off(AudioSource.EventType.ENDED);
         this.node.active = false;
         ClientEvent.dispatchEvent(config.EventRun.WIDGET_FINISH,this.mWidgetId)
-        taskServce.checkFinishAllZhaoXiJieTask()
     }
 }
 

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно