future 1 år sedan
förälder
incheckning
ebd31dd6ae

+ 3 - 0
assets/data/data.ts

@@ -323,6 +323,7 @@ export class task_data{  //玩法===任务
     public _zhao_xi_jie_data:zhao_xi_jie_data = null;
     public _guo_ju_qing:guo_ju_qing_data = null;
     public _da_guai:da_guai_data = null;
+    public _guo_ju_qing_not_rule_data:guo_ju_qing_not_rule_data = null;
 }
 
 export class da_guai_data{
@@ -347,6 +348,8 @@ export class zhao_xi_jie_data{
     public widget_id_list:zhao_xi_jie_item_data[] = []
     public finish_event_id:number = -1; //全部找到之后执行的事件
 }
+export class guo_ju_qing_not_rule_data { //先创建数据模型,目前没有属性
+}
 
 export class event_item{
     public event_id:number = 0;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 507 - 101
assets/resources/prefab/run/game_run.prefab


+ 4 - 3
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 } 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 } 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';
@@ -102,7 +102,6 @@ export class scene_task extends Component {
                         this.task_guo_ju_qing.getComponent(task_guo_ren_wu).updateView(data._task_data._guo_ju_qing)
                     break;
                     case config.task_type.guo_ju_qing_not_rule:
-                        console.log('scene_task UpdateEditScene  过剧情-无规则 过剧情-无规则')
                     break;
                     case config.task_type.zhao_xi_jie:
                         this.task_zhao_xi_jie.active = true;
@@ -154,7 +153,9 @@ export class scene_task extends Component {
                     this.task_guo_ju_qing.getComponent(task_guo_ren_wu).updateView(data._task_data._guo_ju_qing)
                 break;
                 case config.task_type.guo_ju_qing_not_rule:
-                    console.log('scene_task addTask  过剧情-无规则 过剧情-无规则')
+                    if(data._task_data._guo_ju_qing_not_rule_data==null){
+                        data._task_data._guo_ju_qing_not_rule_data = new guo_ju_qing_not_rule_data
+                    }
                 break;
                 case config.task_type.zhao_xi_jie:
                     if( data._task_data._zhao_xi_jie_data==null){

+ 4 - 4
assets/script/run/TaskSchedule/taskServce.ts

@@ -41,7 +41,6 @@ export class taskServce {
                 taskServce.guo_ju_qing_binding_event_id = taskServce.mTaskData._guo_ju_qing.binding_event_id;
             break;
             case config.task_type.guo_ju_qing_not_rule:
-                console.log('taskServce initTask  过剧情-无规则 过剧情-无规则')
             break;
             case config.task_type.da_guai:
                 taskServce.initDaBoss()
@@ -118,8 +117,9 @@ export class taskServce {
             case config.task_type.guo_ju_qing:
                 taskServce.childSceneGuoJuQingBidingEventId = taskServce.mChildSceneData._guo_ju_qing.binding_event_id;
             break;
+            case config.task_type.guo_ju_qing_not_rule:
+            break;
             case config.task_type.da_guai:
-                
             break;
         }
     }
@@ -348,7 +348,8 @@ export class taskServce {
                 taskServce.checkFinishZhaoXiJieTask()
             break;
             case config.task_type.guo_ju_qing:
-            
+            break;
+            case config.task_type.guo_ju_qing_not_rule:
             break;
             case config.task_type.da_guai:
                 let d_1 = taskServce.taskDaGuai.get(widget_id);
@@ -358,7 +359,6 @@ export class taskServce {
                 taskServce.finishDaGuai.set(widget_id,true)
                 ClientEvent.dispatchEvent(config.EventRun.ON_BOSS_HURT,d_1.hurt)
                 taskServce.checkFinishDaBossTask()
-
             break;
         } 
 

+ 23 - 0
assets/script/run/tips/content_only_tip.ts

@@ -0,0 +1,23 @@
+import { _decorator, Component, Node } from 'cc';
+import { gameManager } from '../gameManager';
+const { ccclass, property } = _decorator;
+
+@ccclass('content_only_tip')
+export class content_only_tip extends Component {
+    @property(Node) btn_tip: Node = null;
+    protected m_callback: Function = null;
+
+    protected start(): void {
+        this.btn_tip.on(Node.EventType.TOUCH_END, ()=> {
+            gameManager.Singleton.showTips()
+            if(this.m_callback!=null) {
+                this.m_callback()
+            }
+        },this)
+    }
+
+    initView(callback:Function = null) {
+        this.m_callback = callback
+    }
+}
+

+ 9 - 0
assets/script/run/tips/content_only_tip.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "1b873754-6f11-4126-a56a-9b36e176593c",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 11 - 4
assets/script/run/ui_layer.ts

@@ -13,6 +13,7 @@ import { fail_ani } from './ui/fail_ani';
 import { content_rule_and_tips } from './tips/content_rule_and_tips';
 import { back_title } from './ui/back_title';
 import { boss_tips } from './tips/boss_tips';
+import { content_only_tip } from './tips/content_only_tip';
 const { ccclass, property } = _decorator;
 
 @ccclass('ui_layer')
@@ -29,6 +30,7 @@ export class ui_layer extends Component {
     @property(Prefab) boss_info_data_prefab:Prefab = null;
     @property(Node) ui_manifestations:Node = null;
     @property(Node) content_rule_and_tips:Node = null;
+    @property(Node) content_only_tip:Node = null;
     @property(Node) content_count_down:Node = null;
     @property(Node) back_title_node:Node = null;
     @property(Node) boss_tips:Node = null;
@@ -53,7 +55,8 @@ export class ui_layer extends Component {
         this.content_count_down.removeAllChildren()
         this.ui_content.removeAllChildren()
         this.ui_manifestations.active = false;
-        this.content_rule_and_tips.active =false;
+        this.content_rule_and_tips.active = false;
+        this.content_only_tip.active = false;
         this.boss_tips.active = false;
         ClientEvent.off(config.EventRun.NOTICE_EVENT,this.beActive.bind(this),this)
         ClientEvent.off(config.EventRun.ON_SHOW_RULE_BTN,this.onChangeShowRuleStatus.bind(this),this)
@@ -195,6 +198,7 @@ export class ui_layer extends Component {
     initTaskUi(data:task_data){
         this.ui_manifestations.active = false;
         this.content_rule_and_tips.active = false;
+        this.content_only_tip.active = false;
         switch (data.type) {
             case config.task_type.zhao_xi_jie:
                 if(data._zhao_xi_jie_data==null){
@@ -205,9 +209,8 @@ export class ui_layer extends Component {
             break;
             case config.task_type.guo_ju_qing:
                 if(data._guo_ju_qing==null){
-                    return tools.showToast("过剧情玩法没有配置!");
+                    return tools.showToast("过剧情有规则玩法没有配置!");
                 }
-              
                 this.content_rule_and_tips.active = true;
                 this.content_rule_and_tips.getComponent(content_rule_and_tips).initView(()=>{
                     if(gameManager.Singleton.IsOpenRuleStatus()){
@@ -221,7 +224,11 @@ export class ui_layer extends Component {
                 },data._guo_ju_qing.binding_event_id==-1)
             break;
             case config.task_type.guo_ju_qing_not_rule:
-                console.log('ui_layer initTaskUi  过剧情-无规则 过剧情-无规则')
+                if(data._guo_ju_qing_not_rule_data==null){
+                    return tools.showToast("过剧情-无规则玩法没有配置!");
+                }
+                this.content_only_tip.active = true
+                this.content_only_tip.getComponent(content_only_tip).initView()
             break;
             case config.task_type.da_guai:
                 if(data._da_guai==null){

Vissa filer visades inte eftersom för många filer har ändrats