Merge branch 'qx_JoyousManor' of gitlab2.dui88.com:clq/db-game-template into qx_JoyousManor_zjz

egret/libs/tw/manager/NetManager.ts

@@ -989,6 +989,7 @@ export class NetManager extends ABNetManager {
 
         }
         if (!data.success && !net.hideMsg) {
+            console.log('test-->接口错误--》》',net.uri,data)
             GDispatcher.dispatchEvent(ABNetManager.ERROR, net, result.message || result.desc || result.msg, result);
             onNotSuccess(data, net.name);
         }

egret/resource/default.res.json

@@ -101,7 +101,7 @@
 			"name": "shop"
 		},
 		{
-			"keys": "option_left_png,option_right_png,option_scrollbar_png,ex_panda_png,ex_buybtn_png,ex_close_png,hotballoon_png,道具数量框_png,光线_png,水_半_png,水_空_png,水_满_png,饲料_半_png,饲料_空_png,饲料_满_png,roalightimg_png,closebtn_png,exd_fail_bg_png,iknowbtn_png,lightdotimg_png,roalightbg_png,奖品1_png,我要兑换按钮_png,奖品12_png,我要兑换按钮2_png,ex_buybtn2_png,ex_close2_png,ex_panda2_png,closebtn2_png,exd_fail_bg2_png,iknowbtn2_png,lightdotimg2_png,roalightbg2_png,roalightimg2_png,hotballoon2_png,option_left2_png,option_right2_png,option_scrollbar2_png,规则背景_png,规则关闭_png,introduce_bg_new_png,introduce_btn_close_png,introduce_btn_new_png,shopPanel_close_png,shop_btn_-_png,shop_btn_+_png,shop_item_bg_big_png,shop_item_cntBg_png,prop_apple_png,prop_papaya_png,shopBuy_close_btn_png,warehouse_close_btn_png,papaya_bg_png,apple_bg_png,sellOutLine_png,sell_+_en_png,sell_-_en_png,task_close_btn_png,浇水3_png,饲料2_png,task_brn_bg_dis_png,欢趣竞猜 icon_png,趣赶集 icon_png,newUserCloseBtn_png,noFeed_bg_png,noFeed_sr_btn_png,noWater_btn_png,noWater_bg_png",
+			"keys": "option_left_png,option_right_png,option_scrollbar_png,ex_panda_png,ex_buybtn_png,ex_close_png,hotballoon_png,道具数量框_png,光线_png,水_半_png,水_空_png,水_满_png,饲料_半_png,饲料_空_png,饲料_满_png,roalightimg_png,closebtn_png,exd_fail_bg_png,iknowbtn_png,lightdotimg_png,roalightbg_png,奖品1_png,我要兑换按钮_png,奖品12_png,我要兑换按钮2_png,ex_buybtn2_png,ex_close2_png,ex_panda2_png,closebtn2_png,exd_fail_bg2_png,iknowbtn2_png,lightdotimg2_png,roalightbg2_png,roalightimg2_png,hotballoon2_png,option_left2_png,option_right2_png,option_scrollbar2_png,规则背景_png,规则关闭_png,introduce_bg_new_png,introduce_btn_close_png,introduce_btn_new_png,shopPanel_close_png,shop_btn_-_png,shop_btn_+_png,shop_item_bg_big_png,shop_item_cntBg_png,prop_apple_png,prop_papaya_png,shopBuy_close_btn_png,warehouse_close_btn_png,papaya_bg_png,apple_bg_png,sellOutLine_png,sell_+_en_png,sell_-_en_png,task_close_btn_png,浇水3_png,饲料2_png,task_brn_bg_dis_png,欢趣竞猜 icon_png,趣赶集 icon_png,newUserCloseBtn_png,noFeed_bg_png,noFeed_sr_btn_png,noWater_btn_png,noWater_bg_png,oldUserClose_png,sellTitle_apple_png,sellTitle_papaya_png",
 			"name": "preload"
 		}
 	],
@@ -1605,6 +1605,21 @@
 			"url": "assets/index_scene/planting/option/option_papaya.png",
 			"type": "image",
 			"name": "option_papaya_png"
+		},
+		{
+			"name": "oldUserClose_png",
+			"type": "image",
+			"url": "assets/oldUser_panel/oldUserClose.png"
+		},
+		{
+			"name": "sellTitle_apple_png",
+			"type": "image",
+			"url": "assets/warehouse_panel/sell_panel/sellTitle_apple.png"
+		},
+		{
+			"name": "sellTitle_papaya_png",
+			"type": "image",
+			"url": "assets/warehouse_panel/sell_panel/sellTitle_papaya.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/OldUserPanelSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="CreditsTip" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image y="355" source="oldUserBg_png" horizontalCenter="0"/>
+	<e:Image y="0" source="oldUserBg_png" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" y="311" x="635">
 		<e:skinName>
-		<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="oldUserClose_png" source.down="oldUserClose_png" source.disabled="oldUserClose_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
+			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="btn" label="" y="894" horizontalCenter="0">
+	<e:Button id="btn" label="" y="956" horizontalCenter="0">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" scaleX.down="0.9" scaleY.down="0.9" source="oldUserBtn_png" source.down="oldUserBtn_png" source.disabled="oldUserBtn_png"/>