1

egret/resource/TextureMerger/box.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["../assets/box/boxbtn.png","../assets/box/boxbg.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["../assets/box/boxbtn.png","../assets/box/boxbg.png","../assets/box/box_star.png"]}
\ No newline at end of file

egret/resource/TextureMerger/common.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/turnnoprize再来一次.png","../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/exchangebtn.png","../assets/common/common_yuanbao.png","../assets/common/common_prop3.png","../assets/common/common_prop2.png","../assets/common/common_prop1.png","../assets/common/common_prizelight.png","../assets/common/common_money.png","../assets/common/common_blood.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/common_block.png","../assets/common/common_block_front.png","../assets/common/common_block_bg_yellow.png","../assets/common/common_block_bg_red.png","../assets/common/common_block_bg_blue.png","../assets/common/chocolate3.png","../assets/common/chocolate1.png","../assets/common/chocolate0.png","../assets/common/chocolate2.png","../assets/common/turnprize_icon3.png","../assets/common/turnprize_icon2.png","../assets/common/turnprize_icon1.png","../assets/common/commom_prop_bg.png","../assets/common/arrowbg.png","../assets/common/common_closebtn2.png","../assets/common/commom_share1.png","../assets/common/turnnoprize继续闯关.png","../assets/common/commom_prop_bg.png","../assets/common/combglight.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/turnnoprize再来一次.png","../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/exchangebtn.png","../assets/common/common_yuanbao.png","../assets/common/common_prop3.png","../assets/common/common_prop2.png","../assets/common/common_prop1.png","../assets/common/common_prizelight.png","../assets/common/common_money.png","../assets/common/common_blood.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/common_block.png","../assets/common/common_block_front.png","../assets/common/common_block_bg_yellow.png","../assets/common/common_block_bg_red.png","../assets/common/common_block_bg_blue.png","../assets/common/chocolate3.png","../assets/common/chocolate1.png","../assets/common/chocolate0.png","../assets/common/chocolate2.png","../assets/common/turnprize_icon3.png","../assets/common/turnprize_icon2.png","../assets/common/turnprize_icon1.png","../assets/common/commom_prop_bg.png","../assets/common/arrowbg.png","../assets/common/common_closebtn2.png","../assets/common/commom_share1.png","../assets/common/turnnoprize继续闯关.png","../assets/common/combglight.png","../assets/common/common_box_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/hbnoprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbnoprize","version":5,"files":["../assets/hbNoPrize/hbNoPrize_bg.png","../assets/hbNoPrize/hbNoPrize_btn.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbnoprize","version":5,"files":["../assets/hbNoPrize/hbNoPrize_bg.png","../assets/hbNoPrize/hbNoPrize_btn.png","../assets/hbNoPrize/hbnoprizebg2.png"]}
\ No newline at end of file

egret/resource/TextureMerger/sign.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/sign_quan10.png","../assets/sign/sign_quan23.png","../assets/sign/sign_quan36.png","../assets/sign/sign_quan25.png","../assets/sign/sign_quan35.png","../assets/sign/sign_quan30.png","../assets/sign/sign_mask.png","../assets/sign/signitemno.png","../assets/sign/signitemyes.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/sign_quan10.png","../assets/sign/sign_quan23.png","../assets/sign/sign_quan36.png","../assets/sign/sign_quan25.png","../assets/sign/sign_quan35.png","../assets/sign/sign_quan30.png","../assets/sign/sign_mask.png","../assets/sign/signitemno.png","../assets/sign/signitemyes.png","../assets/sign/unsignbtn.png"]}
\ No newline at end of file

egret/resource/default.thm.json

@@ -29,6 +29,7 @@
 		"resource/skins/H5Skin.exml",
 		"resource/skins/HbCutTimeSkin.exml",
 		"resource/skins/HbGameSkin.exml",
+		"resource/skins/HbNoPrize2Skin.exml",
 		"resource/skins/HbNoPrizeSkin.exml",
 		"resource/skins/HbPrizeSkin.exml",
 		"resource/skins/HbRuleSkin.exml",

egret/resource/skins/BoxSkin.exml

@@ -5,15 +5,11 @@
 	<e:Image id="combglight" source="combglight_png" y="241" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image id="combglight1" source="combglight_png" y="241" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="boxbg_png" y="-147.9" scale9Grid="93,413,564,43" x="0"/>
-	<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="429.63" visible="false"/>
-	<e:Image id="img2" horizontalCenter="10.5" y="429.63" source="{data.url2}" scaleX="0.7" scaleY="0.7" visible="false"/>
-	<e:Image id="money" y="430.07" scaleX="0.6" scaleY="0.6" x="150" source="signprize元宝_png" visible="false"/>
-	<e:Image id="blood" y="432.67" horizontalCenter="1.5" source="common_blood_png" scaleX="0.7" scaleY="0.7" visible="false"/>
-	<e:Group id="numsgroup" x="396.38" y="432.27" visible="false">
-		<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
-		<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
-	</e:Group>
-	<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="564.95" width="75" textAlign="right" x="287.16" visible="false"/>
+	<e:Image id="bg" source="commom_prop_bg_png" x="113.02" y="403.62"/>
+	<e:Label id="propnums" text="X8" size="50" horizontalCenter="59" verticalCenter="-86" verticalAlign="middle" textAlign="center" textColor="0xC17343" fontFamily="FZY3JW" x="510.38" y="534.4" bold="true" visible="false"/>
+	<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="409.63" visible="false"/>
+	<e:Image id="money" y="486.62" scaleX="0.8" scaleY="0.8" x="295" source="common_yuanbao_png" visible="false"/>
+	<e:Image id="blood" y="470" horizontalCenter="-31.5" source="common_blood_png" visible="false"/>
 	<e:Button id="closeBtn" label="" x="588.96" y="264.18">
 		<e:skinName>
 		<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
@@ -35,5 +31,5 @@
 		<e:Label id="tips" text="x23" textColor="0xC17343" fontFamily="FZY3JW" size="28" x="243"/>
 		<e:Image source="box_star_png" x="181.5" y="-13"/>
 	</e:Group>
-	<e:Image id="propbg" source="commom_prop_bg_png" x="113.02" y="403.62"/>
+	<e:Image id="propImg" source="{data.url}" y="460.62" x="299" visible="false"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/BoxPanel.ts

@@ -7,8 +7,8 @@ import AdSmallComp from "../mapScene/AdSmallComp";
 
 export default class BoxPanel extends Panel {
     start(data) {
-        this['propbg'].visible=false;
-        this['tipswrapper'].visible=false;
+        
+        this['tipswrapper'].visible = false;
         super.start();
         this['close2Btn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             NetManager.ins.clickLog(getlogItem(17));
@@ -27,11 +27,12 @@ export default class BoxPanel extends Panel {
         let num = homedata.nextRangeStarsNum - homedata.totalStars;
         if (num <= 0) {
             num = 0;
-            this['tips'].text =``;
+            this['tips'].text = ``;
+            this['close2Btn'].y=676.99;
         }
         else {
             this['tips'].text = `x${num}`;
-            this['tipswrapper'].visible=true;
+            this['tipswrapper'].visible = true;
         }
 
     }
@@ -39,29 +40,27 @@ export default class BoxPanel extends Panel {
     updateOption(option: any) {
         const { categoryType, img, num, propType, realValue } = option;// 2次数  3道具 4元宝 5实物 6优惠券 7虚拟商品
 
+        this['propnums'].visible = false;
         this['propnums'].text = 'x1';
-        if (num) {
+        if(num)
             this['propnums'].text = 'x' + num;
-        }
         switch (categoryType) {
-            case 2://blood
+            case 2:
                 this['blood'].visible = true;
-                this['numsgroup'].visible = true;
-                this['propbg'].visible=true;
+                this['propnums'].visible = true;
                 break;
-            case 3://prop
-                this['numsgroup'].visible = true;
-                this['img2'].visible = true;
-                this.data.url2 = `common_prop${propType}_png`;
-                this['propbg'].visible=true;
+            case 3:
+                this['propImg'].visible=true;
+                this['propnums'].visible = true;
+                this.data.url = `turnprize_icon${propType}_png`;
                 break;
-            case 4://money
-                this['numsgroup'].visible = true;
+            case 4:
+                this['propnums'].visible = true;
                 this['money'].visible = true;
-                this['propnums2'].text = `x${realValue}`;
-                this['propbg'].visible=true;
+                this['propnums'].text = 'x' + realValue;
                 break;
             default:
+                this['bg'].visible = false;
                 this['img'].visible = true;
                 this.data.url = img;
                 break;

mock/happyclear/openTreasureBox.json

@@ -19,7 +19,7 @@
             "minValue": null,
             "maxValue": null,
             "coinType": 1,
-            "propType": 2,
+            "propType": 3,
             "num": null,
             "img": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
             "appItemId": null,