Skip to content

D
db-game-template
Commit 020f1fd2 authored by 邱旭's avatar 邱旭
Browse files
Options

联调，测试，修几个bug

parent dbcba83e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 395 additions and 295 deletions
.idea/workspace.xml
View file @ 020f1fd2
This diff is collapsed.
egret/index.html
View file @ 020f1fd2
......@@ -95,6 +95,11 @@
},
};
window['gameGroupLink'] = {
dxq: 'https://www.baidu.com/',
xxl: 'https://www.baidu.com/',
}
window['marketLink'] = 'https://gonghang.activity-1.m.duiba.com.cn/hdtool/index?id=3737984&dbnewopen';
window['record'] = 'ff0a36885.html';
......
egret/libs/tw/manager/NetManager.ts
View file @ 020f1fd2
......@@ -1538,17 +1538,17 @@ export class NetManager extends ABNetManager {
/**
* 解锁土地
* @param callback
* @param tickNum
* @param ticketNum
* @param landId
*/
public unlockLand(callback: Function, tickNum, landId) {
public unlockLand(callback: Function, ticketNum, landId) {
const net: INetData = {
name: NetName.UNLOCK_LAND,
uri: '/projectx/{projectId}/area/join.do',
type: 'post',
dataType: 'json',
param: {
tickNum,
ticketNum,
landId
},
callback: callback
......@@ -1576,6 +1576,7 @@ export class NetManager extends ABNetManager {
/**
* 用户去玩游戏合集里的游戏，发接口告诉后端打一个标记，用于后端发奖
* @param callback
* @param activity
*/
public gameGroupMark(callback: Function, activity) {
const net: INetData = {
......
egret/resource/TextureMerger/common.tmproject
View file @ 020f1fd2
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/closeBtn.png","../assets/common/light1.png","../assets/common/light.png","../assets/common/swap_light.png","../assets/common/common_-_en.png","../assets/common/common_+_en.png","../assets/common/common_+_dis.png","../assets/common/common_-_dis.png","../assets/common/prop_water.png","../assets/common/prop_speed.png","../assets/common/prop_food.png","../assets/common/prop_cattle.png","../assets/common/prop_wheat.png","../assets/common/prop_chicken.png","../assets/common/prop_corn.png","../assets/common/prop_potato.png","../assets/common/prop_walnut.png","../assets/common/medal_sp_achv_advanced_farmer_dis.png","../assets/common/medal_sp_achv_advanced_farmer.png","../assets/common/medal_sp_achv_internship_farmer.png","../assets/common/medal_sp_achv_internship_farmer_dis.png","../assets/common/medal_sp_achv_excellent_farmer_dis.png","../assets/common/medal_sp_achv_excellent_farmer.png","../assets/common/medal_sp_achv_well_breeder_dis.png","../assets/common/medal_sp_achv_well_breeder.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/closeBtn.png","../assets/common/light1.png","../assets/common/light.png","../assets/common/swap_light.png","../assets/common/common_-_en.png","../assets/common/common_+_en.png","../assets/common/common_+_dis.png","../assets/common/common_-_dis.png","../assets/common/prop_water.png","../assets/common/prop_speed.png","../assets/common/prop_food.png","../assets/common/prop_cattle.png","../assets/common/prop_wheat.png","../assets/common/prop_chicken.png","../assets/common/prop_corn.png","../assets/common/prop_potato.png","../assets/common/prop_walnut.png","../assets/common/medal_achv_advanced_farmer_0.png","../assets/common/medal_achv_advanced_farmer.png","../assets/common/medal_achv_excellent_farmer_0.png","../assets/common/medal_achv_internship_farmer_0.png","../assets/common/medal_achv_excellent_farmer.png","../assets/common/medal_achv_internship_farmer.png","../assets/common/medal_achv_well_breeder_0.png","../assets/common/medal_achv_well_breeder.png"]}
\ No newline at end of file
egret/resource/TextureMerger/index_scene.tmproject deleted 100644 → 0
View file @ dbcba83e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"index_scene","version":5,"files":["../assets/index_scene/index_bg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/index_ui.tmproject deleted 100644 → 0
View file @ dbcba83e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"index_ui","version":5,"files":["../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/index_scene/ui/勋章.png","../assets/index_scene/ui/头像面板.png","../assets/index_scene/ui/加速卡.png","../assets/index_scene/ui/仓库_btn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/medals.tmproject
View file @ 020f1fd2
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"medals","version":5,"files":["../assets/medals_panel/medals_bg.png","../assets/room/room_sp_achv_1.png","../assets/room/room_sp_achv_2.png","../assets/medals_panel/medals_swap_light.png","../assets/medals_panel/下拉查看更多.png","../assets/medals_panel/medal_wait_dis.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"medals","version":5,"files":["../assets/medals_panel/medals_bg.png","../assets/room/room_sp_achv_1.png","../assets/room/room_sp_achv_2.png","../assets/medals_panel/medals_swap_light.png","../assets/medals_panel/下拉查看更多.png","../assets/medals_panel/medal_wait_0.png"]}
\ No newline at end of file
egret/resource/TextureMerger/shop_buy.tmproject deleted 100644 → 0
View file @ dbcba83e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop_buy","version":5,"files":["../assets/shop/shop_buy/shop_bug_bg.png","../assets/shop/shop_buy/shop_buy_btn.png","../assets/shop/shop_buy/shop_buy_food.png","../assets/shop/shop_buy/shop_buy_speed.png","../assets/shop/shop_buy/shop_buy_water.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ 020f1fd2
......@@ -5,7 +5,7 @@
"name": "loading"
},
{
"keys": "closeBtn_png,light1_png,light_png,swap_light_png,common_-_en_png,common_+_en_png,common_+_dis_png,common_-_dis_png,prop_water_png,prop_speed_png,prop_food_png,prop_cattle_png,prop_wheat_png,prop_chicken_png,prop_corn_png,prop_potato_png,prop_walnut_png,medal_sp_achv_advanced_farmer_dis_png,medal_sp_achv_advanced_farmer_png,medal_sp_achv_internship_farmer_png,medal_sp_achv_internship_farmer_dis_png,medal_sp_achv_excellent_farmer_dis_png,medal_sp_achv_excellent_farmer_png,medal_sp_achv_well_breeder_dis_png,medal_sp_achv_well_breeder_png",
"keys": "closeBtn_png,light1_png,light_png,swap_light_png,common_-_en_png,common_+_en_png,common_+_dis_png,common_-_dis_png,prop_water_png,prop_speed_png,prop_food_png,prop_cattle_png,prop_wheat_png,prop_chicken_png,prop_corn_png,prop_potato_png,prop_walnut_png,medal_achv_advanced_farmer_0_png,medal_achv_advanced_farmer_png,medal_achv_excellent_farmer_0_png,medal_achv_internship_farmer_0_png,medal_achv_excellent_farmer_png,medal_achv_internship_farmer_png,medal_achv_well_breeder_0_png,medal_achv_well_breeder_png",
"name": "common"
},
{
......@@ -53,7 +53,7 @@
"name": "room"
},
{
"keys": "medals_bg_png,room_sp_achv_1_png,room_sp_achv_2_png,medals_swap_light_png,下拉查看更多_png,medal_wait_dis_png",
"keys": "medals_bg_png,room_sp_achv_1_png,room_sp_achv_2_png,medals_swap_light_png,下拉查看更多_png,medal_wait_0_png",
"name": "medals"
},
{
......@@ -1148,104 +1148,104 @@
"name": "light_point_png"
},
{
"url": "assets/common/medal_sp_achv_advanced_farmer_dis.png",
"url": "assets/guide/guide_cancel.png",
"type": "image",
"name": "medal_sp_achv_advanced_farmer_dis_png"
"name": "guide_cancel_png"
},
{
"url": "assets/common/medal_sp_achv_advanced_farmer.png",
"url": "assets/shop/shopBuy_bg.png",
"type": "image",
"name": "medal_sp_achv_advanced_farmer_png"
"name": "shopBuy_bg_png"
},
{
"url": "assets/common/medal_sp_achv_internship_farmer.png",
"url": "assets/shop/shopBuy_btn.png",
"type": "image",
"name": "medal_sp_achv_internship_farmer_png"
"name": "shopBuy_btn_png"
},
{
"url": "assets/common/medal_sp_achv_excellent_farmer_dis.png",
"url": "assets/shop/shop_prop_none.png",
"type": "image",
"name": "medal_sp_achv_excellent_farmer_dis_png"
"name": "shop_prop_none_png"
},
{
"url": "assets/common/medal_sp_achv_internship_farmer_dis.png",
"url": "assets/shop/shop_prop_done.png",
"type": "image",
"name": "medal_sp_achv_internship_farmer_dis_png"
"name": "shop_prop_done_png"
},
{
"url": "assets/common/medal_sp_achv_excellent_farmer.png",
"url": "assets/shop/shop_prop_buy.png",
"type": "image",
"name": "medal_sp_achv_excellent_farmer_png"
"name": "shop_prop_buy_png"
},
{
"url": "assets/common/medal_sp_achv_well_breeder.png",
"url": "assets/shop/shopBuy_btn1.png",
"type": "image",
"name": "medal_sp_achv_well_breeder_png"
"name": "shopBuy_btn1_png"
},
{
"url": "assets/common/medal_sp_achv_well_breeder_dis.png",
"url": "assets/index_scene/xiaoE/xiaoETip_miss.png",
"type": "image",
"name": "medal_sp_achv_well_breeder_dis_png"
"name": "xiaoETip_miss_png"
},
{
"url": "assets/medals_panel/medal_wait_dis.png",
"url": "assets/index_scene/xiaoE/xiaoETip_get.png",
"type": "image",
"name": "medal_wait_dis_png"
"name": "xiaoETip_get_png"
},
{
"url": "assets/guide/guide_cancel.png",
"url": "assets/index_scene/xiaoE/xiaoETip_plant.png",
"type": "image",
"name": "guide_cancel_png"
"name": "xiaoETip_plant_png"
},
{
"url": "assets/shop/shopBuy_bg.png",
"url": "assets/index_scene/xiaoE/xiaoETip_whooo.png",
"type": "image",
"name": "shopBuy_bg_png"
"name": "xiaoETip_whooo_png"
},
{
"url": "assets/shop/shopBuy_btn.png",
"url": "assets/common/medal_achv_advanced_farmer_0.png",
"type": "image",
"name": "shopBuy_btn_png"
"name": "medal_achv_advanced_farmer_0_png"
},
{
"url": "assets/shop/shop_prop_none.png",
"url": "assets/common/medal_achv_advanced_farmer.png",
"type": "image",
"name": "shop_prop_none_png"
"name": "medal_achv_advanced_farmer_png"
},
{
"url": "assets/shop/shop_prop_done.png",
"url": "assets/common/medal_achv_excellent_farmer_0.png",
"type": "image",
"name": "shop_prop_done_png"
"name": "medal_achv_excellent_farmer_0_png"
},
{
"url": "assets/shop/shop_prop_buy.png",
"url": "assets/common/medal_achv_internship_farmer_0.png",
"type": "image",
"name": "shop_prop_buy_png"
"name": "medal_achv_internship_farmer_0_png"
},
{
"url": "assets/shop/shopBuy_btn1.png",
"url": "assets/common/medal_achv_excellent_farmer.png",
"type": "image",
"name": "shopBuy_btn1_png"
"name": "medal_achv_excellent_farmer_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_miss.png",
"url": "assets/common/medal_achv_internship_farmer.png",
"type": "image",
"name": "xiaoETip_miss_png"
"name": "medal_achv_internship_farmer_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_get.png",
"url": "assets/common/medal_achv_well_breeder_0.png",
"type": "image",
"name": "xiaoETip_get_png"
"name": "medal_achv_well_breeder_0_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_plant.png",
"url": "assets/common/medal_achv_well_breeder.png",
"type": "image",
"name": "xiaoETip_plant_png"
"name": "medal_achv_well_breeder_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_whooo.png",
"url": "assets/medals_panel/medal_wait_0.png",
"type": "image",
"name": "xiaoETip_whooo_png"
"name": "medal_wait_0_png"
}
]
}
\ No newline at end of file
egret/resource/skins/MainSceneSkin.exml
View file @ 020f1fd2
......@@ -10,17 +10,25 @@
<e:Group id="xiaoEGroup" x="30" anchorOffsetX="0" anchorOffsetY="0" verticalCenter="-148" visible="false">
<e:Image source="xiaoETip_bg_png" x="0" y="0"/>
<e:Label text="哈喽小主人，你想了解哪些内容？" x="26" y="20" textColor="0x785332" size="24" bold="true"/>
<e:Scroller width="390" height="160" x="26" y="60">
<e:Scroller top="60" right="21" left="26" height="160">
<e:Group>
<e:List id="xiaoEGroupList" top="0" right="0" left="0" bottom="0"/>
<e:List id="xiaoEGroupList" top="0" right="0" left="0">
<e:layout>
<e:VerticalLayout/>
</e:layout>
</e:List>
</e:Group>
</e:Scroller>
</e:Group>
<e:Group id="xiaoEAnswer" x="30" anchorOffsetX="0" anchorOffsetY="0" touchChildren="false" verticalCenter="-148" visible="false">
<e:Group id="xiaoEAnswer" x="30" anchorOffsetX="0" anchorOffsetY="0" touchChildren="true" verticalCenter="-148" visible="false">
<e:Image source="xiaoETip_bg_png" x="0" y="0"/>
<e:Label id="answerTitle" text="哈喽小主人，你想了解哪些内容？" x="26" y="20" size="24" bold="true" textColor="0x785332"/>
<e:Label id="answerTxt" text="" x="26" y="55" size="20" bold="true" anchorOffsetX="0" width="386" anchorOffsetY="0" height="132" textColor="0xe06200" verticalAlign="justify"/>
<e:Label text="我知道了&gt;" x="315" y="197" size="22" bold="true" anchorOffsetX="0" anchorOffsetY="0" textColor="0x785332"/>
<e:Scroller width="386" height="138" x="26" y="52">
<e:Group>
<e:Label id="answerTxt" text="" y="3" size="20" bold="true" anchorOffsetX="0" anchorOffsetY="0" textColor="0xe06200" verticalAlign="justify" scaleX="1" scaleY="1" left="0" right="0" lineSpacing="10"/>
</e:Group>
</e:Scroller>
<e:Label id="xiaoEIKnow" text="我知道了&gt;" x="315" y="200.04" size="22" bold="true" anchorOffsetX="0" anchorOffsetY="0" textColor="0x785332"/>
</e:Group>
<e:Image id="xiaoE" x="24" source="小E_png" verticalCenter="62.5"/>
<e:Group id="xiaoETip" x="30" anchorOffsetX="0" anchorOffsetY="0" touchChildren="false" verticalCenter="-80" visible="false">
......
egret/resource/skins/MedalPanelSkin.exml
View file @ 020f1fd2
......@@ -13,7 +13,7 @@
<e:Label id="date" text="恭喜你获得一个勋章" y="710" size="30" textColor="0xFFE6A4" horizontalCenter="0"/>
<e:Image id="light_point" verticalCenter="-14" touchEnabled="false" horizontalCenter="1" source="light_point_png"/>
<e:Image id="light" source="medal_light_png" touchEnabled="false" horizontalCenter="0" verticalCenter="0"/>
<e:Image id="medal" source="medal_sp_achv_internship_farmer_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image id="mask" source="medal_sp_achv_internship_farmer_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image id="medal" horizontalCenter="0" verticalCenter="0" source="medal_achv_excellent_farmer_png"/>
<e:Image id="mask" horizontalCenter="0" verticalCenter="0" source="medal_achv_excellent_farmer_png"/>
<e:Image id="swap_light" x="50" y="200" source="swap_light_png" scaleX="1.5" scaleY="2"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/Objs/OptionPanelSkin.exml
View file @ 020f1fd2
......@@ -5,12 +5,6 @@
<e:Image id="cattleBtn" source="option_cattle_png" anchorOffsetX="48.5" anchorOffsetY="58.5" x="298" bottom="235"/>
<e:Image id="cornBtn" source="option_corn_png" x="460" anchorOffsetX="47.5" anchorOffsetY="65" bottom="235"/>
<e:Image id="wheatBtn" source="option_wheat_png" anchorOffsetX="43" anchorOffsetY="59" x="114" bottom="55"/>
<e:Group id="walnutBtn" x="405.5" y="231" anchorOffsetY="0" height="119" touchChildren="false">
<e:Image anchorOffsetX="43" anchorOffsetY="59" source="option_walnut_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image source="免费邮寄到家_png" x="0" y="-37"/>
</e:Group>
<e:Group id="potatoBtn" x="245.5" y="234" anchorOffsetY="0" height="113" touchChildren="false">
<e:Image source="免费邮寄到家_png" y="-40" horizontalCenter="0"/>
<e:Image anchorOffsetX="43" anchorOffsetY="59" source="option_potato_png" horizontalCenter="0" verticalCenter="0"/>
</e:Group>
<e:Image id="walnutBtn" anchorOffsetX="43" anchorOffsetY="59" source="option_walnut_png" horizontalCenter="155" verticalCenter="89"/>
<e:Image id="potatoBtn" anchorOffsetX="43" anchorOffsetY="59" source="option_potato_png" horizontalCenter="-4" verticalCenter="90"/>
</e:Skin>
\ No newline at end of file
egret/src/Main.ts
View file @ 020f1fd2
......@@ -39,7 +39,7 @@ class Main extends eui.UILayer {
DataManager.ins.petIndexData.update(window['CFG']);
layers.init(this);
Loading.init(layers.topLayer);
Loading.init(layers.loadingLayer);
PanelCtrl.instance.init(layers.popupLayer);
SceneCtrl.instance.init(layers.sceneLayer);
TopLayerCtrl.instance.init(layers.topLayer);
......@@ -93,8 +93,8 @@ class Main extends eui.UILayer {
initstatistics(); // 页面停留时长（接口）
docEvent(); // document事件（显示，隐藏，重载）
NetManager.ins.getRule((success, res) => {
});
// NetManager.ins.getRule((success, res) => {
// });
this.addChild(new Bar()).y = -2;
......
egret/src/Panels/GameGroupPanel.ts
View file @ 020f1fd2
......@@ -39,21 +39,23 @@ export default class GameGroupPanel extends Panel {
}
private onTap(e) {
let k = 'dxq';
switch (e.target) {
case this.planeBtn:
NetManager.ins.clickLog(getlogItem(16));
NetManager.ins.gameGroupMark(() => {
GDispatcher.addEvent('docVisible', this.back, this);
}, 'dxq');
k = 'dxq';
break;
case this.clearBtn:
NetManager.ins.clickLog(getlogItem(17));
NetManager.ins.gameGroupMark(() => {
GDispatcher.addEvent('docVisible', this.back, this);
}, 'xxl');
k = 'xxl';
break;
}
NetManager.ins.gameGroupMark(() => {
GDispatcher.addEvent('docVisible', this.back, this);
window.location.href = window['gameGroupLink'][k];
}, k);
}
async back() {
......
egret/src/Panels/MedalPanel.ts
View file @ 020f1fd2
......@@ -5,19 +5,19 @@ import {getlogItem} from "../comm/getlogItem";
import TouchEvent = egret.TouchEvent;
export const medalDesc = {
sp_achv_internship_farmer: {
achv_internship_farmer: {
desc: '种植达到50次',
bid: 28,
},
sp_achv_advanced_farmer: {
achv_advanced_farmer: {
desc: '种植达到80次',
bid: 29,
},
sp_achv_well_breeder: {
achv_well_breeder: {
desc: '养殖奶牛和小鸡共计达50次',
bid: 30,
},
sp_achv_excellent_farmer: {
achv_excellent_farmer: {
desc: '种植达到200次',
bid: 31,
},
......@@ -69,7 +69,7 @@ export default class MedalPanel extends Panel {
private initUI(): void {
const {name, spId, date, status} = this.data;
const {name, spId, timestamp, status} = this.data;
this.title.text = name;
this.desc.text = medalDesc[spId].desc;
......@@ -79,7 +79,7 @@ export default class MedalPanel extends Panel {
// 旋转背景光
Tween.get(this.light, {loop: true}).to({rotation: 360}, 6000);
const d = new Date(date);
const d = new Date(timestamp);
this.date.text = `${d.getFullYear()}.${d.getMonth() + 1}.${d.getDate()}获得勋章`;
this.medal.source = `medal_${spId}_png`;
......@@ -105,7 +105,7 @@ export default class MedalPanel extends Panel {
this.swap_light.visible = false;
this.light_point.visible = false;
this.medal.source = `medal_${spId}_dis_png`;
this.medal.source = `medal_${spId}_0_png`;
}
......
egret/src/Panels/MedalsPanel.ts
View file @ 020f1fd2
......@@ -74,7 +74,7 @@ export default class MedalsPanel extends Panel {
for (let i = 0; i < 2; i++) {
const newMedal = new Medal({
index, spId: 'wait',
name: '敬请期待', date: 0, status: false,
name: '敬请期待', timestamp: 0, status: false,
total,
});
this.sGroup.addChild(newMedal);
......
egret/src/Panels/NewUserPanel.ts
View file @ 020f1fd2
import Panel from "../views/Panel";
import TouchEvent = egret.TouchEvent;
import {NetManager} from "../../libs/tw/manager/NetManager";
import {showToast} from "../comm/UtilsConst";
import {btnDelay, showToast} from "../comm/UtilsConst";
import {getToken} from "../Scenes/MainScene/Const";
import {G_UpdateHomeData} from "../Scenes/Home";
import {MainIns} from "../Scenes/MainScene/MainScene";
import {wait} from "../comm/GameConst";
import {getlogItem} from "../comm/getlogItem";
export default class NewUserPanel extends Panel {
public closeBtn: eui.Button;
......@@ -26,6 +27,8 @@ export default class NewUserPanel extends Panel {
protected start() {
super.start();
NetManager.ins.showLog(getlogItem(18));
}
public initEvents() {
......@@ -38,28 +41,15 @@ export default class NewUserPanel extends Panel {
this.btn.removeEventListener(TouchEvent.TOUCH_TAP, this.hidePanel, this);
}
public hidePanel() {
getToken().then((token) => {
if (!token) {
showToast('网络异常，请刷新页面重试');
return;
}
NetManager.ins.newUserPrize(async (res, success) => {
if (!success) {
showToast('网络异常，请稍后再试');
return;
}
public async hidePanel() {
super.hidePanel();
G_UpdateHomeData().then(() => {
MainIns().mainUI.setPropInfo();
});
btnDelay(this.btn);
btnDelay(this.closeBtn);
super.hidePanel();
NetManager.ins.clickLog(getlogItem(18));
await wait(500);
this.data.f();
}, token)
});
this.data.f();
}
}
egret/src/Panels/ShopBuyPanel.ts
View file @ 020f1fd2
import Panel from "../views/Panel";
import {MainDispatcher, MainIns} from "../Scenes/MainScene/MainScene";
import Tween = egret.Tween;
import {showToast} from "../comm/UtilsConst";
import {btnDelay, showToast} from "../comm/UtilsConst";
import {G_GetHomeDataByKey, HOME} from "../Scenes/Home";
import Loading from "../loading/Loading";
import {NetManager} from "../../libs/tw/manager/NetManager";
......@@ -52,13 +52,12 @@ export default class ShopBuyPanel extends Panel {
this.buyBtn1.addEventListener(egret.TouchEvent.TOUCH_TAP, this.buy, this);
}
private buy() {
private buy(e) {
if (G_GetHomeDataByKey(HOME.GOLD) < this.data.needGold) {
showToast('啊哦，欢趣豆不足，快去攒豆吧');
return;
}
Loading.instace.show();
Tools.creditsCost('join_7', 'join', this.data.needGold, '欢趣农场')
......@@ -98,8 +97,6 @@ export default class ShopBuyPanel extends Panel {
private initUI(): void {
this.y = 750 / window.innerWidth * window.innerHeight * 0.2;
}
destroy() {
......
egret/src/Panels/TaskToast.ts
View file @ 020f1fd2
......@@ -33,16 +33,24 @@ export default class TaskToast extends Panel {
protected start() {
super.start();
if (!this.data.food) {
this.data.food = 0;
}
if (!this.data.water) {
this.data.water = 0;
}
this.title.text = this.data.title;
this.foodLabel.text = "×" + this.data.food;
this.waterLabel.text = "×" + this.data.water;
if(this.data.food <= 0) {
if (this.data.food <= 0) {
this.foodGroup.visible = false;
this.waterGroup.x = 162;
}
if(this.data.water <= 0) {
if (this.data.water <= 0) {
this.waterGroup.visible = false;
this.foodGroup.x = 162;
}
......
egret/src/Panels/UnlockPanel.ts
View file @ 020f1fd2
......@@ -4,6 +4,7 @@ import {NetManager} from "../../libs/tw/manager/NetManager";
import {btnDelay, showToast} from "../comm/UtilsConst";
import {G_GetHomeDataByKey, G_UpdateHomeData, HOME} from "../Scenes/Home";
import {getlogItem} from "../comm/getlogItem";
import {MainIns} from "../Scenes/MainScene/MainScene";
export default class UnlockPanel extends Panel {
public closeBtn: eui.Image;
......@@ -51,12 +52,15 @@ export default class UnlockPanel extends Panel {
return;
}
Tools.creditsCost('area', 'dojoin', price).then((ticket) => {
Tools.creditsCost('area', 'join', price).then((ticket) => {
NetManager.ins.unlockLand((success) => {
if (!success) return;
// M_UpdateLand(landId); TODO 放到动画结束的地方
this.data.call();
MainIns().mainUI.getPropInfo();
}, ticket, landId);
}).catch(() => {
showToast('消耗欢趣豆失败，请稍后再试');
......
egret/src/Scenes/Home.ts
View file @ 020f1fd2
......@@ -36,41 +36,31 @@ export enum HOME {
/**
* 刷新拥有的产物，使用数据之前要刷新，如打开仓库、打开商店
*/
export const G_UpdateHomeData = function () {
const updateGold = new Promise((resolve) => {
export const G_UpdateHomeData = async function () {
return new Promise((resolve) => {
NetManager.ins.getProjectUserInfo((success, res) => {
if (!success) {
resolve();
return;
}
G_SetHomeDataByKey(HOME.GOLD, res.data.consumerCredits);
resolve();
});
});
const updateSp = new Promise((resolve, reject) => {
NetManager.ins.queryUserSpList((success, res) => {
if (!success) {
NetManager.ins.queryUserSpList((success, res) => {
if (!success) {
resolve();
return;
}
for (const k in HomeData.prop) {
HomeData.prop[k] = res.data[k] || 0;
}
for (const k in HomeData.product) {
HomeData.product[k] = res.data[k] || 0;
}
for (const k in HomeData.seed) {
HomeData.seed[k] = res.data[k] || 0;
}
if (MainIns()) {
MainIns().mainUI.setPropInfo();
}
resolve();
return;
}
for (const k in HomeData.prop) {
HomeData.prop[k] = res.data[k] || 0;
}
for (const k in HomeData.product) {
HomeData.product[k] = res.data[k] || 0;
}
for (const k in HomeData.seed) {
HomeData.seed[k] = res.data[k] || 0;
}
if (MainIns()) {
MainIns().mainUI.setPropInfo();
}
resolve();
});
});
});
return Promise.all([updateGold, updateSp]);
})
};
export const G_GetHomeData = function () {
......@@ -78,7 +68,7 @@ export const G_GetHomeData = function () {
};
export const G_GetHomeDataByKey = function (key: HOME) {
return JSON.parse(JSON.stringify(HomeData[key])) || null;
return JSON.parse(JSON.stringify(HomeData[key]));
};
export const G_SetHomeDataByKey = function (key: HOME, val) {
......
egret/src/Scenes/MainScene/LandMgr.ts
View file @ 020f1fd2
......@@ -124,24 +124,24 @@ export default class LandMgr {
}
}
// 显示xiaoE随机提示
let flag = true;
for (let i = 0; i < res.data.length; i++) {
let v = res.data[i];
if (v.canGather) {
flag = false;
MainIns().showXiaoETip('get');
break;
} else if (!v.lock && !v.petId) {
flag = false;
MainIns().showXiaoETip('plant');
break;
}
}
if (flag) {
MainIns().showXiaoETip(Math.random() > 0.5 ? 'whooo' : 'miss');
}
// 显示xiaoE随机提示 TODO 2020.12.26 需求不需要
// let flag = true;
// for (let i = 0; i < res.data.length; i++) {
// let v = res.data[i];
// if (v.canGather) {
// flag = false;
// MainIns().showXiaoETip('get');
// break;
// } else if (!v.lock && !v.petId) {
// flag = false;
// MainIns().showXiaoETip('plant');
// break;
// }
// }
//
// if (flag) {
// MainIns().showXiaoETip(Math.random() > 0.5 ? 'whooo' : 'miss');
// }
});
}
......
egret/src/Scenes/MainScene/MainScene.ts
View file @ 020f1fd2
......@@ -16,7 +16,6 @@ import TouchEvent = egret.TouchEvent;
import {NetManager} from "../../../libs/tw/manager/NetManager";
import {getlogItem} from "../../comm/getlogItem";
import Tween = egret.Tween;
import tr = egret.sys.tr;
////////////////// Instance //////////////////
let instance: MainScene = null;
......@@ -77,6 +76,8 @@ export default class MainScene extends Scene {
public answerTxt: eui.Label;
public xiaoETip: eui.Group;
public xiaoETipImg: eui.Image;
public xiaoEIKnow:eui.Label;
constructor(data?) {
super(data);
......@@ -120,11 +121,12 @@ export default class MainScene extends Scene {
// this.hideXiaoETip();
}, this);
const question = JSON.parse(JSON.stringify(Tools.xiaoEQuestion));
for (let i = 0; i < Tools.xiaoEQuestion.length; i++) {
Tools.xiaoEQuestion[i]['showAnswer'] = this.showAnswer;
question[i]['showAnswer'] = this.showAnswer;
}
this.xiaoEGroupList.itemRenderer = QuestionItem;
this.xiaoEGroupList.dataProvider = new eui.ArrayCollection(Tools.xiaoEQuestion);
this.xiaoEGroupList.dataProvider = new eui.ArrayCollection(question);
NetManager.ins.showLog(getlogItem(7));
NetManager.ins.showLog(getlogItem(9));
......@@ -198,6 +200,7 @@ export default class MainScene extends Scene {
[this.houseBtn, this.onTap, this],
[this.xiaoE, this.onTap, this],
[this.xiaoEAnswer, this.onTap, this],
[this.xiaoEIKnow, this.onTap, this],
[this.xiaoETip, this.onTap, this],
]);
}
......@@ -223,6 +226,7 @@ export default class MainScene extends Scene {
case this.xiaoE:
NetManager.ins.clickLog(getlogItem(7));
case this.xiaoEAnswer:
case this.xiaoEIKnow:
M_HideOption();
this.hideXiaoETip();
this.showQuestion();
......@@ -282,9 +286,9 @@ class QuestionItem extends eui.ItemRenderer {
}
onTap() {
if (+this.data.type == 1) { // 跳链接的
if (+this.data.type == 0) { // 跳链接的
window.location.href = this.data.redirect;
} else if (+this.data.type == 0) {
} else if (+this.data.type == 1) {
this.data.showAnswer(this.data);
}
}
......
egret/src/Scenes/MainScene/MainUI.ts
View file @ 020f1fd2
......@@ -21,6 +21,8 @@ import TopLayerCtrl from "../../ctrls/topLayerCtrl";
import {Tools} from "../../Tools";
import {getlogItem} from "../../comm/getlogItem";
import {NetName} from "../../../libs/tw/enum/NetName";
import {getToken} from "./Const";
import {wait} from "../../comm/GameConst";
export let propData = {
sp_food_1: {name: 'food',},
......@@ -171,9 +173,9 @@ export default class MainUI extends ComponentBase {
// this.getGoldNum();
await this.getPropInfoByBI();
G_GetHomeDataByKey(HOME.GOLD);
const unitName = DataManager.ins.getData(NetName.GET_PROJECTUSERINFO).data.unitName;
this.userGold.text = `${unitName}：${G_GetHomeDataByKey(HOME.GOLD)}`;
// console.log(G_GetHomeDataByKey(HOME.GOLD));
// const unitName = DataManager.ins.getData(NetName.GET_PROJECTUSERINFO).data.unitName;
// this.userGold.text = `${unitName}：${G_GetHomeDataByKey(HOME.GOLD)}`;
// 埋点
NetManager.ins.showLog(getlogItem(1));
......@@ -225,8 +227,6 @@ export default class MainUI extends ComponentBase {
this[`${propData['sp_food_1'].name}Group`].visible = true;
this[`${propData['sp_food_2'].name}Group`].visible = true;
this.setPropInfo();
}
public async getPropInfoByBI() {
......@@ -244,8 +244,8 @@ export default class MainUI extends ComponentBase {
}
this[`${propData['sp_prop_1'].name}Group`].visible = data['sp_prop_1'] > 0;
this.userGold.text = `欢趣豆：${G_GetHomeDataByKey(HOME.GOLD)}`;
const unitName = DataManager.ins.getData(NetName.GET_PROJECTUSERINFO).data.unitName;
this.userGold.text = `${unitName}：${G_GetHomeDataByKey(HOME.GOLD)}`;
}
public setPropInfo() {
......@@ -256,8 +256,8 @@ export default class MainUI extends ComponentBase {
}
this[`${propData['sp_prop_1'].name}Group`].visible = (data['sp_prop_1'] > 0);
this.userGold.text = `欢趣豆：${G_GetHomeDataByKey(HOME.GOLD)}`;
const unitName = DataManager.ins.getData(NetName.GET_PROJECTUSERINFO).data.unitName;
this.userGold.text = `${unitName}：${G_GetHomeDataByKey(HOME.GOLD)}`;
}
public async getGoldNum() {
......@@ -271,7 +271,7 @@ export default class MainUI extends ComponentBase {
});
}
private getUserInfo() {
private async getUserInfo() {
const consumerInfo = Tools.consumerInfo;
if (!consumerInfo) {
......@@ -284,7 +284,8 @@ export default class MainUI extends ComponentBase {
? '欢趣使者' : ((nickname.length > 7) ? nickname.slice(0, 7) + '...' : nickname);
// 登陆奖励
const loginPrize = () => {
const loginPrize = async () => {
if (ifLogin) {
Tools.consumerInfo.ifLogin = false;
// NetManager.ins.doTask((success, res) => {
......@@ -299,10 +300,11 @@ export default class MainUI extends ComponentBase {
// MainIns().mainUI.getPropInfo();
// }, 1);
await wait(800);
TopLayerCtrl.instance.show(ModuleTypes.TASK_TOAST, {
title: '登陆奖励',
food: loginPresent.spFood1RewardNum,
water: loginPresent.spFood2RewardNum,
food: loginPresent['sp_food_1'] || 0,
water: loginPresent['sp_food_2'] || 0,
});
}
};
......@@ -310,6 +312,24 @@ export default class MainUI extends ComponentBase {
if (newUser) { // 新用户出引导，TODO 因为换了活动，则不存在老用户
Tools.consumerInfo.newUser = false;
// TODO 是新用户直接发奖吧
getToken().then((token) => {
if (!token) {
showToast('网络异常，请刷新页面重试');
return;
}
NetManager.ins.newUserPrize(async (res, success) => {
if (!success) {
showToast('网络异常，请稍后再试');
return;
}
G_UpdateHomeData().then(() => {
MainIns().mainUI.setPropInfo();
});
}, token);
});
PanelCtrl.instance.show(Guide, {
call: () => {
if (popup) {
......@@ -323,9 +343,9 @@ export default class MainUI extends ComponentBase {
} else if (popup) { // 不是新用户，但是要弹弹窗
Tools.consumerInfo.popup = false;
PanelCtrl.instance.show(OldUserPanel, {f: loginPrize});
} else if (ifLogin) {
loginPrize(); // 首次登陆
}
loginPrize(); // 首次登陆
}
destroy() {
......
egret/src/Scenes/RoomScene/Medal.ts
View file @ 020f1fd2
......@@ -11,7 +11,7 @@ export default class Medal extends eui.Component {
private data = null;
constructor(data?: { spId: string, status: boolean, index: number, name?: string, date: number, total }) {
constructor(data?: { spId: string, status: boolean, index: number, name?: string, timestamp: number, total }) {
super();
this.skinName = getSkinPath('Objs/Medal');
this.data = data || null;
......@@ -37,15 +37,13 @@ export default class Medal extends eui.Component {
.to({x: 100}, duration)
.wait(total * duration);
}, duration * index + wait);
this.addEventListener(TouchEvent.TOUCH_TAP, () => {
TopLayerCtrl.instance.show(ModuleTypes.MEDAL_PANEL, this.data, 0.7);
}, this);
} else {
this.img.source = `medal_${spId}_dis_png`;
this.light_mask.source = `medal_${spId}_dis_png`;
this.img.source = `medal_${spId}_0_png`;
this.light_mask.source = `medal_${spId}_0_png`;
this.label.textColor = 0xbbbbbb;
}
if(spId != 'wait'){
this.addEventListener(TouchEvent.TOUCH_TAP, () => {
TopLayerCtrl.instance.show(ModuleTypes.MEDAL_PANEL, this.data, 0.7);
}, this);
......
egret/src/Tools.ts
View file @ 020f1fd2
......@@ -87,7 +87,7 @@ export class Tools {
spId: string,
name: string,
status: boolean
date: number
timestamp: number
}
} = {};
......
egret/src/views/layers.ts
View file @ 020f1fd2
class Layers extends eui.UILayer {
private _topLayer: eui.UILayer;
private _popupLayer: eui.UILayer;
private _sceneLayer: eui.UILayer;
private _loadingLayer: eui.UILayer;
init(root: eui.UILayer) {
root.addChild(this);
this._topLayer = new eui.UILayer();
this._popupLayer = new eui.UILayer();
this._sceneLayer = new eui.UILayer();
this._loadingLayer = new eui.UILayer();
this.addChild(this._sceneLayer);
this.addChild(this._popupLayer);
this.addChild(this._topLayer);
this.addChild(this._loadingLayer);
this._popupLayer.visible = false;
this._topLayer.visible = false;
this._popupLayer.visible = false;
this._topLayer.visible = false;
this._loadingLayer.visible = false;
// this._sceneLayer.percentHeight = 100;
}
get topLayer() { return this._topLayer }
get popupLayer() { return this._popupLayer }
get sceneLayer() { return this._sceneLayer }
get topLayer() {
return this._topLayer
}
get loadingLayer() {
return this._loadingLayer
}
get popupLayer() {
return this._popupLayer
}
get sceneLayer() {
return this._sceneLayer
}
}
......
mock/joyousManor/achieves.json
View file @ 020f1fd2
{
"success": true,
"message": "",
"code": "",
"code": null,
"data": [
{
"spId": "sp_achv_internship_farmer",
"name": "见习农夫",
"status": true,
"date": 1608780885463
"name": "农场大亨",
"spId": "achv_excellent_farmer",
"status": false,
"timestamp": null
},
{
"spId": "sp_achv_advanced_farmer",
"name": "进阶高手",
"status": true,
"date": 1608680885463
"name": "见习农夫",
"spId": "achv_internship_farmer",
"status": false,
"timestamp": null
},
{
"spId": "sp_achv_well_breeder",
"name": "养殖达人",
"status": false,
"date": 0
"spId": "achv_well_breeder",
"status": true,
"timestamp": 1608885446699
},
{
"spId": "sp_achv_excellent_farmer",
"name": "农场大亨",
"status": true,
"date": 1607680885463
"name": "进阶高手",
"spId": "achv_advanced_farmer",
"status": false,
"timestamp": null
}
]
],
"message": null,
"success": true
}
\ No newline at end of file
mock/joyousManor/consumerInfo.json
View file @ 020f1fd2
{
"code": null,
"data": {
"nickname": "啊啊啊啊啊啊啊啊啊啊",
"newUser": false,
"popup": false,
"ifLogin": false,
"newUser": false,
"nickname": "4l60053306590_",
"loginPresent": {
"spFood1RewardNum": 2,
"spFood2RewardNum": 2
"sp_food_2": 2
}
},
"message": null,
"success": true
}
}
\ No newline at end of file
mock/joyousManor/getLandInfo.json
View file @ 020f1fd2
......@@ -48,7 +48,7 @@
"feedNum": 30,
"id": 5,
"level": 3,
"petId": 1,
"petId": 0,
"lock": false
},
{
......
mock/joyousManor/question.json
View file @ 020f1fd2
{
"code": null,
"data": "[{\"type\":1,\"content\":\"如何种植\",\"redirect\":\"http://acitivity.m.duiba.com.cn\"},{\"type\":0,\"content\":\"土豆成熟的块\"}]",
"data": "[{\"type\":1,\"content\":\"如何种植\",\"answer\":\"111111111111\"},{\"type\":1,\"content\":\"如何种植\",\"answer\":\"111111111111\"},{\"type\":1,\"content\":\"如何种植\",\"answer\":\"111111111111\"},{\"type\":1,\"content\":\"如何种植\",\"answer\":\"111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n111111111111\\n\"},{\"type\":1,\"content\":\"如何种植\",\"answer\":\"111111111111\"},{\"type\":0,\"content\":\"土豆成熟的块\",\"redirect\":\"https://www.baidu.com/\"}]",
"message": null,
"success": true
}
\ No newline at end of file
mock/joyousManor/taskInfo.json
View file @ 020f1fd2
......@@ -11,7 +11,7 @@
{
"id": 2,
"spFood1RewardNum": 40,
"spFood2RewardNum": 50,
"spFood2RewardNum": 0,
"status": 0,
"type": 0
},
......
mock/projectX/getProjectUserInfo.json
View file @ 020f1fd2
{
"success": true,
"message": null,
"code": null,
"data": {
"credits": "1.3万",
"unitName": "欢趣豆",
"consumerCredits": 15500,
"consumerId": 222,
"partnerUserId": "888"
}
}
\ No newline at end of file
"success": true,
"code": null,
"desc": null,
"timestamp": 1608953704899,
"data": {
"domain": "//activity.m.duibatest.com.cn",
"credits": "1111",
"unitName": "元宝",
"consumerId": 100420415,
"partnerUserId": "5414",
"consumerCredits": 1111,
"loginJs": "<script>\n/oppocommunity/i.test(navigator.userAgent) && RainbowBridge.callMethod(\"OPlusJSCommondMethod\", \"login\", null, function(res) {\n if (res.status.code == 0) {\n window.location.href=\"oppocommunity://www.oppo.cn?url=https://hdapi.oppo.cn/duiba/credit/getRedirectURL?appKey=3U36ATfZ6WoK4dzPSBJhRiKzP5MS&dbredirect=\"+encodeURIComponent(window.location.href);\n }\n});\n</script>",
"nickName": "zDH_tmC0xIbK",
"avatar": null
}
}
mock/projectX/getUserSpList.json
View file @ 020f1fd2
......@@ -3,24 +3,32 @@
"message": null,
"code": null,
"data": {
"sp_1": 10,
"sp_achv_excellent_farmer": 0,
"sp_seed_5": 10,
"sp_3": 0,
"sp_seed_4": 1,
"sp_2": 0,
"sp_3": 10,
"sp_seed_6": 1,
"sp_4": 0,
"sp_5": 10,
"sp_6": 0,
"sp_food_1": 100,
"sp_food_2": 100,
"sp_prop_1": 0,
"sp_task_1": 10,
"sp_task_2": 100,
"sp_achv_1": 0,
"sp_achv_2": 0,
"sp_seed_1": 0,
"sp_seed_2": 1,
"sp_seed_3": 1,
"sp_seed_4": 0,
"sp_seed_5": 0,
"sp_seed_6": 0
"sp_seed_1": 10,
"sp_achv_advanced_farmer": 0,
"sp_task_1": 0,
"sp_seed_3": 0,
"sp_exchange_sp_food_2": 0,
"sp_task_2": 0,
"sp_achv_internship_farmer": 0,
"sp_seed_2": 18,
"sp_exchange_sp_food_1": 0,
"sp_task_3": 0,
"sp_task_4": 0,
"sp_first_login": 1,
"sp_exchange_sp_prop_1": 2,
"sp_1": 0,
"sp_achv_well_breeder": 0,
"sp_breed_animal": 0,
"sp_food_2": 4,
"sp_prop_1": 4,
"sp_food_1": 4,
"sp_plant_vegetable": 0
}
}
}
\ No newline at end of file
测试.html
View file @ 020f1fd2
......@@ -37,6 +37,8 @@
}
</style>
<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/libs/zepto_security_downloadApp.min.js"></script>
<!--工行sdk-->
<script src="https://assets.geilicdn.com/v-components/jsbridge/1.0.1/index.min.js"></script>
<script src="https://yun.duiba.com.cn/db_games/hybrid_app2.js"></script>
......
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