更新

assets/Script/JiaZai.ts

@@ -126,7 +126,7 @@ export default class JiaZai extends cc.Component {
         this.getSRank();
         this.checkAndSetPlayerPassLevel();
         // this.checkDailyQuests();
-        //console.log("进入首页获取的share", cc.fx.GameConfig.GM_INFO.otherUid, cc.fx.GameConfig.GM_INFO.otherLevel);
+        console.log("进入首页获取的share", cc.fx.GameConfig.GM_INFO.otherUid, cc.fx.GameConfig.GM_INFO.otherLevel);
 
 
         cc.game.setFrameRate(63);
@@ -884,7 +884,18 @@ export default class JiaZai extends cc.Component {
             //@ts-ignore
             wx.offHide(this.onHideListener);
         }
-
+        Utils.getCityRank((res) => {
+            if (res.code === 1) {
+                if (res.data.length > 0) {
+                    for (let i = 0; i < res.data.length; i++) {
+                        if (res.data[i]._id === cc.fx.GameConfig.GM_INFO.uid) {
+                            cc.fx.GameConfig.GM_INFO.cityRank = i + 1;
+                            break;
+                        }
+                    }
+                }
+            }
+        }, cc.fx.GameConfig.GM_INFO.address);
         if (this.node.getChildByName("Load").getChildByName("startBtn").getComponent("btnControl")._touch) {
             this.node.getChildByName("Load").getChildByName("startBtn").getComponent("btnControl").setTouch(false);
             let version = cc.fx.GameTool.getWechatGameVersion();

assets/Script/Map.ts

@@ -172,6 +172,7 @@ export default class MapConroler extends cc.Component {
     getProgressLevel: number = 0;
     getProgress: number = 0;
     isRippleShrink: boolean = false;
+    cityRank: number = 100;
 
     private magicEffectIndex: number = 0;
     private magicEffect1: cc.Node = null; // 第一套特效节点
@@ -227,6 +228,7 @@ export default class MapConroler extends cc.Component {
         this.revolving_state = 0;
         this.hitSoundCount = 0;
         this.hitSoundTime = 0;
+        this.cityRank = cc.fx.GameConfig.GM_INFO.cityRank;
         //this.iceLabel.string = cc.fx.GameConfig.GM_INFO.freezeAmount.toString();
         // this.hammerLabel.string = cc.fx.GameConfig.GM_INFO.hammerAmount.toString();
         // this.magicLabel.string = cc.fx.GameConfig.GM_INFO.magicAmount.toString();
@@ -244,7 +246,19 @@ export default class MapConroler extends cc.Component {
         } else {
             console.log("SceneManager 节点未找到");
         }
-
+        Utils.getCityRank((res) => {
+            if (res.code === 1) {
+                if (res.data.length > 0) {
+                    for (let i = 0; i < res.data.length; i++) {
+                        if (res.data[i]._id === cc.fx.GameConfig.GM_INFO.uid) {
+                            cc.fx.GameConfig.GM_INFO.cityRank = i + 1;
+                            this.cityRank = cc.fx.GameConfig.GM_INFO.cityRank;
+                            break;
+                        }
+                    }
+                }
+            }
+        }, cc.fx.GameConfig.GM_INFO.address);
     }
 
     start() {
@@ -2052,6 +2066,19 @@ export default class MapConroler extends cc.Component {
 
         if (this.blockNum == 0 && !this.gameWin && !this.gameOver) {
             // alert("游戏成功");
+            Utils.getCityRank((res) => {
+                if (res.code === 1) {
+                    if (res.data.length > 0) {
+                        for (let i = 0; i < res.data.length; i++) {
+                            if (res.data[i]._id === cc.fx.GameConfig.GM_INFO.uid) {
+                                cc.fx.GameConfig.GM_INFO.cityRank = i + 1;
+                                this.cityRank = cc.fx.GameConfig.GM_INFO.cityRank;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }, cc.fx.GameConfig.GM_INFO.address);
             if (cc.fx.GameConfig.GM_INFO.otherLevel == 0) {
                 if (cc.fx.GameConfig.GM_INFO.tasks.levelPass.value < cc.fx.GameConfig.GM_INFO.tasks.levelPass.target) {
                     cc.fx.GameConfig.GM_INFO.tasks.levelPass.value += 1;
@@ -2101,7 +2128,13 @@ export default class MapConroler extends cc.Component {
 
             }
             else cc.fx.GameTool.addLevel(this.count_Time, this.add_Time, (data) => {
-                console.log("加分后排行结果");
+                // console.log("加分后排行结果", data);
+                if (data.code == 1) {
+                    if (data.data.rank != -1) {
+                        this.cityRank = data.data.rank;
+                        // console.log("更新排名", this.cityRank);
+                    }
+                }
             });
             const winCOIN = cc.find("Canvas"); // 假设 Canvas 节点
             if (winCOIN) {
@@ -4188,19 +4221,24 @@ export default class MapConroler extends cc.Component {
     }
 
     createRank() {
-        console.log("通过关卡数量:", cc.fx.GameConfig.GM_INFO.addLevel);
+        // console.log("通过关卡数量:", cc.fx.GameConfig.GM_INFO.addLevel);
         let rank = this.node.parent.parent.getChildByName("Win").getChildByName("Rank");
         let Career = this.node.parent.parent.getChildByName("Win").getChildByName("Career");
         rank.active = true;
         Career.active = false;
 
-
+        NumberToImage.numberToImageNodes4((cc.fx.GameConfig.GM_INFO.addLevel + 1), 40, 15, "company_", rank.getChildByName("addLevel"), true);
-        NumberToImage.numberToImageNodes4(cc.fx.GameConfig.GM_INFO.addLevel, 43, 15, "company_", rank.getChildByName("addLevel"), true);
         for (let i = 0; i < rank.getChildByName("addLevel").children.length; i++) {
             rank.getChildByName("addLevel").children[i].color = cc.Color.WHITE;
         }
 
         rank.getChildByName("cityName").getComponent(cc.Sprite).spriteFrame = this.CityName.getSpriteFrame(cc.fx.GameConfig.GM_INFO.address);
+        if (this.cityRank == 100) this.cityRank = 99;
+        // console.log("排名", this.cityRank);
+        NumberToImage.numberToImageNodes4(this.cityRank, 55, 15, "resultBig_", rank.getChildByName("rank"), true);
+        for (let i = 0; i < rank.getChildByName("rank").children.length; i++) {
+            rank.getChildByName("rank").children[i].color = cc.Color.WHITE;
+        }
 
     }
 

assets/Script/module/Config/GameConfig.ts

@@ -136,7 +136,8 @@ export class GameConfig {
         tasks: { levelPass: { value: number; target: number; state: number; }; share: { value: number; target: number; state: number; }; useEnergy: { value: number; target: number; state: number; }; useProp: { value: number; target: number; state: number; }; }; addLevel: number; //每日过关数
         address: string; //用户城市信息
         firstTime: number; //用户注册时间
-        longitude: string;
+        longitude: string; //用户经度
+        cityRank: number;
     };
 
 
@@ -148,6 +149,7 @@ export class GameConfig {
 
 
 
+
     //游戏内信息
 
     static get Instance() {
@@ -313,6 +315,7 @@ export class GameConfig {
             address: "",    //用户城市信息
             firstTime: 0,   //用户注册时间
             longitude: "",   //用户经度
+            cityRank: 99,    //城市排名
         };
         // this.setCode(this.getKey("scode"));
         // this.GM_INFO.level = 0;

assets/Script/module/Pay/Utils.ts

@@ -1403,4 +1403,32 @@ export default class Utils {
         }
     }
 
+    static getCityRank(callBack, data) {
+        //@ts-ignore
+        if (typeof wx !== 'undefined' && wx !== null) {
+            let uid = cc.fx.StorageMessage.getStorage("uid");
+            //旧的读取数据设置数据方法,以强联网为主
+            if (uid != undefined && uid != "" && uid != null) {
+                cc.fx.GameConfig.GM_INFO.uid = uid;
+            }
+
+            let setData = {
+                uid: cc.fx.GameConfig.GM_INFO.uid,
+                action: 'read',
+                address: data,
+            }
+
+            console.log("_______________s:", setData);
+            Utils.POST("getAddressRank", setData, res => {
+                if (res.code === 1) {
+                    console.log("1设置城市信息成功", res);
+                    if (callBack) callBack(res);
+                } else {
+                    console.log("1设置城市信息失败", res);
+                }
+            })
+
+        }
+    }
+
 }

assets/Script/module/Tool/GameTool.ts

@@ -419,8 +419,8 @@ var GameTool = {
     //关卡上限
     maxLevel() {
         let jg = false;
-        if (cc.fx.GameConfig.GM_INFO.level > 689) {
+        if (cc.fx.GameConfig.GM_INFO.level > 709) {
-            cc.fx.GameConfig.GM_INFO.level = 690;
+            cc.fx.GameConfig.GM_INFO.level = 710;
             jg = true;
         }
         return jg;
@@ -483,7 +483,7 @@ var GameTool = {
             }
             //laf云函数
             Utils.setUserCoin((data) => {
-                console.log("上传laf云函数用户金币:", data);
+                // console.log("上传laf云函数用户金币:", data);
             })
         }
     },

assets/action_bundle/prefab/Avatar.prefab

@@ -66,14 +66,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 620
+        "__id__": 628
       },
       {
-        "__id__": 621
+        "__id__": 629
       }
     ],
     "_prefab": {
-      "__id__": 622
+      "__id__": 630
     },
     "_opacity": 255,
     "_color": {
@@ -12442,7 +12442,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -12605,17 +12605,17 @@
         "__id__": 338
       },
       {
-        "__id__": 611
+        "__id__": 619
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 618
+        "__id__": 626
       }
     ],
     "_prefab": {
-      "__id__": 619
+      "__id__": 627
     },
     "_opacity": 255,
     "_color": {
@@ -12923,11 +12923,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 609
+        "__id__": 617
       }
     ],
     "_prefab": {
-      "__id__": 610
+      "__id__": 618
     },
     "_opacity": 255,
     "_color": {
@@ -12991,11 +12991,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 607
+        "__id__": 615
       }
     ],
     "_prefab": {
-      "__id__": 608
+      "__id__": 616
     },
     "_opacity": 255,
     "_color": {
@@ -13150,12 +13150,15 @@
       },
       {
         "__id__": 597
+      },
+      {
+        "__id__": 605
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 606
+      "__id__": 614
     },
     "_opacity": 255,
     "_color": {
@@ -22446,7 +22449,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "港澳台",
+    "_name": "海南省",
     "_objFlags": 0,
     "_parent": {
       "__id__": 340
@@ -22542,7 +22545,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 135,
+      "width": 90,
       "height": 56.7
     },
     "_anchorPoint": {
@@ -22594,8 +22597,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "港澳台",
+    "_string": "海南",
-    "_N$string": "港澳台",
+    "_N$string": "海南",
     "_fontSize": 45,
     "_lineHeight": 45,
     "_enableWrapText": true,
@@ -22620,7 +22623,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a1iM0bwtVDlb+pSf3NqV+t",
+    "fileId": "5bsxgb7u5Mb5+rxmyd1I/3",
     "sync": false
   },
   {
@@ -22739,7 +22742,7 @@
     "component": "",
     "_componentId": "7589aoelbpHs5EJQkTTKE6y",
     "handler": "switchAddress",
-    "customEventData": "港澳台"
+    "customEventData": "海南省"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -22749,12 +22752,12 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "98r4a8FM5FnJe6bwnhfIp/",
+    "fileId": "88EB16a7BOkYeBCT4Ibg1T",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "其他",
+    "_name": "港澳台",
     "_objFlags": 0,
     "_parent": {
       "__id__": 340
@@ -22850,7 +22853,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90,
+      "width": 135,
       "height": 56.7
     },
     "_anchorPoint": {
@@ -22902,8 +22905,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "其他",
+    "_string": "港澳台",
-    "_N$string": "其他",
+    "_N$string": "港澳台",
     "_fontSize": 45,
     "_lineHeight": 45,
     "_enableWrapText": true,
@@ -22928,7 +22931,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "3bGfO3SilFPbX0YFG2ZUPS",
+    "fileId": "a1iM0bwtVDlb+pSf3NqV+t",
     "sync": false
   },
   {
@@ -23039,6 +23042,314 @@
     },
     "_id": ""
   },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "7589aoelbpHs5EJQkTTKE6y",
+    "handler": "switchAddress",
+    "customEventData": "港澳台"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "98r4a8FM5FnJe6bwnhfIp/",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "其他",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 340
+    },
+    "_children": [
+      {
+        "__id__": 598
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 601
+      },
+      {
+        "__id__": 602
+      }
+    ],
+    "_prefab": {
+      "__id__": 604
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 238,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        280,
+        -1271.916,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "cityName",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 597
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 599
+      }
+    ],
+    "_prefab": {
+      "__id__": 600
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 90,
+      "height": 56.7
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        2,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 598
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "其他",
+    "_N$string": "其他",
+    "_fontSize": 45,
+    "_lineHeight": 45,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3bGfO3SilFPbX0YFG2ZUPS",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 597
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "42fa0d28-c2f6-4abd-9330-8164945d399e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 597
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.05,
+    "clickEvents": [
+      {
+        "__id__": 603
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 597
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.ClickEvent",
     "target": {
@@ -23069,20 +23380,20 @@
     },
     "_children": [
       {
-        "__id__": 598
+        "__id__": 606
       },
       {
-        "__id__": 601
+        "__id__": 609
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 604
+        "__id__": 612
       }
     ],
     "_prefab": {
-      "__id__": 605
+      "__id__": 613
     },
     "_opacity": 255,
     "_color": {
@@ -23136,17 +23447,17 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 597
+      "__id__": 605
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 599
+        "__id__": 607
       }
     ],
     "_prefab": {
-      "__id__": 600
+      "__id__": 608
     },
     "_opacity": 255,
     "_color": {
@@ -23200,7 +23511,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 598
+      "__id__": 606
     },
     "_enabled": true,
     "_materials": [
@@ -23245,17 +23556,17 @@
     "_name": "cityName",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 597
+      "__id__": 605
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 602
+        "__id__": 610
       }
     ],
     "_prefab": {
-      "__id__": 603
+      "__id__": 611
     },
     "_opacity": 255,
     "_color": {
@@ -23309,7 +23620,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 601
+      "__id__": 609
     },
     "_enabled": true,
     "_materials": [
@@ -23353,7 +23664,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 597
+      "__id__": 605
     },
     "_enabled": true,
     "_materials": [
@@ -23481,20 +23792,20 @@
     },
     "_children": [
       {
-        "__id__": 612
+        "__id__": 620
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 614
+        "__id__": 622
       },
       {
-        "__id__": 615
+        "__id__": 623
       }
     ],
     "_prefab": {
-      "__id__": 617
+      "__id__": 625
     },
     "_opacity": 255,
     "_color": {
@@ -23548,13 +23859,13 @@
     "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 611
+      "__id__": 619
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 613
+      "__id__": 621
     },
     "_opacity": 255,
     "_color": {
@@ -23619,7 +23930,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 611
+      "__id__": 619
     },
     "_enabled": true,
     "_materials": [
@@ -23653,7 +23964,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 611
+      "__id__": 619
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -23662,7 +23973,7 @@
     "zoomScale": 1.1,
     "clickEvents": [
       {
-        "__id__": 616
+        "__id__": 624
       }
     ],
     "_N$interactable": true,
@@ -23718,7 +24029,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 612
+      "__id__": 620
     },
     "_id": ""
   },