完整版

assets/Scene/GuideScene.fire.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.3.2",
+  "uuid": "1d6bc13a-95e8-41e2-8703-441263ec00bb",
+  "importer": "scene",
+  "asyncLoadAssets": false,
+  "autoReleaseAssets": false,
+  "subMetas": {}
+}

assets/Scene/LoadScene.fire

@@ -15,6 +15,9 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 4
       }
     ],
     "_active": true,
@@ -60,6 +63,148 @@
     "autoReleaseAssets": true,
     "_id": "9c08062d-4cf1-4b6e-a8ba-4a3881cc7e7d"
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "GameData",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        375,
+        667,
+        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": "e1voegXqFG7pcNFtBwd4RM"
+  },
+  {
+    "__type__": "58403/n16JCa5sZhNMjZzGo",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "audioGameBgm0": null,
+    "baishao_audio": {
+      "__uuid__": "47388b59-bca9-4607-bdc1-1fc7ba079a12"
+    },
+    "cha_audio": {
+      "__uuid__": "b1a7d924-b756-4abd-9de4-f913e76d7ba6"
+    },
+    "chixiaodou_audio": {
+      "__uuid__": "16df01b7-75d9-47f2-96bf-23d29632af47"
+    },
+    "danggui_audio": {
+      "__uuid__": "5f08c436-44f0-4802-bc19-0443972a105b"
+    },
+    "danshen_audio": {
+      "__uuid__": "5325e681-09c2-4cdd-87f1-7b4d76247f14"
+    },
+    "dazao_audio": {
+      "__uuid__": "e97e82df-44e2-4294-89fb-dadbf44bf622"
+    },
+    "gancao_audio": {
+      "__uuid__": "c1fcf0fb-c572-4800-9848-1e78718fdabf"
+    },
+    "ganjiang_audio": {
+      "__uuid__": "b3d0fc52-3960-42d1-869f-39121e912bdb"
+    },
+    "gouqi_audio": {
+      "__uuid__": "589a92bd-21cc-43d4-8594-2e9c92930f13"
+    },
+    "jingjie_audio": {
+      "__uuid__": "5d063b36-f6ad-4d0a-ad0c-1eaf633a1293"
+    },
+    "jinju_audio": {
+      "__uuid__": "ffdbc929-ffdb-46b7-a93e-29447856ca36"
+    },
+    "lizhi_audio": {
+      "__uuid__": "ac2f83fb-1f9e-4d58-b043-bdcd25634e14"
+    },
+    "lizi_audio": {
+      "__uuid__": "7a5029a4-6d49-4a15-a1bb-9faa9506e801"
+    },
+    "longyan_audio": {
+      "__uuid__": "03f3670c-b2e3-44dc-a718-35d83b45a100"
+    },
+    "moli_audio": {
+      "__uuid__": "ebf27f93-6c3b-44cd-b228-944b77435936"
+    },
+    "muchai_audio": {
+      "__uuid__": "434c4832-eab0-46c1-a1ef-baa5316386b4"
+    },
+    "mudan_audio": {
+      "__uuid__": "c2b82d71-e775-43c4-9ba6-650d7ac46c31"
+    },
+    "mulan_audio": {
+      "__uuid__": "5ae0ebd3-2b4a-4ea4-9454-7b8b4fcefad4"
+    },
+    "pugongying_audio": {
+      "__uuid__": "b313152c-a590-406a-90f6-e78ca8cf99fa"
+    },
+    "putao_audio": {
+      "__uuid__": "b31b447b-2c35-46ea-bb6c-84952055fae8"
+    },
+    "renshen_audio": {
+      "__uuid__": "280fe06b-d0a1-4f1d-bf58-4c37e907b7ea"
+    },
+    "taozi_audio": {
+      "__uuid__": "4fb5e673-7017-4a1a-bf48-92250446042d"
+    },
+    "zhuye_audio": {
+      "__uuid__": "9c9e6c09-6653-44b7-8a72-9eddc54c2425"
+    },
+    "_id": "c9svoY3rpPjLRVujzjU/12"
+  },
   {
     "__type__": "cc.Node",
     "_name": "Canvas",
@@ -69,34 +214,37 @@
     },
     "_children": [
       {
-        "__id__": 3
+        "__id__": 5
-      },
-      {
-        "__id__": 6
       },
       {
         "__id__": 8
       },
       {
-        "__id__": 12
+        "__id__": 10
       },
       {
-        "__id__": 18
+        "__id__": 14
       },
       {
-        "__id__": 21
+        "__id__": 20
+      },
+      {
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 24
-      },
-      {
-        "__id__": 25
-      },
       {
         "__id__": 26
+      },
+      {
+        "__id__": 27
+      },
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 29
       }
     ],
     "_prefab": null,
@@ -152,16 +300,16 @@
     "_name": "Main Camera",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 4
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
+        "__id__": 6
       },
       {
-        "__id__": 5
+        "__id__": 7
       }
     ],
     "_prefab": null,
@@ -217,7 +365,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 5
     },
     "_enabled": true,
     "_cullingMask": 4294967295,
@@ -253,7 +401,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 5
     },
     "_enabled": true,
     "_id": "82rBHh8bJIGKuGw03a3Yrd"
@@ -263,13 +411,13 @@
     "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 4
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 9
       }
     ],
     "_prefab": null,
@@ -325,7 +473,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 8
     },
     "_enabled": true,
     "_materials": [
@@ -357,16 +505,16 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 4
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 11
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_prefab": null,
@@ -422,7 +570,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "_materials": [
@@ -456,7 +604,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 10
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -465,7 +613,7 @@
     "zoomScale": 1.1,
     "clickEvents": [
       {
-        "__id__": 11
+        "__id__": 13
       }
     ],
     "_N$interactable": true,
@@ -521,14 +669,14 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 8
+      "__id__": 10
     },
     "_id": "5fQ0XX+HFAlq0Hihrzp10i"
   },
   {
     "__type__": "cc.ClickEvent",
     "target": {
-      "__id__": 2
+      "__id__": 4
     },
     "component": "",
     "_componentId": "454adgphRpA6oq5lB6Cg1fK",
@@ -540,17 +688,17 @@
     "_name": "Rank",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 4
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 15
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 18
       }
     ],
     "_prefab": null,
@@ -564,7 +712,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 102,
       "height": 40
     },
     "_anchorPoint": {
@@ -576,8 +724,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        258.955,
+        279.513,
-        -476.544,
+        -547.706,
         0,
         0,
         0,
@@ -606,16 +754,16 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 12
+      "__id__": 14
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 16
       },
       {
-        "__id__": 15
+        "__id__": 17
       }
     ],
     "_prefab": null,
@@ -629,8 +777,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 126,
+      "width": 104,
-      "height": 140
+      "height": 102
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -642,7 +790,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        7.105427357601002e-15,
         0,
         0,
         0,
@@ -671,7 +819,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -681,9 +829,11 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": null,
+    "_spriteFrame": {
+      "__uuid__": "5bb2b601-5166-425e-899d-d3a9b9663c04"
+    },
     "_type": 1,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -693,7 +843,9 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_atlas": null,
+    "_atlas": {
+      "__uuid__": "ef1ad44d-51f9-416e-9fc4-9c35dee52cf3"
+    },
     "_id": "e3tnncQgtFn49iTBzwCpMN"
   },
   {
@@ -701,16 +853,16 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 15
     },
     "_enabled": true,
     "alignMode": 0,
     "_target": null,
     "_alignFlags": 45,
-    "_left": -13,
+    "_left": -1,
-    "_right": -13,
+    "_right": -1,
-    "_top": -50,
+    "_top": -30.999999999999996,
-    "_bottom": -50,
+    "_bottom": -30.999999999999993,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -728,7 +880,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -737,7 +889,7 @@
     "zoomScale": 1.1,
     "clickEvents": [
       {
-        "__id__": 17
+        "__id__": 19
       }
     ],
     "_N$interactable": true,
@@ -803,14 +955,14 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 13
+      "__id__": 15
     },
     "_id": "79F7b/WB5F2JOMTqOD3Wq1"
   },
   {
     "__type__": "cc.ClickEvent",
     "target": {
-      "__id__": 2
+      "__id__": 4
     },
     "component": "",
     "_componentId": "454adgphRpA6oq5lB6Cg1fK",
@@ -822,16 +974,16 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 4
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 20
+        "__id__": 22
       }
     ],
     "_prefab": null,
@@ -887,7 +1039,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -920,7 +1072,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "alignMode": 1,
@@ -947,16 +1099,16 @@
     "_name": "version",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 4
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 24
       },
       {
-        "__id__": 23
+        "__id__": 25
       }
     ],
     "_prefab": null,
@@ -1012,7 +1164,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 23
     },
     "_enabled": true,
     "_materials": [
@@ -1045,7 +1197,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 23
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1072,7 +1224,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 4
     },
     "_enabled": true,
     "_designResolution": {
@@ -1089,7 +1241,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 4
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1116,14 +1268,94 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 4
     },
     "_enabled": true,
-    "localTest": true,
+    "localTest": false,
-    "clientTestVersion": "1.0.1",
+    "clientTestVersion": "1.0.3",
     "testVersion": {
-      "__id__": 19
+      "__id__": 21
     },
     "_id": "50zCP3Mq9MKIKjMbohPY8j"
+  },
+  {
+    "__type__": "58403/n16JCa5sZhNMjZzGo",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 4
+    },
+    "_enabled": true,
+    "audioGameBgm0": null,
+    "baishao_audio": {
+      "__uuid__": "47388b59-bca9-4607-bdc1-1fc7ba079a12"
+    },
+    "cha_audio": {
+      "__uuid__": "b1a7d924-b756-4abd-9de4-f913e76d7ba6"
+    },
+    "chixiaodou_audio": {
+      "__uuid__": "16df01b7-75d9-47f2-96bf-23d29632af47"
+    },
+    "danggui_audio": {
+      "__uuid__": "5f08c436-44f0-4802-bc19-0443972a105b"
+    },
+    "danshen_audio": {
+      "__uuid__": "5325e681-09c2-4cdd-87f1-7b4d76247f14"
+    },
+    "dazao_audio": {
+      "__uuid__": "e97e82df-44e2-4294-89fb-dadbf44bf622"
+    },
+    "gancao_audio": {
+      "__uuid__": "c1fcf0fb-c572-4800-9848-1e78718fdabf"
+    },
+    "ganjiang_audio": {
+      "__uuid__": "b3d0fc52-3960-42d1-869f-39121e912bdb"
+    },
+    "gouqi_audio": {
+      "__uuid__": "589a92bd-21cc-43d4-8594-2e9c92930f13"
+    },
+    "jingjie_audio": {
+      "__uuid__": "5d063b36-f6ad-4d0a-ad0c-1eaf633a1293"
+    },
+    "jinju_audio": {
+      "__uuid__": "ffdbc929-ffdb-46b7-a93e-29447856ca36"
+    },
+    "lizhi_audio": {
+      "__uuid__": "ac2f83fb-1f9e-4d58-b043-bdcd25634e14"
+    },
+    "lizi_audio": {
+      "__uuid__": "7a5029a4-6d49-4a15-a1bb-9faa9506e801"
+    },
+    "longyan_audio": {
+      "__uuid__": "03f3670c-b2e3-44dc-a718-35d83b45a100"
+    },
+    "moli_audio": {
+      "__uuid__": "ebf27f93-6c3b-44cd-b228-944b77435936"
+    },
+    "muchai_audio": {
+      "__uuid__": "434c4832-eab0-46c1-a1ef-baa5316386b4"
+    },
+    "mudan_audio": {
+      "__uuid__": "c2b82d71-e775-43c4-9ba6-650d7ac46c31"
+    },
+    "mulan_audio": {
+      "__uuid__": "5ae0ebd3-2b4a-4ea4-9454-7b8b4fcefad4"
+    },
+    "pugongying_audio": {
+      "__uuid__": "b313152c-a590-406a-90f6-e78ca8cf99fa"
+    },
+    "putao_audio": {
+      "__uuid__": "b31b447b-2c35-46ea-bb6c-84952055fae8"
+    },
+    "renshen_audio": {
+      "__uuid__": "280fe06b-d0a1-4f1d-bf58-4c37e907b7ea"
+    },
+    "taozi_audio": {
+      "__uuid__": "4fb5e673-7017-4a1a-bf48-92250446042d"
+    },
+    "zhuye_audio": {
+      "__uuid__": "9c9e6c09-6653-44b7-8a72-9eddc54c2425"
+    },
+    "_id": "c78uwvSdFH7oUk6WRJFjFe"
   }
 ]

