Skip to content

B
babycare_xiaoxiao
Commit 03216629 authored by wjf's avatar wjf
Browse files
Options

l

parent 2b5c25f1
Show whitespace changes
Inline Side-by-side
Showing with 16941 additions and 8328 deletions
.gitignore
View file @ 03216629
...@@ -3,3 +3,4 @@ node_modules ...@@ -3,3 +3,4 @@ node_modules
released released
.DS_Store .DS_Store
psd psd
./scripts/copyJs.js
libs/FYGE.d.ts
View file @ 03216629
...@@ -3175,8 +3175,8 @@ export class MaskManager { ...@@ -3175,8 +3175,8 @@ export class MaskManager {
/** /**
* Applies the Mask and adds it to the current filter stack. * Applies the Mask and adds it to the current filter stack.
* *
* @param {PIXI.RenderTarget} target - Display Object to push the sprite mask to * @param {RenderTarget} target - Display Object to push the sprite mask to
* @param {PIXI.Sprite} maskData - Sprite to be used as the mask * @param {Sprite} maskData - Sprite to be used as the mask
*/ */
private pushSpriteMask; private pushSpriteMask;
/** /**
...@@ -3645,7 +3645,7 @@ export class Sprite extends Container { ...@@ -3645,7 +3645,7 @@ export class Sprite extends Container {
texture: Texture; texture: Texture;
tint: number; tint: number;
/** /**
* * 网络图片
* @param url * @param url
*/ */
static fromUrl(url: string): Sprite; static fromUrl(url: string): Sprite;
...@@ -6916,7 +6916,7 @@ export class FrameAni extends Container { ...@@ -6916,7 +6916,7 @@ export class FrameAni extends Container {
*/ */
constructor(texturesAll: Texture[]); constructor(texturesAll: Texture[]);
private count; private count;
onEnterFrame(): void; private onEnterFrame;
/** /**
* 从0开始播放 * 从0开始播放
*/ */
...@@ -6926,13 +6926,7 @@ export class FrameAni extends Container { ...@@ -6926,13 +6926,7 @@ export class FrameAni extends Container {
*/ */
reset(frame?: number): void; reset(frame?: number): void;
/** /**
* 改texture和居中 * 重置所有贴图，会置0停止，不设置播放，否则原先的play里的startTime及loop不好维护
* @param index
*/
private changeTexture;
/**
* 重置所有贴图，还没加其实
* @param texturesAll * @param texturesAll
*/ */
resetTexturesAll(texturesAll: Texture[]): void; resetTexturesAll(texturesAll: Texture[]): void;
...@@ -7290,7 +7284,7 @@ export class MovieClip extends Container { ...@@ -7290,7 +7284,7 @@ export class MovieClip extends Container {
init(mv: any): void; init(mv: any): void;
private initChildren; private initChildren;
/** /**
* 用基础属性重置 * 用基础属性重置，废的
* @param display * @param display
* @param transform * @param transform
*/ */
...@@ -8020,4 +8014,3 @@ export var Stats: (canvasId: any) => { ...@@ -8020,4 +8014,3 @@ export var Stats: (canvasId: any) => {
} }
export { Stats };} export { Stats };}
\ No newline at end of file
// declare module "fyge" {export = FYGE;}
libs/fyge.min.js
View file @ 03216629
This source diff could not be displayed because it is too large. You can view the blob instead.
libs/fyge.min.js.map
View file @ 03216629
This source diff could not be displayed because it is too large. You can view the blob instead.
resource/res.json
View file @ 03216629
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"name": "NoStepPanel" "name": "NoStepPanel"
}, },
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "aa.png,blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
......
scripts/copyJs.js
View file @ 03216629
...@@ -6,7 +6,7 @@ var fs = require("fs"); ...@@ -6,7 +6,7 @@ var fs = require("fs");
// fs.readFileSync("./output.js") // fs.readFileSync("./output.js")
// ) // )
// var endPath = 'D:/duibaGame/测试项目0527/taobaominiTest/client/pages/index1/'; // 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 = 'D:/duibaGame/淘宝项目/babycareXiaoxiaoleTBminiTry/client/pages/index/';
var version = Math.round(new Date().getTime() / 1000); var version = Math.round(new Date().getTime() / 1000);
// fs.writeFileSync(endPath + "output." + version + ".js", fs.readFileSync("./released/output.js")); // fs.writeFileSync(endPath + "output." + version + ".js", fs.readFileSync("./released/output.js"));
fs.writeFileSync(endPath + "output.js", fs.readFileSync("./released/output.js")); fs.writeFileSync(endPath + "output.js", fs.readFileSync("./released/output.js"));
......
src/Main.ts
View file @ 03216629
...@@ -44,7 +44,7 @@ export class Main { ...@@ -44,7 +44,7 @@ export class Main {
1624,//设计高度 1624,//设计高度
sysInfo && sysInfo.windowWidth || document.body.clientWidth, sysInfo && sysInfo.windowWidth || document.body.clientWidth,
sysInfo && sysInfo.windowHeight || document.body.clientHeight, sysInfo && sysInfo.windowHeight || document.body.clientHeight,
FYGE.RENDERER_TYPE.CANVAS FYGE.RENDERER_TYPE.WEBGL
); );
this.stage = stage; this.stage = stage;
this.canvas = canvas;//赋值下，为了下面的destroy的cancelAnimationFrame this.canvas = canvas;//赋值下，为了下面的destroy的cancelAnimationFrame
......
src/ResJson.ts
View file @ 03216629
This source diff could not be displayed because it is too large. You can view the blob instead.
src/scene/PlayScene.ts
View file @ 03216629
...@@ -396,7 +396,14 @@ export class PlayScene extends Scene { ...@@ -396,7 +396,14 @@ export class PlayScene extends Scene {
var mask = drawShape(path); var mask = drawShape(path);
this.elementContainer.mask = mask; this.elementContainer.mask = mask;
mask.updateShape();//执行一边吧，不然又bug，不更新_localBoundSelf mask.updateShape();//执行一边吧，不然又bug，不更新_localBoundSelf
// this.elementContainer.filterArea= mask.getBounds(true).clone();
console.log(this.elementContainer.filterArea)
this.addChild(mask) this.addChild(mask)
setInterval(()=>{this.elementContainer["_boundsID"]++},30)
window["aa"]=this.elementContainer
window["bb"]=mask
// console.log(this.elementContainer.getBounds(true))
// console.log(this.elementContainer.getBounds(true))
//容器事件 //容器事件
this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.mouseDownE, this); this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.mouseDownE, this);
this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_MOVE, this.mouseMoveE, this); this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_MOVE, this.mouseMoveE, this);
......
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