Commit 94469eaa authored by limingzhe's avatar limingzhe

fix: 老代码

parent 557942c7
No preview for this file type
No preview for this file type
{ {
"ver": "1.2.7", "ver": "1.2.9",
"uuid": "9993b7c8-e4e4-4b48-8922-9c55f423bdb3", "uuid": "9993b7c8-e4e4-4b48-8922-9c55f423bdb3",
"optimizationPolicy": "AUTO", "optimizationPolicy": "AUTO",
"asyncLoadAssets": false, "asyncLoadAssets": false,
......
{ {
"ver": "1.2.7", "ver": "1.2.9",
"uuid": "c3f18614-c716-4f1f-899f-09f073ac6c43", "uuid": "c3f18614-c716-4f1f-899f-09f073ac6c43",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": true,
......
...@@ -85,6 +85,6 @@ ...@@ -85,6 +85,6 @@
{ {
"__type__": "cc.BufferRange", "__type__": "cc.BufferRange",
"offset": 4128, "offset": 4128,
"length": 432 "length": 384
} }
] ]
\ No newline at end of file
...@@ -6,9 +6,10 @@ ...@@ -6,9 +6,10 @@
"properties": null, "properties": null,
"techniques": [ "techniques": [
{ {
"name": "add", "name": "opaque-add",
"passes": [ "passes": [
{ {
"stage": "opaque",
"rasterizerState": { "rasterizerState": {
"cullMode": 0 "cullMode": 0
}, },
...@@ -59,9 +60,10 @@ ...@@ -59,9 +60,10 @@
] ]
}, },
{ {
"name": "alpha-blend", "name": "opaque-alpha-blend",
"passes": [ "passes": [
{ {
"stage": "opaque",
"rasterizerState": { "rasterizerState": {
"cullMode": 0 "cullMode": 0
}, },
...@@ -112,9 +114,10 @@ ...@@ -112,9 +114,10 @@
] ]
}, },
{ {
"name": "add-multiply", "name": "opaque-add-multiply",
"passes": [ "passes": [
{ {
"stage": "opaque",
"rasterizerState": { "rasterizerState": {
"cullMode": 0 "cullMode": 0
}, },
...@@ -165,9 +168,10 @@ ...@@ -165,9 +168,10 @@
] ]
}, },
{ {
"name": "add-smooth", "name": "opaque-add-smooth",
"passes": [ "passes": [
{ {
"stage": "opaque",
"rasterizerState": { "rasterizerState": {
"cullMode": 0 "cullMode": 0
}, },
...@@ -206,9 +210,256 @@ ...@@ -206,9 +210,256 @@
] ]
}, },
{ {
"name": "premultiply-blend", "name": "opaque-premultiply-blend",
"passes": [ "passes": [
{ {
"stage": "opaque",
"rasterizerState": {
"cullMode": 0
},
"blendState": {
"targets": [
{
"blend": true,
"blendSrc": 770,
"blendDst": 771,
"blendSrcAlpha": 770,
"blendDstAlpha": 771
}
]
},
"depthStencilState": {
"depthTest": true,
"depthWrite": false
},
"properties": {
"mainTexture": {
"value": "grey",
"type": 29
},
"mainTiling_Offset": {
"value": [
1,
1,
0,
0
],
"type": 16
}
},
"program": "builtin-3d-particle|particle-vs-legacy:lpvs_main|no-tint-fs:premultiplied"
}
]
},
{
"name": "transparent-add",
"passes": [
{
"stage": "transparent",
"rasterizerState": {
"cullMode": 0
},
"blendState": {
"targets": [
{
"blend": true,
"blendSrc": 770,
"blendDst": 1,
"blendSrcAlpha": 770,
"blendDstAlpha": 1
}
]
},
"depthStencilState": {
"depthTest": true,
"depthWrite": false
},
"properties": {
"mainTexture": {
"value": "grey",
"type": 29
},
"mainTiling_Offset": {
"value": [
1,
1,
0,
0
],
"type": 16
},
"tintColor": {
"value": [
0.5,
0.5,
0.5,
0.5
],
"inspector": {
"type": "color"
},
"type": 16
}
},
"program": "builtin-3d-particle|particle-vs-legacy:lpvs_main|tinted-fs:add"
}
]
},
{
"name": "transparent-alpha-blend",
"passes": [
{
"stage": "transparent",
"rasterizerState": {
"cullMode": 0
},
"blendState": {
"targets": [
{
"blend": true,
"blendSrc": 770,
"blendDst": 771,
"blendSrcAlpha": 770,
"blendDstAlpha": 771
}
]
},
"depthStencilState": {
"depthTest": true,
"depthWrite": false
},
"properties": {
"mainTexture": {
"value": "grey",
"type": 29
},
"mainTiling_Offset": {
"value": [
1,
1,
0,
0
],
"type": 16
},
"tintColor": {
"value": [
0.5,
0.5,
0.5,
0.5
],
"inspector": {
"type": "color"
},
"type": 16
}
},
"program": "builtin-3d-particle|particle-vs-legacy:lpvs_main|tinted-fs:add"
}
]
},
{
"name": "transparent-add-multiply",
"passes": [
{
"stage": "transparent",
"rasterizerState": {
"cullMode": 0
},
"blendState": {
"targets": [
{
"blend": true,
"blendSrc": 770,
"blendDst": 771,
"blendSrcAlpha": 770,
"blendDstAlpha": 771
}
]
},
"depthStencilState": {
"depthTest": true,
"depthWrite": false
},
"properties": {
"mainTexture": {
"value": "grey",
"type": 29
},
"mainTiling_Offset": {
"value": [
1,
1,
0,
0
],
"type": 16
},
"tintColor": {
"value": [
0.5,
0.5,
0.5,
0.5
],
"inspector": {
"type": "color"
},
"type": 16
}
},
"program": "builtin-3d-particle|particle-vs-legacy:lpvs_main|tinted-fs:multiply"
}
]
},
{
"name": "transparent-add-smooth",
"passes": [
{
"stage": "transparent",
"rasterizerState": {
"cullMode": 0
},
"blendState": {
"targets": [
{
"blend": true,
"blendSrc": 770,
"blendDst": 771,
"blendSrcAlpha": 770,
"blendDstAlpha": 771
}
]
},
"depthStencilState": {
"depthTest": true,
"depthWrite": false
},
"properties": {
"mainTexture": {
"value": "grey",
"type": 29
},
"mainTiling_Offset": {
"value": [
1,
1,
0,
0
],
"type": 16
}
},
"program": "builtin-3d-particle|particle-vs-legacy:lpvs_main|no-tint-fs:addSmooth"
}
]
},
{
"name": "transparent-premultiply-blend",
"passes": [
{
"stage": "transparent",
"rasterizerState": { "rasterizerState": {
"cullMode": 0 "cullMode": 0
}, },
......
...@@ -878,7 +878,7 @@ ...@@ -878,7 +878,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "954fec8b-cd16-4bb9-a3b7-7719660e7558", "fileId": "",
"sync": false "sync": false
} }
] ]
\ No newline at end of file
...@@ -206,6 +206,8 @@ cc.Class({ ...@@ -206,6 +206,8 @@ cc.Class({
tmpArr = [item]; tmpArr = [item];
this._pageArr.push(tmpArr); this._pageArr.push(tmpArr);
curLen = this._disW + item.width + this._disW;
} else { } else {
tmpArr.push(item); tmpArr.push(item);
} }
......
This diff is collapsed.
...@@ -8,90 +8,90 @@ ...@@ -8,90 +8,90 @@
"x": 166, "x": 166,
"y": 136, "y": 136,
"width": 1280, "width": 1280,
"height": 736, "height": 740,
"layout": { "layout": {
"type": "dock-h",
"children": [ "children": [
{ {
"width": 233,
"height": 655,
"type": "dock-v",
"children": [ "children": [
{ {
"width": 233,
"height": 226,
"type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
"hierarchy" "hierarchy"
], ]
"height": 226,
"type": "panel",
"width": 233
}, },
{ {
"width": 233,
"height": 426,
"type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
"assets", "assets",
"cloud-function" "cloud-function"
], ]
"height": 426,
"type": "panel",
"width": 233
} }
], ]
"height": 655,
"type": "dock-v",
"width": 233
}, },
{ {
"width": 737,
"height": 651,
"type": "dock-v",
"children": [ "children": [
{ {
"width": 737,
"height": 373.6875,
"type": "dock-h",
"children": [ "children": [
{ {
"width": 470,
"height": 373.6875,
"type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
"scene" "scene"
], ]
"height": 375.984375,
"type": "panel",
"width": 470
}, },
{ {
"width": 264,
"height": 373.6875,
"type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
"node-library" "node-library"
], ]
"height": 375.984375,
"type": "panel",
"width": 264
} }
], ]
"height": 375.984375,
"type": "dock-h",
"width": 737
}, },
{ {
"width": 737,
"height": 274.296875,
"type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
"console", "console",
"timeline", "timeline",
"game-window" "game-window"
], ]
"height": 276,
"type": "panel",
"width": 737
} }
], ]
"height": 655,
"type": "dock-v",
"width": 737
}, },
{ {
"width": 304,
"height": 651,
"type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
"inspector", "inspector",
"cocos-services" "cocos-services"
], ]
"height": 655,
"type": "panel",
"width": 304
} }
], ]
"type": "dock-h"
}, },
"panels": [ "panels": [
"hierarchy", "hierarchy",
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
"packages": "packages", "packages": "packages",
"name": "cocos_mz_001", "name": "cocos_mz_001",
"id": "07f9ce6f-9026-4d2b-9501-fb5344d83050", "id": "07f9ce6f-9026-4d2b-9501-fb5344d83050",
"version": "2.4.0", "version": "2.4.5",
"isNew": false "isNew": false
} }
\ No newline at end of file
{ {
"last-module-event-record-time": 1597992983902 "last-module-event-record-time": 1597992983902,
"migrate-history": [
"cloud-function"
]
} }
{"version":"1.0.8","stats":{"/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/cc_mz_004/play/temp/quick-scripts/src/__qc_index__.js":"2021-01-22T02:12:27.790Z","/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/scene.js":"2021-01-22T02:12:27.771Z","/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/util.js":"2021-01-22T02:12:27.772Z","/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/prefab/bgBottom.js":"2021-01-22T02:12:27.774Z"}} {"version":"1.0.8","stats":{"/Users/lmz/Documents/workspace/pro_hw/cc_mz_004/play/temp/quick-scripts/src/__qc_index__.js":"2021-08-17T01:35:29.248Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/util.js":"2021-08-17T01:35:29.230Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/prefab/bgBottom.js":"2021-08-17T01:35:29.230Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/scene.js":"2021-08-17T01:35:29.229Z"}}
This source diff could not be displayed because it is too large. You can view the blob instead.
(function () { (function () {
var scripts = [{"deps":{"./assets/mz_004/script/util":2,"./assets/mz_004/script/scene":1,"./assets/mz_004/prefab/bgBottom":3},"path":"preview-scripts/__qc_index__.js"},{"deps":{"./util":2},"path":"preview-scripts/assets/mz_004/script/scene.js"},{"deps":{},"path":"preview-scripts/assets/mz_004/script/util.js"},{"deps":{"../script/util":2},"path":"preview-scripts/assets/mz_004/prefab/bgBottom.js"}]; var scripts = [{"deps":{"./assets/mz_004/script/util":1,"./assets/mz_004/prefab/bgBottom":2,"./assets/mz_004/script/scene":3},"path":"preview-scripts/__qc_index__.js"},{"deps":{},"path":"preview-scripts/assets/mz_004/script/util.js"},{"deps":{"../script/util":1},"path":"preview-scripts/assets/mz_004/prefab/bgBottom.js"},{"deps":{"./util":1},"path":"preview-scripts/assets/mz_004/script/scene.js"}];
var entries = ["preview-scripts/__qc_index__.js"]; var entries = ["preview-scripts/__qc_index__.js"];
var bundleScript = 'preview-scripts/__qc_bundle__.js'; var bundleScript = 'preview-scripts/__qc_bundle__.js';
......
...@@ -206,6 +206,8 @@ cc.Class({ ...@@ -206,6 +206,8 @@ cc.Class({
tmpArr = [item]; tmpArr = [item];
this._pageArr.push(tmpArr); this._pageArr.push(tmpArr);
curLen = this._disW + item.width + this._disW;
} else { } else {
tmpArr.push(item); tmpArr.push(item);
} }
......
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