assets/Script/GameManager.ts

@@ -1,3 +1,5 @@
+import AudioManager from "./module/Music/AudioManager";
+
 // 主游戏控制类
 const {ccclass, property} = cc._decorator;
 @ccclass
@@ -27,26 +29,34 @@ export default class GameManager extends cc.Component {
     startTime: number;      //游戏开始计时
     overTime: number;       //游戏结束计时
     now_Food: string;       //当前关卡名字信息
-    result: boolean;        //当前关卡名字信息
+    result: number;        //当前关卡名字信息
+    choice: number;        //当前关卡选择第几个按钮
     foodPicArray: any;      //存放当前每一大局游戏所有植物图片
     foodAudioArray: any;    //存放当前每一大局游戏所有植物声音
-
+    customData:any;         //存放当前配置
-    onLoad () {}
+    needleTween: cc.Tween<cc.Sprite>;
-
+    onLoad () {
-    start () {
         this.fit();
         this.init();
         this.startGame();
     }
+
+    start () {
+
+    }
     //初始化数据
     init(){
         this.touchable = false;
-        this.result = false;
+        this.result = -1;
         this.foodAudioArray = [];
         this.foodPicArray = [];
         this.timeTween = null;
+        this.needleTween = null;
+        this.choice = 0;
+        cc.fx.GameConfig.GM_INFO.stepTimeList = 0;
+        cc.fx.GameConfig.GM_INFO.successList = [];
+        cc.fx.GameConfig.GM_INFO.level = 0;
         this.voiceSpriteFrame = this.Plant.getChildByName("icon").getComponent(cc.Sprite).spriteFrame;
-
         this.btnReset();
     }
     //开始游戏
@@ -73,80 +83,182 @@ export default class GameManager extends cc.Component {
     }
     //创建关卡
     createCustom(){
+        this.choice = 0;
         this.Plant.opacity = 0;
-        this.timeNode.getComponent(cc.Sprite).fillRange = 0;
+        this.timeNode.getChildByName("time").getComponent(cc.Sprite).fillRange = 0;
-        let customData = cc.fx.GameConfig.LEVEL_INFO[cc.fx.GameConfig.GM_INFO.custom].custom[cc.fx.GameConfig.GM_INFO.level];
+        this.timeNode.getChildByName("needle").angle = 0;
-        let name = customData.item;
+        if(cc.fx.GameConfig.GM_INFO.level >= cc.fx.GameConfig.LEVEL_INFO[cc.fx.GameConfig.GM_INFO.custom].custom.length){
+            cc.director.loadScene("OverScene");
+            return;
+        }
+        this.customData = cc.fx.GameConfig.LEVEL_INFO[cc.fx.GameConfig.GM_INFO.custom].custom[cc.fx.GameConfig.GM_INFO.level];
+        let name = this.customData.item;
 
-        if(customData.type == 1){
+        //埋点数据设置
+        cc.fx.GameConfig.CLICK_SET("round",cc.fx.GameConfig.GM_INFO.level);
+        cc.fx.GameConfig.CLICK_SET("levelConfig",cc.fx.GameConfig.GM_INFO.custom);
+        cc.fx.GameConfig.CLICK_SET("item",name);
+        cc.fx.GameConfig.CLICK_SET("roundType",this.customData.type);
+
+        if(this.customData.type == 1){
             this.Plant.getChildByName("name").getComponent(cc.Label).string = cc.fx.GameTool.getFoodName(name);
             name = "prop_"+name;
             this.Plant.getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.FoodPlist["_spriteFrames"][name];
             this.now_Food = name;
+            cc.tween(this.Plant)
+            .to(0.2,{opacity:255})
+            .call(()=>{
+                this.startTimer();
+            })
+            .start();
         }
         else{
             this.Plant.getChildByName("name").getComponent(cc.Label).string = ""
             this.Plant.getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.voiceSpriteFrame;
+            let audioName = name + "_audio";
+            name = "audio"+ name;
             this.now_Food = name;
+            cc.fx.AudioManager._instance.playEffect(audioName,this.startTimer.bind(this));
+            cc.tween(this.Plant)
+            .to(0.2,{opacity:255})
+            .call(()=>{
+            })
+            .start();
         }
         //关卡+1
         cc.fx.GameConfig.GM_INFO.level += 1;
-        cc.tween(this.Plant)
+
-        .to(0.2,{opacity:255})
+    }
+    //开始转圈倒计时
+    startTimer(){
+        this.startTime = cc.fx.GameTool.getTime();
+        this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+        this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+        this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+        if(this.containsNanana(this.now_Food) == true){
+            // console.log("可以点火");
+            this.Btn_Firewood.getComponent(cc.Button).interactable = true;
+        }
+        this.timeNode.getChildByName("time").getComponent(cc.Sprite).fillRange = 0;
+        this.needleTween = 
+        cc.tween(this.timeNode.getChildByName("needle"))
+        .to(5,{angle:-360})
+        .start();
+        this.timeTween = 
+        cc.tween(this.timeNode.getChildByName("time").getComponent(cc.Sprite))
+        .to(5,{fillRange:1})
         .call(()=>{
-            this.startTime = cc.fx.GameTool.getTime();
+            this.timeTween = null;
-            this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+            this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
-            this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+            this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
-            this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+            this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
-            this.timeTween = 
+            this.Btn_Firewood.getComponent(cc.Button).interactable = false;
-            cc.tween(this.timeNode.getComponent(cc.Sprite))
+            this.setData(null);
-            .to(2.5,{fillRange:1})
+            this.nextLevel();
-            .call(()=>{
-                this.timeTween = null;
-                this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
-                this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
-                this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
-                this.nextLevel();
-            })
-            .start();
         })
         .start();
     }
 
+    containsNanana(str) {
+        return /muchai/i.test(str);
+    }
+
     //新植物按钮
     click_Choice(customData,data){
-        //关掉计时器
+        //关掉计时器   处理逻辑之前，先行关掉按钮开关
+        this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        this.Btn_Firewood.getComponent(cc.Button).interactable = false;
         this.timeTween.stop();
         this.timeTween = null;
+        this.needleTween.stop();
+        this.needleTween = null;
         //判断是否正确，并把出现的物品存入数组
         this.result = this.judgingResult();
-        if(data == "Btn_New") this.result = !this.result;
+        if(data == "Btn_New"){
+            if(this.result == -1){
+                this.result = 1; 
+            } 
+            else{
+                this.result = -1;
+            }
+        } 
+
         //设置按钮状态
-        this.setBtnState(this[data]);
+        this.setBtnState(this[data],data);
+        //根据答题，设置上传数据
+        this.setData(data);
         //获取反应时间
         this.setTimeData();
         //进行下一关
         this.nextLevel();
     }
 
+    //点火按钮
+    click_Ignition(){
+        cc.fx.GameConfig.CLICK_SET("ignite",true);
+        if(this.customData.flamable == 0){
+            // console.log("错误点火");
+        }
+        else if(this.customData.flamable == 1){
+            let igniteCount = cc.fx.GameConfig.CLICK_DATA.igniteCount + 1;
+            cc.fx.GameConfig.CLICK_SET("igniteCount",igniteCount);
+            this.Btn_Firewood.getChildByName("fireBg").active = true;
+            this.Btn_Firewood.getChildByName("fire").active = true;
+            setTimeout(() => {
+                if(this.Btn_Firewood){
+                    this.Btn_Firewood.getChildByName("fireBg").active = false;
+                    this.Btn_Firewood.getChildByName("fire").active = false;
+                }
+            }, 1050);
+            // console.log("正确点火");
+        }
+    }
+
     //判断是否有过的结果 type只为new hear see 三选一 
     judgingResult(){
-        let result = false;
+        let result = -1;
-        let arrayTemp = this.foodPicArray;
+        //先检查音频
-        if(this.now_Food.substring(0,4) != "prop"){
+        let name = this.now_Food.substring(5,this.now_Food.length);
-            arrayTemp = [];
+        if(this.foodAudioArray.length > 0){
-            arrayTemp = this.foodAudioArray; 
+            for(let i=0; i<this.foodAudioArray.length;i++){
-        }
+                if(name == this.foodAudioArray[i].substring(5,this.now_Food.length)){
-        if(arrayTemp.length > 0){
+                    result = 2;
-            for(let i=0; i<arrayTemp.length;i++){
+                    this.foodAudioArray.splice(i,1);
-                if(this.now_Food == arrayTemp[i]){
+                    cc.fx.GameConfig.CLICK_SET("rightChoice",2);
-                    result = true;
+                    i = 10000;
                     break;
                 }
             }
         }
-        //判断后放进数组
+        //再检查图盘
-        arrayTemp.push(this.now_Food);
+        if(this.foodPicArray.length > 0){
+            for(let i=0; i<this.foodPicArray.length;i++){
+                if(name == this.foodPicArray[i].substring(5,this.now_Food.length)){
+                    //如果图片里面有
+                    result = 3;
+                    this.foodPicArray.splice(i,1);
+                    cc.fx.GameConfig.CLICK_SET("rightChoice",3);
+                    i = 10000;
+                    break;
+                }
+            }
+        }
+
+        //把新生成的存放进数组里
+        if(this.now_Food.substring(0,4) != "prop"){
+            this.foodAudioArray.push(this.now_Food);
+        }
+            
+        else {
+            this.foodPicArray.push(this.now_Food);  
+        }
+           
+
+        if(result == -1){
+            cc.fx.GameConfig.CLICK_SET("rightChoice",1);
+        }
         return result;
     }
 
@@ -154,12 +266,22 @@ export default class GameManager extends cc.Component {
     setTimeData(){
         this.overTime = cc.fx.GameTool.getTime();
         let time = this.overTime - this.startTime;
-        cc.fx.GameConfig.CLICK_DATA.stepTimeList.push(time);
+        cc.fx.GameConfig.CLICK_SET("stepTime",time);
+        //防止溢出
+        if(time < 0 || time > 2500) time = 2500;
+        cc.fx.GameConfig.GM_INFO.stepTimeList += time;
     }
 
     //设置按钮状态
-    setBtnState(node){
+    setBtnState(node,data){
-        if(this.result == false){
+        if(data == "Btn_New") this.choice = 1;
+        else if(data == "Btn_Hear") this.choice = 2;
+        else if(data == "Btn_See") this.choice = 3;
+        else if(data == null){
+            this.choice = 0;
+        } 
+
+        if(this.choice != cc.fx.GameConfig.CLICK_DATA.rightChoice){
             node.getChildByName("err").active = true;
             node.getChildByName("correct").active = false;
         } 
@@ -171,6 +293,7 @@ export default class GameManager extends cc.Component {
         this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
         this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
         this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        this.Btn_Firewood.getComponent(cc.Button).interactable = false;
     }
 
     //下一轮 首先重置按钮状态
@@ -200,6 +323,7 @@ export default class GameManager extends cc.Component {
         this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
         this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
         this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        this.Btn_Firewood.getComponent(cc.Button).interactable = false;
     }
 
     //返回首页
@@ -226,14 +350,27 @@ export default class GameManager extends cc.Component {
 
     //如果是倒计时 调用此方法
     startCountDownTime () {
-        this.timeNode.getComponent(cc.Sprite).fillRange = 0;
+        this.timeNode.getChildByName("time").getComponent(cc.Sprite).fillRange = 0;
-        cc.tween(this.timeNode.getComponent(cc.Sprite))
+        this.timeNode.getChildByName("needle").angle = 0;
-        .to(2,{fillRange:1})
-        .start();
     }
     //上传每次操作数据
-    setData(){
+    setData(data){
-         cc.fx.GameTool.setGameData();
+        if(data == "Btn_New") this.choice = 1;
+        else if(data == "Btn_Hear") this.choice = 2;
+        else if(data == "Btn_See") this.choice = 3;
+        else if(data == null){
+            this.choice = 0;
+            cc.fx.GameConfig.CLICK_SET("stepTime",5000);
+            cc.fx.GameConfig.GM_INFO.stepTimeList += 5000;
+        } 
+        var jg = false;
+        if(this.choice == cc.fx.GameConfig.CLICK_DATA.rightChoice){
+            jg = true;
+            cc.fx.GameConfig.GM_INFO.successList.push(jg);
+        } 
+        cc.fx.GameConfig.CLICK_SET("choice",this.choice);
+        cc.fx.GameConfig.CLICK_SET("success",jg);
+        cc.fx.GameTool.setGameData();
     }
     //上传排行榜数据
     gameOver(time){

assets/Script/GameOver.ts

@@ -7,40 +7,101 @@ export default class NewClass extends cc.Component {
     count: cc.Label = null;
     @property(cc.Label)
     time: cc.Label = null;
-    @property(cc.Node)
+    @property(cc.Sprite)
-    selfNode: cc.Node = null;
+    finishiTime: cc.Sprite = null;
-    @property(cc.Node)
-    one: cc.Node = null;
-    @property(cc.Node)
-    two: cc.Node = null;
-    @property(cc.Node)
-    three: cc.Node = null;
-    @property(cc.Node)
-    four: cc.Node = null;
-    @property(cc.Node)
-    five: cc.Node = null;
     listData: any;
     selfData: any;
+    accuracy:number;
+
     // onLoad () {}
     start () {
-        this.count.string = cc.fx.GameConfig.GM_INFO.total + "";
+        this.count.string = 0 + "";
-        if(cc.fx.GameConfig.GM_INFO.mean_Time > 10){
-            cc.fx.GameConfig.GM_INFO.mean_Time = (parseInt(Math.random()*10+"")+5)/10
-        }
-        this.time.string = cc.fx.GameConfig.GM_INFO.mean_Time + "s";
         this.init();
+ 
     }
     //初始化数据
     init(){
-        this.listData = [];
+        //展示准确率
-        this.selfData = null;
+        this.showAccuracy();
-        this.one.active = false;
+        //展示完成时间
-        this.two.active = false;
+        this.showFinishiTime();
-        this.three.active = false;
+        //上传排行榜
-        this.four.active = false;
+        this.setRank();
-        this.five.active = false;
+        //删除本关卡
-        this.getRank();
+        setTimeout(() => {
+            cc.fx.GameTool.getCustom(true);
+        }, 100);
     }
+
+    setRank(){
+        let data = {
+            "totleTimes": cc.fx.GameConfig.GM_INFO.stepTimeList,
+            "accuracy": this.accuracy,
+        }
+        cc.fx.GameTool.setRank(data);
+    }
+
+    showFinishiTime(){
+        cc.tween(this.finishiTime)
+        .delay(1.5)
+        .to(0.5,{fillRange:1})
+        .start();
+        cc.tween(this.time.node)
+        .delay(1.7)
+        .to(0.3,{opacity:255})
+        .call(()=>{
+            this.conversionTime();
+        })
+        .start();
+    }
+
+    conversionTime(){
+        var minute = 0;
+        var second = 0;
+        let obj = {a:100};
+        let time = parseInt(cc.fx.GameConfig.GM_INFO.stepTimeList/1000 + "");
+        cc.tween(obj)
+        // .delay(0.1)
+        .to(1,{a:time},{
+            progress: (start,end,current,ratio)=>{
+                current = end*ratio;
+                second = current.toFixed(0);
+                if(second >= 60){
+                    minute = parseInt(second/60+"");
+                    second -= 60*minute;
+                }
+                this.time.string = minute + "分" + second + "秒";
+            }
+        })
+        .call(()=>{
+            this.node.getChildByName("btn").active = true;
+            cc.tween(this.node.getChildByName("btn"))
+            .to(0.3,{opacity:255})
+            .start();
+        })
+        .start()
+    }
+    
+    showAccuracy(){
+        this.accuracy = parseInt(cc.fx.GameConfig.GM_INFO.successList.length/
+            cc.fx.GameConfig.GM_INFO.level*100+"");
+        
+        console.log("答对的个数:",cc.fx.GameConfig.GM_INFO.successList.length);
+        console.log("总数:",cc.fx.GameConfig.GM_INFO.level);
+        console.log("准确率:",this.accuracy);
+        let obj = {a:100};
+        cc.tween(obj)
+        .delay(0.5)
+        .to(1,{a:this.accuracy},{
+            progress: (start,end,current,ratio)=>{
+                current = end*ratio;
+                current = current.toFixed(0);
+                this.count.string = current + "";
+            }
+        })
+        .start()
+    }
+
     //打开排行榜
     openRank(){
         cc.director.loadScene("RankScene");
@@ -49,48 +110,8 @@ export default class NewClass extends cc.Component {
     again(){
         cc.director.loadScene("GameScene");
     }
-    //获取排行榜
+
-    getRank(){
+    update(dt: number): void {
-        //获取排行榜数据  所需数据量
+        // this.count.string = this.accuracy + "";
-        let dataFile = {
-            length:5
-        }
-         cc.fx.GameTool.getRank(dataFile,data =>this.getRankData(data));
-    }
-    //设置排行信息
-    getRankData(data){
-        if(data){
-             cc.fx.GameTool.getRankData(data,this,4);
-             cc.fx.GameTool.setPic(this.selfNode.getChildByName("pic").getChildByName("icon"),this.selfData.pic);
-            for(let i=0;i<=4;i++){
-                this.setRank(i,this.listData[i]);
-            }
-        }
-    }
-    //根据内容填充排行榜
-    setRank(num,data){
-        var hitNode = null;
-        if(num == 0){
-            hitNode = this.one;
-        }
-        else if(num == 1){
-            hitNode = this.two;
-        }
-        else if(num == 2){
-            hitNode = this.three;
-        }
-        else if(num == 3){
-            hitNode = this.four;
-        }
-        else if(num == 4){
-            hitNode = this.five;
-        }
-        if(hitNode){
-            hitNode.active = true;
-             cc.fx.GameTool.subName(data.nickName,4);
-            hitNode.getChildByName("name").getComponent(cc.Label).string = data.nickName;
-            hitNode.getChildByName("total").getComponent(cc.Label).string = data.totalSunCount;
-             cc.fx.GameTool.setPic(hitNode.getChildByName("pic").getChildByName("icon"),data.pic);
-        }
     }
 }

assets/Script/GuideManager.ts

@@ -0,0 +1,286 @@
+import AudioManager from "./module/Music/AudioManager";
+
+// 主游戏控制类
+const {ccclass, property} = cc._decorator;
+@ccclass
+export default class GuideManager extends cc.Component {
+
+    @property(cc.Node)
+    Tip: cc.Node = null;
+    
+    @property(cc.SpriteAtlas)
+    FoodPlist: cc.SpriteAtlas = null;
+
+    @property(cc.Node)
+    Btn_New: cc.Node = null;
+    @property(cc.Node)
+    Btn_Hear: cc.Node = null;
+    @property(cc.Node)
+    Btn_See: cc.Node = null;
+    @property(cc.Node)
+    Plant: cc.Node = null;
+    voiceSpriteFrame: cc.SpriteFrame;     //是否可点击
+
+    needleTween: cc.Tween<cc.Sprite>;
+    func: () => void;
+
+    custom:number;
+
+    now_Food: string;       //当前关卡名字信息
+    customData: { item: string; type: number; right: number; }[];
+    choice: number;
+
+    onLoad () {
+        this.custom = 0;
+    }
+
+    start () {
+
+    }
+    //初始化数据
+    init(){
+        this.voiceSpriteFrame = this.Plant.getChildByName("icon").getComponent(cc.Sprite).spriteFrame;``
+        this.node.getChildByName("jumpBtn").active = true;
+        this.node.getChildByName("nextBtn").active = false;
+        cc.tween(this.node.getChildByName("jumpBtn"))
+        .to(0.35,{opacity:255})
+        .start();
+        let tip = cc.fx.tipType.tipOne;
+
+        let label = this.node.getChildByName("tip1").getComponent(cc.Label);
+        cc.fx.GameTool.typingAni(label,tip,this.startGame.bind(this),this);
+
+        this.initData();
+    }
+
+    initData(){
+        this.customData = [
+            {
+                "item": "putao",
+                "type": 1,
+                "right":1,
+            },
+            {
+                "item": "taozi",
+                "type": 2,
+                "right":1,
+            },
+            {
+                "item": "putao",
+                "type": 2,
+                "right":3,
+            },
+            {
+                "item": "taozi",
+                "type": 1,
+                "right":2,
+            },
+            {
+                "item": "putao",
+                "type": 1,
+                "right":2,
+            },
+        ]
+    }
+
+    passVoice(){
+        let voice = this.node.getChildByName("voiceTip");
+        voice.getChildByName("startBtn").getComponent(cc.Button).interactable = false;
+        voice.getChildByName("playBtn").getComponent(cc.Button).interactable = false;
+        cc.tween(voice)
+        .to(0.5,{opacity:0})
+        .call(()=>{
+            voice.active = false;
+        })
+        .start();
+        setTimeout(() => {
+            this.init();
+        }, 1000);
+    }
+
+    playVoice(){
+        cc.fx.AudioManager._instance.playEffect("taozi_audio",null);
+    }
+
+    jumpClick(){
+        cc.director.loadScene("GameScene");
+    }
+
+    nextClick(){
+        //第一步
+        this.node.getChildByName("nextBtn").active = false;
+        let label = this.node.getChildByName("tip1").getComponent(cc.Label);
+  
+        if(this.custom == 0){
+            cc.tween(this.node.getChildByName("tip1"))
+            .to(0.2,{opacity:0})
+            .call(() =>{
+                label.string = "";
+            })
+            .to(0.1,{opacity:255})
+            .call(() =>{ 
+                let tip = cc.fx.tipType.tipTwo;
+                cc.fx.GameTool.typingAni(label,tip,this.startGame.bind(this),this);
+            })
+            .start();
+        }
+        else if(this.custom == 1){
+            this.node.getChildByName("nextBtn").active = false;
+            this.node.getChildByName("jumpBtn").active = false;
+            cc.tween(this.node.getChildByName("tip1"))
+            .to(0.2,{opacity:0})
+            .call(() =>{
+                label.string = "";
+                this.createCustom();
+            })
+            .start();
+        }
+        this.custom += 1;
+    }
+
+    createCustom(){
+        this.choice = 0;
+        this.Btn_Hear.active = true;
+        this.Btn_New.active = true;
+        this.Btn_See.active = true;
+        this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        let name = this.customData[this.custom-2].item;
+        if(this.customData[this.custom-2].type == 1){
+            this.Plant.getChildByName("name").getComponent(cc.Label).string = cc.fx.GameTool.getFoodName(name);
+            name = "prop_"+name;
+            this.Plant.getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.FoodPlist["_spriteFrames"][name];
+            this.now_Food = name;
+            cc.tween(this.Plant)
+            .to(0.2,{opacity:255})
+            .call(()=>{
+                this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+                this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+                this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+            })
+            .start();
+        }
+        else{
+            this.Plant.getChildByName("name").getComponent(cc.Label).string = ""
+            this.Plant.getChildByName("icon").getComponent(cc.Sprite).spriteFrame = this.voiceSpriteFrame;
+            let audioName = name + "_audio";
+            name = "audio"+ name;
+            this.now_Food = name;
+            cc.fx.AudioManager._instance.playEffect(audioName,null);
+            cc.tween(this.Plant)
+            .to(0.2,{opacity:255})
+            .call(()=>{
+                this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+                this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+                this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = true;
+            })
+            .start();
+        }
+        //关卡+1
+
+    }
+
+    //新植物按钮
+    click_Choice(customData,data){
+        //关掉计时器   处理逻辑之前，先行关掉按钮开关
+        if(data == "Btn_New"){
+            this.choice = 1;
+            this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        } 
+        else if(data == "Btn_Hear"){
+            this.choice = 2;
+            this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        } 
+        else if(data == "Btn_See"){
+            this.choice = 3;
+            this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+        } 
+        let target = this[data];
+        var label = this.Tip.getChildByName("content").getComponent(cc.Label);
+        //正确
+        if(this.choice == this.customData[this.custom-2].right){
+            this.Tip.stopAllActions();
+            this.Tip.active = false;
+            this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+            this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+            this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+            target.getChildByName("err").active = false;
+            target.getChildByName("correct").active = true;
+            setTimeout(() => {
+                this.Btn_New.getChildByName("nomal").active = true;
+                this.Btn_New.getChildByName("err").active = false;
+                this.Btn_New.getChildByName("correct").active = false;
+                this.Btn_Hear.getChildByName("nomal").active = true;
+                this.Btn_Hear.getChildByName("err").active = false;
+                this.Btn_Hear.getChildByName("correct").active = false;
+                this.Btn_See.getChildByName("nomal").active = true;
+                this.Btn_See.getChildByName("err").active = false;
+                this.Btn_See.getChildByName("correct").active = false;
+                this.Btn_Hear.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+                this.Btn_New.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+                this.Btn_See.getChildByName("nomal").getComponent(cc.Button).interactable = false;
+                this.custom += 1;
+                if(this.custom >= 7){
+                    this.node.getChildByName("againBtn").active = true;
+                    this.node.getChildByName("startBtn").active = true;
+                    this.Btn_Hear.active = false;
+                    this.Btn_New.active = false;
+                    this.Btn_See.active = false;
+                } 
+                else this.createCustom();
+            }, 1000);
+        }
+        else{
+            var tipTemp = cc.fx.tipType.tipErrOld;
+            this.Tip.active = true;
+            target.getChildByName("err").active = true;
+            target.getChildByName("correct").active = false;
+            switch((this.custom-2)){
+                case 0: case 1: 
+                    tipTemp = cc.fx.tipType.tipErrNew;
+                    break;
+                case 2:
+                    if(this.choice == 2) tipTemp = cc.fx.tipType.tipErrHear;
+                    break;
+                case 3:
+                    if(this.choice == 3) tipTemp = cc.fx.tipType.tipErrSee;
+                    break;
+                case 4:
+                    if(this.choice == 3) tipTemp = cc.fx.tipType.tipErrLast;
+                    break;
+            }
+            label.string = tipTemp;
+            this.Tip.opacity = 255;
+            this.Tip.stopAllActions();
+            var self = this;
+            var action = cc.callFunc(function(){
+                self.Tip.active = false;
+            })
+            this.Tip.runAction(cc.sequence(cc.delayTime(2),cc.fadeIn(0.5),action))
+        }
+    }
+
+    //开始游戏
+    startGame(){
+        this.node.getChildByName("nextBtn").active = true;
+        cc.tween(this.node.getChildByName("nextBtn"))
+        .to(0.35,{opacity:255})
+        .start();
+    }
+
+    againClick(){
+        cc.director.loadScene("GuideScene");
+    }
+
+    
+
+    onEnable () {
+        // cc.fx.Notifications.on("clickSun", this.clickSun, this);
+    }
+    onDisable () {
+        // cc.fx.Notifications.off("clickSun", this.clickSun);
+    }
+    update (dt) {
+    }
+}

assets/Script/GuideManager.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "effe29e5-3670-444b-81fd-b45338af7f19",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/Load.ts

@@ -16,29 +16,37 @@ export default class NewClass extends cc.Component {
     start () {
         window.initMgr();
         cc.fx.GameConfig.init(this.localTest);
-        cc.fx.AudioManager.Instance.init();
         this.testVersion.string = this.clientTestVersion;
 
+        //24年 25年9万   27年
         // setTimeout(() => {
         //     for(let i=0; i<10;i++){
         //         let num = cc.fx.GameTool.getSeedRandom(1,10);
         //         console.log(num);
         //     }
         // }, 100);
+        // 
         
     }
 
+    setRank(){
+        let data = {
+            "totleTimes": 8759,
+            "accuracy": 80,
+        }
+        cc.fx.GameTool.setRank(data);
+    }
+
     //开始游戏，跳转至引导页面
     startGame(){
         setTimeout(() => {
-            cc.director.loadScene("GameScene");
+            cc.director.loadScene("GuideScene");
         }, 100);
-
         // cc.director.loadScene("GuideScene");
     }
     //备用，用来测试跳转 指定关卡
     clickBtn(event,data){
-        cc.fx.GameConfig.GM_INFO.custom = parseInt(data);
+        // cc.fx.GameConfig.GM_INFO.custom = parseInt(data);
         cc.director.loadScene("GameScene");
     }   
     //打开排行榜

assets/Script/RankManager.ts

@@ -45,8 +45,8 @@ export default class RankManager extends cc.Component {
     //实际设置排行数据
     getRankData(data){
         if(data){
-            // console.log(data);
+            //console.log(data);
-             cc.fx.GameTool.getRankData(data,this,6);
+            cc.fx.GameTool.getRankData(data,this,6);
             this.setPic(this.selfData.pic);
         }
     }
@@ -60,23 +60,33 @@ export default class RankManager extends cc.Component {
         this.Player.getChildByName("rank").active = false;
         let time = 1;
         this.tween = cc.tween(this.Player)
-        .to(2,{position:cc.v3(210,453,0)})
+        .to(2,{position:cc.v3(232,446,0)})
         .call(() =>{
             this.Player.getChildByName("rank").active = true;
             this.Player.getChildByName("rank").getChildByName("number")
             .getComponent(cc.Label).string =  parseInt(time*100 + "") + "%";
         })
         .start();
+        
         time = (this.listData.length - this.rankNumber)/this.listData.length;
-        if(this.listData.length >= 99){
+        if(this.listData.length > 0){
-            if(this.rankNumber >= 99){
+            if(this.listData.length >= 99){
-                time = (Math.random()*49+1)/100
+                if(this.rankNumber >= 99){
-                var matchId = cc.sys.localStorage.getItem("matchNumber");
+                    time = (Math.random()*49+1)/100
-                if(matchId == null || matchId == undefined){
-                    time = 0;
                 }
+                else  time = (this.listData.length - this.rankNumber)/this.listData.length;
+            }
+            else{
+                if(this.rankNumber > 99){
+                    time = 0
+                }
+                else time = (this.listData.length - this.rankNumber)/this.listData.length;
             }
         }
+        else{
+            time = 0;
+        }
+
         setTimeout(() => {
             if(this.tween)this.tween.stop();
             this.Player.getChildByName("rank").active = true;

assets/Script/module/Crypto/HttpUtil.ts

@@ -61,8 +61,8 @@ function responseHandler(response: { data: any }) {
 // 响应拦截器
 // Rq.interceptors.response.use(responseHandler)
 const config = {
-  gameId: "100009",
+  gameId: "100010",
-  secretKey: "CMNhOzBA",
+  secretKey: "wozrGKsL",
   EK:"hui231%1"
 };
 

assets/Script/module/GameStart/GameAppStart.ts

@@ -1,6 +1,6 @@
 import { GameConfig } from "../Config/GameConfig";
 import HttpUtil from "../Crypto/HttpUtil";
-import { AudioManager } from "../Music/AudioManager";
+import AudioManager from "../Music/AudioManager";
 import { Notifications } from "../Notification/Notification";
 import { StorageMessage } from "../Storage/Storage";
 import { GameTool } from "../Tool/GameTool";
@@ -22,6 +22,7 @@ window.initMgr = function() {
 
     //应用系统信息
     //配置文件
+
     cc.fx.GameConfig = GameConfig;
     cc.fx.HttpUtil = HttpUtil;
     cc.fx.GameTool = GameTool;
@@ -71,31 +72,46 @@ window.initMgr = function() {
         All : "all", //不区分
     };
 
+    //用于存储消息的ID
+    cc.fx.storageType = cc.Enum({
+	    storageTypeCustom: 1000101, //用于存储关卡等级
+	});
 
+    //用于存储提示语  按照步骤提示
+    cc.fx.tipType = cc.Enum({
+        tipOne: '神农氏回到家中，开始整理今天收集来的物品。当他第一次拿出或说出一种植物时，请告诉他这是新植物。',
+        tipTwo: '如果他拿出或说出的植物你今天看到过，请告诉他上次是看到的；如果你听他说过，则请告诉他上次是听到的。', //用于存储关卡等级
+        tipErrNew: '这是这局游戏第一次出现{植物}',
+        tipErrOld: '{植物}刚才出现过呢',
+        tipErrHear: '上次遇到{植物}时，似乎不是听到的吧',
+        tipErrSee: '上次遇到{植物}时，似乎不是看到的吧',
+        tipErrLast: '之前确实看到过{植物}，但最近一次似乎不是看到的呢',
+
+    });
     //暂时不用
-    cc.fx.clickStatEventType = {
+    // cc.fx.clickStatEventType = {
-        clickStatEventTypeVideoAD : 20173201,//视频播放完成
+    //     clickStatEventTypeVideoAD : 20173201,//视频播放完成
-        clickStatEventTypeClickAdVideo : 20173202,//视频播放为完成
+    //     clickStatEventTypeClickAdVideo : 20173202,//视频播放为完成
-        clickStatEventTypeBannerAD : 20173203,//banner播放为完成
+    //     clickStatEventTypeBannerAD : 20173203,//banner播放为完成
-        clickStatEventTypeUserFrom : 99990001,//用户来源
+    //     clickStatEventTypeUserFrom : 99990001,//用户来源
-        clickStatEventTypeShare : 99990002,//用户分享
+    //     clickStatEventTypeShare : 99990002,//用户分享
-        clickStatEventTypeClickAdBtn : 99990007,//点击分流icon
+    //     clickStatEventTypeClickAdBtn : 99990007,//点击分流icon
-        clickStatEventTypeBannerAD2 : 67890033, // banner广告干预
+    //     clickStatEventTypeBannerAD2 : 67890033, // banner广告干预
-        clickStatEventTypeSubmitVersionInfo : 9999, //上报微信版本及基础库信息
+    //     clickStatEventTypeSubmitVersionInfo : 9999, //上报微信版本及基础库信息
-        clickStatEventTypeClickFirstAd : 99990003, //分流icon显示
+    //     clickStatEventTypeClickFirstAd : 99990003, //分流icon显示
-        clickStatEventTypeClickSecondAd : 99990004, //玩家点击分流按钮
+    //     clickStatEventTypeClickSecondAd : 99990004, //玩家点击分流按钮
-        clickStatEventTypeWxLoginStart : 10001,//微信登录开始
+    //     clickStatEventTypeWxLoginStart : 10001,//微信登录开始
-        clickStatEventTypeWxLoginSuccess : 10002,//微信登录成功
+    //     clickStatEventTypeWxLoginSuccess : 10002,//微信登录成功
-        clickStatEventTypeWxLoginFailed : 10003,//微信登录失败
+    //     clickStatEventTypeWxLoginFailed : 10003,//微信登录失败
-        clickStatEventTypeAuthorizationStart : 10003,//授权开始
+    //     clickStatEventTypeAuthorizationStart : 10003,//授权开始
-        clickStatEventTypeAuthorizationSuccess : 10004,//授权成功
+    //     clickStatEventTypeAuthorizationSuccess : 10004,//授权成功
-        clickStatEventTypeAuthorizationFailed : 10005,//授权失败
+    //     clickStatEventTypeAuthorizationFailed : 10005,//授权失败
-        clickStatEventTypeLoginSDKStart : 10007,//登录SDK开始
+    //     clickStatEventTypeLoginSDKStart : 10007,//登录SDK开始
-        clickStatEventTypeLoginSDKSuccess : 10008,//登录SDK成功
+    //     clickStatEventTypeLoginSDKSuccess : 10008,//登录SDK成功
-        clickStatEventTypeLoginSDKFailed : 10009,//登录SDK时失败
+    //     clickStatEventTypeLoginSDKFailed : 10009,//登录SDK时失败
-        clickStatEventTypeTCP_Start : 10009,//TCP连接开始
+    //     clickStatEventTypeTCP_Start : 10009,//TCP连接开始
-        clickStatEventTypeTCP_Success : 10010,//TCP连接成功
+    //     clickStatEventTypeTCP_Success : 10010,//TCP连接成功
-        clickStatEventTypeTCP_Failed : 10011,//TCP连接失败
+    //     clickStatEventTypeTCP_Failed : 10011,//TCP连接失败
-    };
+    // };
 
 };

assets/Script/module/Music/AudioManager.ts

@@ -1,23 +1,60 @@
 
 
-const { ccclass, property } = cc._decorator;
+const {ccclass, property} = cc._decorator;
-@ccclass('AudioManager')
+@ccclass
-export class AudioManager  {
+export default class AudioManager extends cc.Component {
-
+    static _instance: any;
-    private static _instance : AudioManager = null;
     //背景音乐
     @property(cc.AudioClip)
     audioGameBgm0: cc.AudioClip = null;
-    //跳跃
+
     @property(cc.AudioClip)
-    audioButtonClick: cc.AudioClip = null;
+    baishao_audio: cc.AudioClip = null;
-    //落地上
     @property(cc.AudioClip)
-    audioWarning: cc.AudioClip = null;
+    cha_audio: cc.AudioClip = null;
-    //碰撞
     @property(cc.AudioClip)
-    audioWin: cc.AudioClip = null;
+    chixiaodou_audio: cc.AudioClip = null;
-    //落方块上
+    @property(cc.AudioClip)
+    danggui_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    danshen_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    dazao_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    gancao_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    ganjiang_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    gouqi_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    jingjie_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    jinju_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    lizhi_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    lizi_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    longyan_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    moli_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    muchai_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    mudan_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    mulan_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    pugongying_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    putao_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    renshen_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    taozi_audio: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    zhuye_audio: cc.AudioClip = null;
+
 
     mAudioMap: {};
     bgMusicVolume: number;
@@ -30,8 +67,20 @@ export class AudioManager  {
     rewardCount: number;
     mMusicKey: any;
 
-    static playWarning() {
+    onLoad() {
-        throw new Error('Method not implemented.');
+        if (AudioManager._instance == null) {
+            AudioManager._instance = this;
+            cc.game.addPersistRootNode(this.node);
+        }
+        else {
+            return;
+        }
+        this.reward = false;
+        this.finish = false;
+        this.rewardCount = 0;
+        this.ctor();
+
+        this.preload();
     }
 
     ctor () {
@@ -76,22 +125,15 @@ export class AudioManager  {
         // cc.wwx.Storage.setItem(cc.wwx.Storage.Key_Setting_Effect_Volume, this.mEffectSwitch);
     }
 
-    static get Instance()
+    // static get Instance()
-    {
+    // {
-        if (this._instance == null)
+    //     if (this._instance == null)
-        {
+    //     {
-            this._instance = new AudioManager();
+    //         this._instance = new AudioManager();
-        }
+    //     }
-        return this._instance;
+    //     return this._instance;
-    }
+    // }
 
-    public init() {
-        this.reward = false;
-        this.finish = false;
-        this.rewardCount = 0;
-        this.ctor();
-        this.preload();
-    }
     preload () {
         if (!(cc.sys.platform === cc.sys.WECHAT_GAME)) { return; }
 
@@ -145,6 +187,12 @@ export class AudioManager  {
     onShow () {
         cc.audioEngine.resumeAll();
     }
+
+    //播放音效
+    playEffect(name,callback){
+        if(this[name])
+            return this.play(this[name], false,callback,this.mEffectSwitch);
+    }
     playMusic (key, callback, loop) {
         loop = typeof loop == 'undefined'  || loop ? true : false;
         this.stopMusic();
@@ -174,11 +222,7 @@ export class AudioManager  {
 
         }
     }
-    //播放音效
+
-    playEffect(name,callback){
-        if(this[name])
-            return this.play(this[name], false,callback,this.mEffectSwitch);
-    }
     /*
     * 游戏开始音效
     *
@@ -216,7 +260,7 @@ export class AudioManager  {
      * 按钮
      */
     playAudioButton () {
-        return this.play(this.audioButtonClick, false,null,this.mEffectSwitch);
+        // return this.play(this.audioButtonClick, false,null,this.mEffectSwitch);
     }
 };
 

assets/Script/module/RankList/ItemRender.ts

@@ -12,10 +12,12 @@ export default class ItemRender extends cc.Component {
 
     /**数据改变时调用 */
     public dataChanged(){
-         cc.fx.GameTool.subName(this.data.name,6);
+        cc.fx.GameTool.subName(this.data.name,6);
         this.node.getChildByName("rankLab").getComponent(cc.Label).string = this.data.rank + "";
         this.node.getChildByName("nameLab").getComponent(cc.Label).string = this.data.name + "";
-        this.node.getChildByName("totalLab").getComponent(cc.Label).string = this.data.total + "";
+        this.node.getChildByName("totalLab").getComponent(cc.Label).string = this.data.total + "%";
+        let timeTemp = cc.fx.GameTool.getTimeShenNong(this.data.time);
+        this.node.getChildByName("timeLab").getComponent(cc.Label).string = timeTemp + "";
         this.node.getChildByName("rank").getChildByName("one").active = false;
         this.node.getChildByName("rank").getChildByName("two").active = false;
         this.node.getChildByName("rank").getChildByName("three").active = false;

assets/Script/module/Tool/GameTool.ts

@@ -33,7 +33,7 @@ var GameTool = {
             "data": data
         };
 
-        // console.log("上传数据:")
+        console.log("上传数据:")
         cc.fx.HttpUtil.uploadUserLogData(postData,function(){})
     },
     //上传排行榜  type为1
@@ -43,8 +43,8 @@ var GameTool = {
             "gameId":cc.fx.GameConfig.GM_INFO.gameId,
             "userId":cc.fx.GameConfig.GM_INFO.userId,
             "type":1,
-            "reactionTime": data,
+            "totleTimes": data.totleTimes,
-            "totalSunCount": cc.fx.GameConfig.GM_INFO.total,
+            "accuracy": data.accuracy,
             "success": cc.fx.GameConfig.GM_INFO.success
         };
         cc.fx.HttpUtil.rankData(1,function(){},postData);
@@ -152,7 +152,7 @@ var GameTool = {
         let self = false;
          cc.fx.GameTool.setPic(target.selfNode.getChildByName("pic").getChildByName("icon"),target.selfData.pic);
         for(let i=0;i<=target.listData.length-1;i++){
-            rankData.push({rank:(i+1), name:target.listData[i].nickName, total:target.listData[i].totalSunCount, pic:target.listData[i].pic});
+            rankData.push({rank:(i+1), name:target.listData[i].nickName, total:target.listData[i].accuracy,time:target.listData[i].totleTimes, pic:target.listData[i].pic});
             if(cc.fx.GameConfig.GM_INFO.userId == target.listData[i].userId){
                 self = true;
                 target.rankNumber = i;
@@ -165,7 +165,9 @@ var GameTool = {
         }
          cc.fx.GameTool.subName(target.selfData.nickName,nameLength);
         target.selfNode.getChildByName("nameLab").getComponent(cc.Label).string = target.selfData.nickName;
-        target.selfNode.getChildByName("totalLab").getComponent(cc.Label).string = target.selfData.totalSunCount;
+        target.selfNode.getChildByName("totalLab").getComponent(cc.Label).string = target.selfData.accuracy + "%";
+        let timeTemp = cc.fx.GameTool.getTimeShenNong(target.selfData.totleTimes);
+        target.selfNode.getChildByName("timeLab").getComponent(cc.Label).string = timeTemp + "";
         switch(target.selfNode.getChildByName("rankLab").getComponent(cc.Label).string){
             case "1":
                 target.selfNode.getChildByName("rank").getChildByName("one").active = true;
@@ -176,7 +178,6 @@ var GameTool = {
             case "3":
                 target.selfNode.getChildByName("rank").getChildByName("three").active = true;
                 break;
-
         }
         // 大排行
         if(nameLength == 6){
@@ -195,6 +196,35 @@ var GameTool = {
         let tmp = min + rnd * (max - min);
         return parseInt(tmp);
     },
+    //获取关卡配置的那个关卡数
+    getCustom(type){
+        let custom = cc.fx.StorageMessage.getStorage(cc.fx.storageType.storageTypeCustom);
+        if(custom == "undifend" || custom==null || custom == ""){
+            this.setCustom();
+        }
+        else{
+            cc.fx.GameConfig.GM_INFO_SET("custom",custom[0]);
+            if(custom[0] != 0 || type ==  true){
+                custom.shift();
+                if(custom.length == 0){
+                    this.setCustom();
+                }
+                else cc.fx.StorageMessage.setStorage(cc.fx.storageType.storageTypeCustom,custom);
+            }
+        }
+    },
+    //本地没有存储到配置，或者配置用完，重新创建配置
+    setCustom(){
+        let arrayLength = cc.fx.GameConfig.LEVEL_INFO.length;
+        let arrayList = [];
+        for(let i=1; i<arrayLength;i++){
+            arrayList.push(i);
+        }
+        arrayList.sort(() => Math.random() - 0.5);
+        arrayList.unshift(0)
+        cc.fx.GameConfig.GM_INFO_SET("custom",arrayList[0]);
+        cc.fx.StorageMessage.setStorage(cc.fx.storageType.storageTypeCustom,arrayList);
+    },
 
     getFoodName(food){
         var name = "葡萄";
@@ -298,6 +328,25 @@ var GameTool = {
     setGameInfo: function(pd){
    
     },
+
+    //打字机效果
+    typingAni(label,text,cb,target){
+        var self = target;
+        var html = '';
+        var arr = text.split('');
+        var len = arr.length;
+        var step = 0;
+        self.func = ()=>{
+            html += arr[step];
+            label.string = html;
+            if (++step == len) {
+                self.unschedule(self.func);
+                cb && cb();
+            }
+        }
+        self.schedule(self.func,0.1, cc.macro.REPEAT_FOREVER, 0)
+    },
+
     //输入秒,返回需要展示时间格式
     getTimeMargin:(second) => {
         let total = 0;
@@ -314,6 +363,22 @@ var GameTool = {
         return m + ':' + miao
     },
 
+    //输入秒,返回需要展示时间格式
+    getTimeShenNong:(second) => {
+        second = parseInt(second/1000+"");
+        let total = 0;
+        total = second;
+        let min = 0;
+        if(total > 60){
+            min = parseInt((total / 60)+"");//计算整数分
+        }
+        let m =  min + "'";  
+
+        let afterMin = total - min * 60;//取得算出分后剩余的秒数
+        let miao = afterMin + "''";
+        return m + miao
+    },
+
     //获取时间戳
     getTime(){
         const timestamp = new Date().getTime();

assets/animation/fire.anim

@@ -0,0 +1,79 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "fire",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1.5166666666666666,
+  "sample": 60,
+  "speed": 0.8,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "419712bd-00e6-4352-97bc-105ab199d852"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "eef1f6ad-ae7d-4f74-ab87-cd4c81dea072"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "6999b621-4a9f-4a89-970f-4f6637f6ebe1"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "24bb96d6-d160-419c-89a8-8f1a1e203491"
+            }
+          },
+          {
+            "frame": 0.6666666666666666,
+            "value": {
+              "__uuid__": "5fead804-1827-4c8d-9b89-c09849aeed4e"
+            }
+          },
+          {
+            "frame": 0.8333333333333334,
+            "value": {
+              "__uuid__": "e363a676-9b52-4402-b43a-37062f24c250"
+            }
+          },
+          {
+            "frame": 1,
+            "value": {
+              "__uuid__": "e363a676-9b52-4402-b43a-37062f24c250"
+            }
+          },
+          {
+            "frame": 1.1666666666666667,
+            "value": {
+              "__uuid__": "a67083f3-132b-4dc7-963c-af204012cd97"
+            }
+          },
+          {
+            "frame": 1.3333333333333333,
+            "value": {
+              "__uuid__": "5256d2df-6e2d-4cac-9ac7-bd33add06053"
+            }
+          },
+          {
+            "frame": 1.5,
+            "value": {
+              "__uuid__": "419712bd-00e6-4352-97bc-105ab199d852"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

assets/animation/fire.anim.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "2.1.2",
+  "uuid": "cd606b05-2183-4a5a-ad7c-9f3464006aaa",
+  "importer": "animation-clip",
+  "subMetas": {}
+}

assets/res/icon.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "53e207e8-07fb-4d62-a1c4-3e81fcb5f10d",
+  "uuid": "8084ec83-76e6-4ef4-a0e9-162a417b5c08",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 66,
+  "width": 64,
-  "height": 66,
+  "height": 64,
   "platformSettings": {},
   "subMetas": {
-    "ball0": {
+    "icon": {
       "ver": "1.0.6",
-      "uuid": "32515cc5-7773-4371-81c6-1ed0e522d287",
+      "uuid": "6c6849e9-8426-4bd8-8298-194917d20da7",
       "importer": "sprite-frame",
-      "rawTextureUuid": "53e207e8-07fb-4d62-a1c4-3e81fcb5f10d",
+      "rawTextureUuid": "8084ec83-76e6-4ef4-a0e9-162a417b5c08",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 66,
+      "width": 64,
-      "height": 66,
+      "height": 64,
-      "rawWidth": 66,
+      "rawWidth": 64,
-      "rawHeight": 66,
+      "rawHeight": 64,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/Bg/overBg.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "691e01d7-097f-4b24-afc2-78052ef608cb",
+  "uuid": "194abbe2-2c5a-4d46-8aac-957b3bb44457",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -8,15 +8,15 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 318,
+  "width": 750,
-  "height": 203,
+  "height": 1660,
   "platformSettings": {},
   "subMetas": {
-    "beginLabel": {
+    "overBg": {
       "ver": "1.0.6",
-      "uuid": "9916f2dc-19a7-4f69-8951-44c592442d9c",
+      "uuid": "634acecc-5987-409f-8c81-28569289abb3",
       "importer": "sprite-frame",
-      "rawTextureUuid": "691e01d7-097f-4b24-afc2-78052ef608cb",
+      "rawTextureUuid": "194abbe2-2c5a-4d46-8aac-957b3bb44457",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 318,
+      "width": 750,
-      "height": 203,
+      "height": 1660,
-      "rawWidth": 318,
+      "rawWidth": 750,
-      "rawHeight": 203,
+      "rawHeight": 1660,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/Bg/rank_Bg.jpg.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "b6890719-3b74-401d-9195-b39ec488d5e0",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 1660,
+  "platformSettings": {},
+  "subMetas": {
+    "rank_Bg": {
+      "ver": "1.0.6",
+      "uuid": "e46860aa-922b-408c-8a92-ccfb24106c76",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "b6890719-3b74-401d-9195-b39ec488d5e0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 1660,
+      "rawWidth": 750,
+      "rawHeight": 1660,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/Json/CLICK_DATA.json

@@ -4,15 +4,13 @@
         "type": 1,            
         "success": false,    
         "round": 0,           
-        "totalSunCount": 0,   
+        "choice": 0,   
-        "movedSunCount": 0,   
+        "rightChoice": 0,   
-        "sunSpeed": 0,        
+        "item": "",        
-        "overlapSunCount": 0, 
+        "roundType": 0, 
-        "colorList": [],      
+        "stepTime": 0,        
-        "duration": 0,        
+        "levelConfig": 0, 
-        "difficultyLevel": 0, 
+        "ignite": false,       
-        "sunList": [],       
+        "igniteCount": 0      
-        "stepTimeList": [],   
-        "remainder": 120      
     }
 }

assets/resources/Json/GM_INFO.json

@@ -2,14 +2,17 @@
     "data":{
         "mean_Time": 0,         
         "total": 0,                 
-        "currSeed": 203314,        
+        "currSeed": 200000,        
-        "gameId": 100009,          
+        "gameId": "100010",        
-        "userId": 0,                 
+        "userId": 200139,              
         "guide": true,            
         "url": "http://api.sparkus.cn",
         "success": false,           
         "matchId": null,             
         "custom": 0,               
-        "level": 0                  
+        "level": 0,                   
+        "stepTimeList":0,           
+        "successList":[],
+        "gameTime":5                  
     }
 }

assets/resources/Music/baishao_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "47388b59-bca9-4607-bdc1-1fc7ba079a12",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.464,
+  "subMetas": {}
+}

assets/resources/Music/cha_audio.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "b1a7d924-b756-4abd-9de4-f913e76d7ba6",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.608,
+  "duration": 1.464,
   "subMetas": {}
 }

assets/resources/Music/chixiaodou_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "16df01b7-75d9-47f2-96bf-23d29632af47",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.608,
+  "subMetas": {}
+}

assets/resources/Music/danggui_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "5f08c436-44f0-4802-bc19-0443972a105b",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.416,
+  "subMetas": {}
+}

assets/resources/Music/danshen_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "5325e681-09c2-4cdd-87f1-7b4d76247f14",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.416,
+  "subMetas": {}
+}

assets/resources/Music/dazao_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "e97e82df-44e2-4294-89fb-dadbf44bf622",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.416,
+  "subMetas": {}
+}

assets/resources/Music/gancao_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "c1fcf0fb-c572-4800-9848-1e78718fdabf",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.464,
+  "subMetas": {}
+}

assets/resources/Music/ganjiang_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "b3d0fc52-3960-42d1-869f-39121e912bdb",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.416,
+  "subMetas": {}
+}

assets/resources/Music/gouqi_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "589a92bd-21cc-43d4-8594-2e9c92930f13",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.464,
+  "subMetas": {}
+}

assets/resources/Music/jingjie_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "5d063b36-f6ad-4d0a-ad0c-1eaf633a1293",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.416,
+  "subMetas": {}
+}

assets/resources/Music/jinju_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "ffdbc929-ffdb-46b7-a93e-29447856ca36",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.512,
+  "subMetas": {}
+}

assets/resources/Music/lizhi_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "ac2f83fb-1f9e-4d58-b043-bdcd25634e14",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.464,
+  "subMetas": {}
+}

assets/resources/Music/lizi_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "7a5029a4-6d49-4a15-a1bb-9faa9506e801",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.392,
+  "subMetas": {}
+}

assets/resources/Music/longyan_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "03f3670c-b2e3-44dc-a718-35d83b45a100",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.488,
+  "subMetas": {}
+}

assets/resources/Music/moli_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "ebf27f93-6c3b-44cd-b228-944b77435936",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.44,
+  "subMetas": {}
+}

assets/resources/Music/muchai_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "434c4832-eab0-46c1-a1ef-baa5316386b4",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.488,
+  "subMetas": {}
+}

assets/resources/Music/mudan_audio.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "c2b82d71-e775-43c4-9ba6-650d7ac46c31",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.608,
+  "duration": 1.416,
   "subMetas": {}
 }

assets/resources/Music/mulan_audio.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "5ae0ebd3-2b4a-4ea4-9454-7b8b4fcefad4",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.632,
+  "duration": 1.416,
   "subMetas": {}
 }

assets/resources/Music/pugongying_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "b313152c-a590-406a-90f6-e78ca8cf99fa",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.584,
+  "subMetas": {}
+}

assets/resources/Music/putao_audio.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "b31b447b-2c35-46ea-bb6c-84952055fae8",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.608,
+  "duration": 1.44,
   "subMetas": {}
 }

assets/resources/Music/renshen_audio.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "280fe06b-d0a1-4f1d-bf58-4c37e907b7ea",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 1.608,
+  "duration": 1.44,
   "subMetas": {}
 }

assets/resources/Music/taozi_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "4fb5e673-7017-4a1a-bf48-92250446042d",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.512,
+  "subMetas": {}
+}

assets/resources/Music/zhuye_audio.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "9c9e6c09-6653-44b7-8a72-9eddc54c2425",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.44,
+  "subMetas": {}
+}

assets/resources/Rank.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "571ada69-963a-415d-8f4a-bd6e19c68094",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/Rank/rankUI.plist

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>frames</key>
+        <dict>
+            <key>rank_icon1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{66,66}</string>
+                <key>spriteSourceSize</key>
+                <string>{66,66}</string>
+                <key>textureRect</key>
+                <string>{{853,1},{66,66}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>rank_icon2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{66,66}</string>
+                <key>spriteSourceSize</key>
+                <string>{66,66}</string>
+                <key>textureRect</key>
+                <string>{{921,1},{66,66}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>rank_icon3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{66,66}</string>
+                <key>spriteSourceSize</key>
+                <string>{66,66}</string>
+                <key>textureRect</key>
+                <string>{{853,69},{66,66}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>rank_other.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{750,30}</string>
+                <key>spriteSourceSize</key>
+                <string>{750,30}</string>
+                <key>textureRect</key>
+                <string>{{1,123},{750,30}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>rank_phoneBg.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{98,129}</string>
+                <key>spriteSourceSize</key>
+                <string>{98,129}</string>
+                <key>textureRect</key>
+                <string>{{753,1},{98,129}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>rank_self.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{750,120}</string>
+                <key>spriteSourceSize</key>
+                <string>{750,120}</string>
+                <key>textureRect</key>
+                <string>{{1,1},{750,120}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>rank_share.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{36,36}</string>
+                <key>spriteSourceSize</key>
+                <string>{36,36}</string>
+                <key>textureRect</key>
+                <string>{{921,69},{36,36}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+        </dict>
+        <key>metadata</key>
+        <dict>
+            <key>format</key>
+            <integer>3</integer>
+            <key>pixelFormat</key>
+            <string>RGBA8888</string>
+            <key>premultiplyAlpha</key>
+            <false/>
+            <key>realTextureFileName</key>
+            <string>rankUI.png</string>
+            <key>size</key>
+            <string>{988,154}</string>
+            <key>smartupdate</key>
+            <string>$TexturePacker:SmartUpdate:5341b601eefa087d2cb306ba3bf8ebc1:1ca3b704db99ddd15d8f7c856a8c4d9f:e78f5013a428c1be0767af4d62c87be1$</string>
+            <key>textureFileName</key>
+            <string>rankUI.png</string>
+        </dict>
+    </dict>
+</plist>

assets/resources/Rank/rankUI.plist.meta

@@ -0,0 +1,174 @@
+{
+  "ver": "1.2.6",
+  "uuid": "4aa928a4-3ba6-433f-a3d6-261260e338af",
+  "importer": "asset",
+  "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+  "size": {
+    "width": 988,
+    "height": 154
+  },
+  "type": "Texture Packer",
+  "subMetas": {
+    "rank_icon1.png": {
+      "ver": "1.0.6",
+      "uuid": "4f8a74d6-8e87-4734-9df3-90027b702649",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 853,
+      "trimY": 1,
+      "width": 66,
+      "height": 66,
+      "rawWidth": 66,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "rank_icon2.png": {
+      "ver": "1.0.6",
+      "uuid": "3cc7bc6a-bf5d-4ca9-a7b8-22a399f29300",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 921,
+      "trimY": 1,
+      "width": 66,
+      "height": 66,
+      "rawWidth": 66,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "rank_icon3.png": {
+      "ver": "1.0.6",
+      "uuid": "515ff941-a6d1-421a-9243-249091fc5b1d",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 853,
+      "trimY": 69,
+      "width": 66,
+      "height": 66,
+      "rawWidth": 66,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "rank_other.png": {
+      "ver": "1.0.6",
+      "uuid": "e30f966f-d546-44a0-9ee4-ba5745d69daa",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 123,
+      "width": 750,
+      "height": 30,
+      "rawWidth": 750,
+      "rawHeight": 30,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "rank_phoneBg.png": {
+      "ver": "1.0.6",
+      "uuid": "700fa527-a104-4d31-846a-99ebc1c5803a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 753,
+      "trimY": 1,
+      "width": 98,
+      "height": 129,
+      "rawWidth": 98,
+      "rawHeight": 129,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "rank_self.png": {
+      "ver": "1.0.6",
+      "uuid": "5d5398c4-b3d5-4045-910e-1bfa6fed47ea",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 1,
+      "width": 750,
+      "height": 120,
+      "rawWidth": 750,
+      "rawHeight": 120,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "rank_share.png": {
+      "ver": "1.0.6",
+      "uuid": "df04b74d-9f23-4e49-a2a0-388f63ce0f2f",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 921,
+      "trimY": 69,
+      "width": 36,
+      "height": 36,
+      "rawWidth": 36,
+      "rawHeight": 36,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    }
+  }
+}

assets/resources/Rank/rankUI.png.meta

@@ -0,0 +1,15 @@
+{
+  "ver": "2.3.7",
+  "uuid": "ff2159b6-082c-4a51-8ae1-77f8acbb60a1",
+  "importer": "texture",
+  "type": "raw",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 988,
+  "height": 154,
+  "platformSettings": {},
+  "subMetas": {}
+}

assets/resources/Ui/Food.plist

@@ -94,7 +94,7 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>prop_gan'jiang.png</key>
+            <key>prop_gancao.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -109,7 +109,7 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>prop_gancao.png</key>
+            <key>prop_ganjiang.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -363,7 +363,7 @@
             <key>size</key>
             <string>{876,1320}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:e2099cd8614810562c5dcb0c1caa1d12:98a635a56ae7e114dbeab8055bac1a15:163e62934c25e06ca257725760fde093$</string>
+            <string>$TexturePacker:SmartUpdate:e5a221df16fe6f4f817b09ac8ea090a7:98a635a56ae7e114dbeab8055bac1a15:163e62934c25e06ca257725760fde093$</string>
             <key>textureFileName</key>
             <string>Food.png</string>
         </dict>

assets/resources/Ui/Food.plist.meta

@@ -147,9 +147,9 @@
       "spriteType": "normal",
       "subMetas": {}
     },
-    "prop_gan'jiang.png": {
+    "prop_gancao.png": {
       "ver": "1.0.6",
-      "uuid": "99234446-a345-4bff-96ba-c2ebfdbe2134",
+      "uuid": "20ec22dc-cd80-453a-9207-b7f462ac8a34",
       "importer": "sprite-frame",
       "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756",
       "trimType": "auto",
@@ -170,9 +170,9 @@
       "spriteType": "normal",
       "subMetas": {}
     },
-    "prop_gancao.png": {
+    "prop_ganjiang.png": {
       "ver": "1.0.6",
-      "uuid": "20ec22dc-cd80-453a-9207-b7f462ac8a34",
+      "uuid": "b4a90350-0463-403c-b8cc-0248f3122578",
       "importer": "sprite-frame",
       "rawTextureUuid": "68b739ea-93fe-4fca-a6ab-d3b18c300756",
       "trimType": "auto",

assets/resources/Ui/Food.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 818,
+  "width": 876,
-  "height": 223,
+  "height": 1320,
   "platformSettings": {},
   "subMetas": {}
 }

assets/resources/Ui/publicUI.plist

@@ -9,15 +9,15 @@
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
-                <string>{0,0}</string>
+                <string>{0,7}</string>
                 <key>spriteSize</key>
-                <string>{188,239}</string>
+                <string>{188,225}</string>
                 <key>spriteSourceSize</key>
                 <string>{188,239}</string>
                 <key>textureRect</key>
-                <string>{{1555,524},{188,239}}</string>
+                <string>{{727,620},{188,225}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Firewood.png</key>
             <dict>
@@ -30,10 +30,85 @@
                 <key>spriteSourceSize</key>
                 <string>{141,157}</string>
                 <key>textureRect</key>
-                <string>{{1745,635},{141,157}}</string>
+                <string>{{1550,464},{141,157}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
+            <key>againBtn.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,1}</string>
+                <key>spriteSize</key>
+                <string>{156,38}</string>
+                <key>spriteSourceSize</key>
+                <string>{458,70}</string>
+                <key>textureRect</key>
+                <string>{{1550,607},{156,38}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>again_Label.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,1}</string>
+                <key>spriteSize</key>
+                <string>{156,38}</string>
+                <key>spriteSourceSize</key>
+                <string>{458,70}</string>
+                <key>textureRect</key>
+                <string>{{1550,607},{156,38}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>back.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-1,0}</string>
+                <key>spriteSize</key>
+                <string>{28,40}</string>
+                <key>spriteSourceSize</key>
+                <string>{40,40}</string>
+                <key>textureRect</key>
+                <string>{{1047,415},{28,40}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>ball0.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{66,66}</string>
+                <key>spriteSourceSize</key>
+                <string>{66,66}</string>
+                <key>textureRect</key>
+                <string>{{1630,785},{66,66}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>beginLabel.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{318,203}</string>
+                <key>spriteSourceSize</key>
+                <string>{318,203}</string>
+                <key>textureRect</key>
+                <string>{{727,415},{318,203}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
             <key>btn_begin.png</key>
             <dict>
                 <key>aliases</key>
@@ -60,7 +135,7 @@
                 <key>spriteSourceSize</key>
                 <string>{501,85}</string>
                 <key>textureRect</key>
-                <string>{{1,818},{501,85}}</string>
+                <string>{{1077,290},{501,85}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -75,7 +150,7 @@
                 <key>spriteSourceSize</key>
                 <string>{501,85}</string>
                 <key>textureRect</key>
-                <string>{{1167,437},{501,85}}</string>
+                <string>{{1077,377},{501,85}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -90,7 +165,7 @@
                 <key>spriteSourceSize</key>
                 <string>{501,85}</string>
                 <key>textureRect</key>
-                <string>{{504,884},{501,85}}</string>
+                <string>{{1047,464},{501,85}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -105,7 +180,7 @@
                 <key>spriteSourceSize</key>
                 <string>{501,85}</string>
                 <key>textureRect</key>
-                <string>{{1007,884},{501,85}}</string>
+                <string>{{1047,551},{501,85}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -120,7 +195,7 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{504,818},{117,38}}</string>
+                <string>{{727,810},{117,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -135,9 +210,9 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{1,905},{235,38}}</string>
+                <string>{{1174,638},{235,38}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>err3.png</key>
             <dict>
@@ -150,7 +225,172 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{238,905},{235,38}}</string>
+                <string>{{1214,638},{235,38}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>finishi.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{552,204}</string>
+                <key>spriteSourceSize</key>
+                <string>{552,204}</string>
+                <key>textureRect</key>
+                <string>{{1077,1},{552,204}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>finishi_Bg.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{580,37}</string>
+                <key>spriteSourceSize</key>
+                <string>{580,37}</string>
+                <key>textureRect</key>
+                <string>{{1,818},{580,37}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>fire1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,-9}</string>
+                <key>spriteSize</key>
+                <string>{104,72}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{1414,766},{104,72}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>fire2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-1,-14}</string>
+                <key>spriteSize</key>
+                <string>{104,62}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{846,810},{104,62}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>fire3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,-14}</string>
+                <key>spriteSize</key>
+                <string>{104,62}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{1620,281},{104,62}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>fire4.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-1,-11}</string>
+                <key>spriteSize</key>
+                <string>{106,68}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{657,723},{106,68}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>fire5.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-1,-10}</string>
+                <key>spriteSize</key>
+                <string>{106,70}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{1631,105},{106,70}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>fire6.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-1,-12}</string>
+                <key>spriteSize</key>
+                <string>{106,66}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{1587,213},{106,66}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>fire7.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{-1,-13}</string>
+                <key>spriteSize</key>
+                <string>{108,64}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{1520,785},{108,64}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>fire8.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,-7}</string>
+                <key>spriteSize</key>
+                <string>{102,76}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{1631,1},{102,76}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>fire_Bg.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,-17}</string>
+                <key>spriteSize</key>
+                <string>{152,56}</string>
+                <key>spriteSourceSize</key>
+                <string>{152,90}</string>
+                <key>textureRect</key>
+                <string>{{1542,647},{152,56}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -180,9 +420,9 @@
                 <key>spriteSourceSize</key>
                 <string>{12,40}</string>
                 <key>textureRect</key>
-                <string>{{1603,415},{12,40}}</string>
+                <string>{{1695,213},{12,40}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>nomal1.png</key>
             <dict>
@@ -195,7 +435,7 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{1555,765},{117,38}}</string>
+                <string>{{1542,745},{117,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -210,7 +450,7 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{1904,635},{235,38}}</string>
+                <string>{{1254,638},{235,38}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -225,9 +465,9 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{623,829},{235,38}}</string>
+                <string>{{1294,638},{235,38}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>play_test.png</key>
             <dict>
@@ -240,67 +480,82 @@
                 <key>spriteSourceSize</key>
                 <string>{218,218}</string>
                 <key>textureRect</key>
-                <string>{{1745,415},{218,218}}</string>
+                <string>{{954,638},{218,218}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>prop_lizhi.png</key>
+            <key>rankBtn.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{-11,11}</string>
-                <key>spriteSize</key>
-                <string>{358,390}</string>
-                <key>spriteSourceSize</key>
-                <string>{442,442}</string>
-                <key>textureRect</key>
-                <string>{{1163,524},{358,390}}</string>
-                <key>textureRotated</key>
-                <true/>
-            </dict>
-            <key>prop_moli.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{-1,1}</string>
                 <key>spriteSize</key>
-                <string>{438,438}</string>
+                <string>{156,38}</string>
                 <key>spriteSourceSize</key>
-                <string>{442,442}</string>
+                <string>{458,70}</string>
                 <key>textureRect</key>
-                <string>{{727,1},{438,438}}</string>
+                <string>{{1542,705},{156,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>prop_putao.png</key>
+            <key>rankBtn2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{126,126}</string>
+                <key>spriteSourceSize</key>
+                <string>{126,126}</string>
+                <key>textureRect</key>
+                <string>{{1414,638},{126,126}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>rank_Label.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
                 <string>{-1,1}</string>
                 <key>spriteSize</key>
-                <string>{434,386}</string>
+                <string>{156,38}</string>
                 <key>spriteSourceSize</key>
-                <string>{442,442}</string>
+                <string>{458,70}</string>
                 <key>textureRect</key>
-                <string>{{727,441},{434,386}}</string>
+                <string>{{1542,705},{156,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>prop_taozi.png</key>
+            <key>tipKuang.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
                 <key>spriteOffset</key>
-                <string>{-4,1}</string>
+                <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{434,434}</string>
+                <string>{508,81}</string>
                 <key>spriteSourceSize</key>
-                <string>{442,442}</string>
+                <string>{508,81}</string>
                 <key>textureRect</key>
-                <string>{{1167,1},{434,434}}</string>
+                <string>{{1077,207},{508,81}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>tip_Line.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{67,16}</string>
+                <key>spriteSourceSize</key>
+                <string>{67,16}</string>
+                <key>textureRect</key>
+                <string>{{1,857},{67,16}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -315,7 +570,7 @@
                 <key>spriteSourceSize</key>
                 <string>{442,442}</string>
                 <key>textureRect</key>
-                <string>{{1603,1},{348,412}}</string>
+                <string>{{727,1},{348,412}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -330,9 +585,9 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{1555,805},{117,38}}</string>
+                <string>{{1580,290},{117,38}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>yes2.png</key>
             <dict>
@@ -345,9 +600,9 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{860,829},{235,38}}</string>
+                <string>{{1334,638},{235,38}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>yes3.png</key>
             <dict>
@@ -360,9 +615,9 @@
                 <key>spriteSourceSize</key>
                 <string>{501,70}</string>
                 <key>textureRect</key>
-                <string>{{1555,845},{235,38}}</string>
+                <string>{{1374,638},{235,38}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
         </dict>
         <key>metadata</key>
@@ -376,9 +631,9 @@
             <key>realTextureFileName</key>
             <string>publicUI.png</string>
             <key>size</key>
-            <string>{1964,970}</string>
+            <string>{1708,874}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:0a66cc0dcd3d5c5cbb13c7430134f019:8831b9a726891ba1f9932c3fff67bf76:1c7d81f68058ada321959f2296017bb5$</string>
+            <string>$TexturePacker:SmartUpdate:402fb07b06b289da1dc614ab677d2b68:7579b45183131d2eaf53a0368aab34a4:1c7d81f68058ada321959f2296017bb5$</string>
             <key>textureFileName</key>
             <string>publicUI.png</string>
         </dict>

assets/resources/Ui/publicUI.plist.meta

@@ -4,8 +4,8 @@
   "importer": "asset",
   "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
   "size": {
-    "width": 1964,
+    "width": 1708,
-    "height": 970
+    "height": 874
   },
   "type": "Texture Packer",
   "subMetas": {
@@ -16,13 +16,13 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
-      "offsetY": 0,
+      "offsetY": 7,
-      "trimX": 1555,
+      "trimX": 727,
-      "trimY": 524,
+      "trimY": 620,
       "width": 188,
-      "height": 239,
+      "height": 225,
       "rawWidth": 188,
       "rawHeight": 239,
       "borderTop": 0,
@@ -42,8 +42,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1745,
+      "trimX": 1550,
-      "trimY": 635,
+      "trimY": 464,
       "width": 141,
       "height": 157,
       "rawWidth": 141,
@@ -55,6 +55,121 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "againBtn.png": {
+      "ver": "1.0.6",
+      "uuid": "9b794c5b-0c52-4264-a891-fe6a85f8cebd",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 1,
+      "trimX": 1550,
+      "trimY": 607,
+      "width": 156,
+      "height": 38,
+      "rawWidth": 458,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "again_Label.png": {
+      "ver": "1.0.6",
+      "uuid": "75ceffef-e469-4845-80bd-e0052840d248",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 1,
+      "trimX": 1550,
+      "trimY": 607,
+      "width": 156,
+      "height": 38,
+      "rawWidth": 458,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "back.png": {
+      "ver": "1.0.6",
+      "uuid": "43c83a99-6be0-468f-a894-1b624f3d33ac",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 0,
+      "trimX": 1047,
+      "trimY": 415,
+      "width": 28,
+      "height": 40,
+      "rawWidth": 40,
+      "rawHeight": 40,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "ball0.png": {
+      "ver": "1.0.6",
+      "uuid": "09f3b49a-507f-485e-b8bf-809f98dd4923",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1630,
+      "trimY": 785,
+      "width": 66,
+      "height": 66,
+      "rawWidth": 66,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "beginLabel.png": {
+      "ver": "1.0.6",
+      "uuid": "04421a0b-266e-4d13-81df-1873ef3c4a83",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 727,
+      "trimY": 415,
+      "width": 318,
+      "height": 203,
+      "rawWidth": 318,
+      "rawHeight": 203,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "btn_begin.png": {
       "ver": "1.0.6",
       "uuid": "57e85453-6997-4242-babb-705697538e98",
@@ -88,8 +203,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1,
+      "trimX": 1077,
-      "trimY": 818,
+      "trimY": 290,
       "width": 501,
       "height": 85,
       "rawWidth": 501,
@@ -111,8 +226,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1167,
+      "trimX": 1077,
-      "trimY": 437,
+      "trimY": 377,
       "width": 501,
       "height": 85,
       "rawWidth": 501,
@@ -134,8 +249,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 504,
+      "trimX": 1047,
-      "trimY": 884,
+      "trimY": 464,
       "width": 501,
       "height": 85,
       "rawWidth": 501,
@@ -157,8 +272,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1007,
+      "trimX": 1047,
-      "trimY": 884,
+      "trimY": 551,
       "width": 501,
       "height": 85,
       "rawWidth": 501,
@@ -180,8 +295,8 @@
       "rotated": false,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 504,
+      "trimX": 727,
-      "trimY": 818,
+      "trimY": 810,
       "width": 117,
       "height": 38,
       "rawWidth": 501,
@@ -200,11 +315,11 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 1,
+      "trimX": 1174,
-      "trimY": 905,
+      "trimY": 638,
       "width": 235,
       "height": 38,
       "rawWidth": 501,
@@ -223,11 +338,11 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 238,
+      "trimX": 1214,
-      "trimY": 905,
+      "trimY": 638,
       "width": 235,
       "height": 38,
       "rawWidth": 501,
@@ -239,6 +354,259 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "finishi.png": {
+      "ver": "1.0.6",
+      "uuid": "ecd8b796-cf3d-45e6-ab5d-99906ff68426",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1077,
+      "trimY": 1,
+      "width": 552,
+      "height": 204,
+      "rawWidth": 552,
+      "rawHeight": 204,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "finishi_Bg.png": {
+      "ver": "1.0.6",
+      "uuid": "0a9b51e5-23bb-4902-bd02-0b3f91e60173",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 818,
+      "width": 580,
+      "height": 37,
+      "rawWidth": 580,
+      "rawHeight": 37,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire1.png": {
+      "ver": "1.0.6",
+      "uuid": "419712bd-00e6-4352-97bc-105ab199d852",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -9,
+      "trimX": 1414,
+      "trimY": 766,
+      "width": 104,
+      "height": 72,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire2.png": {
+      "ver": "1.0.6",
+      "uuid": "eef1f6ad-ae7d-4f74-ab87-cd4c81dea072",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -14,
+      "trimX": 846,
+      "trimY": 810,
+      "width": 104,
+      "height": 62,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire3.png": {
+      "ver": "1.0.6",
+      "uuid": "6999b621-4a9f-4a89-970f-4f6637f6ebe1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": -14,
+      "trimX": 1620,
+      "trimY": 281,
+      "width": 104,
+      "height": 62,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire4.png": {
+      "ver": "1.0.6",
+      "uuid": "24bb96d6-d160-419c-89a8-8f1a1e203491",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": -1,
+      "offsetY": -11,
+      "trimX": 657,
+      "trimY": 723,
+      "width": 106,
+      "height": 68,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire5.png": {
+      "ver": "1.0.6",
+      "uuid": "5fead804-1827-4c8d-9b89-c09849aeed4e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": -1,
+      "offsetY": -10,
+      "trimX": 1631,
+      "trimY": 105,
+      "width": 106,
+      "height": 70,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire6.png": {
+      "ver": "1.0.6",
+      "uuid": "e363a676-9b52-4402-b43a-37062f24c250",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -12,
+      "trimX": 1587,
+      "trimY": 213,
+      "width": 106,
+      "height": 66,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire7.png": {
+      "ver": "1.0.6",
+      "uuid": "a67083f3-132b-4dc7-963c-af204012cd97",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": -13,
+      "trimX": 1520,
+      "trimY": 785,
+      "width": 108,
+      "height": 64,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire8.png": {
+      "ver": "1.0.6",
+      "uuid": "5256d2df-6e2d-4cac-9ac7-bd33add06053",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": -7,
+      "trimX": 1631,
+      "trimY": 1,
+      "width": 102,
+      "height": 76,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "fire_Bg.png": {
+      "ver": "1.0.6",
+      "uuid": "15c8df95-b7df-427c-b48c-57c1392d9e84",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -17,
+      "trimX": 1542,
+      "trimY": 647,
+      "width": 152,
+      "height": 56,
+      "rawWidth": 152,
+      "rawHeight": 90,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "guang.png": {
       "ver": "1.0.6",
       "uuid": "7b0b1d20-5a1d-4723-8af8-50a47e841643",
@@ -269,11 +637,11 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1603,
+      "trimX": 1695,
-      "trimY": 415,
+      "trimY": 213,
       "width": 12,
       "height": 40,
       "rawWidth": 12,
@@ -295,8 +663,8 @@
       "rotated": false,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 1555,
+      "trimX": 1542,
-      "trimY": 765,
+      "trimY": 745,
       "width": 117,
       "height": 38,
       "rawWidth": 501,
@@ -318,8 +686,8 @@
       "rotated": true,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 1904,
+      "trimX": 1254,
-      "trimY": 635,
+      "trimY": 638,
       "width": 235,
       "height": 38,
       "rawWidth": 501,
@@ -338,11 +706,11 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 623,
+      "trimX": 1294,
-      "trimY": 829,
+      "trimY": 638,
       "width": 235,
       "height": 38,
       "rawWidth": 501,
@@ -364,8 +732,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1745,
+      "trimX": 954,
-      "trimY": 415,
+      "trimY": 638,
       "width": 218,
       "height": 218,
       "rawWidth": 218,
@@ -377,32 +745,9 @@
       "spriteType": "normal",
       "subMetas": {}
     },
-    "prop_lizhi.png": {
+    "rankBtn.png": {
       "ver": "1.0.6",
-      "uuid": "23d491b1-7e9f-4b72-b6c5-9ca6c9c67d69",
+      "uuid": "793be74f-dab6-4d93-a264-bb3fe5aae57c",
-      "importer": "sprite-frame",
-      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": true,
-      "offsetX": -11,
-      "offsetY": 11,
-      "trimX": 1163,
-      "trimY": 524,
-      "width": 358,
-      "height": 390,
-      "rawWidth": 442,
-      "rawHeight": 442,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "spriteType": "normal",
-      "subMetas": {}
-    },
-    "prop_moli.png": {
-      "ver": "1.0.6",
-      "uuid": "8c1f8cbd-52b8-4b94-b1bb-7e10ad3e3d40",
       "importer": "sprite-frame",
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
@@ -410,12 +755,12 @@
       "rotated": false,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 727,
+      "trimX": 1542,
-      "trimY": 1,
+      "trimY": 705,
-      "width": 438,
+      "width": 156,
-      "height": 438,
+      "height": 38,
-      "rawWidth": 442,
+      "rawWidth": 458,
-      "rawHeight": 442,
+      "rawHeight": 70,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -423,9 +768,32 @@
       "spriteType": "normal",
       "subMetas": {}
     },
-    "prop_putao.png": {
+    "rankBtn2.png": {
       "ver": "1.0.6",
-      "uuid": "49c8145f-3b60-4271-bd5a-a1807a2619ac",
+      "uuid": "5bb2b601-5166-425e-899d-d3a9b9663c04",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1414,
+      "trimY": 638,
+      "width": 126,
+      "height": 126,
+      "rawWidth": 126,
+      "rawHeight": 126,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "rank_Label.png": {
+      "ver": "1.0.6",
+      "uuid": "4d3e4edd-f44e-4e1a-8648-d173f746eea8",
       "importer": "sprite-frame",
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
@@ -433,12 +801,12 @@
       "rotated": false,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 727,
+      "trimX": 1542,
-      "trimY": 441,
+      "trimY": 705,
-      "width": 434,
+      "width": 156,
-      "height": 386,
+      "height": 38,
-      "rawWidth": 442,
+      "rawWidth": 458,
-      "rawHeight": 442,
+      "rawHeight": 70,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -446,22 +814,45 @@
       "spriteType": "normal",
       "subMetas": {}
     },
-    "prop_taozi.png": {
+    "tipKuang.png": {
       "ver": "1.0.6",
-      "uuid": "48df25f5-238b-42b2-8a45-413f5180c5c0",
+      "uuid": "5797ba40-0232-4eca-8729-719373e39e8c",
       "importer": "sprite-frame",
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -4,
+      "offsetX": 0,
-      "offsetY": 1,
+      "offsetY": 0,
-      "trimX": 1167,
+      "trimX": 1077,
-      "trimY": 1,
+      "trimY": 207,
-      "width": 434,
+      "width": 508,
-      "height": 434,
+      "height": 81,
-      "rawWidth": 442,
+      "rawWidth": 508,
-      "rawHeight": 442,
+      "rawHeight": 81,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 62,
+      "borderRight": 64,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "tip_Line.png": {
+      "ver": "1.0.6",
+      "uuid": "898c2010-408b-4389-8788-f8a7c4d9c4a1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 857,
+      "width": 67,
+      "height": 16,
+      "rawWidth": 67,
+      "rawHeight": 16,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,
@@ -479,7 +870,7 @@
       "rotated": false,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 1603,
+      "trimX": 727,
       "trimY": 1,
       "width": 348,
       "height": 412,
@@ -499,11 +890,11 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 1555,
+      "trimX": 1580,
-      "trimY": 805,
+      "trimY": 290,
       "width": 117,
       "height": 38,
       "rawWidth": 501,
@@ -522,11 +913,11 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 860,
+      "trimX": 1334,
-      "trimY": 829,
+      "trimY": 638,
       "width": 235,
       "height": 38,
       "rawWidth": 501,
@@ -545,11 +936,11 @@
       "rawTextureUuid": "c818910f-f1ff-45e2-bf2f-6c69d87723e6",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": -1,
       "offsetY": 1,
-      "trimX": 1555,
+      "trimX": 1374,
-      "trimY": 845,
+      "trimY": 638,
       "width": 235,
       "height": 38,
       "rawWidth": 501,

assets/resources/Ui/publicUI.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1964,
+  "width": 1011,
-  "height": 970,
+  "height": 1484,
   "platformSettings": {},
   "subMetas": {}
 }

build-templates/web-mobile/index.html

@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>后裔逐日</title>
+  <title>神农寻百草</title>
   <!-- <title>后裔逐日｜测试环境</title> -->
 
   <!--http://www.html5rocks.com/en/mobile/mobifying/-->
@@ -153,7 +153,7 @@
     var urlNow = window.location.href;
     //更改测试链接标题
     if(containsNanana(urlNow) == true){
-        document.title = "后裔逐日 | 测试环境";
+        document.title = "神农寻百草 | 测试环境";
     }
 
      // 存储gameid userid  gameid为key userId和时间戳为value

build-templates/web-mobile/main.js

@@ -5,8 +5,8 @@ window.boot = function () {
     window._CCSettings = undefined;
     var onProgress = null;
     
-    var RESOURCES = remote_url + cc.AssetManager.BuiltinBundleName.RESOURCES;
+    // var RESOURCES = remote_url + cc.AssetManager.BuiltinBundleName.RESOURCES;
-    // var RESOURCES = cc.AssetManager.BuiltinBundleName.RESOURCES;
+    var RESOURCES = cc.AssetManager.BuiltinBundleName.RESOURCES;
     var INTERNAL = cc.AssetManager.BuiltinBundleName.INTERNAL;
     var MAIN = cc.AssetManager.BuiltinBundleName.MAIN;
     function setLoadingDisplay () {

build/ShenNong/assets/internal/config.52d36.json

@@ -0,0 +1 @@
+{"paths":{"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-sprite",0],"3":["materials/builtin-unlit",1],"4":["effects/builtin-3d-trail",0],"5":["effects/builtin-2d-graphics",0],"6":["materials/builtin-2d-gray-sprite",1],"7":["materials/builtin-3d-trail",1],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["effects/builtin-clear-stencil",0],"12":["materials/builtin-clear-stencil",1],"13":["materials/builtin-2d-label",1],"14":["materials/builtin-2d-sprite",1],"15":["effects/builtin-2d-label",0]},"types":["cc.EffectAsset","cc.Material"],"uuids":["02delMVqdBD70a/HSD99FK","14TDKXr2NJ6LjvHPops74o","28dPjdQWxEQIG3VVl1Qm6T","2aKWBXJHxKHLvrBUi2yYZQ","2afAA24LNP4YmYiaVLiivs","30aC+Hnw1PF4pEcoY3kUYb","3ae7efMv1CLq2ilvUY/tQi","46bU+b5fROqIXVPG6aZWWK","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","c0BAyVxX9JzZy8EjFrc9DU","cffgu4qBxEqa150o1DmRAy","e0LYfU5ZlNFoAB4UiRrGUG","ecpdLyjvZBwrvm+cedCcQy","f1h0LXVtJOta5JLZ1xCzfI"],"scenes":{},"redirect":[],"deps":[],"packs":{"05464a930":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":false,"versions":{"import":["05464a930","3c4b0"],"native":[0,"cea68"]}}