Skip to content

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

guide

parent 4ec7aeeb
Hide whitespace changes
Inline Side-by-side
Showing with 23233 additions and 13658 deletions
.idea/workspace.xml
View file @ cabc914a
......@@ -3,15 +3,13 @@
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/resource/playScene/gameGuideBoard.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/gameGuideBoard.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropHand.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/guidePropHand.png" afterDir="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$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/copyJs.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/copyJs.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/textureMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/textureMerge.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/FirstPropGift.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/FirstPropGift.ts" 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$/src/something/uis/PropGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -79,11 +77,18 @@
<recent name="$PROJECT_DIR$/src/panels" />
</key>
</component>
<component name="RunManager" selected="npm.flushRes">
<configuration name="aaaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/src/aaaa.html" useBuiltInWebServerPort="true">
<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">
<method v="2" />
</configuration>
<configuration name="handleLotS.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/scripts/handleLotS.js" working-dir="$PROJECT_DIR$/scripts">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="build" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
......@@ -119,11 +124,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.lt" />
<item itemvalue="Node.js.handleLotS.js" />
<item itemvalue="JavaScript Debug.aaaa.html" />
</list>
</recent_temporary>
</component>
......@@ -173,14 +178,7 @@
<workItem from="1601170975973" duration="20963000" />
<workItem from="1601257315718" duration="48496000" />
<workItem from="1601429998970" duration="22651000" />
<workItem from="1601689013718" duration="11585000" />
</task>
<task id="LOCAL-00021" summary="Success Panel Effect!">
<created>1594975042897</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1594975042897</updated>
<workItem from="1601689013718" duration="15604000" />
</task>
<task id="LOCAL-00022" summary="Success Panel Effect!">
<created>1595214630434</created>
......@@ -518,7 +516,14 @@
<option name="project" value="LOCAL" />
<updated>1601706735877</updated>
</task>
<option name="localTasksCounter" value="70" />
<task id="LOCAL-00070" summary="guide">
<created>1601709128879</created>
<option name="number" value="00070" />
<option name="presentableId" value="LOCAL-00070" />
<option name="project" value="LOCAL" />
<updated>1601709128879</updated>
</task>
<option name="localTasksCounter" value="71" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -554,7 +559,8 @@
<MESSAGE value="lihe" />
<MESSAGE value="lowt" />
<MESSAGE value="首页动画" />
<option name="LAST_COMMIT_MESSAGE" value="首页动画" />
<MESSAGE value="guide" />
<option name="LAST_COMMIT_MESSAGE" value="guide" />
</component>
<component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
......@@ -570,51 +576,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="1601706735385">
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601709128556">
<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="1601706735385" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601709128556" />
<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="1601708989801">
<state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601714233880">
<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="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="1601708989801" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233880" />
<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="1601708989799">
<state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601714233879">
<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="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="1601708989799" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233879" />
<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="1601708989799">
<state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601714233878">
<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="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="1601708989799" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233878" />
<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="1601708989800">
<state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601714233880">
<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="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="1601708989800" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601714233880" />
<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">
......@@ -631,12 +637,12 @@
</state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<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="1601706737193">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601709129844">
<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="1601706737193" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601709129844" />
<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" />
......@@ -669,11 +675,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="671" height="676" key="search.everywhere.popup" timestamp="1601708615588">
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup" timestamp="1601714273023">
<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="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601708615588" />
<state x="639" y="288" width="670" height="158" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601714273023" />
<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
output.js
View file @ cabc914a
This source diff could not be displayed because it is too large. You can view the blob instead.
output.js.map
View file @ cabc914a
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ cabc914a
......@@ -35,7 +35,7 @@
"build": "npm run handleRes && node scripts/mergeJson && npm run upload && npm run buildTS",
"watch": "webpack --watch",
"dev": "webpack-dev-server --open --config webpack.dev.js --host 0.0.0.0",
"buildTS": "webpack --config webpack.prod.js && node scripts/mergeJs",
"buildTS": "webpack --config webpack.prod.js && node scripts/mergeJs && npm run copyJs",
"copyJs": "node scripts/copyJs",
"lt": "node scripts/handleLotS.js"
},
......
scripts/copyJs.js
View file @ cabc914a
......@@ -6,10 +6,10 @@ var fs = require("fs");
// fs.readFileSync("./output.js")
// )
// var endPath = 'D:/duibaGame/测试项目0527/taobaominiTest/client/pages/index1/';
var endPath = 'D:/duibaGame/淘宝项目/taobao_mini/babycare_xiaoxiaole/babycare_c_client/client/pages/index/';
var endPath = '/Users/haiyoucuv/Documents/Web/泡泡玛特消消乐/taobao_mini/popmart_xiaoxiaole/popmart_c_client/client/pages/index/';
var version = Math.round(new Date().getTime() / 1000);
// fs.writeFileSync(endPath + "output." + version + ".js", fs.readFileSync("./released/output.js"));
fs.writeFileSync(endPath + "output.js", fs.readFileSync("./released/output.js"));
// console.log("js覆盖完成")
console.log(`版本号：
${version}`)
\ No newline at end of file
${version}`)
scripts/textureMerge.js
View file @ cabc914a
......@@ -47,7 +47,7 @@ files.forEach(function (file) {
var pathname = outPath + file + "/" + file + ".json";
//有中文命名时处理
var data = iconv.decode(fs.readFileSync(pathname), "GBK");//GBK，window版本只能GBK，TexturePacker版本问题，mac改成utf-8
var data = iconv.decode(fs.readFileSync(pathname), "utf-8");//GBK，window版本只能GBK，TexturePacker版本问题，mac改成utf-8
// console.log(data)
//反序列化
data = JSON.parse(data); //eval(data)
......@@ -99,7 +99,7 @@ function getTmCmd(src, outPath, name) {
/**
* 对文件使用utf8编码
* @param {string} pathname
* @param {string} pathname
*/
function applyUtf8(pathname) {
fs.writeFile(pathname, iconv.decode(fs.readFileSync(pathname), "GBK"), {
......@@ -113,7 +113,7 @@ function applyUtf8(pathname) {
/**
* 判断文件夹内是否有图片
* @param {*} path
* @param {*} path
*/
function judgeHasImage(path) {
var files = fs.readdirSync(path);
......@@ -128,4 +128,4 @@ function judgeHasImage(path) {
}
}
return false;
}
\ No newline at end of file
}
src/ResJson.ts
View file @ cabc914a
This source diff could not be displayed because it is too large. You can view the blob instead.
src/SkinJson.ts
View file @ cabc914a
......@@ -327,7 +327,7 @@ export const SkinJson = {
"alpha": 1,
"type": "sprite",
"props": {
"source": "prize.png"
"source": ""
},
"id": "prizeImg"
},
......
src/scene/map/MapScene.ts
View file @ cabc914a
......@@ -78,6 +78,7 @@ export class MapScene extends Scene {
const guide = this.addChild(new Container());
guide.y = -layers.stageOffsetY;
guide.y = -layers.stageOffsetY;
const g = guide.addChild(new Graphics());
g.beginFill(0, 0.6);
g.drawRect(0, 0, 750, 1624);
......
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