Merge remote-tracking branch 'origin/master'

assets/Bundles/HomeScene/HomeScene.scene

@@ -478,7 +478,7 @@
       "y": -180,
       "z": -12.000012657215834
     },
-    "_id": "f4WG5IZnRHAa+o7IcJTRry"
+    "_id": "46ESycPjlJcqqYe4vteFUh"
   },
   {
     "__type__": "cc.UITransform",
@@ -500,7 +500,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "d7Wad0P3FBZ7SfhgMbao7X"
+    "_id": "91ZktmCTJFgLcg9dBFYc/k"
   },
   {
     "__type__": "cc.Sprite",
@@ -536,7 +536,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "98TqwrmEZBXZGAlfDwlsLj"
+    "_id": "eeG0xyVhlHTorKDzbAtsHs"
   },
   {
     "__type__": "cc.Node",
@@ -584,7 +584,7 @@
       "y": -180,
       "z": -11.00000220913452
     },
-    "_id": "6brM2J7lpCFZynDesegjF1"
+    "_id": "9d9GziRalBKJn7S8d1Iv5c"
   },
   {
     "__type__": "cc.UITransform",
@@ -606,7 +606,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "b12wF7OhZFNKCBer5DgaRw"
+    "_id": "c9mbg/FjpBvIX1kcdG8Jyt"
   },
   {
     "__type__": "cc.Sprite",
@@ -642,7 +642,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "518cAz4upF9Kh/4KcgBoXL"
+    "_id": "bdNce7fw1O5pTE0O8knQM5"
   },
   {
     "__type__": "cc.Node",
@@ -690,7 +690,7 @@
       "y": -180,
       "z": -64.00000614258742
     },
-    "_id": "82IYIzQMZIirEBYV4Mow7S"
+    "_id": "72548vagpJB6EJ7q9Ek9Cf"
   },
   {
     "__type__": "cc.UITransform",
@@ -712,7 +712,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "55hfTU9zpG7ro48r8m21L9"
+    "_id": "bfzrbvsDRAUqYBa6HDWlBj"
   },
   {
     "__type__": "cc.Sprite",
@@ -748,7 +748,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "ebMH0PEwFAer/5+W/jeJEY"
+    "_id": "19Y9BhxJVDAat0kLXmJAbP"
   },
   {
     "__type__": "cc.Node",
@@ -796,7 +796,7 @@
       "y": 180,
       "z": 25.99999385741257
     },
-    "_id": "32nY9vUzZL34ad4DugfEa+"
+    "_id": "ecKVdJcXRIUJoycUyl6TJ8"
   },
   {
     "__type__": "cc.UITransform",
@@ -818,7 +818,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "02f547kctL9rCdwqjZgWqf"
+    "_id": "e2Z5dliCJGUoihaUGlBewq"
   },
   {
     "__type__": "cc.Sprite",
@@ -854,7 +854,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "deB/q42FhGboz76DGv2gYu"
+    "_id": "b3nL/3H11G/bo/0XwATqk0"
   },
   {
     "__type__": "cc.UITransform",
@@ -1040,7 +1040,7 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -8.577000000000027,
+      "x": 0,
       "y": -0.6999999999999886,
       "z": 0
     },
@@ -3500,7 +3500,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "贪吃的小铭铭",
+    "_string": "鸣鸣很忙用户",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 30,
@@ -6089,9 +6089,6 @@
     "rankList": {
       "__id__": 34
     },
-    "rankList_NoneData": {
-      "__id__": 25
-    },
     "blessBagBtn": {
       "__id__": 145
     },
@@ -6107,6 +6104,9 @@
     "bagBtn": {
       "__id__": 113
     },
+    "shareBtn": {
+      "__id__": 117
+    },
     "userName": {
       "__id__": 91
     },

assets/Scripts/Panels/SnakeSkin.ts

@@ -4,6 +4,8 @@ import store from "../store/store";
 import { observer, render } from "../store/decorators";
 import { sendWebNet, sendWebNetWithToken, WebNetName } from "../Utils/WebNet/WebNet";
 import { _asyncThrottle } from "../Utils/Utils";
+import { showPanel } from "../../Module/UIFast";
+import SharePop from "./SharePop";
 
 const { ccclass, property } = _decorator;
 
@@ -26,9 +28,10 @@ export default class SnakeSkin extends Panel {
   async start() {
   }
 
-  clickClose = () => {
+  clickClose = _asyncThrottle(async() => {
     this.hidePanel();
-  }
+    await showPanel(SharePop)
+  })
 
   clickDress = _asyncThrottle(async () => {
     const { success, data } = await sendWebNetWithToken(WebNetName.doDress, { spId: "sp_skin_snake_year" });

assets/Scripts/Scenes/HomeScene.ts

@@ -42,7 +42,6 @@ export class HomeScene extends Scene {
   @property(Node) rankInfo3: Node = null;
   @property(Node) rankNone: Node = null;
   @property(Node) rankList: Node = null;
-  @property(Node) rankList_NoneData: Node = null;
   @property(Node) blessBagBtn: Node = null;
   @property(Node) PropBtn: Node = null;
   @property(Node) signBtn: Node = null;
@@ -55,11 +54,13 @@ export class HomeScene extends Scene {
   @property(Label) fuDaiText: Label;
   @property(Label) signTxt: Label;
 
+  @property(Sprite) userImg: Sprite;
+
   onLoad() {
     this.startBtn.on(Button.EventType.CLICK, this.clickStart, this);
     this.ruleBtn.on(Button.EventType.CLICK, this.clickRule, this);
     this.rankBtn.on(Button.EventType.CLICK, this.clickRank, this);
-    this.rankList_NoneData.on(Button.EventType.CLICK, this.clickRank, this);
+    this.rankNone.on(Button.EventType.CLICK, this.clickRank, this);
     this.blessBagBtn.on(Button.EventType.CLICK, this.clickBag, this);
     this.PropBtn.on(Button.EventType.CLICK, this.clickProp, this);
     this.signBtn.on(Button.EventType.CLICK, this.clickSign, this);
@@ -105,6 +106,7 @@ export class HomeScene extends Scene {
       continueSignDays = 0,
     } = store.homeInfo || {};
 
+    this.userName.string = strFormat(nickname || "鸣鸣很忙用户", 8) ;
     this.userName.string = strFormat(nickname || "鸣鸣很忙用户", 8) ;
     this.pointNum.string = `${creditsNum > 9999999 ? "9999999+" : creditsNum}` ;
     // this.fuDaiText.string = `${store.homeInfo?.fuDaiNum || 0}`;
@@ -190,7 +192,7 @@ export class HomeScene extends Scene {
   clickShare = _asyncThrottle(async () => {
     if (!this.checkActTime()) return;
 
-    shareStore.doShare()
+    shareStore.doShare(true)
   });
 }