Skip to content

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

道具兑换修改

parent acd4351c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 139 deletions
.idea/workspace.xml
View file @ acdd306a
This diff is collapsed.
egret/index.html
View file @ acdd306a
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Egret</title>
<title>e趣农场</title>
<meta name="viewport"
content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
......@@ -15,7 +15,7 @@
html,
body {
-ms-touch-action: none;
background: #888888;
background: #fff;
padding: 0;
border: 0;
margin: 0;
......@@ -57,48 +57,52 @@
icon: '签到 icon_png',
btnLabel: '登陆',
label: '每日登陆',
bid: 12,
bid: null,
},
2: {
icon: '分享 icon_png',
btnLabel: '去分享',
label: '分享给好友',
bid: 13,
bid: 11,
},
3: {
icon: '消费 icon_png',
btnLabel: '去完成',
label: '访问欢趣竞猜',
label: '访问e趣竞猜',
link: 'https://gonghang.activity-1.m.duiba.com.cn/projectx/p63e3d5c8/index.html',
bid: 14,
bid: 12,
},
4: {
icon: '生活日 icon_png',
btnLabel: '去完成',
label: '访问欢趣市集',
label: '访问欢趣赶集',
link: 'https://gonghang.activity-1.m.duiba.com.cn/hdtool/index?id=3737984&dbnewopen',
bid: 15,
bid: 13,
},
5: {
icon: '浏览积分商城任务_png',
btnLabel: '去浏览',
label: '浏览积分商城',
link: 'https://ghjf.g-town.com.cn/',
bid: 30,
bid: 14,
},
6: {
icon: '消费任务_png',
btnLabel: '去浏览',
label: '浏览扶贫商城',
link: 'https://ghfp.g-town.com.cn/index.html#/main?VNK=2f8c4fde',
bid: 31,
bid: 15,
},
};
window['marketLink'] = 'https://gonghang.activity-1.m.duiba.com.cn/hdtool/index?id=3737984&dbnewopen';
window['record'] = 'ff0a36885.html';
window['rule'] =
"一、活动时间： \n" +
"2020年11月1日-2020年12月31日 \n" +
"二、活动主题：欢趣农场\n" +
"二、活动主题：e趣农场\n" +
"三、活动对象：工银e生活绑卡用户\n" +
"四、活动内容： \n" +
"点击对应的土地，选择你想种的作物开始种植或者喂养。浇灌或者喂养作物成长，作物成熟后可出售成欢趣豆或集齐足额作物兑换好礼，具体兑换好礼详情见商店页面；集齐足额特殊作物有机会兑换对应作物的实物立减金券。\n" +
......
egret/libs/tw/manager/NetManager.ts
View file @ acdd306a
......@@ -1577,13 +1577,15 @@ export class NetManager extends ABNetManager {
* 用户去玩游戏合集里的游戏，发接口告诉后端打一个标记，用于后端发奖
* @param callback
*/
public gameGroupMark(callback: Function) {
public gameGroupMark(callback: Function, activity) {
const net: INetData = {
name: NetName.GAMEGROUP_MARK,
uri: '/projectx/{projectId}/game/mark.do',
type: 'post',
dataType: 'json',
param: {},
param: {
activity
},
callback: callback,
hideMsg: true,
};
......
egret/resource/default.res.json
View file @ acdd306a
......@@ -13,7 +13,7 @@
"name": "loading_scene"
},
{
"keys": "index_bg_png,小E_png,xiaoETip_bg_png,xiaoETip_item_btn_png",
"keys": "index_bg_png,小E_png,xiaoETip_bg_png,xiaoETip_item_btn_png,xiaoETip_miss_png,xiaoETip_get_png,xiaoETip_plant_png,xiaoETip_whooo_png",
"name": "main_scene"
},
{
......@@ -1226,6 +1226,26 @@
"url": "assets/shop/shopBuy_btn1.png",
"type": "image",
"name": "shopBuy_btn1_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_miss.png",
"type": "image",
"name": "xiaoETip_miss_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_get.png",
"type": "image",
"name": "xiaoETip_get_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_plant.png",
"type": "image",
"name": "xiaoETip_plant_png"
},
{
"url": "assets/index_scene/xiaoE/xiaoETip_whooo.png",
"type": "image",
"name": "xiaoETip_whooo_png"
}
]
}
\ No newline at end of file
egret/resource/skins/MainSceneSkin.exml
View file @ acdd306a
......@@ -22,6 +22,8 @@
<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:Group>
<e:Group id="xiaoETip" x="30" anchorOffsetX="0" anchorOffsetY="0" touchChildren="false" verticalCenter="-148" visible="false">
</e:Group>
<e:Image id="xiaoE" x="24" source="小E_png" verticalCenter="62.5"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/RoomSceneSkin.exml
View file @ acdd306a
......@@ -2,7 +2,7 @@
<e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing" xmlns:ns1="*">
<w:Config id="16e64c53e86"/>
<e:Group id="group" horizontalCenter="0" top="0" height="1624" width="750">
<e:Group left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624">
<e:Group id="root" left="0" right="0" horizontalCenter="0" verticalCenter="0" height="1624">
<e:Image id="bg" scaleX="1" scaleY="1" horizontalCenter="0" verticalCenter="0" source="room_bg_png"/>
<e:Image id="backBtn" source="返回农场_png" horizontalCenter="-284.5" verticalCenter="-506"/>
<e:Image id="farm" source="room_farm_png" x="323" y="428"/>
......@@ -14,8 +14,8 @@
<e:Group x="61" y="388" width="182" height="26">
<e:Label id="nickname" text="欢趣使者的小屋" y="0" textColor="0xffe595" size="26" horizontalCenter="0"/>
</e:Group>
<e:Image source="room_panda_png" x="261" y="813"/>
<e:Image source="room_table_png" x="125" y="1029"/>
<e:Image id="panda" source="room_panda_png" x="261" y="813" visible="false"/>
<e:Image id="table" source="room_table_png" x="125" y="1029"/>
</e:Group>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/Main.ts
View file @ acdd306a
......@@ -96,7 +96,7 @@ class Main extends eui.UILayer {
NetManager.ins.getRule((success, res) => {
});
this.addChild(new Bar());
this.addChild(new Bar()).y = -2;
await this.getGameRes();
......
egret/src/Panels/GameGroupPanel.ts
View file @ acdd306a
......@@ -6,6 +6,7 @@ import {GetProfitDetailData} from "../../libs/tw/data/customMade/GetProfitDetail
import {GDispatcher} from "../../libs/tc/util/GDispatcher";
import {Tools} from "../Tools";
import {MainIns} from "../Scenes/MainScene/MainScene";
import {getlogItem} from "../comm/getlogItem";
export default class GameGroupPanel extends Panel {
public closeBtn: Image;
......@@ -38,19 +39,21 @@ export default class GameGroupPanel extends Panel {
}
private onTap(e) {
NetManager.ins.gameGroupMark(() => {
GDispatcher.addEvent('docVisible', this.back, this);
switch (e.target) {
case this.planeBtn:
break;
case this.clearBtn:
break;
}
});
switch (e.target) {
case this.planeBtn:
NetManager.ins.clickLog(getlogItem(16));
NetManager.ins.gameGroupMark(() => {
GDispatcher.addEvent('docVisible', this.back, this);
}, 'dxq');
break;
case this.clearBtn:
NetManager.ins.clickLog(getlogItem(17));
NetManager.ins.gameGroupMark(() => {
GDispatcher.addEvent('docVisible', this.back, this);
}, 'xxl');
break;
}
}
async back() {
......@@ -66,7 +69,8 @@ export default class GameGroupPanel extends Panel {
}
private initUI(): void {
NetManager.ins.showLog(getlogItem(16));
NetManager.ins.showLog(getlogItem(17));
}
destroy() {
......
egret/src/Panels/IntroducePanel.ts
View file @ acdd306a
import Panel from "../views/Panel";
import TouchEvent = egret.TouchEvent;
import {petData} from "../Scenes/MainScene/Const";
import {M_HideOption, M_ShowOption} from "../Scenes/MainScene/Objs/OptionPanel";
import {NetManager} from "../../libs/tw/manager/NetManager";
import {getlogDpm, getlogItem} from "../comm/getlogItem";
import {M_ShowOption} from "../Scenes/MainScene/Objs/OptionPanel";
export default class IntroducePanel extends Panel {
public closeBtn: eui.Button;
......@@ -35,7 +33,6 @@ export default class IntroducePanel extends Panel {
}
private tapBtn() {
NetManager.ins.clickLog(getlogDpm(27, this.data.petId));
this.data.call && this.data.call();
super.hidePanel();
}
......@@ -48,9 +45,6 @@ export default class IntroducePanel extends Panel {
protected start() {
super.start();
this.initUI();
NetManager.ins.showLog(getlogDpm(27, this.data.petId));
}
private initUI(): void {
......
egret/src/Panels/MedalPanel.ts
View file @ acdd306a
import Panel from "../views/Panel";
import Tween = egret.Tween;
import {NetManager} from "../../libs/tw/manager/NetManager";
import {getlogItem} from "../comm/getlogItem";
import TouchEvent = egret.TouchEvent;
export const medalDesc = {
sp_achv_internship_farmer: '种植达到50次',
sp_achv_advanced_farmer: '种植达到80次',
sp_achv_well_breeder: '养殖奶牛和小鸡共计达50次',
sp_achv_excellent_farmer: '种植达到200次',
sp_achv_internship_farmer: {
desc: '种植达到50次',
bid: 28,
},
sp_achv_advanced_farmer: {
desc: '种植达到80次',
bid: 29,
},
sp_achv_well_breeder: {
desc: '养殖奶牛和小鸡共计达50次',
bid: 30,
},
sp_achv_excellent_farmer: {
desc: '种植达到200次',
bid: 31,
},
}
export default class MedalPanel extends Panel {
......@@ -37,10 +52,10 @@ export default class MedalPanel extends Panel {
}
protected onShowAnimCall() {
// Tween.get(this.title)
// .set({alpha: 0})
// .wait(330)
// .to({alpha: 1}, 340);
Tween.get(this.title)
.set({alpha: 0})
.wait(330)
.to({alpha: 1}, 340);
}
protected getTapEvts(): any[] {
......@@ -57,7 +72,7 @@ export default class MedalPanel extends Panel {
const {name, spId, date, status} = this.data;
this.title.text = name;
this.desc.text = medalDesc[spId];
this.desc.text = medalDesc[spId].desc;
if (status) {
......@@ -78,8 +93,12 @@ export default class MedalPanel extends Panel {
.to({x: 550}, 2000)
.wait(1000);
NetManager.ins.showLog(getlogItem(medalDesc[spId].bid));
this.addEventListener(TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(medalDesc[this.data.spId].bid));
}, this);
} else {
console.log(1111)
this.date.text = '你还未获得该勋章';
this.light.visible = false;
......
egret/src/Panels/MedalsPanel.ts
View file @ acdd306a
......@@ -2,6 +2,7 @@ import Panel from "../views/Panel";
import Medal from "../Scenes/RoomScene/Medal";
import Tween = egret.Tween;
import {Tools} from "../Tools";
import Ease = egret.Ease;
export default class MedalsPanel extends Panel {
public closeBtn: eui.Button;
......@@ -39,7 +40,7 @@ export default class MedalsPanel extends Panel {
protected hideAnim(): Tween {
let _y = 570 - (1624 - 750 / window.innerWidth * window.innerHeight) / 2;
Tween.get(this).wait(400).to({alpha: 0}, 100);
return Tween.get(this).to({x: 510, y: _y, scaleX: 0.1, scaleY: 0.1}, 500, egret.Ease.getPowOut(5));
return Tween.get(this).to({x: 510, y: _y, scaleX: 0.1, scaleY: 0.1}, 500, Ease.getPowOut(5));
}
protected start() {
......
egret/src/Panels/NewUserPanel.ts
View file @ acdd306a
......@@ -5,7 +5,6 @@ import {showToast} from "../comm/UtilsConst";
import {getToken} from "../Scenes/MainScene/Const";
import {G_UpdateHomeData} from "../Scenes/Home";
import {MainIns} from "../Scenes/MainScene/MainScene";
import {getlogItem} from "../comm/getlogItem";
import {wait} from "../comm/GameConst";
export default class NewUserPanel extends Panel {
......@@ -27,7 +26,6 @@ export default class NewUserPanel extends Panel {
protected start() {
super.start();
NetManager.ins.showLog(getlogItem(26));
}
public initEvents() {
......@@ -41,7 +39,6 @@ export default class NewUserPanel extends Panel {
}
public hidePanel() {
NetManager.ins.clickLog(getlogItem(26));
getToken().then((token) => {
if (!token) {
showToast('网络异常，请刷新页面重试');
......
egret/src/Panels/OldUserPanel.ts
View file @ acdd306a
import Panel from "../views/Panel";
import TouchEvent = egret.TouchEvent;
import {NetManager} from "../../libs/tw/manager/NetManager";
import {getlogItem} from "../comm/getlogItem";
import {wait} from "../comm/GameConst";
export default class OldUserPanel extends Panel {
......@@ -23,7 +22,6 @@ export default class OldUserPanel extends Panel {
protected start() {
super.start();
NetManager.ins.showLog(getlogItem(27));
}
public initEvents() {
......@@ -38,7 +36,6 @@ export default class OldUserPanel extends Panel {
async hidePanel() {
super.hidePanel();
NetManager.ins.clickLog(getlogItem(27));
await wait(500);
this.data.f();
......
egret/src/Panels/ShopPanel.ts
View file @ acdd306a
......@@ -6,6 +6,7 @@ import {ModuleTypes} from "../types/sceneTypes";
import Tween = egret.Tween;
import Component = eui.Component;
import TouchEvent = egret.TouchEvent;
import {getlogItem} from "../comm/getlogItem";
const propData = [
{
......@@ -15,6 +16,7 @@ const propData = [
price: 0,
stock: 0,
introduce: '加速作物成长，每张加速卡可减免4小时的成长时长',
bid: 19,
},
{
key: 'water',
......@@ -23,6 +25,7 @@ const propData = [
price: 0,
stock: 0,
introduce: '用于浇灌植物成长，每使用一次消耗一壶水',
bid: 20,
},
{
key: 'food',
......@@ -31,6 +34,7 @@ const propData = [
price: 0,
stock: 0,
introduce: '用于喂养动物成长，每使用一次消耗一袋饲料',
bid: 21,
},
];
......@@ -42,6 +46,7 @@ const seedData = [
spId: 'sp_seed_1',
price: 0,
stock: 0,
bid: 27,
},
{
key: 'wheat',
......@@ -49,6 +54,7 @@ const seedData = [
spId: 'sp_seed_2',
price: 0,
stock: 0,
bid: 22,
},
{
key: 'corn',
......@@ -56,6 +62,7 @@ const seedData = [
spId: 'sp_seed_3',
price: 0,
stock: 0,
bid: 24,
},
{
key: 'cattle',
......@@ -63,6 +70,7 @@ const seedData = [
spId: 'sp_seed_4',
price: 0,
stock: 0,
bid: 26,
},
{
key: 'potato',
......@@ -70,6 +78,7 @@ const seedData = [
spId: 'sp_seed_5',
price: 0,
stock: 0,
bid: 23,
},
{
key: 'walnut',
......@@ -77,6 +86,7 @@ const seedData = [
spId: 'sp_seed_6',
price: 0,
stock: 0,
bid: 25,
},
];
......@@ -262,6 +272,9 @@ class ShopItem extends Component {
} else {
this.propBuyBtn.visible = false;
}
NetManager.ins.showLog(getlogItem(this.data.bid));
}
private initEvent() {
......@@ -280,6 +293,8 @@ class ShopItem extends Component {
* @private
*/
private async tapPropBuy() {
NetManager.ins.clickLog(getlogItem(this.data.bid));
topLayerCtrl.instance.show(ModuleTypes.SHOP_BUY_PANEL, {
...this.data,
needGold: this.data.price,
......@@ -292,6 +307,8 @@ class ShopItem extends Component {
* @private
*/
private async tapSeedBuy() {
NetManager.ins.clickLog(getlogItem(this.data.bid));
const num = this.num;
if (num == 0) return;
......
egret/src/Panels/TaskPanel.ts
View file @ acdd306a
......@@ -92,6 +92,9 @@ class TaskItem extends ItemRenderer {
}
dataChanged() {
if (this.data.id == 1) this.data.status = 1; // TODO 2020.12.24 改成登陆奖励，直接写死已领取
this.icon.source = window['taskUi'][this.data.id].icon;
this.title.text = window['taskUi'][this.data.id].label;
......
egret/src/Panels/UnlockPanel.ts
View file @ acdd306a
......@@ -3,6 +3,7 @@ import {Tools} from "../Tools";
import {NetManager} from "../../libs/tw/manager/NetManager";
import {showToast} from "../comm/UtilsConst";
import {G_GetHomeDataByKey, G_UpdateHomeData, HOME} from "../Scenes/Home";
import {getlogItem} from "../comm/getlogItem";
export default class UnlockPanel extends Panel {
public closeBtn: eui.Image;
......@@ -38,6 +39,8 @@ export default class UnlockPanel extends Panel {
private onTap(e) {
switch (e.target) {
case this.btn:
NetManager.ins.clickLog(getlogItem(10));
/// TODO 解锁土地，刷新土地，关闭弹窗
const landId = this.data.landId;
const price = +Tools.areaPrice[landId].price;
......@@ -79,6 +82,7 @@ export default class UnlockPanel extends Panel {
private initUI(): void {
this.label.text = `增加一块可使用的土地\n需要消耗${Tools.areaPrice[this.data.landId].price}欢趣豆`;
NetManager.ins.showLog(getlogItem(10));
}
destroy() {
......
egret/src/Panels/WareHousePanel.ts
View file @ acdd306a
......@@ -4,7 +4,6 @@ import {ModuleTypes} from "../types/sceneTypes";
import {NetManager} from "../../libs/tw/manager/NetManager";
import {btnDelay, preLoadRes} from "../comm/UtilsConst";
import {MainDispatcher} from "../Scenes/MainScene/MainScene";
import {getlogItem} from "../comm/getlogItem";
import {G_GetHomeDataByKey, G_UpdateHomeData, HOME} from "../Scenes/Home";
import SceneCtrl from "../ctrls/sceneCtrl";
import Tween = egret.Tween;
......@@ -344,11 +343,7 @@ class WareHouseCrop extends Component {
}
private initUi(data?) {
this.updateUI();
NetManager.ins.showLog(getlogItem(16));
NetManager.ins.showLog(getlogItem(17));
}
private updateUI() {
......@@ -364,13 +359,11 @@ class WareHouseCrop extends Component {
private tapBtn(e) {
switch (e.target) {
case this.sellBtn:
NetManager.ins.clickLog(getlogItem(16));
btnDelay(this.sellBtn);
TopLayerCtrl.instance.show(ModuleTypes.SELL_PANEL, {key: this.data.key, total: this.data.total}, .4);
break;
case this.exBtn:
NetManager.ins.clickLog(getlogItem(17));
btnDelay(this.exBtn);
SceneCtrl.instance.change(ModuleTypes.EXCHANGE_SCENE);
break;
......
egret/src/Scenes/ExchangeScene/ExchangeScene.ts
View file @ acdd306a
import Scene from "../../views/Scene";
import SceneCtrl from "../../ctrls/sceneCtrl";
import { ModuleTypes } from "../../types/sceneTypes";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import {ModuleTypes} from "../../types/sceneTypes";
import {NetManager} from "../../../libs/tw/manager/NetManager";
import PanelCtrl from "../../ctrls/panelCtrl";
import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import { getSkinPath } from "../../utils";
import {GDispatcher} from "../../../libs/tc/util/GDispatcher";
import {getSkinPath} from "../../utils";
import {btnDelay, preLoadRes, showToast} from "../../comm/UtilsConst";
import { G_GetHomeDataByKey, G_UpdateHomeData, HOME } from "../Home";
import { getlogDpm, getlogItem } from "../../comm/getlogItem";
import {G_GetHomeDataByKey, G_UpdateHomeData, HOME} from "../Home";
import ExchangePanel from "../../Panels/ExchangePanel";
const ruNum = 20; // 发奖规则的个数
export default class ExchangeScene extends Scene {
public group:eui.Group;
public shopLayer:eui.Group;
public backBtn:eui.Image;
public goodsGroup:eui.Group;
public none:eui.Group;
public have:eui.Scroller;
public list:eui.List;
public group: eui.Group;
public shopLayer: eui.Group;
public backBtn: eui.Image;
public goodsGroup: eui.Group;
public none: eui.Group;
public have: eui.Scroller;
public list: eui.List;
private prizeData = {};
......@@ -42,12 +41,6 @@ export default class ExchangeScene extends Scene {
private initUI(): void {
this.group.height = 750 / window.innerWidth * window.innerHeight;
NetManager.ins.showLog(getlogItem(19));
NetManager.ins.showLog(getlogItem(20));
NetManager.ins.showLog(getlogItem(22));
NetManager.ins.showLog(getlogItem(23));
NetManager.ins.showLog(getlogItem(24));
this.reset();
}
......@@ -139,8 +132,6 @@ export default class ExchangeScene extends Scene {
this.prizeData[prizeId].strategyId = k; // 保存规则Id
prizeIds += `${k}:${prizeId},`;
this.prizeData[prizeId].canGet = true;
(this.canShow) ? NetManager.ins.showLog(getlogDpm(21, +k.slice(8))) : 0;
}
this.canShow = false;
prizeIds = prizeIds.slice(0, prizeIds.length - 1);
......@@ -257,7 +248,6 @@ class ExchangeItem extends eui.ItemRenderer {
return;
}
btnDelay(this.btn);
NetManager.ins.clickLog(getlogDpm(21, +this.data.strategyId.slice(8)));
egret.Tween.get(this.btn)
.to({scaleX: 0.9, scaleY: 0.9}, 80, egret.Ease.quadIn)
.to({scaleX: 1, scaleY: 1}, 80, egret.Ease.quadOut)
......
egret/src/Scenes/MainScene/MainScene.ts
View file @ acdd306a
......@@ -13,7 +13,8 @@ import M_EVENT from "./MSceneEnum";
import Label = eui.Label;
import {Tools} from "../../Tools";
import TouchEvent = egret.TouchEvent;
import tr = egret.sys.tr;
import {NetManager} from "../../../libs/tw/manager/NetManager";
import {getlogItem} from "../../comm/getlogItem";
////////////////// Instance //////////////////
let instance: MainScene = null;
......@@ -72,6 +73,7 @@ export default class MainScene extends Scene {
public xiaoEAnswer: eui.Group;
public answerTitle: eui.Label;
public answerTxt: eui.Label;
public xiaoETip:eui.Group;
constructor(data?) {
super(data);
......@@ -120,6 +122,9 @@ export default class MainScene extends Scene {
this.xiaoEGroupList.itemRenderer = QuestionItem;
this.xiaoEGroupList.dataProvider = new eui.ArrayCollection(Tools.xiaoEQuestion);
NetManager.ins.showLog(getlogItem(7));
NetManager.ins.showLog(getlogItem(9));
}
private showAnswer = (data) => {
......@@ -164,11 +169,13 @@ export default class MainScene extends Scene {
private onTap(e: egret.TouchEvent) {
switch (e.target) {
case this.houseBtn:
NetManager.ins.clickLog(getlogItem(9));
SceneCtrl.instance.change(ModuleTypes.ROOM_SCENE);
break;
case this.xiaoEAnswer:
case this.xiaoE:
NetManager.ins.clickLog(getlogItem(7));
case this.xiaoEAnswer:
M_HideOption();
this.xiaoEGroup.visible = true;
break;
......
egret/src/Scenes/MainScene/MainUI.ts
View file @ acdd306a
......@@ -3,12 +3,11 @@ import {M_HideOption} from "./Objs/OptionPanel";
import PanelCtrl from "../../ctrls/panelCtrl";
import {ModuleTypes} from "../../types/sceneTypes";
import {btnDelay, showToast} from "../../comm/UtilsConst";
import {MainDispatcher, MainIns} from "./MainScene";
import {MainIns} from "./MainScene";
import {NetManager} from "../../../libs/tw/manager/NetManager";
import {DataManager} from "../../../libs/tw/manager/DataManager";
import {loadSvga} from "../../comm/loadSvga";
import {getSvga} from "../../utils";
import {getlogItem} from "../../comm/getlogItem";
import SceneCtrl from "../../ctrls/sceneCtrl";
import {G_GetHomeDataByKey, G_SetHomeDataByKey, G_UpdateHomeData, HOME} from "../Home";
import RulePanel from "../../Panels/RulePanel";
......@@ -20,6 +19,7 @@ import Guide from "../../Panels/Guide";
import ShopPanel from "../../Panels/ShopPanel";
import TopLayerCtrl from "../../ctrls/topLayerCtrl";
import {Tools} from "../../Tools";
import {getlogItem} from "../../comm/getlogItem";
export let propData = {
sp_food_1: {name: 'food',},
......@@ -85,15 +85,12 @@ export default class MainUI extends ComponentBase {
btnDelay(e.target);
switch (e.target) {
case this.foodGroup: // 食物数量区域
NetManager.ins.clickLog(getlogItem(6));
showToast('点击饿了的动物才能进行喂食哦');
break;
case this.waterGroup: // 水壶数量区域
NetManager.ins.clickLog(getlogItem(7));
showToast('点击渴了的植物才能浇水哦');
break;
case this.speedGroup:
NetManager.ins.clickLog(getlogItem(18));
showToast('点击植物/动物去加速成长时间');
break;
default:
......@@ -105,32 +102,32 @@ export default class MainUI extends ComponentBase {
btnDelay(e.target);
switch (e.target) {
case this.taskBtn: // 任务按钮
NetManager.ins.clickLog(getlogItem(3));
NetManager.ins.clickLog(getlogItem(4));
PanelCtrl.instance.show(ModuleTypes.TASK_PANEL);
break;
case this.warehouseBtn: // 仓库按钮
NetManager.ins.clickLog(getlogItem(4));
NetManager.ins.clickLog(getlogItem(5));
PanelCtrl.instance.show(WareHousePanel);
break;
case this.avatarImg: // 头像
// window['share']();
NetManager.ins.clickLog(getlogItem(1)); // 头像点击埋点
break;
case this.recordBtn: // 兑换记录
NetManager.ins.clickLog(getlogItem(2)); // 售卖记录点击
NetManager.ins.clickLog(getlogItem(2));
window.location.href = window['record'];
break;
case this.shopBtn: // 商店
NetManager.ins.clickLog(getlogItem(5)); // 商店点击埋点
NetManager.ins.clickLog(getlogItem(6));
PanelCtrl.instance.show(ShopPanel);
break;
case this.gameGroupBtn: // 游戏合集
NetManager.ins.clickLog(getlogItem(3));
PanelCtrl.instance.show(GameGroupPanel);
break;
......@@ -140,7 +137,7 @@ export default class MainUI extends ComponentBase {
break;
case this.ruleBtn:
NetManager.ins.clickLog(getlogItem(28));
NetManager.ins.clickLog(getlogItem(1));
PanelCtrl.instance.show(RulePanel);
break;
default:
......@@ -175,14 +172,12 @@ export default class MainUI extends ComponentBase {
this.getPropInfoByBI();
// 埋点
NetManager.ins.showLog(getlogItem(1)); // 头像曝光
NetManager.ins.showLog(getlogItem(2)); // 兑换记录
NetManager.ins.showLog(getlogItem(3)); // 任务按钮
NetManager.ins.showLog(getlogItem(4)); // 仓库按钮
NetManager.ins.showLog(getlogItem(5)); // 商店按钮
NetManager.ins.showLog(getlogItem(6)); // 饲料区域
NetManager.ins.showLog(getlogItem(7)); // 水区域
NetManager.ins.showLog(getlogItem(28)); // 规则
NetManager.ins.showLog(getlogItem(1));
NetManager.ins.showLog(getlogItem(2));
NetManager.ins.showLog(getlogItem(3));
NetManager.ins.showLog(getlogItem(4));
NetManager.ins.showLog(getlogItem(5));
NetManager.ins.showLog(getlogItem(6));
}
private tipLabel(duration) {
......@@ -244,7 +239,6 @@ export default class MainUI extends ComponentBase {
DataManager.ins.updateData(propData[k].name, data[k]);
}
if (data['sp_prop_1'] > 0) {
NetManager.ins.showLog(getlogItem(18)); // 加速卡区域
this[`${propData['sp_prop_1'].name}Group`].visible = true;
} else {
this[`${propData['sp_prop_1'].name}Group`].visible = false;
......
egret/src/Scenes/MainScene/Objs/Land.ts
View file @ acdd306a
import {getSkinPath, getSvga} from "../../../utils";
import Crop from "./Crop";
import {NetManager} from "../../../../libs/tw/manager/NetManager";
import {getlogItem} from "../../../comm/getlogItem";
import {getlogDpm} from "../../../comm/getlogItem";
import {M_HideOption, M_ShowOption} from "./OptionPanel";
import {detectionDiamond, petData} from "../Const";
import TouchEvent = egret.TouchEvent;
......@@ -126,7 +126,7 @@ export default class Land extends eui.Component {
case LAND_STATE.NONE: // 没有
// 显示Option
NetManager.ins.clickLog(getlogItem(this.index + 7)); // 8, 9, 10, 11
NetManager.ins.clickLog(getlogDpm(8, this.index));
M_ShowOption({index: this.index});
this.changeState(LAND_STATE.ACTIVE);
break;
......@@ -162,7 +162,7 @@ export default class Land extends eui.Component {
}
private initUI() {
NetManager.ins.showLog(getlogItem(this.index + 7)); // 8, 9, 10, 11 TODO 埋点问题
NetManager.ins.showLog(getlogDpm(8, this.index));
this.setTouchOption(); // 设置点击参数
// 根据数据添加Crop 初始化状态
......
egret/src/Scenes/RoomScene/RoomScene.ts
View file @ acdd306a
......@@ -9,9 +9,12 @@ import {G_GetHomeDataByKey, HOME} from "../Home";
import Medal from "./Medal";
import {Tools} from "../../Tools";
import To = egret.tween.To;
import {loadSvga} from "../../comm/loadSvga";
import {getSvga} from "../../utils";
export default class RoomScene extends Scene {
public group: eui.Group;
public root: eui.Group;
public bg: eui.Image;
public backBtn: eui.Image;
public farm: eui.Image;
......@@ -19,6 +22,8 @@ export default class RoomScene extends Scene {
public medals: eui.Group;
public ad: eui.Image;
public nickname: eui.Label;
public panda: eui.Image;
public table: eui.Image;
private medalsArr: Medal[] = [];
......@@ -34,7 +39,7 @@ export default class RoomScene extends Scene {
}
}
private initUI(): void {
private async initUI() {
this.group.height = 750 / window.innerWidth * window.innerHeight;
let userInfo = Tools.consumerInfo;
this.nickname.text = ((!userInfo || !userInfo.nickname || (userInfo.nickname == 'null'))
......@@ -59,6 +64,12 @@ export default class RoomScene extends Scene {
newMedal.y = 68 + ~~(index / 3) * 64;
});
const mv = await loadSvga(getSvga('panda_house'));
this.root.addChildAt(mv, this.root.numChildren - 1);
// @ts-ignore
mv.gotoAndPlay(1, true);
}
destroy() {
......@@ -102,7 +113,7 @@ export default class RoomScene extends Scene {
console.log('农场相框');
break;
case this.market: // 集市
window.location.href = 'https://gonghang.activity-1.m.duiba.com.cn/hdtool/index?id=3737984&dbnewopen';
window.location.href = window['marketLink'];
console.log('集市');
break;
default:
......
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