future 1 ano atrás
pai
commit
17a04a1d17

+ 3 - 0
assets/data/data.ts

@@ -320,6 +320,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 = null;
 }
 
 export class da_guai_data{
@@ -346,6 +347,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;

Diferenças do arquivo suprimidas por serem muito extensas
+ 432 - 110
assets/scene/game.scene


+ 7 - 5
assets/script/config.ts

@@ -3,7 +3,7 @@ import { scene_item_data, widget_item_data } from '../data/data';
 const { ccclass, property } = _decorator;
 
 export class config {
-    static debug = false;
+    static debug = true;
     static is_zb = false; //是否是主播模式
     static gameName = "神秘的笔记";
     static select_res_and_control_type = {
@@ -105,9 +105,10 @@ export class config {
         config.question_type_map.set(config.question_type.four,"4")
         //task_type_map
         config.task_type_map.set(config.task_type.zhao_xi_jie,"找细节-说明:在图中找指定的细节")
-        config.task_type_map.set(config.task_type.guo_ju_qing,"过剧情-说明:按照剧情提示进行操作")
+        config.task_type_map.set(config.task_type.guo_ju_qing,"过剧情-带规则-说明:按照剧情提示进行操作")
         config.task_type_map.set(config.task_type.da_guai,"打怪-说明:使用场上的道具攻击怪物")
-        config.task_type_map.set(config.task_type.guo_du,"过度场景")
+        config.task_type_map.set(config.task_type.guo_du,"过度场景-说明:无答案、无提示进行操作")
+        config.task_type_map.set(config.task_type.guo_ju_qing_not_rule,"过剧情-无规则-说明:按照剧情提示进行操作")
         //Zindex_type_map
         config.Zindex_type_map.set(config.Zindex_type.Zindex_scene,"场景层")
         config.Zindex_type_map.set(config.Zindex_type.Zindex_ui,"界面UI层")
@@ -194,9 +195,10 @@ export class config {
     static task_type_map:Map<number,string> = new Map();
     static task_type = {
         zhao_xi_jie:0, //找细节-说明:在图中找指定的细节
-        guo_ju_qing:1, //过剧情-说明:按照剧情提示进行操作
+        guo_ju_qing:1, //过剧情-带规则-说明:按照剧情提示进行操作
         da_guai:2, //打怪-说明:使用场上的道具攻击怪物
-        guo_du:3, //过度
+        guo_du:3, //过度场景-说明:无答案、无提示进行操作
+        guo_ju_qing_not_rule:4, //过剧情-无规则-说明:按照剧情提示进行操作
     }
 
     static zhao_xi_jie_tip_type = {

+ 6 - 2
assets/script/run/TaskSchedule/taskServce.ts

@@ -39,6 +39,8 @@ export class taskServce {
             case config.task_type.guo_ju_qing:
                 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:
+            break;
             case config.task_type.da_guai:
                 taskServce.initDaBoss()
             break;
@@ -114,8 +116,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;
         }
     }
@@ -344,7 +347,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);

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

@@ -0,0 +1,24 @@
+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;
+    
+    start() {
+        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": "73d21d49-fb4e-42af-b5a2-0d9c5cac4036",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 12 - 1
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){
@@ -220,6 +224,13 @@ export class ui_layer extends Component {
                     gameManager.Singleton.showRule()
                 },data._guo_ju_qing.binding_event_id==-1)
             break;
+            case config.task_type.guo_ju_qing_not_rule:
+                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){
                     return tools.showToast("打boss玩法没有配置!");

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff