merge branch
parent
131a12f3a7
commit
9e4c7352f0
|
@ -0,0 +1,45 @@
|
|||
{
|
||||
"__type__": "cc.Material",
|
||||
"_name": "",
|
||||
"_objFlags": 0,
|
||||
"__editorExtras__": {},
|
||||
"_native": "",
|
||||
"_effectAsset": {
|
||||
"__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0",
|
||||
"__expectedType__": "cc.EffectAsset"
|
||||
},
|
||||
"_techIdx": 0,
|
||||
"_defines": [
|
||||
{},
|
||||
{}
|
||||
],
|
||||
"_states": [
|
||||
{
|
||||
"rasterizerState": {},
|
||||
"depthStencilState": {},
|
||||
"blendState": {
|
||||
"targets": [
|
||||
{}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"rasterizerState": {},
|
||||
"depthStencilState": {},
|
||||
"blendState": {
|
||||
"targets": [
|
||||
{}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"_props": [
|
||||
{
|
||||
"mainTexture": {
|
||||
"__uuid__": "d78e9706-3f29-4e0e-9c56-10513fa44cbb@6c48a",
|
||||
"__expectedType__": "cc.Texture2D"
|
||||
}
|
||||
},
|
||||
{}
|
||||
]
|
||||
}
|
|
@ -0,0 +1 @@
|
|||
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"b13b73f0-6f27-48e5-bfd5-cb5d0ccd2697","files":[".json"],"subMetas":{},"userData":{}}
|
|
@ -0,0 +1,45 @@
|
|||
{
|
||||
"__type__": "cc.Material",
|
||||
"_name": "",
|
||||
"_objFlags": 0,
|
||||
"__editorExtras__": {},
|
||||
"_native": "",
|
||||
"_effectAsset": {
|
||||
"__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0",
|
||||
"__expectedType__": "cc.EffectAsset"
|
||||
},
|
||||
"_techIdx": 0,
|
||||
"_defines": [
|
||||
{},
|
||||
{}
|
||||
],
|
||||
"_states": [
|
||||
{
|
||||
"rasterizerState": {},
|
||||
"depthStencilState": {},
|
||||
"blendState": {
|
||||
"targets": [
|
||||
{}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"rasterizerState": {},
|
||||
"depthStencilState": {},
|
||||
"blendState": {
|
||||
"targets": [
|
||||
{}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"_props": [
|
||||
{
|
||||
"mainTexture": {
|
||||
"__uuid__": "63ad5861-547d-4ad1-ae2b-15195c2400a1@6c48a",
|
||||
"__expectedType__": "cc.Texture2D"
|
||||
}
|
||||
},
|
||||
{}
|
||||
]
|
||||
}
|
|
@ -0,0 +1 @@
|
|||
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"2904334c-3d13-4ca3-8547-9f4e7e3f6a44","files":[".json"],"subMetas":{},"userData":{}}
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"ver": "1.1.50",
|
||||
"importer": "prefab",
|
||||
"imported": true,
|
||||
"uuid": "32c984d3-1f11-459c-be46-f5fed4af477e",
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
"syncNodeName": "BarBloodHero"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,45 @@
|
|||
// Effect Syntax Guide: https://docs.cocos.com/creator/manual/zh/shader/index.html
|
||||
|
||||
CCEffect %{
|
||||
techniques:
|
||||
- name: opaque
|
||||
passes:
|
||||
- vert: legacy/main-functions/general-vs:vert # builtin header
|
||||
frag: unlit-fs:frag
|
||||
properties: &props
|
||||
mainTexture: { value: white }
|
||||
mainColor: { value: [1, 1, 1, 1], editor: { type: color } }
|
||||
- name: transparent
|
||||
passes:
|
||||
- vert: general-vs:vert # builtin header
|
||||
frag: unlit-fs:frag
|
||||
blendState:
|
||||
targets:
|
||||
- blend: true
|
||||
blendSrc: src_alpha
|
||||
blendDst: one_minus_src_alpha
|
||||
blendSrcAlpha: src_alpha
|
||||
blendDstAlpha: one_minus_src_alpha
|
||||
properties: *props
|
||||
}%
|
||||
|
||||
CCProgram unlit-fs %{
|
||||
precision highp float;
|
||||
#include <legacy/output>
|
||||
#include <legacy/fog-fs>
|
||||
|
||||
in vec2 v_uv;
|
||||
in vec3 v_position;
|
||||
|
||||
uniform sampler2D mainTexture;
|
||||
|
||||
uniform Constant {
|
||||
vec4 mainColor;
|
||||
};
|
||||
|
||||
vec4 frag () {
|
||||
vec4 col = mainColor * texture(mainTexture, v_uv);
|
||||
CC_APPLY_FOG(col, v_position);
|
||||
return CCFragOutput(col);
|
||||
}
|
||||
}%
|
|
@ -0,0 +1,11 @@
|
|||
{
|
||||
"ver": "1.7.1",
|
||||
"importer": "effect",
|
||||
"imported": true,
|
||||
"uuid": "01be914e-6648-4deb-b7de-5463cd4cc483",
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {},
|
||||
"userData": {}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -1 +1 @@
|
|||
{"ver":"1.1.50","importer":"scene","imported":true,"uuid":"ad2a9769-ce87-4f25-9229-4ece059e8754","files":[".json"],"subMetas":{},"userData":{}}
|
||||
{"ver":"1.1.50","importer":"scene","imported":true,"uuid":"a1144b48-4b0c-4e22-b19c-64e8fe2cccdd","files":[".json"],"subMetas":{},"userData":{}}
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"ver": "1.0.26",
|
||||
"importer": "image",
|
||||
"imported": true,
|
||||
"uuid": "d78e9706-3f29-4e0e-9c56-10513fa44cbb",
|
||||
"files": [
|
||||
".json",
|
||||
".png"
|
||||
],
|
||||
"subMetas": {
|
||||
"6c48a": {
|
||||
"importer": "texture",
|
||||
"uuid": "d78e9706-3f29-4e0e-9c56-10513fa44cbb@6c48a",
|
||||
"displayName": "cowl",
|
||||
"id": "6c48a",
|
||||
"name": "texture",
|
||||
"userData": {
|
||||
"wrapModeS": "repeat",
|
||||
"wrapModeT": "repeat",
|
||||
"minfilter": "linear",
|
||||
"magfilter": "linear",
|
||||
"mipfilter": "none",
|
||||
"anisotropy": 0,
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "d78e9706-3f29-4e0e-9c56-10513fa44cbb",
|
||||
"visible": false
|
||||
},
|
||||
"ver": "1.0.22",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
}
|
||||
},
|
||||
"userData": {
|
||||
"hasAlpha": true,
|
||||
"type": "texture",
|
||||
"fixAlphaTransparencyArtifacts": false,
|
||||
"redirect": "d78e9706-3f29-4e0e-9c56-10513fa44cbb@6c48a"
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 860 B |
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"ver": "1.0.26",
|
||||
"importer": "image",
|
||||
"imported": true,
|
||||
"uuid": "63ad5861-547d-4ad1-ae2b-15195c2400a1",
|
||||
"files": [
|
||||
".json",
|
||||
".png"
|
||||
],
|
||||
"subMetas": {
|
||||
"6c48a": {
|
||||
"importer": "texture",
|
||||
"uuid": "63ad5861-547d-4ad1-ae2b-15195c2400a1@6c48a",
|
||||
"displayName": "dot",
|
||||
"id": "6c48a",
|
||||
"name": "texture",
|
||||
"userData": {
|
||||
"wrapModeS": "repeat",
|
||||
"wrapModeT": "repeat",
|
||||
"minfilter": "linear",
|
||||
"magfilter": "linear",
|
||||
"mipfilter": "none",
|
||||
"anisotropy": 0,
|
||||
"isUuid": true,
|
||||
"imageUuidOrDatabaseUri": "63ad5861-547d-4ad1-ae2b-15195c2400a1",
|
||||
"visible": false
|
||||
},
|
||||
"ver": "1.0.22",
|
||||
"imported": true,
|
||||
"files": [
|
||||
".json"
|
||||
],
|
||||
"subMetas": {}
|
||||
}
|
||||
},
|
||||
"userData": {
|
||||
"hasAlpha": true,
|
||||
"type": "texture",
|
||||
"fixAlphaTransparencyArtifacts": false,
|
||||
"redirect": "63ad5861-547d-4ad1-ae2b-15195c2400a1@6c48a"
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -2,7 +2,7 @@
|
|||
"ver": "4.0.23",
|
||||
"importer": "typescript",
|
||||
"imported": true,
|
||||
"uuid": "afbe4ac6-0732-49cb-b3b9-36c65db1df69",
|
||||
"uuid": "d6b537d8-7184-40a2-95af-4e03825c309a",
|
||||
"files": [],
|
||||
"subMetas": {},
|
||||
"userData": {}
|
||||
|
|
Loading…
Reference in New Issue