1

assets/resources/game/prefab/game.prefab

@@ -3089,7 +3089,7 @@
       "__id__": 72
     },
     "_enabled": true,
-    "panel_name": "module/redeem/RedeemNode",
+    "panel_name": "module/sign/sign",
     "bool_Auth": true,
     "open_type": 0,
     "transition_type": 0,
@@ -6994,7 +6994,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "2fEbg+L8BDpLKurgiCkzqI",
+    "fileId": "a4LGvPwYFK9ZLc5FVgrU20",
     "sync": false
   },
   {
@@ -7227,7 +7227,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "9bjb3ECPxHR6J+fuO7/RWp",
+    "fileId": "dd1kkjkbZHGrVh7/dXTEUI",
     "sync": false
   },
   {
@@ -7357,7 +7357,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "e1XhQNaAlPDL1rFCnJcd1k",
+    "fileId": "6bwct8R1lNfbGb93N07/mX",
     "sync": false
   },
   {
@@ -11825,7 +11825,7 @@
     "node": {
       "__id__": 228
     },
-    "_enabled": true,
+    "_enabled": false,
     "btn1": {
       "__id__": 257
     },

assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -192,7 +192,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 610,
+      "width": 551,
       "height": 777
     },
     "_anchorPoint": {
@@ -2089,8 +2089,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {

assets/resources/module/newOpenRedBag/texture/hb.png.meta

@@ -7,7 +7,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 610,
+  "width": 551,
   "height": 777,
   "platformSettings": {},
   "subMetas": {
@@ -22,9 +22,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 610,
+      "width": 551,
       "height": 777,
-      "rawWidth": 610,
+      "rawWidth": 551,
       "rawHeight": 777,
       "borderTop": 0,
       "borderBottom": 0,

assets/script/game/component/BtnOpenPanel.ts

@@ -36,7 +36,7 @@ export default class BtnOpenPanel extends cc.Component {
             return;
         }
         mk.audio.playEffect("button");
-        if (this.bool_Auth) {
+        if (cc.sys.isNative && this.bool_Auth) {
             if (!gData.loginData.isAuth) {
                 JsbSystem.WxAuth();
                 return;

assets/script/game/game/Game.ts

@@ -140,8 +140,8 @@ export default class Game extends cc.Component {
      * 根据配置，添加开启的功能按钮
      */
     private initBtns() {
-        let sc = this.node_btn.getComponent(FunBtns) as FunBtns;
-        sc.init();
+        // let sc = this.node_btn.getComponent(FunBtns) as FunBtns;
+        // sc.init();
     }
 
     private initQiPaos() {

assets/script/game/module/login/Login.ts

@@ -1,6 +1,5 @@
 import Util from "../../../before/util/Util";
 import JsbSystem from "../../../mk/system/JsbSystem";
-import LoadingBar from "../../component/LoadingBar";
 import { UpdateState } from "../../data/AppData";
 import HotUpdatePanel from "../hotUpdate/HotUpdatePanel";
 
@@ -9,8 +8,8 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class Login extends cc.Component {
 
-    @property(LoadingBar)
-    private bar: LoadingBar = null;
+    @property(cc.Sprite)
+    private bar: cc.Sprite = null;
     @property({ displayName: '加载文字', type: cc.Label })
     private lbl_progress: cc.Label = null;
     @property({ displayName: '服务协议', type: cc.Label })
@@ -63,7 +62,7 @@ export default class Login extends cc.Component {
 
         if (gData.appData.updateState == UpdateState.IsUpdate) {
             this.lbl_progress.string = '正在更新中,请耐心等待';
-            this.bar.setProgress(gData.appData.updatePercent);
+            this.setProgress(gData.appData.updatePercent);
             return;
         }
 
@@ -104,7 +103,7 @@ export default class Login extends cc.Component {
 
     /** 设置进度 */
     private setProgress(current) {
-        this.bar.setProgress(current);
+        this.bar.fillRange = current/100;
         this.lbl_progress.string = "加载中 " + current + "%";
     }
 

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -44,6 +44,11 @@ export default class RedBagTask extends cc.Component{
 
     private initTaskProgressUI()
     {
+        cc.tween(this.sp_taskProgress).to(0.2, {fillRange: 0.4}, {onUpdate: ()=>{
+            let str = this.sp_taskProgress.fillRange * 100;
+            this.lbl_taskProgress.string = str.toFixed(0) + "%";
+        }}).start();
+        cc.tween(this)
 
     }