Skip to content

B
babycare_xiaoxiao
Commit 1c73dd1f authored by 邱旭's avatar 邱旭
Browse files
Options

m

parent 22f3be3d
Show whitespace changes
Inline Side-by-side
Showing with 20025 additions and 28640 deletions
.idea/workspace.xml
View file @ 1c73dd1f
......@@ -2,53 +2,18 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucAgain.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueL.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueS.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueSR.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucGet.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucPrizeTip.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucPropTip.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/successBgL.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/successBgS.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucgoPrize.png" 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/feile.gameOver.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.gameOver.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/star_dis.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/star_en.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/star_en.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/去抽奖.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/圆角矩形 648.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/开奖按钮120.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/道具圆圈.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功Bg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功不满星按钮.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/starLight/star_light_9.png" beforeDir="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/mergeJs.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/mergeJs.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/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.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/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/tb/index/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/tb/index/output.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -107,11 +72,25 @@
<recent name="$PROJECT_DIR$/lotties" />
</key>
</component>
<component name="RunManager" selected="npm.flushRes">
<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.build">
<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="handleLot.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/scripts/handleLot.js" working-dir="$PROJECT_DIR$/scripts">
<configuration name="copyJs" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="copyJs" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
......@@ -146,11 +125,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.build" />
<item itemvalue="npm.copyJs" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.handleLotS" />
<item itemvalue="npm.dev" />
<item itemvalue="Node.js.handleLot.js" />
<item itemvalue="Node.js.handleLotS.js" />
</list>
</recent_temporary>
</component>
......@@ -164,7 +143,7 @@
<updated>1612576978320</updated>
<workItem from="1612576979459" duration="13000" />
<workItem from="1612577003915" duration="21094000" />
<workItem from="1612662929222" duration="31380000" />
<workItem from="1612662929222" duration="37313000" />
</task>
<task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created>
......@@ -250,7 +229,14 @@
<option name="project" value="LOCAL" />
<updated>1612687050300</updated>
</task>
<option name="localTasksCounter" value="13" />
<task id="LOCAL-00013" summary="m">
<created>1612756277485</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1612756277485</updated>
</task>
<option name="localTasksCounter" value="14" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
output.js
View file @ 1c73dd1f
This source diff could not be displayed because it is too large. You can view the blob instead.
output.js.map
View file @ 1c73dd1f
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ 1c73dd1f
......@@ -30,12 +30,12 @@
"createModule": "node scripts/createModule",
"handleLotS": "node scripts/handleLotS",
"flushRes": "node scripts/flushRes",
"handleRes": "node scripts/delRel && node scripts/copyRes && node scripts/createTm && node scripts/textureMerge && node scripts/delTm && node scripts/imageMin",
"handleRes": "node scripts/delRel && node scripts/copyRes && node scripts/createTm && node scripts/textureMerge && node scripts/delTm",
"upload": "node scripts/upload",
"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"
},
"author": "MrKwon",
......
scripts/copyJs.js
View file @ 1c73dd1f
......@@ -6,7 +6,7 @@ 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/qiuxu/Documents/兑吧/项目/斐乐消消乐/taobao_mini/fila-xxl-front/fila/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"));
......
scripts/mergeJs.js
View file @ 1c73dd1f
......@@ -8,7 +8,7 @@ var fs = require("fs");
var endPath = './released/';
fs.writeFileSync(endPath + "output.js",
'import * as FYGE from "fyge-tbmini";\n' +
'import * as FYGE from "fyge";\n' +
// 'import * as SvgaParser from "svga-parser";\n' +
fs.readFileSync("./output.js"));
console.log("js生成")
scripts/textureMerge.js
View file @ 1c73dd1f
......@@ -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)
......@@ -102,7 +102,7 @@ function getTmCmd(src, outPath, name) {
* @param {string} pathname
*/
function applyUtf8(pathname) {
fs.writeFile(pathname, iconv.decode(fs.readFileSync(pathname), "GBK"), {
fs.writeFile(pathname, iconv.decode(fs.readFileSync(pathname), "utf-8"), {
encoding: "UTF8"
}, function (err) {
if (err) {
......
src/ResJson.ts
View file @ 1c73dd1f
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/StartPanel.ts
View file @ 1c73dd1f
......@@ -45,6 +45,7 @@ export class StartPanel extends Panel {
const chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex));
chapterTxt.text = "第" + (level >> 0) + "关";
chapterTxt.position.set(375, 463);
console.log(chapterTxt)
this.addChild(new StartTarget(level)).position.set(0, 613);
......
src/scene/LoadingScene.ts
View file @ 1c73dd1f
......@@ -64,7 +64,7 @@ export class LoadingScene extends Scene {
progressEvent(e: FYGE.Event) {
let pro = e.data;
FYGE.Tween.get(this.progressBar, null, null, true)
.to({value: pro}, 0/**(p-this.lastP)*/)
.to({value: pro}, 2000/**(p-this.lastP)*/)
.call(() => {
if (pro >= 1) {
this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
......
src/scene/map/MapScene.ts
View file @ 1c73dd1f
......@@ -207,13 +207,13 @@ export class MapScene extends Scene {
public start(data?: any) {
super.start(data);
Tools.gameOver({
"isVisitSuccess": true,
"prize": undefined,
"level": 99,
"score": 58940,
"stars": 3
});
// Tools.gameOver({
// "isVisitSuccess": true,
// "prize": undefined,
// "level": 99,
// "score": 58940,
// "stars": 3
// });
}
public initEvents() {
......
tb/index/output.js
View file @ 1c73dd1f
This source diff could not be displayed because it is too large. You can view the blob instead.
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