future 1 year ago
parent
commit
a07e119c5a

File diff suppressed because it is too large
+ 235 - 518
assets/resources/prefabs/game_play_ji_yi_li.prefab


+ 5 - 5
assets/resources/prefabs/question_item.prefab

@@ -478,7 +478,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 65.56640625,
+      "width": 65.55871776824301,
       "height": 25.2
     },
     "_anchorPoint": {
@@ -509,15 +509,15 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 249,
+      "g": 242,
+      "b": 225,
       "a": 255
     },
     "_string": "A、0个",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
+    "_actualFontSize": 27.783251231527096,
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_lineHeight": 20,

+ 11 - 9
assets/script/play_list/base_view.ts

@@ -68,10 +68,12 @@ export class base_view extends Component {
                 StatisticsManager.request_collect_rewardVideoData(collect_data)
             })
         })
-        this.btn_tip.on(Node.EventType.TOUCH_START,()=>{
-            gameManager.playBtnSound()
-            this.onTipBtnClick();
-        },this);
+        if(this.btn_tip!=null) {
+            this.btn_tip.on(Node.EventType.TOUCH_START,()=>{
+                gameManager.playBtnSound()
+                this.onTipBtnClick();
+            },this);
+        }
         if(this.btn_pause!=null){
             this.btn_pause.on(Node.EventType.TOUCH_START,()=>{
                 self.isPause  = true;
@@ -171,9 +173,9 @@ export class base_view extends Component {
         this.unscheduleAllCallbacks()
     }
     start_time_count(time:number){
-        if(this.lab_time_count==null){
-            return
-        }
+        // if(this.lab_time_count==null){
+        //     return
+        // }
         this.time_all_count = time;
         // this.lab_time_count.active = true;
        
@@ -196,10 +198,10 @@ export class base_view extends Component {
                     // self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
                     self.lab_countdown_time.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
                 }else{
-                    self.progressbar.progress = (self.time_all_count-self.time_count)/self.time_all_count;
+                    // self.progressbar.progress = (self.time_all_count-self.time_count)/self.time_all_count;
                     // self.lab_time_count.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
                     self.lab_countdown_time.getComponent(Label).string = `${this.time_all_count-this.time_count}s`
-                    self.clock_ani.getComponent(clock_angle).addSecond();
+                    // self.clock_ani.getComponent(clock_angle).addSecond();
                     // tween(self.lab_countdown_time).to(0.8,{scale: new Vec3(2, 2, 1)}).call(()=>{
                     //     self.lab_countdown_time.scale = new Vec3(1,1,1)  
                     // }).start()

+ 2 - 2
assets/script/play_list/ji_yi_li/view_game_play_ji_yi_li.ts

@@ -13,9 +13,9 @@ const { ccclass, property } = _decorator;
 @ccclass('view_game_play_ji_yi_li')
 export class view_game_play_ji_yi_li extends base_view {
   @property(Node) img_1:Node;
+  @property(Node) bottom_node:Node;
   @property(Node) question_node:Node;
   protected initUI(): void {
-      
   }
 
   public initView(data: any, isUpdate?: boolean): void {
@@ -44,7 +44,7 @@ export class view_game_play_ji_yi_li extends base_view {
     this.img_1.active = false;
     this.question_node.active = true;
     this.lab_title.active = false;
-    this.lab_time_count.active = false;
+    this.bottom_node.active = false;
   }
   initAnswerView(){
     this.showStep1()

Some files were not shown because too many files changed in this diff