Merge branch 'master' of gitlab2.dui88.com:sparkprojects/zheshangbank_taoquan_20240612

assets/Scripts/TaskCenter.ts

@@ -109,6 +109,29 @@ export default class TaskCenter {
                         showToast(levelToast[level]);
                     }
                 });
+            } else if(code == "bt_13"){
+                beforeDoComplete(item, async () => {
+                    window["MarsJSBridge"].invoke("toggleAppMode", {
+                        funcType:"1" // 1: 跳转到设置页面 , 其他: 跳到应用设置页面
+                    }, function(res) {
+                        // 没有回调
+                    });
+                    // location.href = jumpUrl;
+                    //获取跳转方式
+                    // let type = getQueryParamValue(jumpUrl, "type");
+                    // console.info("跳转方式type", type)
+                    // if (type == "1") { //跳转方式1
+                    //     (jumpUrl && jumpUrl != '/') && appJump(jumpUrl, needNav);
+                    // } else if (type == "2") {//跳转方式2
+                    //     appJumpToMini(
+                    //         "username",
+                    //         jumpUrl,
+                    //     );
+                    // } else { //不拼方式不跳了，害怕跳错了
+                    //
+                    // }
+
+                });
             } else {
                 beforeDoComplete(item, async () => {
                     await sendWebNetWithToken(
@@ -138,7 +161,6 @@ export default class TaskCenter {
             return;
         }
 
-
         /** 行方任务 */
         if (code?.startsWith("bank_")) {
             console.info('11111')

assets/resources/RankScene/RankScene.scene

@@ -977,7 +977,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 347.84002685546875,
+      "width": 300.9998779296875,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1007,7 +1007,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "活动结束次日0点结算奖励",
+    "_string": "活动结束次日结算奖励",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30.1,
@@ -1304,7 +1304,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 375,
-      "y": -345,
+      "y": -328,
       "z": 0
     },
     "_lrot": {
@@ -1452,7 +1452,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 12,
-      "height": 690
+      "height": 656
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1609,7 +1609,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -11,
+      "y": 6,
       "z": 0
     },
     "_lrot": {
@@ -1706,7 +1706,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 690
+      "height": 656
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1896,7 +1896,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 690
+      "height": 656
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1920,7 +1920,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 730,
-    "_bottom": 204,
+    "_bottom": 238,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -2057,7 +2057,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 205
+      "height": 276.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2090,9 +2090,9 @@
       "__uuid__": "91125734-8a97-4708-b03c-4805fb8ddbdf@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
-    "_type": 0,
+    "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2127,7 +2127,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -254,
-      "y": 40,
+      "y": 72.777,
       "z": 0
     },
     "_lrot": {
@@ -2259,7 +2259,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -41,
-      "y": 40,
+      "y": 72.777,
       "z": 0
     },
     "_lrot": {
@@ -2391,7 +2391,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 220,
-      "y": 40,
+      "y": 72.777,
       "z": 0
     },
     "_lrot": {

assets/resources/RankScene/png/myRankBg.png.meta

@@ -50,8 +50,8 @@
         "height": 205,
         "rawWidth": 750,
         "rawHeight": 205,
-        "borderTop": 0,
-        "borderBottom": 0,
+        "borderTop": 136,
+        "borderBottom": 54,
         "borderLeft": 0,
         "borderRight": 0,
         "packable": true,

assets/store/store.ts

 import mobx from "mobx";
 import { sendWebNet, WebNetName } from "db://assets/Scripts/Utils/WebNet/WebNet";
-import { showPanel } from "../Module/UIFast";
+import { showPanel, showToast } from "../Module/UIFast";
 import { GetRankPrizePanel } from "../Scripts/Panels/GetRankPrizePanel";
 import { NoGetRankPrizePanel } from "../Scripts/Panels/NoGetRankPrizePanel";
 import { GuidePrizePanel } from "../Scripts/Panels/GuidePrizePanel";
@@ -84,8 +84,8 @@ class Store {
             showPanel(GuidePrizePanel);
         }
 
-        if (assistPopInfo) {
-
+        if (assistPopInfo?.newAssistNum && assistPopInfo?.newChallengeNum) {
+            showToast(`${assistPopInfo.newAssistNum}位好友为你助力~\n已获得${assistPopInfo.newChallengeNum}次挑战次数`);
         }
 
     }

build/web-mobile-001/index.html

@@ -54,7 +54,7 @@
     <script src="//yun.duiba.com.cn/polaris/SVGA.Lite.v2.1.1.d3a67cbc13c591c53c6f87ab34c57ce387010374.js" crossorigin="anonymous"></script>
     <script src="//yun.duiba.com.cn/aurora/assets/2403d1edf2acd15b179306b6ddaa5f0967d78a8f.js"></script>
 
-    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722308912753/style.css"/>
+    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722406205524/style.css"/>
 
     <style>
         .sui-captcha {
@@ -113,16 +113,16 @@
 </script>
 
 <!-- Polyfills bundle. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722308912753/src/polyfills.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722406205524/src/polyfills.bundle.js" charset="utf-8"></script>
 
 <!-- SystemJS support. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722308912753/src/system.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722406205524/src/system.bundle.js" charset="utf-8"></script>
 
 <!-- Import map -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722308912753/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1722406205524/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>
 
 <script>
-  System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1722308912753/index.js').catch(function (err) {
+  System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1722406205524/index.js').catch(function (err) {
     console.error(err);
   })
 </script>