代码暂存

egret/resource/default.res.json

@@ -241,8 +241,8 @@
 			"name": "helpGroup"
 		},
 		{
-			"name": "preload",
-			"keys": "combglight_png"
+			"keys": "combglight_png,turnnoprize继续闯关2_png",
+			"name": "preload"
 		}
 	],
 	"resources": [
@@ -4957,21 +4957,6 @@
 			"type": "image",
 			"name": "commom_prop_bg2_png"
 		},
-		{
-			"url": "assets/common/turnprize_icon1.png",
-			"type": "image",
-			"name": "turnprize_icon12_png"
-		},
-		{
-			"url": "assets/common/turnprize_icon2.png",
-			"type": "image",
-			"name": "turnprize_icon22_png"
-		},
-		{
-			"url": "assets/common/turnprize_icon3.png",
-			"type": "image",
-			"name": "turnprize_icon32_png"
-		},
 		{
 			"url": "assets/recharge/recharge_icon.png",
 			"type": "image",
@@ -5368,9 +5353,14 @@
 			"name": "help_light_png"
 		},
 		{
-			"name": "combglight_png",
+			"url": "assets/common/combglight.png",
+			"type": "image",
+			"name": "combglight_png"
+		},
+		{
+			"url": "assets/common/turnnoprize继续闯关.png",
 			"type": "image",
-			"url": "assets/common/combglight.png"
+			"name": "turnnoprize继续闯关2_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/TurntableNoPrizeSkin.exml

@@ -15,10 +15,11 @@
 		<e:Button id="btn1" label="" y="0" x="9.09">
 			<e:skinName>
 				<e:Skin states="up,down,disabled">
-				<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
+				<e:Image width="100%" height="100%" source="turnnoprize再来一次2_png" source.down="turnnoprize再来一次2_png" source.disabled="turnnoprize再来一次2_png"/>
 				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 				</e:Skin>
 			</e:skinName>
+
 		</e:Button>
 		<e:Button id="btn2" label="" y="0" x="279">
 			<e:skinName>

egret/resource/skins/TurntablePrizeSkin.exml

@@ -11,7 +11,7 @@
 	<e:Image id="money" source="signprize元宝_png" y="400.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
 	<e:Image id="blood" source="singprize体力_png" y="362.8" horizontalCenter="0" visible="false"/>
 	<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="411.76" visible="false"/>
-	<e:Image id="prop" scaleX="1.1" scaleY="1.1" source="taskPrize_money_png" verticalCenter="-80" x="260"/>
+	<e:Image id="prop" scaleX="1.1" scaleY="1.1" verticalCenter="-80" x="260" source="common_blood_png"/>
 	<e:Group id="numsgroup" x="410" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="-80">
 		<e:Label id="propnums" text="×8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="left" fontFamily="FZY3JW" textColor="0xC17343" left="0" bold="true"/>
 	</e:Group>
@@ -31,18 +31,20 @@
 		<e:Button id="btn1" label="" y="0" x="9.09">
 			<e:skinName>
 				<e:Skin states="up,down,disabled">
-				<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
+				<e:Image width="100%" height="100%" source="turnnoprize再来一次2_png" source.down="turnnoprize再来一次2_png" source.disabled="turnnoprize再来一次2_png"/>
 				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 				</e:Skin>
 			</e:skinName>
+
 		</e:Button>
 		<e:Button id="btn2" label="" y="0" x="279">
 			<e:skinName>
-			<e:Skin states="up,down,disabled">
-				<e:Image width="100%" height="100%" source="turprize继续闯关按钮_png" source.down="turprize继续闯关按钮_png" source.disabled="turprize继续闯关按钮_png"/>
+				<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="turnnoprize继续闯关2_png" source.down="turnnoprize继续闯关2_png" source.disabled="turnnoprize继续闯关2_png"/>
 				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-			</e:Skin>
+				</e:Skin>
 			</e:skinName>
+
 		</e:Button>
 		<e:Group id="status1" x="52" y="69.32">
 			<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>

egret/src/panels/TurntablePanel/TurntablePrizePanel.ts

@@ -44,7 +44,7 @@ export default class TurnPrizePanel extends Panel {
             case 2:
                 // this['blood'].visible = true;
                 // this['numsgroup'].visible = true;
-                this["prop"].source = 'hbPrize_blood_png';
+                this["prop"].source = 'common_blood_png';
                 this['numsgroup'].visible = true;
                 break;
             case 3:
@@ -55,7 +55,7 @@ export default class TurnPrizePanel extends Panel {
                 // this.data.url = `turnprize_icon${propType}_png`;
                 break;
             case 4:
-                this["prop"].source = 'hbPrize_money_png';
+                this["prop"].source = 'common_yuanbao_png';
                 this['numsgroup'].visible = true;
                 // this['money'].visible = true;
                 this['propnums'].text = '×' + realValue;