Skip to content

D
db-game-template
Commit 342b649a authored by Edwise's avatar Edwise 🍷
Browse files
Options

改了一堆

parent e5975944
Hide whitespace changes
Inline Side-by-side
Showing with 340 additions and 97 deletions
egret/index.html
View file @ 342b649a
...@@ -66,14 +66,14 @@ ...@@ -66,14 +66,14 @@
bid: 13, bid: 13,
}, },
3: { 3: {
icon: '消费 icon_png', icon: '欢趣竞猜 icon_png',
btnLabel: '去完成', btnLabel: '去完成',
label: '访问欢趣竞猜', label: '访问欢趣竞猜',
link: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/p63e3d5c8/index.html', link: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/p63e3d5c8/index.html',
bid: 14, bid: 14,
}, },
4: { 4: {
icon: '生活日 icon_png', icon: '趣赶集 icon_png',
btnLabel: '去完成', btnLabel: '去完成',
label: '访问欢趣市集', label: '访问欢趣市集',
link: 'https://gonghang.activity-1.m.duiba.com.cn/hdtool/index?id=3737984&dbnewopen', link: 'https://gonghang.activity-1.m.duiba.com.cn/hdtool/index?id=3737984&dbnewopen',
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
bid: 30, bid: 30,
}, },
6: { 6: {
icon: '消费任务_png', icon: '浏览积分商城任务_png',
btnLabel: '去浏览', btnLabel: '去浏览',
label: '浏览扶贫商城', label: '浏览扶贫商城',
linkId: 'HD0460200417375', // 扶贫商城 linkId: 'HD0460200417375', // 扶贫商城
......
egret/resource/.DS_Store
View file @ 342b649a
No preview for this file type
egret/resource/default.res.json
View file @ 342b649a
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
}, },
{ {
"name": "preload", "name": "preload",
"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" "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"
} }
], ],
"resources": [ "resources": [
...@@ -1510,6 +1510,91 @@ ...@@ -1510,6 +1510,91 @@
"name": "shopBuy_close_btn_png", "name": "shopBuy_close_btn_png",
"type": "image", "type": "image",
"url": "assets/shop/shopBuy_close_btn.png" "url": "assets/shop/shopBuy_close_btn.png"
},
{
"name": "warehouse_close_btn_png",
"type": "image",
"url": "assets/warehouse_panel/warehouse_close_btn.png"
},
{
"name": "papaya_bg_png",
"type": "image",
"url": "assets/warehouse_panel/papaya_bg.png"
},
{
"name": "apple_bg_png",
"type": "image",
"url": "assets/warehouse_panel/apple_bg.png"
},
{
"name": "sellOutLine_png",
"type": "image",
"url": "assets/warehouse_panel/sell_panel/sellOutLine.png"
},
{
"name": "sell_+_en_png",
"type": "image",
"url": "assets/warehouse_panel/sell_panel/sell_+_en.png"
},
{
"name": "sell_-_en_png",
"type": "image",
"url": "assets/warehouse_panel/sell_panel/sell_-_en.png"
},
{
"name": "task_close_btn_png",
"type": "image",
"url": "assets/task_panel/task_close_btn.png"
},
{
"name": "浇水3_png",
"type": "image",
"url": "assets/task_panel/浇水.png"
},
{
"name": "饲料2_png",
"type": "image",
"url": "assets/task_panel/饲料.png"
},
{
"name": "task_brn_bg_dis_png",
"type": "image",
"url": "assets/task_panel/task_brn_bg_dis.png"
},
{
"name": "欢趣竞猜 icon_png",
"type": "image",
"url": "assets/task_panel/欢趣竞猜 icon.png"
},
{
"name": "趣赶集 icon_png",
"type": "image",
"url": "assets/task_panel/趣赶集 icon.png"
},
{
"name": "newUserCloseBtn_png",
"type": "image",
"url": "assets/newUser_panel/newUserCloseBtn.png"
},
{
"name": "noFeed_bg_png",
"type": "image",
"url": "assets/noFeed_panel/noFeed_bg.png"
},
{
"name": "noFeed_sr_btn_png",
"type": "image",
"url": "assets/noFeed_panel/noFeed_sr_btn.png"
},
{
"name": "noWater_btn_png",
"type": "image",
"url": "assets/noWater_panel/noWater_btn.png"
},
{
"name": "noWater_bg_png",
"type": "image",
"url": "assets/noWater_panel/noWater_bg.png"
} }
] ]
} }
\ No newline at end of file
egret/resource/default.thm.json
View file @ 342b649a
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
"resource/skins/UnlockPanelSkin.exml", "resource/skins/UnlockPanelSkin.exml",
"resource/skins/WareHouseCropItemSkin.exml", "resource/skins/WareHouseCropItemSkin.exml",
"resource/skins/WareHouseSeedItemSkin.exml", "resource/skins/WareHouseSeedItemSkin.exml",
"resource/skins/WareHouseSkin.exml" "resource/skins/WareHouseSkin.exml",
"resource/skins/NoFeedPanelSkin.exml",
"resource/skins/NoWaterPanelSkin.exml"
], ],
"path": "resource/default.thm.json" "path": "resource/default.thm.json"
} }
\ No newline at end of file
egret/resource/skins/NewUserPanelSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?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:Skin class="CreditsTip" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image y="247" horizontalCenter="0" source="newUserBg_png"/> <e:Image y="0" horizontalCenter="0" source="newUserBg_png"/>
<e:Button id="closeBtn" label="" y="203" x="635"> <e:Button id="closeBtn" label="" y="240" x="618">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <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:Image width="100%" height="100%" source="newUserCloseBtn_png" source.down="newUserCloseBtn_png" source.disabled="newUserCloseBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="btn" label="" y="1013" horizontalCenter="0"> <e:Button id="btn" label="" y="1131" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="newUserBtn_png" source.down="newUserBtn_png" source.disabled="newUserBtn_png"/> <e:Image width="100%" height="100%" source="newUserBtn_png" source.down="newUserBtn_png" source.disabled="newUserBtn_png"/>
......
egret/resource/skins/NoFeedPanelSkin.exml 0 → 100644
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="NoFeedPanelSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group width="609" height="627" y="469" horizontalCenter="0">
<e:Image source="noFeed_bg_png" y="-69" horizontalCenter="0" x="29" scaleX="1" scaleY="1"/>
<e:Image id="closeBtn" source="noFeed_sr_btn_png" y="392" horizontalCenter="0" x="203" scaleX="1" scaleY="1"/>
<e:Label text="当前饲料不足" y="128" textColor="0x404040" horizontalCenter="0" size="33" bold="true" x="234" scaleX="1" scaleY="1"/>
<e:Label text="通过完成任务和参与游戏可以获取饲料哦" y="254" horizontalCenter="0" textColor="0x535353" size="27" x="90" scaleX="1" scaleY="1"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/NoWaterPanelSkin.exml 0 → 100644
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="NoWaterPanelSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group width="750" height="700" y="272" horizontalCenter="0">
<e:Image source="noWater_bg_png" y="0" horizontalCenter="0"/>
<e:Image id="closeBtn" source="noWater_btn_png" y="464" horizontalCenter="0"/>
<e:Label text="当前水滴不足" y="208" horizontalCenter="0" textColor="0x404040" size="33" bold="true"/>
<e:Label text="通过完成任务和参与游戏可以获取水滴哦" y="336.5" size="27" textColor="0x535353" horizontalCenter="0"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/SellPanelSkin.exml
View file @ 342b649a
...@@ -14,4 +14,22 @@ ...@@ -14,4 +14,22 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="addBtn" label="" x="446" y="399.5" width="58">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="sell_+_en_png" source.down="sell_+_en_png" source.disabled="+_dis_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="reduceBtn" label="" x="246" y="399.5" width="58">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="sell_-_en_png" source.down="sell_-_en_png" source.disabled="-_dis_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Image source="sellOutLine_png" y="447" horizontalCenter="0"/>
<e:Label id="curCntLabel" text="1" y="413" horizontalCenter="0"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/SellRecordItemSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="501" height="50" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CreditsTip" width="501" height="50" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="sellRecord_outline_png" horizontalCenter="0" bottom="0"/> <e:Image source="sellRecord_outline_png" horizontalCenter="0" bottom="0"/>
<e:Label id="dateLabel" text="" textColor="0x855933" size="20" verticalCenter="0" left="0"/> <e:Label id="dateLabel" text="" size="20" verticalCenter="0" left="0" textColor="0x8b572b" alpha="0.8"/>
<e:Label id="cropLabel" text="" textColor="0x855933" size="20" verticalCenter="0" horizontalCenter="0"/> <e:Label id="cropLabel" text="" size="20" verticalCenter="0" horizontalCenter="0" alpha="0.8" textColor="0x8b572b"/>
<e:Label id="creditsLabel" text="" textColor="0x855933" size="20" verticalCenter="0" right="0"/> <e:Label id="creditsLabel" text="" size="20" verticalCenter="0" right="0" textColor="0x8b572b" alpha="0.8"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/SellRecordSkin.exml
View file @ 342b649a
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<e:Group anchorOffsetX="0" anchorOffsetY="0" height="776" width="534"> <e:Group anchorOffsetX="0" anchorOffsetY="0" height="776" width="534">
<e:List id="list" horizontalCenter="0" top="0" left="0" right="0" width="501"> <e:List id="list" horizontalCenter="0" top="0" left="0" right="0" width="501">
<e:layout> <e:layout>
<e:VerticalLayout gap="20"/> <e:VerticalLayout gap="10"/>
</e:layout> </e:layout>
</e:List> </e:List>
</e:Group> </e:Group>
......
egret/resource/skins/SelledPanelSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="750" height="1010" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CreditsTip" width="750" height="1010" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="selled_bg_png" y="114" horizontalCenter="0"/> <e:Image source="selled_bg_png" y="114" horizontalCenter="0"/>
<e:Image id="closeBtn" source="closeBtn_png" x="537.7" y="83.85" scaleX="0.9" scaleY="0.9"/> <e:Image id="closeBtn" source="closeBtn_png" x="537.7" y="83.85" scaleX="0.9" scaleY="0.9" visible="false"/>
<e:Label id="infoLabel" text="您的鸡蛋已被欢趣商店收下" y="234" textColor="0x806546" size="22" horizontalCenter="0"/> <e:Label id="infoLabel" text="您的鸡蛋已被欢趣商店收下" y="254" textColor="0x806546" size="22" horizontalCenter="0"/>
<e:Label text="感谢您的辛勤劳作" y="263" textColor="0x806546" size="22" horizontalCenter="0"/> <e:Label text="感谢您的辛勤劳作" y="283" textColor="0x806546" size="22" horizontalCenter="0"/>
<e:Label id="numLabel" text="为您献上500个欢趣豆" y="292" textColor="0x806546" size="22" horizontalCenter="0"/> <e:Label id="numLabel" text="为您献上500个欢趣豆" y="312" textColor="0x806546" size="22" horizontalCenter="0"/>
<e:Image id="okBtn" source="selled_btn_png" y="518" horizontalCenter="0"/> <e:Image id="okBtn" source="selled_btn_png" y="588" horizontalCenter="1"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/TaskItemSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="654" height="200" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CreditsTip" width="654" height="200" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="task_item_bg_png" horizontalCenter="0" verticalCenter="-10"/> <e:Image source="task_item_bg_png" horizontalCenter="0" verticalCenter="-10"/>
<e:Image id="icon" width="137" height="137" x="27.67" verticalCenter="-10"/> <e:Image id="icon" width="103" height="103" x="50" verticalCenter="-15"/>
<e:Label id="title" text="Label" textColor="0x624a33" size="30" left="178" top="38"/> <e:Label id="title" text="Label" size="30" left="178" textColor="0xc57d4d" y="44"/>
<e:Label id="textKHD" text="可获得：" textColor="0x9a9a9a" size="24" top="110" left="178"/> <e:Label id="textKHD" text="可获得：" size="24" left="178" textColor="0xff5b00" y="100"/>
<e:Group id="prizeGroup" x="265" verticalCenter="20"> <e:Group id="prizeGroup" x="265" y="93">
<e:Group id="foodGroup" y="0" x="0"> <e:Group id="foodGroup" y="0" x="0">
<e:Image source="饲料 拷贝_png" y="-3" left="0"/> <e:Image y="0" left="0" source="饲料2_png"/>
<e:Label id="textFood" text="×500" textColor="0x9A9A9A" size="30" y="6" left="37"/> <e:Label id="textFood" text="×500" size="24" y="6" left="37" textColor="0xff5b00"/>
</e:Group> </e:Group>
<e:Group id="waterGroup" x="108" y="2"> <e:Group id="waterGroup" x="90" y="2">
<e:Image source="浇水2_png" y="-2" left="0"/> <e:Image y="0" left="0" source="浇水3_png"/>
<e:Label id="textWater" text="×500" textColor="0x9A9A9A" size="30" y="4.5" left="52"/> <e:Label id="textWater" text="×500" size="24" y="4.5" left="52" textColor="0xff5b00"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Group id="btn" x="508.5" verticalCenter="-10"> <e:Group id="btn" x="460" verticalCenter="-15">
<e:Image id="btn_bg" source="task_brn_bg_png" x="0" y="0"/> <e:Image id="btn_bg" source="task_brn_bg_png" x="0" y="0"/>
<e:Image id="btn_bg_dis" x="0" y="0" source="task_brn_bg_dis_png"/>
<e:Label id="btn_label" text="去完成" horizontalCenter="0" verticalCenter="0" size="28"/> <e:Label id="btn_label" text="去完成" horizontalCenter="0" verticalCenter="0" size="28"/>
</e:Group> </e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/TaskPanelSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="750" height="1050" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CreditsTip" width="750" height="1067" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="task_bg_png" horizontalCenter="0" y="80"/> <e:Image source="task_bg_png" horizontalCenter="0" y="80"/>
<e:Scroller anchorOffsetX="0" anchorOffsetY="0" height="778" width="654" horizontalCenter="0" bottom="0"> <e:Scroller anchorOffsetX="0" anchorOffsetY="0" height="778" width="654" horizontalCenter="0" y="229">
<e:Group anchorOffsetX="0" anchorOffsetY="0" height="776" width="654"> <e:Group anchorOffsetX="0" anchorOffsetY="0" height="776" width="654">
<e:List id="list" horizontalCenter="0" top="0" left="0" right="0"> <e:List id="list" horizontalCenter="0" top="0" left="0" right="0">
<e:layout> <e:layout>
...@@ -10,5 +10,5 @@ ...@@ -10,5 +10,5 @@
</e:List> </e:List>
</e:Group> </e:Group>
</e:Scroller> </e:Scroller>
<e:Image id="closeBtn" source="closeBtn_png" x="642" y="0"/> <e:Image id="closeBtn" x="653" y="56" source="task_close_btn_png"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/UnlockPanelSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?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:Skin class="CreditsTip" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image y="500.33" source="unlock_bg_png" horizontalCenter="0"/> <e:Image y="500.33" source="unlock_bg_png" horizontalCenter="0"/>
<e:Image id="closeBtn" source="closeBtn_png" x="532" y="433.33"/> <e:Image id="closeBtn" source="closeBtn_png" x="532" y="433.33" visible="false"/>
<e:Label id="label" text="增加一块可使用的土地\n需要消耗5000欢趣豆" y="635" size="24" textColor="0x66492f" anchorOffsetX="0" width="445" horizontalCenter="0" textAlign="center" lineSpacing="15"/> <e:Label id="label" text="增加一块可使用的土地\n需要消耗5000欢趣豆" y="716.33" size="30" anchorOffsetX="0" width="445" horizontalCenter="0.5" textAlign="center" lineSpacing="15" textColor="0x535353"/>
<e:Button id="cancel" label="" x="174" y="745.33"> <e:Button id="cancel" label="" x="103" y="885.33">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="unlock_cancel_png" source.down="unlock_cancel_png" source.disabled="unlock_cancel_png"/> <e:Image width="100%" height="100%" source="unlock_cancel_png" source.down="unlock_cancel_png" source.disabled="unlock_cancel_png"/>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="btn" label="" x="383" y="745.33"> <e:Button id="btn" label="" x="389" y="885.33">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="unlock_btn_png" source.down="unlock_btn_png" source.disabled="unlock_btn_png"/> <e:Image width="100%" height="100%" source="unlock_btn_png" source.down="unlock_btn_png" source.disabled="unlock_btn_png"/>
......
egret/resource/skins/WareHouseCropItemSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="312" height="358" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CreditsTip" width="331" height="389" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="bg" source="egg_bg_png" x="0" y="0"/> <e:Image id="bg" x="0" y="0" source="apple_bg_png"/>
<e:Image id="sellBtn" source="出售_png" x="12" y="240"/> <e:Image id="sellBtn" source="出售_png" x="23" y="295"/>
<e:Label id="label" text="数量：0" x="113" y="195" size="24" textColor="0x9a9a9a"/> <e:Label id="label" text="数量：0" y="217" size="24" textColor="0x9a9a9a" horizontalCenter="0"/>
<e:Image id="exBtn" source="兑换_png" x="164" y="240"/> <e:Image id="exBtn" source="兑换_png" x="177.5" y="295"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/WareHouseSeedItemSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="312" height="360" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CreditsTip" width="332" height="360" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image horizontalCenter="0" y="0" source="warehouse_item_bg_png"/> <e:Image horizontalCenter="0" y="0" source="warehouse_item_bg_png"/>
<e:Label id="nameTxt" text="0" x="0" y="182" size="24" textAlign="center" anchorOffsetX="0" width="312" textColor="0x66492f"/> <e:Label id="nameTxt" text="0" y="192" size="24" textAlign="center" anchorOffsetX="0" width="312" textColor="0x66492f" horizontalCenter="0"/>
<e:Image id="img" source="prop_food_png" left="29.5" top="22"/> <e:Image id="img" source="prop_food_png" left="29.5" top="32" horizontalCenter="0"/>
<e:Label id="tipTxt" text="数量：0" x="0" y="260" size="22" textAlign="center" anchorOffsetX="0" width="312" textColor="0x9a9a9a"/> <e:Label id="tipTxt" text="数量：0" x="0" y="260" size="22" textAlign="center" anchorOffsetX="0" width="312" textColor="0xcd752e"/>
<e:Image id="tipImg" source="itemTip_png" x="23.3" y="14.8"/> <e:Image id="tipImg" source="itemTip_png" x="24" y="22"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/WareHouseSkin.exml
View file @ 342b649a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CreditsTip" width="750" height="850" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CreditsTip" width="750" height="998" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image horizontalCenter="0" source="warehouse_bg_png" y="76"/> <e:Image horizontalCenter="0" source="warehouse_bg_png" y="0"/>
<e:Image id="closeBtn" source="closeBtn_png" x="642" y="0"/> <e:Image id="closeBtn" x="640" y="28.79" source="shopPanel_close_png"/>
<e:Group id="cropGroup" left="0" top="314" right="0" bottom="0" visible="false"> <e:Group id="cropGroup" left="0" top="314" right="0" bottom="0" visible="false">
<e:Image id="record_btn" source="出售记录_png" x="318" y="10" scaleX="1" scaleY="1"/> <e:Image id="record_btn" source="出售记录_png" x="595" y="-11" scaleX="1" scaleY="1"/>
<e:Image id="cropNoneImg" source="warehouse_none_png" x="138" y="120"/> <e:Image id="cropNoneImg" source="warehouse_none_png" x="138" y="120"/>
<e:Scroller id="crops" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1" left="42" bottom="0" right="42" top="54"> <e:Scroller id="crops" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1" bottom="0" top="54" width="730" x="10">
<e:Group anchorOffsetX="0" anchorOffsetY="0"> <e:Group anchorOffsetX="0" anchorOffsetY="0">
</e:Group> </e:Group>
</e:Scroller> </e:Scroller>
</e:Group> </e:Group>
<e:Group id="seedGroup" left="0" top="314" bottom="0" right="0" visible="false"> <e:Group id="seedGroup" left="0" top="314" bottom="0" right="0">
<e:Image id="seedNoneImg" source="warehouse_none_seed_png" x="138" y="120" scaleX="1" scaleY="1"/> <e:Image id="seedNoneImg" source="warehouse_none_seed_png" x="138" y="120" scaleX="1" scaleY="1"/>
<e:Scroller id="seeds" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1" top="0" bottom="0" right="42" left="42"> <e:Scroller id="seeds" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1" y="54" height="630" width="686" x="32">
<e:Group anchorOffsetX="0" anchorOffsetY="0"> <e:Group anchorOffsetX="0" anchorOffsetY="0">
</e:Group> </e:Group>
</e:Scroller> </e:Scroller>
</e:Group> </e:Group>
<e:Button id="tableSeed" label="" x="369" y="254" enabled="true"> <e:Button id="tableSeed" label="" x="362" y="288" enabled="true">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="warehouse_seed_dis_png" source.down="warehouse_seed_dis_png" source.disabled="warehouse_seed_png"/> <e:Image width="100%" height="100%" source="warehouse_seed_dis_png" source.down="warehouse_seed_dis_png" source.disabled="warehouse_seed_png"/>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="tableCrop" label="" x="149" y="254"> <e:Button id="tableCrop" label="" x="173" y="288">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="warehouse_crop_dis_png" source.down="warehouse_crop_dis_png" source.disabled="warehouse_crop_png"/> <e:Image width="100%" height="100%" source="warehouse_crop_dis_png" source.down="warehouse_crop_dis_png" source.disabled="warehouse_crop_png"/>
......
egret/src/Panels/NoFeedPanel.ts 0 → 100644
View file @ 342b649a
import Panel from "../views/Panel"
export default class NoFeedPanel extends Panel{
constructor(data){
super(data)
}
public closeBtn:eui.Image;
public get skinKey() {
return 'NoFeedPanel'
}
}
\ No newline at end of file
egret/src/Panels/NoWaterPanel.ts 0 → 100644
View file @ 342b649a
import Panel from "../views/Panel"
export default class NoWaterPanel extends Panel{
constructor(data){
super(data)
}
public closeBtn:eui.Image;
public get skinKey() {
return 'NoWaterPanel'
}
}
\ No newline at end of file
egret/src/Panels/SellPanel.ts
View file @ 342b649a
import Panel from "../views/Panel"; import Panel from "../views/Panel";
import {productData} from "./WareHousePanel"; import { productData } from "./WareHousePanel";
import {NetManager} from "../../libs/tw/manager/NetManager"; import { NetManager } from "../../libs/tw/manager/NetManager";
import {ProgressNum} from "../components/ProgressNum"; import { ProgressNum } from "../components/ProgressNum";
import {MainDispatcher} from "../Scenes/MainScene/MainScene"; import { MainDispatcher } from "../Scenes/MainScene/MainScene";
import {ModuleTypes} from "../types/sceneTypes"; import { ModuleTypes } from "../types/sceneTypes";
import TopLayerCtrl from "../ctrls/topLayerCtrl"; import TopLayerCtrl from "../ctrls/topLayerCtrl";
export default class SellPanel extends Panel { export default class SellPanel extends Panel {
...@@ -14,6 +14,11 @@ export default class SellPanel extends Panel { ...@@ -14,6 +14,11 @@ export default class SellPanel extends Panel {
public totalLabel: eui.Label; public totalLabel: eui.Label;
public sellBtn: eui.Button; public sellBtn: eui.Button;
public addBtn: eui.Button;
public reduceBtn: eui.Button;
public curCntLabel: eui.Label;
public curCnt: number = 1;
private key; // 当前要卖的东西的id private key; // 当前要卖的东西的id
private total = 0; // 总个数 private total = 0; // 总个数
...@@ -34,7 +39,7 @@ export default class SellPanel extends Panel { ...@@ -34,7 +39,7 @@ export default class SellPanel extends Panel {
onShowAnim() { onShowAnim() {
// const canvasH = 750 / window.innerWidth * window.innerHeight; // const canvasH = 750 / window.innerWidth * window.innerHeight;
egret.Tween.get(this).set({alpha: 0}).to({alpha: 1}, 233, egret.Ease.quadInOut); egret.Tween.get(this).set({ alpha: 0 }).to({ alpha: 1 }, 233, egret.Ease.quadInOut);
} }
protected getTapEvts(): any[] { protected getTapEvts(): any[] {
...@@ -47,11 +52,12 @@ export default class SellPanel extends Panel { ...@@ -47,11 +52,12 @@ export default class SellPanel extends Panel {
super.start(); super.start();
this.initUI(); this.initUI();
MainDispatcher.addEvent('updateSellValue', this.updateSellValue, this); // MainDispatcher.addEvent('updateSellValue', this.updateSellValue, this);
} }
private updateSellValue() { private updateSellValue() {
const value = this.numBar.value; // const value = this.numBar.value;
const value = 0;
this.sellBtn.enabled = (value > 0); this.sellBtn.enabled = (value > 0);
} }
...@@ -66,14 +72,43 @@ export default class SellPanel extends Panel { ...@@ -66,14 +72,43 @@ export default class SellPanel extends Panel {
this.nameLabel.text = d.nameLabel; this.nameLabel.text = d.nameLabel;
this.titleImg.source = `sellTitle_${d.name}_png`; this.titleImg.source = `sellTitle_${d.name}_png`;
this.totalLabel.text = `共${this.data.total}${d.numLabel}`; this.totalLabel.text = `共${this.data.total}${d.numLabel}${d.nameLabel}`;
// this.numBar = new ProgressNum({total: this.total});
// this.addChild(this.numBar);
// this.numBar.x = this.width / 2 - this.numBar.width / 2;
// this.numBar.y = 400;
// this.updateSellValue();
this.setCnt(0);
this.addBtn.addEventListener("touchTap",this.tapHandle,this);
this.reduceBtn.addEventListener("touchTap",this.tapHandle,this);
}
tapHandle (e){
if(e.target == this.addBtn){
this.setCnt(1);
}else if(e.target == this.reduceBtn){
this.setCnt(-1)
}
}
this.numBar = new ProgressNum({total: this.total});
this.addChild(this.numBar);
this.numBar.x = this.width / 2 - this.numBar.width / 2;
this.numBar.y = 400;
this.updateSellValue(); /**设置当前的数量 */
setCnt(value) {
let cnt = this.curCnt + value
if (cnt >= 1 && cnt <= this.total)
this.curCnt = cnt;
if (this.curCnt <= 1) {
this.reduceBtn.enabled = false;
this.addBtn.enabled = true;
} else if (this.curCnt >= this.total){
this.addBtn.enabled = false;
}else {
this.reduceBtn.enabled = true;
}
this.curCntLabel.text = this.curCnt+'';
} }
/** /**
...@@ -81,20 +116,21 @@ export default class SellPanel extends Panel { ...@@ -81,20 +116,21 @@ export default class SellPanel extends Panel {
*/ */
private doSell() { private doSell() {
this.sellBtn.touchEnabled = false; this.sellBtn.touchEnabled = false;
const count = this.numBar.value; // const count = this.numBar.value;
const count = this.curCnt;
NetManager.ins.doSell((success, res) => { NetManager.ins.doSell((success, res) => {
this.sellBtn.touchEnabled = true; this.sellBtn.touchEnabled = true;
if (!success) { if (!success) {
return; return;
} }
const total = this.numBar.value * productData[this.key].price; const total = count * productData[this.key].price;
const data = {name: productData[this.key].nameLabel, total: total}; const data = { name: productData[this.key].nameLabel, total: total };
TopLayerCtrl.instance.show(ModuleTypes.SELLED_PANEL, data, .4); TopLayerCtrl.instance.show(ModuleTypes.SELLED_PANEL, data, .4);
}, this.key, count); }, this.key, count);
} }
destroy() { destroy() {
this.numBar.destroy(); // this.numBar.destroy();
super.destroy(); super.destroy();
} }
......
egret/src/Panels/TaskPanel.ts
View file @ 342b649a
...@@ -84,6 +84,7 @@ class TaskItem extends ItemRenderer { ...@@ -84,6 +84,7 @@ class TaskItem extends ItemRenderer {
public textWater: Label; public textWater: Label;
public btn: Group; public btn: Group;
public btn_bg: Image; public btn_bg: Image;
public btn_bg_dis:Image;
public btn_label: Label; public btn_label: Label;
constructor() { constructor() {
...@@ -114,8 +115,9 @@ class TaskItem extends ItemRenderer { ...@@ -114,8 +115,9 @@ class TaskItem extends ItemRenderer {
private setBtn() { private setBtn() {
this.btn_label.text = (this.data.status == 0) ? window['taskUi'][this.data.id].btnLabel : '已领取'; this.btn_label.text = (this.data.status == 0) ? window['taskUi'][this.data.id].btnLabel : '已领取';
this.btn_label.textColor = (this.data.status == 0) ? 0xffffff : 0x9a9a9a; this.btn_label.textColor = (this.data.status == 0) ? 0xffffff : 0xffffff;
this.btn_bg.visible = (this.data.status == 0); this.btn_bg.visible = (this.data.status == 0);
this.btn_bg_dis.visible = (this.data.status != 0);
let _f = () => { let _f = () => {
TopLayerCtrl.instance.show(ModuleTypes.TASK_TOAST, { TopLayerCtrl.instance.show(ModuleTypes.TASK_TOAST, {
......
egret/src/Panels/WareHousePanel.ts
View file @ 342b649a
...@@ -65,6 +65,24 @@ export const productData = { ...@@ -65,6 +65,24 @@ export const productData = {
price: 0, price: 0,
total: 0, total: 0,
item: null, item: null,
},
'sp_7': { // 核桃
key: 'sp_7',
name: 'apple',
nameLabel: '苹果',
numLabel: '个',
price: 0,
total: 0,
item: null,
},
'sp_8': { // 核桃
key: 'sp_8',
name: 'papaya',
nameLabel: '木瓜',
numLabel: '个',
price: 0,
total: 0,
item: null,
} }
}; };
...@@ -111,6 +129,20 @@ export const seedData = { ...@@ -111,6 +129,20 @@ export const seedData = {
nameLabel: '核桃', nameLabel: '核桃',
total: 0, total: 0,
item: null, item: null,
},
'sp_seed_7': { // 苹果
key: 'sp_seed_7',
name: 'apple',
nameLabel: '苹果',
total: 0,
item: null,
},
'sp_seed_8': { // 木瓜
key: 'sp_seed_8',
name: 'papaya',
nameLabel: '木瓜',
total: 0,
item: null,
} }
}; };
...@@ -200,7 +232,7 @@ export default class WareHousePanel extends Panel { ...@@ -200,7 +232,7 @@ export default class WareHousePanel extends Panel {
//@ts-ignore //@ts-ignore
this.crops.viewport.addChild(item); this.crops.viewport.addChild(item);
item.x = i % 2 * 354; item.x = i % 2 * 354;
item.y = ~~(i / 2) * 359; item.y = ~~(i / 2) * 409;
item.visible = false; item.visible = false;
productData[k].item = item; productData[k].item = item;
i++; i++;
...@@ -276,10 +308,11 @@ export default class WareHousePanel extends Panel { ...@@ -276,10 +308,11 @@ export default class WareHousePanel extends Panel {
} }
showProp.forEach((v, i) => { showProp.forEach((v, i) => {
v.x = i % 2 * 354; v.x = 30+ i % 2 * 344;
v.y = ~~(i / 2) * 359; v.y = ~~(i / 2) * 409;
v.visible = true; v.visible = true;
}); });
console.log('aaa---->>',productData)
this.cropNoneImg.visible = (showProp.length <= 0); this.cropNoneImg.visible = (showProp.length <= 0);
...@@ -310,6 +343,7 @@ export default class WareHousePanel extends Panel { ...@@ -310,6 +343,7 @@ export default class WareHousePanel extends Panel {
for (let k in product) { for (let k in product) {
productData[k].total = product[k]; productData[k].total = product[k];
} }
console.log('testhsuju--->>',product)
const seed = G_GetHomeDataByKey(HOME.SEED); const seed = G_GetHomeDataByKey(HOME.SEED);
for (let k in seed) { for (let k in seed) {
......
egret/src/Scenes/Home.ts
View file @ 342b649a
import {NetManager} from "../../libs/tw/manager/NetManager"; import { NetManager } from "../../libs/tw/manager/NetManager";
import {MainIns} from "./MainScene/MainScene"; import { MainIns } from "./MainScene/MainScene";
let HomeData = { let HomeData = {
gold: 0, // 欢趣豆 gold: 0, // 欢趣豆
...@@ -15,6 +15,8 @@ let HomeData = { ...@@ -15,6 +15,8 @@ let HomeData = {
sp_4: 0, // 牛奶 sp_4: 0, // 牛奶
sp_5: 0, // 土豆 sp_5: 0, // 土豆
sp_6: 0, // 核桃 sp_6: 0, // 核桃
sp_7: 0, //苹果
sp_8: 0, //木瓜
}, },
seed: { seed: {
sp_seed_1: 0, // 鸡 sp_seed_1: 0, // 鸡
...@@ -23,6 +25,8 @@ let HomeData = { ...@@ -23,6 +25,8 @@ let HomeData = {
sp_seed_4: 0, // 牛 sp_seed_4: 0, // 牛
sp_seed_5: 0, // 土豆 sp_seed_5: 0, // 土豆
sp_seed_6: 0, // 核桃 sp_seed_6: 0, // 核桃
sp_seed_7: 0, //苹果
sp_seed_8: 0, //木瓜
}, },
}; };
......
egret/src/Scenes/MainScene/Objs/Crop.ts
View file @ 342b649a
...@@ -14,6 +14,9 @@ import Event = egret.Event; ...@@ -14,6 +14,9 @@ import Event = egret.Event;
import TouchEvent = egret.TouchEvent; import TouchEvent = egret.TouchEvent;
import Ease = egret.Ease; import Ease = egret.Ease;
import Image = eui.Image; import Image = eui.Image;
import PanelCtrl from "../../../ctrls/panelCtrl";
import NoFeedPanel from "../../../Panels/NofeedPanel";
import NoWaterPanel from "../../../Panels/NoWaterPanel";
enum CROP_STATE { enum CROP_STATE {
NONE = 0, // 啥也没有 NONE = 0, // 啥也没有
...@@ -273,14 +276,24 @@ export default class Crop extends eui.Component { ...@@ -273,14 +276,24 @@ export default class Crop extends eui.Component {
let haveNum = G_GetHomeDataByKey(HOME.PROP)[petData[this.petId]['propId']]; let haveNum = G_GetHomeDataByKey(HOME.PROP)[petData[this.petId]['propId']];
if (feedNum > haveNum) { if (feedNum > haveNum) {
this.touchEnable(true); this.touchEnable(true);
let msg = ((petData[this.petId]['propId'] == 'sp_food_1') ? '饲料' : '水壶') + '不够了，快去做任务吧'; // let msg = ((petData[this.petId]['propId'] == 'sp_food_1') ? '饲料' : '水壶') + '不够了，快去做任务吧';
showToast(msg); // showToast(msg);
if(petData[this.petId]['propId'] == 'sp_food_1'){
PanelCtrl.instance.show(NoFeedPanel);
}else{
PanelCtrl.instance.show(NoWaterPanel)
}
} else { } else {
this.touchEnabled = false; this.touchEnabled = false;
NetManager.ins.doFeed(async (success) => { NetManager.ins.doFeed(async (success) => {
if (!success) { if (!success) {
let msg = ((petData[this.petId]['propId'] == 'sp_food_1') ? '饲料' : '水壶') + '不够了，快去做任务吧'; // let msg = ((petData[this.petId]['propId'] == 'sp_food_1') ? '饲料' : '水壶') + '不够了，快去做任务吧';
showToast(msg); // showToast(msg);
if(petData[this.petId]['propId'] == 'sp_food_1'){
PanelCtrl.instance.show(NoFeedPanel);
}else{
PanelCtrl.instance.show(NoWaterPanel)
}
this.touchEnable(true); this.touchEnable(true);
return; return;
} }
......
mock/joyousManor/consumerInfo.json
View file @ 342b649a
{ {
"code": null, "code": null,
"data": { "data": {
"popup": false, "popup": true,
"ifLogin": false, "ifLogin": false,
"newUser": false, "newUser": true,
"nickname": "4l60053306590_", "nickname": "4l60053306590_",
"loginPresent": { "loginPresent": {
"sp_food_2": 2 "sp_food_2": 2
......
mock/joyousManor/doFeed.json
View file @ 342b649a
{ {
"success": true, "success": false,
"message": "", "message": "",
"code": "", "code": "",
"data": null "data": null
......
mock/joyousManor/getLandInfo.json
View file @ 342b649a
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
"id": 2, "id": 2,
"level": 2, "level": 2,
"petId": 0, "petId": 0,
"lock": false "lock": true
}, },
{ {
"canFeed": true, "canFeed": false,
"canGather": false, "canGather": true,
"feedLeftSeconds": 10000, "feedLeftSeconds": 10000,
"feedNum": 30, "feedNum": 30,
"id": 3, "id": 3,
......
mock/joyousManor/priceInfo.json
View file @ 342b649a
...@@ -6,8 +6,10 @@ ...@@ -6,8 +6,10 @@
"sp_1": 50, "sp_1": 50,
"sp_2": 20, "sp_2": 20,
"sp_3": 10, "sp_3": 10,
"sp_4": 5, "sp_4": 0,
"sp_5": 5, "sp_5": 5,
"sp_6": 5 "sp_6": 5,
"sp_7": 90,
"sp_8": 30
} }
} }
\ No newline at end of file
mock/projectX/getUserSpList.json
View file @ 342b649a
...@@ -9,9 +9,11 @@ ...@@ -9,9 +9,11 @@
"sp_3": 6, "sp_3": 6,
"sp_seed_4": 0, "sp_seed_4": 0,
"sp_2": 60, "sp_2": 60,
"sp_5": 5, "sp_5": 10,
"sp_seed_6": 2, "sp_seed_6": 2,
"sp_4": 20, "sp_4": 20,
"sp_7": 1,
"sp_8": 30,
"sp_seed_1": 2, "sp_seed_1": 2,
"sp_achv_advanced_farmer": 0, "sp_achv_advanced_farmer": 0,
"sp_task_1": 0, "sp_task_1": 0,
......
测试.html
View file @ 342b649a
...@@ -171,14 +171,14 @@ ...@@ -171,14 +171,14 @@
bid: 11, bid: 11,
}, },
3: { 3: {
icon: '消费 icon_png', icon: '欢趣竞猜 icon_png',
btnLabel: '去完成', btnLabel: '去完成',
label: '访问e趣竞猜', label: '访问e趣竞猜',
link: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/p4f90ce5d/index.html?appID=66480', link: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/p4f90ce5d/index.html?appID=66480',
bid: 12, bid: 12,
}, },
4: { 4: {
icon: '生活日 icon_png', icon: '趣赶集 icon_png',
btnLabel: '去完成', btnLabel: '去完成',
label: '访问趣赶集', label: '访问趣赶集',
link: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/pa14d7c75/index.html?appID=66480', link: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/pa14d7c75/index.html?appID=66480',
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
bid: 14, bid: 14,
}, },
6: { 6: {
icon: '消费任务_png', icon: '浏览积分商城任务_png',
btnLabel: '去浏览', btnLabel: '去浏览',
label: '浏览扶贫商城', label: '浏览扶贫商城',
linkId: 'HD0460200417375', // 扶贫商城 linkId: 'HD0460200417375', // 扶贫商城
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment