1

egret/resource/default.res.json

@@ -169,7 +169,7 @@
 			"name": "turntableprize2"
 		},
 		{
-			"keys": "turnable_icon1_png,turnable_icon2_png,turnable_icon3_png,turntable_bg_png,turntable_panel_png,turntable_rulebtn_png,turntable_startbtn_png",
+			"keys": "turnable_icon1_png,turnable_icon2_png,turnable_icon3_png,turntable_bg_png,turntable_panel_png,turntable_rulebtn_png,turntable_startbtn_png,turntable_oupon_png,turntable_prop_png,turntable_scratch_png,turntable_thanks_png,turntable_wealth_png,turntable_gameTime_png",
 			"name": "turntable"
 		},
 		{
@@ -2782,6 +2782,36 @@
 			"url": "assets/turntableprize/turprize继续闯关按钮.png",
 			"type": "image",
 			"name": "turprize继续闯关按钮_png"
+		},
+		{
+			"url": "assets/turntable/turntable_oupon.png",
+			"type": "image",
+			"name": "turntable_oupon_png"
+		},
+		{
+			"url": "assets/turntable/turntable_prop.png",
+			"type": "image",
+			"name": "turntable_prop_png"
+		},
+		{
+			"url": "assets/turntable/turntable_scratch.png",
+			"type": "image",
+			"name": "turntable_scratch_png"
+		},
+		{
+			"url": "assets/turntable/turntable_thanks.png",
+			"type": "image",
+			"name": "turntable_thanks_png"
+		},
+		{
+			"url": "assets/turntable/turntable_wealth.png",
+			"type": "image",
+			"name": "turntable_wealth_png"
+		},
+		{
+			"url": "assets/turntable/turntable_gameTime.png",
+			"type": "image",
+			"name": "turntable_gameTime_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/TurntableSkin.exml

@@ -38,7 +38,7 @@
 				</e:Skin>
 			</e:skinName>
 		</e:Button>
-		<e:Label id="btnLabel" text="Label" size="20" verticalCenter="30.5" verticalAlign="middle" textAlign="center" bold="true" horizontalCenter="0"/>
+		<e:Label id="btnLabel" text="Label" size="20" verticalCenter="30.5" verticalAlign="middle" textAlign="center" bold="true" horizontalCenter="0" touchEnabled="false"/>
 	</e:Group>
 	<e:Button id="closeBtn" label="" y="292.88" x="565.89">
 		<e:skinName>

egret/src/panels/TurntablePanel/Turntable.ts

@@ -258,31 +258,31 @@ export default class Turntable extends Panel {
                 let prizeImg = "";
                 switch(v.categoryType) {
                     case "scratch":
-                        prizeImg = "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/object.png";
+                        prizeImg = "turntable_scratch_png";
                         break;
                     case "thanks":
-                        prizeImg = "//yun.duiba.com.cn/upload/uP99F1462438316972.png";
+                        prizeImg = "turntable_thanks_png";
                         break;
                     case 1:
-                        prizeImg = "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/alipay.png";
+                        prizeImg = "turntable_thanks_png";
                         break;
                     case 2:
-                        prizeImg = "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/qb.png";
+                        prizeImg = "turntable_gameTime_png";
                         break;
                     case 3:
                         prizeImg = `turnable_icon${v.propType}_png`;
                         break;
                     case 4:
-                        prizeImg = "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/object.png";
+                        prizeImg = "turntable_wealth_png";
                         break;
                     case 5:
-                        prizeImg = "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/alipay.png";
+                        prizeImg = "turntable_oupon_png";
                         break;
                     case 6:
-                        prizeImg = "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/qb.png";
+                        prizeImg = "turntable_oupon_png";
                         break;
                     case 7:
-                        prizeImg = "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/phonebill.png";
+                        prizeImg = "turntable_oupon_png";
                         break;
 
                     default: