Skip to content

X
xiaoxiaoleTuia
Commit cd93053d authored by zhangjinzhou's avatar zhangjinzhou
Browse files
Options

合并1

parent 659f95d6
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 13 deletions
.gitignore
View file @ cd93053d
...@@ -22,4 +22,5 @@ ...@@ -22,4 +22,5 @@
# doc/*.txt # doc/*.txt
# 会忽略 doc/notes.txt 但不包括 doc/server/arch.txt # 会忽略 doc/notes.txt 但不包括 doc/server/arch.txt
node_modules node_modules
bin-release bin-release
\ No newline at end of file package-lock.json
build.js
View file @ cd93053d
...@@ -24,4 +24,5 @@ else if (cmd === 'build' && process.argv[3] === 'prod2') { ...@@ -24,4 +24,5 @@ else if (cmd === 'build' && process.argv[3] === 'prod2') {
cmd = 'buildProdEXML'; cmd = 'buildProdEXML';
} }
build[cmd]('egret'); build[cmd]('egret');
// build['notinypng']('egret');
console.log(); console.log();
\ No newline at end of file
egret/src/something/enum/ElementType.ts
View file @ cd93053d
...@@ -28,8 +28,10 @@ export enum ElementType { ...@@ -28,8 +28,10 @@ export enum ElementType {
//特殊元素 ,节日元素 //特殊元素 ,节日元素
FESTIVALELE_BIG, //节日元素大中间一个13 FESTIVALELE_BIG, //节日元素大中间一个13
FESTIVALELE_SMALL //节日元素飞溅的小元素14 FESTIVALELE_SMALL, //节日元素飞溅的小元素14
//新增盲盒元素
BLIND_BOX,
} }
/** /**
......
package-lock.json
View file @ cd93053d
...@@ -3626,7 +3626,8 @@ ...@@ -3626,7 +3626,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -3647,12 +3648,14 @@ ...@@ -3647,12 +3648,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -3667,17 +3670,20 @@ ...@@ -3667,17 +3670,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -3794,7 +3800,8 @@ ...@@ -3794,7 +3800,8 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -3806,6 +3813,7 @@ ...@@ -3806,6 +3813,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -3820,6 +3828,7 @@ ...@@ -3820,6 +3828,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -3827,12 +3836,14 @@ ...@@ -3827,12 +3836,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -3851,6 +3862,7 @@ ...@@ -3851,6 +3862,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -3940,7 +3952,8 @@ ...@@ -3940,7 +3952,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -3952,6 +3965,7 @@ ...@@ -3952,6 +3965,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -4037,7 +4051,8 @@ ...@@ -4037,7 +4051,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -4073,6 +4088,7 @@ ...@@ -4073,6 +4088,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -4092,6 +4108,7 @@ ...@@ -4092,6 +4108,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -4135,12 +4152,14 @@ ...@@ -4135,12 +4152,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
......
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