Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

egret/resource/default.res.json

@@ -141,7 +141,7 @@
 			"name": "scratchrulepanel"
 		},
 		{
-			"keys": "bagbtn我的奖券_png,bagbtn我的道具_png,bag我的奖券_png,bag我的道具_png,bag_item_bg2_png,bag_item_bg_png,bag_icon3_png,bag_icon2_png,bag_icon1_png,bag按钮 副本 9_png",
+			"keys": "bagbtn我的奖券_png,bagbtn我的道具_png,bag我的奖券_png,bag我的道具_png,bag_item_bg2_png,bag_item_bg_png,bag_icon3_png,bag_icon2_png,bag_icon1_png,bag按钮 副本 9_png,bag按钮 副本 10_png",
 			"name": "bag"
 		},
 		{
@@ -2554,6 +2554,11 @@
 			"url": "assets/bagquit/bag退出按钮.png",
 			"type": "image",
 			"name": "bag退出按钮_png"
+		},
+		{
+			"url": "assets/bag/bag按钮 副本 10.png",
+			"type": "image",
+			"name": "bag按钮 副本 10_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/default.thm.json

@@ -8,6 +8,8 @@
         "resource/skins/AvatarSkin.exml",
         "resource/skins/BackSkin.exml",
         "resource/skins/BagSkin.exml",
+        "resource/skins/BagItemSkin.exml",
+        "resource/skins/BagSkin.exml",
         "resource/skins/Blood2Skin.exml",
         "resource/skins/BloodSkin.exml",
         "resource/skins/Box2Skin.exml",

egret/resource/skins/BagItemSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="BagItemSkin" width="400" height="300" xmlns:e="http://ns.egret.com/eui">
+</e:Skin>
\ No newline at end of file

egret/resource/skins/BagQuitSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="BagQuitSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
+	<e:Image source="bag退出弹窗_png" y="211" horizontalCenter="0"/>
+	<e:Button id="closeBtn" label="" x="611.94" y="201.92">
+		<e:skinName>
+		<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
+			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+		</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Button label="" x="158" y="476">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="bag退出按钮_png" source.down="bag退出按钮_png" source.disabled="bag退出按钮_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Button label="" x="473.44" y="546.5">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="bag继续按钮_png" source.down="bag继续按钮_png" source.disabled="bag继续按钮_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+</e:Skin>
\ No newline at end of file