Skip to content

B
babycare_xiaoxiao
Commit ec48955f authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

task

parent d8be2daf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 383 additions and 10497 deletions
.idea/workspace.xml
View file @ ec48955f
This diff is collapsed.
aaa.html 0 → 100644
View file @ ec48955f
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="UTF-8">
<title>Chess</title>
<meta name="author" content="还有醋v">
<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" />
<meta name="full-screen" content="true" />
<meta name="screen-orientation" content="portrait" />
<meta name="x5-fullscreen" content="true" />
<meta name="360-fullscreen" content="true" />
<style>
* {
margin: 0;
padding: 0;
}
body {
background-color: #333;
}
#container {
text-align: center;
position: absolute;
top: 50%;
transform: translateY(-50%);
left: 0;
right: 0;
margin: auto;
}
.lattice {
vertical-align: bottom;
width: 50px;
height: 50px;
background-color: darkgreen;
display: inline-block;
border: 1px solid whitesmoke;
}
.disc {
width: 40px;
height: 40px;
border-radius: 20px;
margin-top: 5px;
margin-left: 5px;
/*animation: scale 0.25s 1 ease-in-out;*/
}
@keyframes scale {
0% {
transform: scale(0);
}
100% {
transform: scale(1);
}
}
/*.disc-black {*/
/* background-color: black;*/
/*}*/
.disc-black:after {
content: '';
display: block;
width: 40px;
height: 40px;
margin-top: 5px;
margin-left: 5px;
background-color: black;
border-radius: 20px;
}
.disc-white:after {
content: '';
display: block;
width: 40px;
height: 40px;
margin-top: 5px;
margin-left: 5px;
background-color: whitesmoke;
border-radius: 20px;
}
</style>
</head>
<body>
<div id="root"></div>
<script>
let board = [];
const root = document.getElementById('root');
let color = 1; // 1 黑 2 白
const MAX_ROW = 8;
const MAX_COL = 8;
function initBoard() {
board = [
[ 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 1, 2, 0, 0, 0 ],
[ 0, 0, 0, 2, 1, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 0, 0, 0, 0, 0, 0 ],
];
root.innerHTML = '';
const container = document.createElement('div');
container.id = 'container';
for (let row = 0; row < board.length; row++) {
const boardRow = board[row];
for (let col = 0; col < boardRow.length; col++) {
const value = boardRow[col];
const lattice = document.createElement('div');
lattice.row = row;
lattice.col = col;
lattice.classList.add('lattice');
container.appendChild(lattice);
if (value === 1 || value === 2) {
lattice.classList.add(value === 1 ? 'disc-black' : 'disc-white');
}
}
container.appendChild(document.createElement('br'));
}
root.appendChild(container);
}
initBoard();
root.addEventListener('click', (e) => {
const target = e.target;
const { row: or, col: oc } = target;
let { row, col } = target;
let canDrop = false;
if (board[or][oc] !== 0) { // 不可落子
console.warn('有子了');
} else { // 可落子
let canRemove = false;
while (--row >= 0) { // 向上
if (board[row][col] === color) { // 同色
canDrop = false;
canRemove = false;
console.log('相邻同色子')
} else if (board[row][col] === 3 - color) { // 不同色
}
}
}
});
// function render() {
// root.innerHTML = '';
// const container = document.createElement('div');
// container.id = 'container';
//
// for (let row = 0; row < board.length; row++) {
// const boardRow = board[row];
// for (let col = 0; col < boardRow.length; col++) {
// const value = boardRow[col];
// const lattice = document.createElement('div');
// lattice.classList.add('lattice');
// container.appendChild(lattice);
// if (value === 1 || value === 2) {
// lattice.classList.add(value === 1 ? 'disc-black' : 'disc-white');
// }
// }
// container.appendChild(document.createElement('br'));
// }
//
// container.addEventListener('click', (e) => {
// console.log(e);
//
//
// // lattice.addEventListener('click', (e) => {
// // console.log(row, col);
// // board[row][col] = color;
// // color = 3 - color;
// // render();
// // });
//
// });
//
// root.appendChild(container);
// }
</script>
</body>
</html>
mock/miniTb/popmartXXL2c.receiveTaskRewards.json
View file @ ec48955f
{ {
"success": false, "success": true,
"code": "ipsum in", "code": "ipsum in",
"message": "nulla dolor est eiusmod sunt", "message": "nulla dolor est eiusmod sunt",
"data": { "data": {
......
resource/res.json
View file @ ec48955f
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"name": "SuccessPanel" "name": "SuccessPanel"
}, },
{ {
"keys": "browserGoods_btn_dis.png,browserGoods_btn_en.png,browserGoods_icon.png,follow_btn_dis.png,follow_btn_en.png,follow_icon.png,invites_btn_dis.png,invites_btn_en.png,invites_icon.png,member_btn_dis.png,member_btn_en.png,member_icon.png,orderGoods_btn_dis.png,orderGoods_btn_en.png,orderGoods_icon.png,task_get_btn.png,task_item_bg.png,任务背景.png,去完成.png,去完成灰.png,待领取.png", "keys": "browserGoods_btn_dis.png,browserGoods_btn_en.png,browserGoods_icon.png,follow_btn_dis.png,follow_btn_en.png,follow_icon.png,invites_btn_dis.png,invites_btn_en.png,invites_icon.png,member_btn_dis.png,member_btn_en.png,member_icon.png,orderGoods_btn_dis.png,orderGoods_btn_en.png,orderGoods_icon.png,task_get_btn.png,task_item_bg.png,任务背景.png,去完成.png,去完成灰.png",
"name": "TaskPanel" "name": "TaskPanel"
}, },
{ {
......
src/ResJson.ts
View file @ ec48955f
This diff is collapsed.
src/panels/TaskPanel.ts
View file @ ec48955f
...@@ -6,7 +6,7 @@ import Ease = FYGE.Ease; ...@@ -6,7 +6,7 @@ import Ease = FYGE.Ease;
import Button = FYGE.Button; import Button = FYGE.Button;
import { GDispatcher } from "../Main"; import { GDispatcher } from "../Main";
import { G_EVENT } from "../common/G_EVENT"; import { G_EVENT } from "../common/G_EVENT";
import { showWaiting, hideWaiting } from "../../module/ctrls"; import { showWaiting, hideWaiting, showToast } from "../../module/ctrls";
import Container = FYGE.Container; import Container = FYGE.Container;
import { Item } from "../../module/views/Item"; import { Item } from "../../module/views/Item";
import { Tools } from "../Tools"; import { Tools } from "../Tools";
...@@ -14,6 +14,7 @@ import ScrollList = FYGE.ScrollList; ...@@ -14,6 +14,7 @@ import ScrollList = FYGE.ScrollList;
import Sprite = FYGE.Sprite; import Sprite = FYGE.Sprite;
import TextField = FYGE.TextField; import TextField = FYGE.TextField;
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
import MouseEvent = FYGE.MouseEvent;
// 任务类型（invites 、member、follow、browserGoods、orderGoods） // 任务类型（invites 、member、follow、browserGoods、orderGoods）
export enum TaskType { export enum TaskType {
...@@ -149,6 +150,11 @@ class TaskItem extends Item { ...@@ -149,6 +150,11 @@ class TaskItem extends Item {
private title: TextField; private title: TextField;
private desc: TextField; private desc: TextField;
private getBtn: Button;
private taskBtn: Button;
data: any;
constructor() { constructor() {
super(); super();
} }
...@@ -170,17 +176,100 @@ class TaskItem extends Item { ...@@ -170,17 +176,100 @@ class TaskItem extends Item {
this.desc.bold = true; this.desc.bold = true;
this.desc.position.set(145, 92); this.desc.position.set(145, 92);
this.getBtn = this.addChild(new Button(RES.getRes('task_get_btn.png')));
this.taskBtn = this.addChild(new Button(
RES.getRes(`去完成.png`),
RES.getRes(`去完成.png`),
RES.getRes(`去完成灰.png`)
));
this.getBtn.position.set(501, 43);
this.taskBtn.position.set(501, 43);
this.getBtn.addEventListener(MouseEvent.CLICK, this.clickGet, this);
this.taskBtn.addEventListener(MouseEvent.CLICK, this.clickTask, this);
} }
public initData(id: number, data: any) { public initData(id: number, data: any) {
if (id < 0 || !data) return; if (id < 0 || !data) return;
this.icon.texture = RES.getRes(`${data.taskType}_icon.png`); this.data = data;
this.title.text = taskItemData[data.taskType].title
.replace('${done}', data.todayCompleteTimes) const {
.replace('${total}', data.totalTimes); rewards,
this.desc.text = taskItemData[data.taskType].desc taskType,
.replace('${rewards}', data.rewards); totalTimes,
waitReceiveTimes,
todayCompleteTimes,
} = data;
this.icon.texture = RES.getRes(`${taskType}_icon.png`);
this.title.text = taskItemData[taskType].title
.replace('${done}', todayCompleteTimes)
.replace('${total}', totalTimes);
this.desc.text = taskItemData[taskType].desc
.replace('${rewards}', rewards);
this.taskBtn.changeTexture(
RES.getRes(`${taskType}_btn_en.png`),
RES.getRes(`${taskType}_btn_en.png`),
RES.getRes(`${taskType}_btn_dis.png`)
);
if (+waitReceiveTimes > 0) {
this.getBtn.visible = true;
this.taskBtn.visible = false;
} else if (+todayCompleteTimes >= +totalTimes) {
this.getBtn.visible = false;
this.taskBtn.visible = true;
this.taskBtn.enabled = false;
} else {
this.getBtn.visible = false;
this.taskBtn.visible = true;
this.taskBtn.enabled = true;
}
}
private clickGet() {
this.getBtn.mouseEnable = false;
sendTbNet(TbNetName.receiveTaskRewards, {taskType: this.data.taskType},
(success, res) => {
this.getBtn.mouseEnable = true;
if (!success) return;
showToast(`任务完成，体力值+${res.data.power}！`);
}
);
}
private clickTask() {
switch (this.data.taskType) {
case TaskType.member:
sendTbNet(TbNetName.navigateToOutside, {url: this.data.beMemberUrl});
break;
case TaskType.browserGoods:
/// TODO 去浏览页
console.log('去浏览页');
break;
case TaskType.follow:
sendTbNet(TbNetName.favorShop, {},
(success, res) => {
if (!success) return;
sendTbNet(TbNetName.completeTask, {taskType: this.data.taskType},
(success1, res1) => GDispatcher.dispatchEvent(G_EVENT.UPDATE_TASK)
);
}
);
break;
case TaskType.invites:
sendTbNet(TbNetName.showSharePanel);
break;
case TaskType.orderGoods:
/// TODO 去下单页
console.log('去下单页');
break;
}
} }
} }
src/scene/PlayScene.ts
View file @ ec48955f
...@@ -2688,13 +2688,13 @@ export class PlayScene extends Scene { ...@@ -2688,13 +2688,13 @@ export class PlayScene extends Scene {
ani.x = p[0]; ani.x = p[0];
ani.y = p[1]; ani.y = p[1];
ani.play(); ani.play();
if (name == RecoverName.MAGICLION_ANI) { // if (name == RecoverName.MAGICLION_ANI) {
//具体索引还要改 // 具体索引还要改
// console.log() // console.log()
this.addChildAt(ani, this.getChildIndex(this.map) + 1); // this.addChildAt(ani, this.getChildIndex(this.map) + 1);
} else { // } else {
this.addChild(ani); this.addChild(ani);
} // }
return ani return ani
} }
......
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