Skip to content

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

task

parent d8be2daf
Hide whitespace changes
Inline Side-by-side
Showing with 383 additions and 10497 deletions
.idea/workspace.xml
View file @ ec48955f
......@@ -2,10 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/aaa.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.doJoin.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.doJoin.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.receiveTaskRewards.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.receiveTaskRewards.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/TaskPanel/待领取.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -16,9 +20,9 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="TypeScript File" />
<option value="HTML File" />
<option value="JavaScript File" />
<option value="JsonFile" />
<option value="HTML File" />
</list>
</option>
</component>
......@@ -53,7 +57,7 @@
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
<property name="settings.editor.selected.configurable" value="fileTemplates" />
<property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
<property name="vue.rearranger.settings.migration" value="true" />
</component>
......@@ -73,8 +77,8 @@
<recent name="$PROJECT_DIR$/src/panels" />
</key>
</component>
<component name="RunManager" selected="npm.build">
<configuration name="handleLotS.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/scripts/handleLotS.js" working-dir="$PROJECT_DIR$/scripts">
<component name="RunManager" selected="npm.flushRes">
<configuration name="aaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/aaa.html" useBuiltInWebServerPort="true">
<method v="2" />
</configuration>
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
......@@ -120,11 +124,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="JavaScript Debug.aaa.html" />
<item itemvalue="npm.build" />
<item itemvalue="npm.lt" />
<item itemvalue="Node.js.handleLotS.js" />
</list>
</recent_temporary>
</component>
......@@ -174,14 +178,9 @@
<workItem from="1601170975973" duration="20963000" />
<workItem from="1601257315718" duration="48496000" />
<workItem from="1601429998970" duration="22651000" />
<workItem from="1601689013718" duration="19732000" />
</task>
<task id="LOCAL-00023" summary="Success Panel Effect!">
<created>1595215296744</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1595215296744</updated>
<workItem from="1601689013718" duration="20266000" />
<workItem from="1601775213402" duration="17131000" />
<workItem from="1601867080494" duration="4466000" />
</task>
<task id="LOCAL-00024" summary="Success Panel Effect!">
<created>1595216703734</created>
......@@ -519,7 +518,14 @@
<option name="project" value="LOCAL" />
<updated>1601714506189</updated>
</task>
<option name="localTasksCounter" value="72" />
<task id="LOCAL-00072" summary="guide">
<created>1601720621979</created>
<option name="number" value="00072" />
<option name="presentableId" value="LOCAL-00072" />
<option name="project" value="LOCAL" />
<updated>1601720621979</updated>
</task>
<option name="localTasksCounter" value="73" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -563,6 +569,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1595229546530" />
<state x="131" y="385" key="#com.intellij.ide.fileTemplates.ui.ConfigureTemplatesDialog" timestamp="1601791476050">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="385" key="#com.intellij.ide.fileTemplates.ui.ConfigureTemplatesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1601791476050" />
<state x="188" y="314" key="#dev" timestamp="1594691316512">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -572,51 +582,51 @@
</state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601714504510">
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601720621798">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601714504510" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601720621798" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601714462247">
<state width="905" height="321" key="GridCell.Tab.0.bottom" timestamp="1601877581017">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="896" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1601821415183" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462247" />
<state width="905" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601877581017" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601714462247">
<state width="905" height="321" key="GridCell.Tab.0.center" timestamp="1601877581013">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="896" height="406" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1601821415182" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462247" />
<state width="905" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601877581013" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601714462246">
<state width="905" height="321" key="GridCell.Tab.0.left" timestamp="1601877581010">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="896" height="406" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1601821415180" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462246" />
<state width="905" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601877581010" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601714462247">
<state width="905" height="321" key="GridCell.Tab.0.right" timestamp="1601877581015">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="896" height="406" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1601821415183" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601714462247" />
<state width="905" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601877581015" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
......@@ -628,17 +638,17 @@
</state>
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1601453156433" />
<state x="210" y="320" key="RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594173186663" />
<state x="289" y="314" key="SettingsEditor" timestamp="1596079390860">
<state x="98" y="219" key="SettingsEditor" timestamp="1601791580605">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<state x="98" y="219" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1601791580605" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601714567116">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601720623350">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601714567116" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601720623350" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -648,10 +658,10 @@
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="302" y="531" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601706713549" />
<state x="193" y="23" width="1636" height="1102" maximized="true" key="dock-window-1" timestamp="1601454704302">
<state x="979" y="23" width="676" height="1158" key="dock-window-1" timestamp="1601878543815">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="193" y="23" width="1636" height="1102" maximized="true" key="dock-window-1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454704302" />
<state x="979" y="23" width="676" height="1158" key="dock-window-1/30.23.1890.1177@30.23.1890.1177" timestamp="1601878543815" />
<state x="280" y="23" width="879" height="1158" key="dock-window-1/31.23.1889.1177@31.23.1889.1177" timestamp="1595227066273" />
<state x="588" y="23" width="949" height="1177" key="dock-window-2" timestamp="1601015282397">
<screen x="30" y="23" width="1890" height="1177" />
......@@ -671,11 +681,11 @@
</state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup" timestamp="1601717350560">
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup" timestamp="1601877080487">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601717350560" />
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601877080487" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component>
</project>
\ No newline at end of file
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",
"message": "nulla dolor est eiusmod sunt",
"data": {
......
resource/res.json
View file @ ec48955f
......@@ -37,7 +37,7 @@
"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"
},
{
......
src/ResJson.ts
View file @ ec48955f
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/TaskPanel.ts
View file @ ec48955f
......@@ -6,7 +6,7 @@ import Ease = FYGE.Ease;
import Button = FYGE.Button;
import { GDispatcher } from "../Main";
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 { Item } from "../../module/views/Item";
import { Tools } from "../Tools";
......@@ -14,6 +14,7 @@ import ScrollList = FYGE.ScrollList;
import Sprite = FYGE.Sprite;
import TextField = FYGE.TextField;
import { RES } from "../../module/RES";
import MouseEvent = FYGE.MouseEvent;
// 任务类型（invites 、member、follow、browserGoods、orderGoods）
export enum TaskType {
......@@ -149,6 +150,11 @@ class TaskItem extends Item {
private title: TextField;
private desc: TextField;
private getBtn: Button;
private taskBtn: Button;
data: any;
constructor() {
super();
}
......@@ -170,17 +176,100 @@ class TaskItem extends Item {
this.desc.bold = true;
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) {
if (id < 0 || !data) return;
this.icon.texture = RES.getRes(`${data.taskType}_icon.png`);
this.title.text = taskItemData[data.taskType].title
.replace('${done}', data.todayCompleteTimes)
.replace('${total}', data.totalTimes);
this.desc.text = taskItemData[data.taskType].desc
.replace('${rewards}', data.rewards);
this.data = data;
const {
rewards,
taskType,
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 {
ani.x = p[0];
ani.y = p[1];
ani.play();
if (name == RecoverName.MAGICLION_ANI) {
//具体索引还要改
// console.log()
this.addChildAt(ani, this.getChildIndex(this.map) + 1);
} else {
// if (name == RecoverName.MAGICLION_ANI) {
// 具体索引还要改
// console.log()
// this.addChildAt(ani, this.getChildIndex(this.map) + 1);
// } else {
this.addChild(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