future 1 년 전
부모
커밋
eee465f627
3개의 변경된 파일22개의 추가작업 그리고 9개의 파일을 삭제
  1. 3 3
      assets/scene/game.scene
  2. 19 5
      assets/script/run/tips/tips_view.ts
  3. 0 1
      assets/script/run/top_layer.ts

+ 3 - 3
assets/scene/game.scene

@@ -9578,8 +9578,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 17.632,
-      "y": -363.262,
+      "x": 0,
+      "y": -453,
       "z": 0
     },
     "_lrot": {
@@ -10058,7 +10058,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 19 - 5
assets/script/run/tips/tips_view.ts

@@ -15,6 +15,7 @@ export class tips_view extends Component {
     @property(Node) text_view:Node = null;
     private mData:scene_tips_data = null;
     private IsShowFindRuleTips:boolean = false;
+    private IsShowSecondLevel:boolean = false;
     private isLookTipsVideo:boolean = false;
     private isLookAnswerVideo:boolean = false;
     public initView(data:scene_tips_data){
@@ -61,11 +62,16 @@ export class tips_view extends Component {
             gameManager.Singleton.sys_click_button_music()
         })
         this.btn_close.on(Node.EventType.TOUCH_END,()=>{
-            if(!this.btn_answer.active&&!this.IsShowFindRuleTips){
-                this.show()
-            }else{
-                this.IsShowFindRuleTips = false;
+            if(this.IsShowFindRuleTips==true) {
+                this.IsShowFindRuleTips = false
                 this.close()
+            } else {
+                if(this.IsShowSecondLevel==true) {
+                    this.show()
+                    this.IsShowSecondLevel = false
+                } else {
+                    this.close()
+                }
             }
             gameManager.Singleton.sys_click_button_music()
         })
@@ -74,8 +80,12 @@ export class tips_view extends Component {
 
     show(){
         this.text_view.active = false;
-        this.btn_answer.active = true;
         this.btn_tips.active = true;
+        if(this.isLookTipsVideo) {
+            this.btn_answer.active = true;
+        } else {
+            this.btn_answer.active = false;
+        }
         this.node.active = true;
     }
 
@@ -84,6 +94,8 @@ export class tips_view extends Component {
     }
 
     showTips(){
+        this.IsShowSecondLevel = true
+        this.IsShowTips = true
         this.text_view.active = true;
         this.btn_answer.active = false;
         this.btn_tips.active = false;
@@ -91,6 +103,8 @@ export class tips_view extends Component {
     }
 
     showAnswer(){
+        this.IsShowSecondLevel = true
+        this.isShowAnswer = false
         this.text_view.active = true;
         this.btn_answer.active = false;
         this.btn_tips.active = false;

+ 0 - 1
assets/script/run/top_layer.ts

@@ -11,7 +11,6 @@ import { rule_view } from './tips/rule_view';
 import { tips_view } from './tips/tips_view';
 import { fail } from './ui/fail';
 import { win } from './ui/win';
-import { level_list_item } from './game_list_view/level_list_item';
 const { ccclass, property } = _decorator;
 
 @ccclass('top_layer')