l

egret/index.html

@@ -58,8 +58,8 @@
             { nums: '随机奖励', type: 'random' }
     ];
         // localStorage.clear();
-        window['total_level'] = 18 + 13 * 5;
-window['last_level'] = 80;//必须大于等于total_level
+        window['total_level'] = 18 + 13 * 7;
+window['last_level'] = 100;//必须大于等于total_level
 
 
         // localStorage.clear();

egret/resource/default.res.json

@@ -69,7 +69,7 @@
 			"name": "prize2"
 		},
 		{
-			"keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_ice1_png,startpanel_ele6_png,startpanel_block2_png,startpanel_xxxx_png",
+			"keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_ele9_png,startpanel_ele8_png,startpanel_ele7_png,startpanel_ele6_png,startpanel_ele5_png,startpanel_ele4_png,startpanel_ele3_png,startpanel_ele2_png,startpanel_ele1_png,startpanel_ele0_png,startpanel_block2_png",
 			"name": "startpanel"
 		},
 		{
@@ -1495,11 +1495,6 @@
 			"type": "image",
 			"name": "startpanel_ele6_png"
 		},
-		{
-			"url": "assets/startpanel2/startpanel_ice1.png",
-			"type": "image",
-			"name": "startpanel_ice1_png"
-		},
 		{
 			"url": "assets/mainScene/main_mapbottom.png",
 			"type": "image",
@@ -1971,9 +1966,49 @@
 			"name": "eggPiece5_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel_xxxx.png",
+			"url": "assets/startpanel2/startpanel_ele7.png",
+			"type": "image",
+			"name": "startpanel_ele7_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele5.png",
+			"type": "image",
+			"name": "startpanel_ele5_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele9.png",
+			"type": "image",
+			"name": "startpanel_ele9_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele8.png",
+			"type": "image",
+			"name": "startpanel_ele8_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele4.png",
+			"type": "image",
+			"name": "startpanel_ele4_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele3.png",
+			"type": "image",
+			"name": "startpanel_ele3_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele2.png",
+			"type": "image",
+			"name": "startpanel_ele2_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele1.png",
+			"type": "image",
+			"name": "startpanel_ele1_png"
+		},
+		{
+			"url": "assets/startpanel2/startpanel_ele0.png",
 			"type": "image",
-			"name": "startpanel_xxxx_png"
+			"name": "startpanel_ele0_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/TargetItemSkin.exml

@@ -2,8 +2,15 @@
 <e:Skin class="TargetItemSkin" width="60" height="81" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16cfafb2357"/>
 	<e:Image source="startpanel_block2_png" x="0" y="0"/>
-	<e:Image id="icon_LOLLIPOP" source="startpanel_ele6_png" width="60" height="60"/>
-	<e:Image id="icon_ICE" source="startpanel_ice1_png" width="60" height="60"/>
-	<e:Image id="icon_xxx" width="60" height="60" source="startpanel_xxxx_png"/>
+	<e:Image id="icon0" width="60" height="60" source="startpanel_ele0_png"/>
+	<e:Image id="icon1" width="60" height="60" source="startpanel_ele1_png"/>
+	<e:Image id="icon2" width="60" height="60" source="startpanel_ele2_png"/>
+	<e:Image id="icon3" width="60" height="60" source="startpanel_ele3_png"/>
+	<e:Image id="icon4" width="60" height="60" source="startpanel_ele4_png"/>
+	<e:Image id="icon5" width="60" height="60" source="startpanel_ele5_png"/>
+	<e:Image id="icon6" width="60" height="60" source="startpanel_ele6_png"/>
+	<e:Image id="icon7" width="60" height="60" source="startpanel_ele7_png"/>
+	<e:Image id="icon8" width="60" height="60" source="startpanel_ele8_png"/>
+	<e:Image id="icon9" width="60" height="60" source="startpanel_ele9_png"/>
 	<e:BitmapLabel id="txt" text="X0" font="nums2_fnt" scaleX="0.4" scaleY="0.4" y="46" horizontalCenter="0"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/TargetItemRenderer.ts

 import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
-import { ElementType } from "../something/enum/ElementType";
 export default class TargetItemRenderer extends eui.ItemRenderer {
     constructor() {
         super();
@@ -7,9 +6,14 @@ export default class TargetItemRenderer extends eui.ItemRenderer {
     }
 
     dataChanged(){
-        this['icon_LOLLIPOP'].visible=this.data.type == ElementType.LOLLIPOP;
-        this['icon_ICE'].visible=this.data.type == ElementType.ICE;
-        this['icon_xxx'].visible=this.data.type == ElementType.ROCK;
+        for (let i = 0; i <10; i++) {
+            this['icon' + i].visible=false;
+            
+        }
+
+        this['icon' + this.data.type].visible=true;
+
+
         this['txt'].text = `X${this.data.count }`;
     }
 }
\ No newline at end of file

mock/happyclear/home.json

@@ -522,9 +522,9 @@
                 "num": 2
             }
         ],
-        "remainEnargy": 9979,
+        "remainEnargy": 99,
         "askForEnergy": false,
-        "canReceiveTreasureBoxNum": 0,
+        "canReceiveTreasureBoxNum": 10,
         "nextRangeStarsNum": 150
     }
 }
\ No newline at end of file

mock/happyclear/homemax.json

+{
+    "success": true,
+    "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1566885811031,
+    "data": {
+        "wealth": 7960,
+        "totalStars": 145,
+        "levels": [
+            {
+                "levelNum": 1,
+                "maxScore": 36320,
+                "stars": 3
+            }
+        ],
+        "remainProp": [
+            {
+                "type": 2,
+                "num": 0
+            },
+            {
+                "type": 3,
+                "num": 0
+            },
+            {
+                "type": 4,
+                "num": 0
+            }
+        ],
+        "remainEnargy": 99,
+        "askForEnergy": false,
+        "canReceiveTreasureBoxNum": 10,
+        "nextRangeStarsNum": 150
+    }
+}
\ No newline at end of file