Skip to content

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

111

parent 565390a6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 272 additions and 171 deletions
.idea/workspace.xml
View file @ 35fafbb6
...@@ -2,15 +2,30 @@ ...@@ -2,15 +2,30 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_0.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_10.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_11.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_12.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_13.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_14.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_15.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_16.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/prize_check_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/ProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/ProgressBar.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/libs/FYGE.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/libs/FYGE.d.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/ProgressBarS.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/ProgressBarS.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/libs/fyge.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/libs/fyge.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/libs/fyge.min.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/libs/fyge.min.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" 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/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.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$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/BubbleState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/BubbleState.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/HairballBlackState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/HairballBlackState.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/HairballBrownState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/HairballBrownState.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/LockState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/LockState.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -40,7 +55,7 @@ ...@@ -40,7 +55,7 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resource/map" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/libs" />
<property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.tslint" value="project" /> <property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.tslint" value="(autodetect)" /> <property name="node.js.selected.package.tslint" value="(autodetect)" />
...@@ -52,13 +67,14 @@ ...@@ -52,13 +67,14 @@
<property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" /> <property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/scene/map" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/libs" />
<recent name="$PROJECT_DIR$/resource/map" /> <recent name="$PROJECT_DIR$/resource/map" />
<recent name="$PROJECT_DIR$/resource" /> <recent name="$PROJECT_DIR$/resource" />
</key> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/scene/map" />
</key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.dev">
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
...@@ -100,7 +116,7 @@ ...@@ -100,7 +116,7 @@
<updated>1594106513515</updated> <updated>1594106513515</updated>
<workItem from="1594106517562" duration="5224000" /> <workItem from="1594106517562" duration="5224000" />
<workItem from="1594111755267" duration="29551000" /> <workItem from="1594111755267" duration="29551000" />
<workItem from="1594260676967" duration="14897000" /> <workItem from="1594260676967" duration="22156000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -146,22 +162,22 @@ ...@@ -146,22 +162,22 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="58" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594279815598" /> <state x="58" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594279815598" />
<state width="879" height="329" key="GridCell.Tab.0.bottom" timestamp="1594280192037"> <state width="879" height="329" key="GridCell.Tab.0.bottom" timestamp="1594286173436">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192037" /> <state width="879" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594286173436" />
<state width="879" height="329" key="GridCell.Tab.0.center" timestamp="1594280192036"> <state width="879" height="329" key="GridCell.Tab.0.center" timestamp="1594286173408">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192036" /> <state width="879" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594286173408" />
<state width="879" height="329" key="GridCell.Tab.0.left" timestamp="1594280192034"> <state width="879" height="329" key="GridCell.Tab.0.left" timestamp="1594286173396">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192034" /> <state width="879" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594286173396" />
<state width="879" height="329" key="GridCell.Tab.0.right" timestamp="1594280192036"> <state width="879" height="329" key="GridCell.Tab.0.right" timestamp="1594286173420">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192036" /> <state width="879" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594286173420" />
<state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663"> <state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -178,13 +194,21 @@ ...@@ -178,13 +194,21 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/31.23.1889.1177@31.23.1889.1177" timestamp="1594111906161" /> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/31.23.1889.1177@31.23.1889.1177" timestamp="1594111906161" />
<state x="907" y="23" width="879" height="1158" key="dock-window-1" timestamp="1594284506599">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="907" y="23" width="879" height="1158" key="dock-window-1/31.23.1889.1177@31.23.1889.1177" timestamp="1594284506599" />
<state x="907" y="23" width="879" height="1158" key="dock-window-2" timestamp="1594285002126">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="907" y="23" width="879" height="1158" key="dock-window-2/31.23.1889.1177@31.23.1889.1177" timestamp="1594285002126" />
<state x="157" y="286" key="run.anything.popup" timestamp="1594188122355"> <state x="157" y="286" key="run.anything.popup" timestamp="1594188122355">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594188122355" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594188122355" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594279909133"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594286333221">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594279909133" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594286333221" />
</component> </component>
</project> </project>
\ No newline at end of file
libs/FYGE.d.ts
View file @ 35fafbb6
...@@ -493,6 +493,13 @@ export class EventDispatcher extends HashObject { ...@@ -493,6 +493,13 @@ export class EventDispatcher extends HashObject {
* @return {boolean} 如果有则返回true * @return {boolean} 如果有则返回true
*/ */
hasEventListener(type: string, useCapture?: boolean): boolean; hasEventListener(type: string, useCapture?: boolean): boolean;
/**
* 清除某一类型的所有事件
* @param type
* @param useCapture true 捕获阶段 false 冒泡阶段 默认 true
* @return 返回自己
*/
removeAllEventListenerByType(type: string, useCapture?: boolean): this;
/** /**
* 移除对应类型的侦听 * 移除对应类型的侦听
* @method removeEventListener * @method removeEventListener
...@@ -552,6 +559,114 @@ export class Point extends HashObject { ...@@ -552,6 +559,114 @@ export class Point extends HashObject {
set(x: number, y: number): void; set(x: number, y: number): void;
} }
export class ObservablePoint extends HashObject {
_x: number;
_y: number;
cb: any;
scope: any;
/**
* @param {Function} cb - 值改变时的回调
* @param {object} scope - 回调里的上下文this
* @param {number} [x=0] - x
* @param {number} [y=0] - y
*/
constructor(cb: Function, scope: any, x?: number, y?: number);
/**
* 设置xy
* @param {number} [x=0]
* @param {number} [y=0]
*/
set(x?: number, y?: number): void;
/**
* 从一个点复制xy
*
* @param {Point|ObservablePoint} point
*/
copy(point: Point | ObservablePoint): void;
x: number;
y: number;
destroy(): void;
}
export class Transform extends HashObject {
/**
* 世界矩阵
*/
worldMatrix: Matrix;
/**
* 本地矩阵
*/
localMatrix: Matrix;
/**
* 记录是否更新worldMatrix
*/
_worldID: number;
/**
* 记录是否和父级更新的_worldID一致
*/
_parentID: number;
/**
* 位置
*/
position: ObservablePoint;
/**
* 缩放
*/
scale: ObservablePoint;
/**
* 锚点
* 不改变坐标原点
*/
anchor: ObservablePoint;
/**
* 斜切值
*/
skew: ObservablePoint;
/**
* 弧度制
*/
_rotation: number;
_cx: number;
_sx: number;
_cy: number;
_sy: number;
/**
* 记录的本地坐标id
*/
_localID: number;
/**
* 当前本地坐标id
*/
_currentLocalID: number;
constructor();
/**
* 任何属性更改
* @private
*/
onChange(): void;
/**
* 当斜切改变时，先记录，优化计算
* @private
*/
updateSkew(): void;
/**
* 更新本地矩阵
*/
updateLocalMatrix(): void;
/**
* 更新世界矩阵,跟随父级修改
* @param {Transform} parentTransform - 父级矩阵
*/
updateWorldMatrix(parentTransform: Transform): void;
/**
* 弧度制
*
* @member {number}
*/
rotation: number;
destroy(): void;
}
export class Matrix extends HashObject { export class Matrix extends HashObject {
/** /**
* @property a * @property a
...@@ -752,6 +867,11 @@ export class Matrix extends HashObject { ...@@ -752,6 +867,11 @@ export class Matrix extends HashObject {
* @return {number[]} the newly created array which contains the matrix * @return {number[]} the newly created array which contains the matrix
*/ */
toArray(transpose?: boolean, out?: any): any; toArray(transpose?: boolean, out?: any): any;
/**
* 从矩阵数据转成tansform的数据
* @param transform
*/
decompose(transform: Transform): Transform;
/** /**
* A default (identity) matrix * A default (identity) matrix
* *
...@@ -769,35 +889,6 @@ export class Matrix extends HashObject { ...@@ -769,35 +889,6 @@ export class Matrix extends HashObject {
destroy(): void; destroy(): void;
} }
export class ObservablePoint extends HashObject {
_x: number;
_y: number;
cb: any;
scope: any;
/**
* @param {Function} cb - 值改变时的回调
* @param {object} scope - 回调里的上下文this
* @param {number} [x=0] - x
* @param {number} [y=0] - y
*/
constructor(cb: Function, scope: any, x?: number, y?: number);
/**
* 设置xy
* @param {number} [x=0]
* @param {number} [y=0]
*/
set(x?: number, y?: number): void;
/**
* 从一个点复制xy
*
* @param {Point|ObservablePoint} point
*/
copy(point: Point | ObservablePoint): void;
x: number;
y: number;
destroy(): void;
}
export class Rectangle extends HashObject { export class Rectangle extends HashObject {
/** /**
* 类型 * 类型
...@@ -943,85 +1034,6 @@ export class Rectangle extends HashObject { ...@@ -943,85 +1034,6 @@ export class Rectangle extends HashObject {
destroy(): void; destroy(): void;
} }
export class Transform extends HashObject {
/**
* 世界矩阵
*/
worldMatrix: Matrix;
/**
* 本地矩阵
*/
localMatrix: Matrix;
/**
* 记录是否更新worldMatrix
*/
_worldID: number;
/**
* 记录是否和父级更新的_worldID一致
*/
_parentID: number;
/**
* 位置
*/
position: ObservablePoint;
/**
* 缩放
*/
scale: ObservablePoint;
/**
* 锚点
* 不改变坐标原点
*/
anchor: ObservablePoint;
/**
* 斜切值
*/
skew: ObservablePoint;
/**
* 弧度制
*/
_rotation: number;
_cx: number;
_sx: number;
_cy: number;
_sy: number;
/**
* 记录的本地坐标id
*/
_localID: number;
/**
* 当前本地坐标id
*/
_currentLocalID: number;
constructor();
/**
* 任何属性更改
* @private
*/
onChange(): void;
/**
* 当斜切改变时，先记录，优化计算
* @private
*/
updateSkew(): void;
/**
* 更新本地矩阵
*/
updateLocalMatrix(): void;
/**
* 更新世界矩阵,跟随父级修改
* @param {Transform} parentTransform - 父级矩阵
*/
updateWorldMatrix(parentTransform: Transform): void;
/**
* 弧度制
*
* @member {number}
*/
rotation: number;
destroy(): void;
}
export const GroupD8: { export const GroupD8: {
E: number; E: number;
SE: number; SE: number;
...@@ -3780,7 +3792,7 @@ export const premultiplyBlendMode: any[]; ...@@ -3780,7 +3792,7 @@ export const premultiplyBlendMode: any[];
export function uid(): number; export function uid(): number;
export const backupCanvas: HTMLCanvasElement; export function getBackupCanvasCtx(): CanvasRenderingContext2D;
export function getGradientColor(points: any, colors: any): any; export function getGradientColor(points: any, colors: any): any;
...@@ -6370,6 +6382,10 @@ export class BitmapText extends Container { ...@@ -6370,6 +6382,10 @@ export class BitmapText extends Container {
* 对齐方式 * 对齐方式
*/ */
textAlign: TEXT_ALIGN; textAlign: TEXT_ALIGN;
/**
* 垂直居中方式，暂时还没写,
*/
verticalAlign: VERTICAL_ALIGN;
/** /**
* 文本 * 文本
*/ */
...@@ -6821,10 +6837,17 @@ export class Tween { ...@@ -6821,10 +6837,17 @@ export class Tween {
} }
export class Button extends Sprite { export class Button extends Sprite {
textureUp: any; private textureUp;
textureDown: any; private textureDown;
textureDisable: any; private textureDisable;
constructor(tUp: Texture, tDown?: Texture, tDisable?: Texture); constructor(tUp: Texture, tDown?: Texture, tDisable?: Texture);
/**
* 修改纹理
* @param tUp
* @param tDown
* @param tDisable
*/
changeTexture(tUp: Texture, tDown?: Texture, tDisable?: Texture): void;
/** /**
* @method _mouseEvent * @method _mouseEvent
* @param e * @param e
...@@ -6893,7 +6916,7 @@ export class FrameAni extends Container { ...@@ -6893,7 +6916,7 @@ export class FrameAni extends Container {
*/ */
constructor(texturesAll: Texture[]); constructor(texturesAll: Texture[]);
private count; private count;
private onEnterFrame(): void; onEnterFrame(): void;
/** /**
* 从0开始播放 * 从0开始播放
*/ */
...@@ -6907,7 +6930,8 @@ export class FrameAni extends Container { ...@@ -6907,7 +6930,8 @@ export class FrameAni extends Container {
* @param index * @param index
*/ */
private changeTexture; private changeTexture;
/**
/**
* 重置所有贴图，还没加其实 * 重置所有贴图，还没加其实
* @param texturesAll * @param texturesAll
*/ */
...@@ -7996,3 +8020,4 @@ export var Stats: (canvasId: any) => { ...@@ -7996,3 +8020,4 @@ export var Stats: (canvasId: any) => {
} }
export { Stats };} export { Stats };}
declare module "fyge" {export = FYGE;}
libs/fyge.min.js
View file @ 35fafbb6
This diff is collapsed.
libs/fyge.min.js.map
View file @ 35fafbb6
This diff is collapsed.
mock/miniTb/babycare.getIndex.json
View file @ 35fafbb6
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
}, },
"prizes": [ "prizes": [
{ {
"level": 12 "level": 5
} }
], ],
"visitors": [ "visitors": [
......
src/scene/map/CheckBtn.ts
View file @ 35fafbb6
...@@ -8,10 +8,10 @@ import { Tools } from "../../Tools"; ...@@ -8,10 +8,10 @@ import { Tools } from "../../Tools";
import TEXT_ALIGN = FYGE.TEXT_ALIGN; import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import MouseEvent = FYGE.MouseEvent; import MouseEvent = FYGE.MouseEvent;
import Point = FYGE.Point; import Point = FYGE.Point;
import { FrameAni } from "fyge";
export enum CHECK_TYPE { export enum CHECK_TYPE {
COM, // 普通 COM, // 普通
PRI, // 奖励
CUR, // 当前 CUR, // 当前
} }
...@@ -22,9 +22,19 @@ export default class CheckBtn extends Container { ...@@ -22,9 +22,19 @@ export default class CheckBtn extends Container {
private star: CheckStar[] = null; private star: CheckStar[] = null;
private starAnim: FrameAni = null;
private curAnim: FrameAni = null;
private checkNum: number = null; private checkNum: number = null;
private _data: any = null;
public set data(data) {
this._data = data;
if (!data.isVisitSuccess) return;
this.enabled = data.isVisitSuccess;
this.starCount = data.stars;
}
private _starCount = 0; private _starCount = 0;
public set starCount(count: number) { public set starCount(count: number) {
if (count > 3) { if (count > 3) {
...@@ -46,9 +56,17 @@ export default class CheckBtn extends Container { ...@@ -46,9 +56,17 @@ export default class CheckBtn extends Container {
this.btn.enabled = enabled; this.btn.enabled = enabled;
this.star.forEach(v => v.visible = enabled); this.star.forEach(v => v.visible = enabled);
this.checkLabel.visible = false; this.checkLabel.visible = enabled;
}
// 是不是奖励关卡
private _isPrize: boolean = false;
public set isPrize(isPrize: boolean) {
if (isPrize == this._isPrize) return;
} }
// 按钮类型
private _type: CHECK_TYPE = CHECK_TYPE.COM; private _type: CHECK_TYPE = CHECK_TYPE.COM;
public set type(type: CHECK_TYPE) { public set type(type: CHECK_TYPE) {
if (this._type == type) return; if (this._type == type) return;
...@@ -56,7 +74,6 @@ export default class CheckBtn extends Container { ...@@ -56,7 +74,6 @@ export default class CheckBtn extends Container {
switch (type) { switch (type) {
case CHECK_TYPE.COM: case CHECK_TYPE.COM:
// @ts-ignore
this.btn.changeTexture( this.btn.changeTexture(
RES.getRes('map_check_enable.png'), RES.getRes('map_check_enable.png'),
RES.getRes('map_check_enable.png'), RES.getRes('map_check_enable.png'),
...@@ -65,18 +82,7 @@ export default class CheckBtn extends Container { ...@@ -65,18 +82,7 @@ export default class CheckBtn extends Container {
this.checkLabel.strokeColor = '#316ec6'; this.checkLabel.strokeColor = '#316ec6';
break; break;
case CHECK_TYPE.PRI:
// @ts-ignore
this.btn.changeTexture(
RES.getRes('map_check_enable.png'),
RES.getRes('map_check_enable.png'),
RES.getRes('map_check_disable_prize.png'));
this.checkLabel.strokeColor = '#316ec6';
break;
case CHECK_TYPE.CUR: case CHECK_TYPE.CUR:
// @ts-ignore
this.btn.changeTexture( this.btn.changeTexture(
RES.getRes('map_check_enable_cur.png'), RES.getRes('map_check_enable_cur.png'),
RES.getRes('map_check_enable_cur.png'), RES.getRes('map_check_enable_cur.png'),
...@@ -94,7 +100,6 @@ export default class CheckBtn extends Container { ...@@ -94,7 +100,6 @@ export default class CheckBtn extends Container {
this.alpha = this.stage.viewRect.isPointIn(up) || this.stage.viewRect.isPointIn(bp); this.alpha = this.stage.viewRect.isPointIn(up) || this.stage.viewRect.isPointIn(bp);
} }
constructor(data) { constructor(data) {
super(); super();
...@@ -108,17 +113,16 @@ export default class CheckBtn extends Container { ...@@ -108,17 +113,16 @@ export default class CheckBtn extends Container {
RES.getRes('map_check_disable.png') RES.getRes('map_check_disable.png')
)); ));
// 三个星星
const star1 = this.addChild(new CheckStar()); const star1 = this.addChild(new CheckStar());
star1.position.set(16.5, 83); star1.position.set(16.5, 83);
const star2 = this.addChild(new CheckStar()); const star2 = this.addChild(new CheckStar());
star2.position.set(42.5, 90); star2.position.set(42.5, 90);
const star3 = this.addChild(new CheckStar()); const star3 = this.addChild(new CheckStar());
star3.position.set(67.5, 83); star3.position.set(67.5, 83);
this.star = [star1, star2, star3]; this.star = [star1, star2, star3];
// 关卡文字
this.checkNum = data.check; this.checkNum = data.check;
this.checkLabel = this.btn.addChild(Tools.getText( this.checkLabel = this.btn.addChild(Tools.getText(
data.check, 30, '#ffffff', data.check, 30, '#ffffff',
...@@ -127,9 +131,13 @@ export default class CheckBtn extends Container { ...@@ -127,9 +131,13 @@ export default class CheckBtn extends Container {
this.checkLabel.stroke = 2; this.checkLabel.stroke = 2;
this.checkLabel.strokeColor = '#316ec6'; this.checkLabel.strokeColor = '#316ec6';
this.enabled = false; // 先设置成关闭
// 点击事件
this.addEventListener(MouseEvent.CLICK, () => { this.addEventListener(MouseEvent.CLICK, () => {
console.log(`关卡:${this.checkNum}`); console.log(`关卡:${this.checkNum}`);
}, this); }, this);
} }
} }
......
src/scene/map/MapScene.ts
View file @ 35fafbb6
...@@ -5,9 +5,9 @@ import MapUI from "./MapUI"; ...@@ -5,9 +5,9 @@ import MapUI from "./MapUI";
import MapMid from "./MapMid"; import MapMid from "./MapMid";
import CheckBtn, { CHECK_TYPE } from "./CheckBtn"; import CheckBtn, { CHECK_TYPE } from "./CheckBtn";
import { layers } from "../../../module/views/layers"; import { layers } from "../../../module/views/layers";
import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import ScrollPage = FYGE.ScrollPage; import ScrollPage = FYGE.ScrollPage;
import Container = FYGE.Container; import Container = FYGE.Container;
import { sendTbNet, TbNetName } from "../../TaoBaoNet";
export class MapScene extends Scene { export class MapScene extends Scene {
private mapContainer: Container = null; private mapContainer: Container = null;
...@@ -29,12 +29,6 @@ export class MapScene extends Scene { ...@@ -29,12 +29,6 @@ export class MapScene extends Scene {
protected initUi() { protected initUi() {
super.initUi(); super.initUi();
sendTbNet(TbNetName.getIndex, {},
(success, res) => {
}
);
this.scrollPage = this.addChild(new ScrollPage( this.scrollPage = this.addChild(new ScrollPage(
750, layers.stageHeight, 750, layers.stageHeight,
888, true, true 888, true, true
...@@ -44,6 +38,56 @@ export class MapScene extends Scene { ...@@ -44,6 +38,56 @@ export class MapScene extends Scene {
this.uiLayer = this.addChild(new MapUI()); this.uiLayer = this.addChild(new MapUI());
this.initMap(); this.initMap();
this.updateMapCheck();
}
private updateMapCheck() {
sendTbNet(TbNetName.getIndex, {},
(success, res) => {
// {
// "level": 1,
// "scores": 11111,
// "stars": 1,
// "isPrizeLevel": false,
// "isVisitSuccess": true
// },
if (!success) return;
const currentLevel = res.data.currentLevel;
// 已经通关的
for (let i = 1; i < currentLevel; i++) {
MapScene.checkArr[i].type = CHECK_TYPE.COM;
MapScene.checkArr[i].enabled = true;
}
// 当前关卡
MapScene.checkArr[currentLevel].type = CHECK_TYPE.CUR;
MapScene.checkArr[currentLevel].enabled = true;
// 未通关的
for (let i = currentLevel + 1; i < 121; i++) {
MapScene.checkArr[i].type = CHECK_TYPE.COM;
MapScene.checkArr[i].enabled = false;
}
res.data.visitors.forEach((v) => {
MapScene.checkArr[v.level].data = v;
});
// 奖励关卡
res.data.prizes.forEach((v) => {
MapScene.checkArr[v.level].isPrize = true;
});
this.scrollToCheck(currentLevel);
}
);
} }
public initMap() { public initMap() {
...@@ -51,10 +95,10 @@ export class MapScene extends Scene { ...@@ -51,10 +95,10 @@ export class MapScene extends Scene {
for (let i = 0; i < 120; i++) { for (let i = 0; i < 120; i++) {
arr[i] = { arr[i] = {
starCount: 2,
check: i + 1 check: i + 1
}; };
} }
const topData = arr.splice(118, 2); // 得到顶部的数据 const topData = arr.splice(118, 2); // 得到顶部的数据
const bottomData = arr.splice(0, 8); // 得到尾部的数据 const bottomData = arr.splice(0, 8); // 得到尾部的数据
const midData = arr; // 剩下的是中间的数据 const midData = arr; // 剩下的是中间的数据
...@@ -63,6 +107,7 @@ export class MapScene extends Scene { ...@@ -63,6 +107,7 @@ export class MapScene extends Scene {
for (let i = midData.length / 10 - 1; i >= 0; i--) { for (let i = midData.length / 10 - 1; i >= 0; i--) {
const data = midData.splice(i * 10, 10); const data = midData.splice(i * 10, 10);
// console.log(data);
const nMid = new MapMid(data); const nMid = new MapMid(data);
this.mapContainer.addChild(nMid); this.mapContainer.addChild(nMid);
nMid.y = maxHeight; nMid.y = maxHeight;
...@@ -83,8 +128,7 @@ export class MapScene extends Scene { ...@@ -83,8 +128,7 @@ export class MapScene extends Scene {
// v.type = CHECK_TYPE.PRI; // v.type = CHECK_TYPE.PRI;
// v.enabled = false; // v.enabled = false;
// }); // });
this.scrollToCheck(113); this.scrollToCheck(1);
MapScene.checkArr[113].type = CHECK_TYPE.CUR;
} }
private scrollToCheck(checkNum: number, time = 0) { private scrollToCheck(checkNum: number, time = 0) {
...@@ -94,7 +138,7 @@ export class MapScene extends Scene { ...@@ -94,7 +138,7 @@ export class MapScene extends Scene {
checkNum = 120; checkNum = 120;
} }
const check = MapScene.checkArr[checkNum]; const check = MapScene.checkArr[checkNum];
const checkY = check.y + check.parent.y - 1624 / 2; const checkY = check.y + check.parent.y - layers.stageHeight / 2 + 50;
this.scrollPage.scrollTo(checkY, time); this.scrollPage.scrollTo(checkY, time);
} }
......
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