Skip to content

D
db-game-template
Commit 3eaabb61 authored by zhangjinzhou's avatar zhangjinzhou
Browse files
Options

0519修改

parent 3abb34d0
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 5 deletions
egret/resource/.DS_Store
View file @ 3eaabb61
No preview for this file type
egret/resource/TextureMerger/preload.tmproject
View file @ 3eaabb61
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/index_scene/planting/option/option_left.png","../assets/index_scene/planting/option/option_right.png","../assets/index_scene/planting/option/option_scrollbar.png","../assets/exchange_panel/ex_panda.png","../assets/exchange_panel/ex_buybtn.png","../assets/exchange_panel/ex_close.png","../assets/index_scene/hotballoon.png","../assets/index_scene/ui/道具数量框.png","../assets/index_scene/ui/光线.png","../assets/index_scene/ui/水_半.png","../assets/index_scene/ui/水_空.png","../assets/index_scene/ui/水_满.png","../assets/index_scene/ui/饲料_半.png","../assets/index_scene/ui/饲料_空.png","../assets/index_scene/ui/饲料_满.png","../assets/exchanged_panel/roalightimg.png","../assets/exchanged_panel/closebtn.png","../assets/exchanged_panel/exd_fail_bg.png","../assets/exchanged_panel/iknowbtn.png","../assets/exchanged_panel/lightdotimg.png","../assets/exchanged_panel/roalightbg.png","../assets/exchange/奖品1.png","../assets/exchange/我要兑换按钮.png","../assets/exchange/奖品1.png","../assets/exchange/我要兑换按钮.png","../assets/exchange_panel/ex_buybtn.png","../assets/exchange_panel/ex_close.png","../assets/exchange_panel/ex_panda.png","../assets/exchanged_panel/closebtn.png","../assets/exchanged_panel/exd_fail_bg.png","../assets/exchanged_panel/iknowbtn.png","../assets/exchanged_panel/lightdotimg.png","../assets/exchanged_panel/roalightbg.png","../assets/exchanged_panel/roalightimg.png","../assets/index_scene/hotballoon.png","../assets/index_scene/planting/option/option_left.png","../assets/index_scene/planting/option/option_right.png","../assets/index_scene/planting/option/option_scrollbar.png","../assets/rule_panel/规则背景.png","../assets/rule_panel/规则关闭.png","../assets/introduce_panel/introduce_bg_new.png","../assets/introduce_panel/introduce_btn_close.png","../assets/introduce_panel/introduce_btn_new.png","../assets/shop/shopPanel_close.png","../assets/shop/shop_btn_-.png","../assets/shop/shop_btn_+.png","../assets/shop/shop_item_bg_big.png","../assets/shop/shop_item_cntBg.png","../assets/common/prop_apple.png","../assets/common/prop_papaya.png","../assets/shop/shopBuy_close_btn.png","../assets/warehouse_panel/warehouse_close_btn.png","../assets/warehouse_panel/papaya_bg.png","../assets/warehouse_panel/apple_bg.png","../assets/warehouse_panel/sell_panel/sellOutLine.png","../assets/warehouse_panel/sell_panel/sell_+_en.png","../assets/warehouse_panel/sell_panel/sell_-_en.png","../assets/task_panel/task_close_btn.png","../assets/task_panel/task_brn_bg_dis.png","../assets/task_panel/欢趣竞猜 icon.png","../assets/task_panel/趣赶集 icon.png","../assets/newUser_panel/newUserCloseBtn.png","../assets/noFeed_panel/noFeed_bg.png","../assets/noFeed_panel/noFeed_sr_btn.png","../assets/noWater_panel/noWater_btn.png","../assets/noWater_panel/noWater_bg.png","../assets/oldUser_panel/oldUserClose.png","../assets/warehouse_panel/sell_panel/sellTitle_apple.png","../assets/warehouse_panel/sell_panel/sellTitle_papaya.png","../assets/introduce_panel/introduce_apple.png","../assets/introduce_panel/introduce_papaya.png","../assets/index_scene/横幅.png","../assets/index_scene/index_liba.png","../assets/index_scene/进度条_ed.png","../assets/gameGroup_panel/gameGroup_close.png","../assets/index_scene/planting/木瓜.png","../assets/index_scene/planting/苹果.png","../assets/task_panel/饲料_new.png","../assets/task_panel/浇水_new.png","../assets/index_scene/小E阴影.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/index_scene/planting/option/option_left.png","../assets/index_scene/planting/option/option_right.png","../assets/index_scene/planting/option/option_scrollbar.png","../assets/exchange_panel/ex_panda.png","../assets/exchange_panel/ex_buybtn.png","../assets/exchange_panel/ex_close.png","../assets/index_scene/hotballoon.png","../assets/index_scene/ui/道具数量框.png","../assets/index_scene/ui/光线.png","../assets/index_scene/ui/水_半.png","../assets/index_scene/ui/水_空.png","../assets/index_scene/ui/水_满.png","../assets/index_scene/ui/饲料_半.png","../assets/index_scene/ui/饲料_空.png","../assets/index_scene/ui/饲料_满.png","../assets/exchanged_panel/roalightimg.png","../assets/exchanged_panel/closebtn.png","../assets/exchanged_panel/exd_fail_bg.png","../assets/exchanged_panel/iknowbtn.png","../assets/exchanged_panel/lightdotimg.png","../assets/exchanged_panel/roalightbg.png","../assets/exchange/奖品1.png","../assets/exchange/我要兑换按钮.png","../assets/exchange/奖品1.png","../assets/exchange/我要兑换按钮.png","../assets/exchange_panel/ex_buybtn.png","../assets/exchange_panel/ex_close.png","../assets/exchange_panel/ex_panda.png","../assets/exchanged_panel/closebtn.png","../assets/exchanged_panel/exd_fail_bg.png","../assets/exchanged_panel/iknowbtn.png","../assets/exchanged_panel/lightdotimg.png","../assets/exchanged_panel/roalightbg.png","../assets/exchanged_panel/roalightimg.png","../assets/index_scene/hotballoon.png","../assets/index_scene/planting/option/option_left.png","../assets/index_scene/planting/option/option_right.png","../assets/index_scene/planting/option/option_scrollbar.png","../assets/rule_panel/规则背景.png","../assets/rule_panel/规则关闭.png","../assets/introduce_panel/introduce_bg_new.png","../assets/introduce_panel/introduce_btn_close.png","../assets/introduce_panel/introduce_btn_new.png","../assets/shop/shopPanel_close.png","../assets/shop/shop_btn_-.png","../assets/shop/shop_btn_+.png","../assets/shop/shop_item_bg_big.png","../assets/shop/shop_item_cntBg.png","../assets/common/prop_apple.png","../assets/common/prop_papaya.png","../assets/shop/shopBuy_close_btn.png","../assets/warehouse_panel/warehouse_close_btn.png","../assets/warehouse_panel/papaya_bg.png","../assets/warehouse_panel/apple_bg.png","../assets/warehouse_panel/sell_panel/sellOutLine.png","../assets/warehouse_panel/sell_panel/sell_+_en.png","../assets/warehouse_panel/sell_panel/sell_-_en.png","../assets/task_panel/task_close_btn.png","../assets/task_panel/task_brn_bg_dis.png","../assets/task_panel/欢趣竞猜 icon.png","../assets/task_panel/趣赶集 icon.png","../assets/newUser_panel/newUserCloseBtn.png","../assets/noFeed_panel/noFeed_bg.png","../assets/noFeed_panel/noFeed_sr_btn.png","../assets/noWater_panel/noWater_btn.png","../assets/noWater_panel/noWater_bg.png","../assets/oldUser_panel/oldUserClose.png","../assets/warehouse_panel/sell_panel/sellTitle_apple.png","../assets/warehouse_panel/sell_panel/sellTitle_papaya.png","../assets/introduce_panel/introduce_apple.png","../assets/introduce_panel/introduce_papaya.png","../assets/index_scene/横幅.png","../assets/index_scene/index_liba.png","../assets/index_scene/进度条_ed.png","../assets/gameGroup_panel/gameGroup_close.png","../assets/index_scene/planting/木瓜.png","../assets/index_scene/planting/苹果.png","../assets/task_panel/饲料_new.png","../assets/task_panel/浇水_new.png","../assets/index_scene/小E阴影.png","../assets/shop/newjbimg.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/default.res.json
View file @ 3eaabb61
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
"name": "shop" "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,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,introduce_apple_png,introduce_papaya_png,横幅_png,index_liba_png,进度条_ed_png,gameGroup_close_png,木瓜_png,苹果_png,饲料_new_png,浇水_new_png,小E阴影_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,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,introduce_apple_png,introduce_papaya_png,横幅_png,index_liba_png,进度条_ed_png,gameGroup_close_png,木瓜_png,苹果_png,饲料_new_png,浇水_new_png,小E阴影_png,newjbimg_png",
"name": "preload" "name": "preload"
} }
], ],
...@@ -1665,6 +1665,11 @@ ...@@ -1665,6 +1665,11 @@
"name": "小E阴影_png", "name": "小E阴影_png",
"type": "image", "type": "image",
"url": "assets/index_scene/小E阴影.png" "url": "assets/index_scene/小E阴影.png"
},
{
"name": "newjbimg_png",
"type": "image",
"url": "assets/shop/newjbimg.png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/ExchangeSceneSkin.exml
View file @ 3eaabb61
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
</e:List> </e:List>
</e:Group> </e:Group>
</e:Scroller> </e:Scroller>
<e:Image id="leftBtn" source="option_left_png" y="85" scaleX="1" scaleY="1" x="-28"/>
<e:Image id="rightBtn" source="option_right_png" y="85" x="514"/>
</e:Group> </e:Group>
<e:Image id="recordBtn" source="兑换记录_png" verticalCenter="-458.5" horizontalCenter="-272"/> <e:Image id="recordBtn" source="兑换记录_png" verticalCenter="-458.5" horizontalCenter="-272"/>
<e:Image source="前景_png" touchEnabled="false" scaleX="1" scaleY="1" y="662" horizontalCenter="0" locked="true"/> <e:Image source="前景_png" touchEnabled="false" scaleX="1" scaleY="1" y="662" horizontalCenter="0" locked="true"/>
......
egret/resource/skins/ShopItemSkin.exml
View file @ 3eaabb61
...@@ -40,5 +40,5 @@ ...@@ -40,5 +40,5 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image id="tipImg" source="itemTip_png" x="23" y="14.25"/> <e:Image id="tipImg" x="29" y="17.25" source="newjbimg_png"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/Panels/ShopPanel.ts
View file @ 3eaabb61
...@@ -283,7 +283,10 @@ class ShopItem extends Component { ...@@ -283,7 +283,10 @@ class ShopItem extends Component {
this.img.source = `prop_${data.key}_png`; this.img.source = `prop_${data.key}_png`;
// chicken wheat // chicken wheat
// this.tipImg.visible = (data.key == 'chicken' || data.key == 'wheat'); // this.tipImg.visible = (data.key == 'chicken' || data.key == 'wheat');
this.tipImg.visible = false//(data.key == 'wheat'); let showtiparr = ["apple","papaya","corn","wheat","cattle"]
let showtip = showtiparr.indexOf(data.key)!=-1;
console.error("shotip==>",showtip,data.key);
this.tipImg.visible = showtip//(data.key == 'wheat');
this.nameTxt.text = data.name; this.nameTxt.text = data.name;
this.tipTxt.text = `购买价格：${data.price}欢趣豆`; this.tipTxt.text = `购买价格：${data.price}欢趣豆`;
this.setNum(0); this.setNum(0);
......
egret/src/Scenes/ExchangeScene/ExchangeScene.ts
View file @ 3eaabb61
...@@ -21,6 +21,10 @@ export default class ExchangeScene extends Scene { ...@@ -21,6 +21,10 @@ export default class ExchangeScene extends Scene {
public none: eui.Group; public none: eui.Group;
public have: eui.Scroller; public have: eui.Scroller;
public list: eui.List; public list: eui.List;
leftBtn:eui.Image;
rightBtn:eui.Image;
private prizeData = {}; private prizeData = {};
private canShow: boolean = true; private canShow: boolean = true;
...@@ -60,6 +64,8 @@ export default class ExchangeScene extends Scene { ...@@ -60,6 +64,8 @@ export default class ExchangeScene extends Scene {
return super.getTapEvts().concat([ return super.getTapEvts().concat([
[this.backBtn, this.onTouchTap, this], [this.backBtn, this.onTouchTap, this],
[this.recordBtn, this.onTouchTap, this], [this.recordBtn, this.onTouchTap, this],
[this.leftBtn, this.onTouchTap, this],
[this.rightBtn, this.onTouchTap, this],
]); ]);
} }
...@@ -84,7 +90,18 @@ export default class ExchangeScene extends Scene { ...@@ -84,7 +90,18 @@ export default class ExchangeScene extends Scene {
window.location.href = window['record']; window.location.href = window['record'];
}); });
break; break;
case this.leftBtn:
var contentWidth = this.have.viewport.contentWidth;
var toscrollh = this.have.viewport.scrollH - 170;
if (toscrollh < 0) toscrollh = 0;
this.have.viewport.scrollH = 0;
break;
case this.rightBtn:
var contentWidth = this.have.viewport.contentWidth;
var toscrollh = this.have.viewport.scrollH + 170;
if (toscrollh > contentWidth - 541) toscrollh = contentWidth - 541;
this.have.viewport.scrollH = contentWidth - 541;
break;
default: default:
break; break;
} }
...@@ -102,6 +119,10 @@ export default class ExchangeScene extends Scene { ...@@ -102,6 +119,10 @@ export default class ExchangeScene extends Scene {
} }
this.none.visible = (_d.length <= 0); this.none.visible = (_d.length <= 0);
this.have.visible = !(_d.length <= 0); this.have.visible = !(_d.length <= 0);
this.leftBtn.visible = !(_d.length <= 0);
this.rightBtn.visible = !(_d.length <= 0);
this.list.useVirtualLayout = false; this.list.useVirtualLayout = false;
this.list.itemRenderer = ExchangeItem; this.list.itemRenderer = ExchangeItem;
this.list.dataProvider = new eui.ArrayCollection(_d); this.list.dataProvider = new eui.ArrayCollection(_d);
......
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