Merge pull request #6 from Gadgame/feature/SkinVitalGarden

Feat: Update Fx
feature/ads-smart-display
tiendat3699 2024-06-13 16:29:19 +07:00 committed by GitHub
commit 708207daee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 16070 additions and 252 deletions

View File

@ -29,7 +29,7 @@
"_active": true,
"_components": [],
"_prefab": {
"__id__": 1305
"__id__": 1313
},
"_lpos": {
"__type__": "cc.Vec3",
@ -60,7 +60,7 @@
},
"autoReleaseAssets": false,
"_globals": {
"__id__": 1318
"__id__": 1326
},
"_id": "fc28500a-9944-448d-b613-8d5e42cab12e"
},
@ -318,18 +318,21 @@
},
{
"__id__": 1300
},
{
"__id__": 1302
}
],
"_active": true,
"_components": [
{
"__id__": 1302
"__id__": 1310
},
{
"__id__": 1303
"__id__": 1311
},
{
"__id__": 1304
"__id__": 1312
}
],
"_prefab": null,
@ -6110,7 +6113,7 @@
"__id__": 156
},
"_starFxObjectPrefab": {
"__uuid__": "9ae06eb1-5110-4cd8-b56d-371a29bf2fc5",
"__uuid__": "7f9262f2-95ea-4670-98ed-041e22f0e7c4",
"__expectedType__": "cc.Prefab"
},
"_floatingStartFactory": {
@ -18946,7 +18949,7 @@
},
"_score": 100,
"_goalFx": {
"__uuid__": "e96204d7-e516-46d5-8e80-f1f5fda61677",
"__uuid__": "883c3624-c21a-4c38-9180-4a1b28c1b9cc",
"__expectedType__": "cc.Prefab"
},
"_id": "depU8qmkxCaJIJsMIq3jv4"
@ -34982,6 +34985,117 @@
},
"_id": "6bAMvWIAtAL6SYI7B5mG2v"
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 9
},
"_prefab": {
"__id__": 1303
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1302
},
"asset": {
"__uuid__": "145777c0-32ee-4ce5-9a52-e905d12530e7",
"__expectedType__": "cc.Prefab"
},
"fileId": "691jstaYRLv5H06TR/SBzT",
"instance": {
"__id__": 1304
},
"targetOverrides": [],
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "0dMx6u5rRAm6TmJ1JJh+7M",
"prefabRootNode": null,
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 1305
},
{
"__id__": 1307
},
{
"__id__": 1308
},
{
"__id__": 1309
}
],
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 1306
},
"propertyPath": [
"_name"
],
"value": "ColorBarFx"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"691jstaYRLv5H06TR/SBzT"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 1306
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 926.034,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 1306
},
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 1306
},
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "cc.UITransform",
"_name": "",
@ -35057,23 +35171,23 @@
"fileId": "4c16bf85-f009-4abe-b793-f3a1924392e4",
"instance": null,
"targetOverrides": [
{
"__id__": 1306
},
{
"__id__": 1308
},
{
"__id__": 1310
},
{
"__id__": 1312
},
{
"__id__": 1314
},
{
"__id__": 1316
},
{
"__id__": 1318
},
{
"__id__": 1320
},
{
"__id__": 1322
},
{
"__id__": 1324
}
],
"nestedPrefabInstanceRoots": [
@ -35083,6 +35197,9 @@
{
"__id__": 666
},
{
"__id__": 1302
},
{
"__id__": 162
},
@ -35116,7 +35233,7 @@
"__id__": 162
},
"targetInfo": {
"__id__": 1307
"__id__": 1315
}
},
{
@ -35138,7 +35255,7 @@
"__id__": 446
},
"targetInfo": {
"__id__": 1309
"__id__": 1317
}
},
{
@ -35162,7 +35279,7 @@
"__id__": 383
},
"targetInfo": {
"__id__": 1311
"__id__": 1319
}
},
{
@ -35186,7 +35303,7 @@
"__id__": 391
},
"targetInfo": {
"__id__": 1313
"__id__": 1321
}
},
{
@ -35210,7 +35327,7 @@
"__id__": 407
},
"targetInfo": {
"__id__": 1315
"__id__": 1323
}
},
{
@ -35234,7 +35351,7 @@
"__id__": 399
},
"targetInfo": {
"__id__": 1317
"__id__": 1325
}
},
{
@ -35246,28 +35363,28 @@
{
"__type__": "cc.SceneGlobals",
"ambient": {
"__id__": 1319
"__id__": 1327
},
"shadows": {
"__id__": 1320
"__id__": 1328
},
"_skybox": {
"__id__": 1321
"__id__": 1329
},
"fog": {
"__id__": 1322
"__id__": 1330
},
"octree": {
"__id__": 1323
"__id__": 1331
},
"skin": {
"__id__": 1324
"__id__": 1332
},
"lightProbeInfo": {
"__id__": 1325
"__id__": 1333
},
"postSettings": {
"__id__": 1326
"__id__": 1334
},
"bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false

View File

@ -0,0 +1,45 @@
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 1,
"_defines": [
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{
"mainTexture": {
"__uuid__": "9f05739d-109b-4800-87be-bc2d1503514f@6c48a",
"__expectedType__": "cc.Texture2D"
}
},
{}
]
}

View File

@ -0,0 +1 @@
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"36eabf5f-9f54-4d03-8782-1e2d05151aa4","files":[".json"],"subMetas":{},"userData":{}}

View File

@ -0,0 +1,45 @@
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 1,
"_defines": [
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{
"mainTexture": {
"__uuid__": "5d7bdf06-dc8a-4d8e-96ee-5267db8046ec@6c48a",
"__expectedType__": "cc.Texture2D"
}
},
{}
]
}

View File

@ -0,0 +1 @@
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"e88ffdc0-00a7-40ec-bdba-a7d42d738454","files":[".json"],"subMetas":{},"userData":{}}

View File

@ -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__": "9e6f29b6-1962-4782-9132-530d52f9746a@6c48a",
"__expectedType__": "cc.Texture2D"
}
},
{}
]
}

View File

@ -0,0 +1 @@
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"cbe044d9-f2e4-4009-97e2-ad8e759da1eb","files":[".json"],"subMetas":{},"userData":{}}

View File

@ -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__": "efb01e8b-2cb1-499e-bf68-42a810f22ef0@6c48a",
"__expectedType__": "cc.Texture2D"
}
},
{}
]
}

View File

@ -0,0 +1 @@
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"6e7ad50c-4df0-428d-84d0-9ce88d1a4435","files":[".json"],"subMetas":{},"userData":{}}

View File

@ -0,0 +1,45 @@
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 1,
"_defines": [
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{
"mainTexture": {
"__uuid__": "d96187e8-9bc6-4cfc-ab31-ebf7eea131de@6c48a",
"__expectedType__": "cc.Texture2D"
}
},
{}
]
}

View File

@ -0,0 +1 @@
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"ef0901a5-621d-42e6-aff0-e4c5377133e9","files":[".json"],"subMetas":{},"userData":{}}

View File

@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "cb2a0e19-ff3d-4c9c-a206-ef2751e49e9e",
"files": [],
"subMetas": {},
"userData": {}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "145777c0-32ee-4ce5-9a52-e905d12530e7",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "ColorBarFx"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "883c3624-c21a-4c38-9180-4a1b28c1b9cc",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "Goal Particle-Vital"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "54f080c4-62d7-4b2f-bd03-c2e1693ba20d",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "Impact Particle-Vital"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "7f9262f2-95ea-4670-98ed-041e22f0e7c4",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "StartCollectFx-Vital"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "2cb3a531-0e91-4d3b-a7d7-ae62feccf230",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "Trail-Vital"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -0,0 +1,134 @@
{
"ver": "1.0.26",
"importer": "image",
"imported": true,
"uuid": "d96187e8-9bc6-4cfc-ab31-ebf7eea131de",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "d96187e8-9bc6-4cfc-ab31-ebf7eea131de@6c48a",
"displayName": "Leaf",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "d96187e8-9bc6-4cfc-ab31-ebf7eea131de",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "d96187e8-9bc6-4cfc-ab31-ebf7eea131de@f9941",
"displayName": "Leaf",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 145,
"height": 122,
"rawWidth": 145,
"rawHeight": 122,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-72.5,
-61,
0,
72.5,
-61,
0,
-72.5,
61,
0,
72.5,
61,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
122,
145,
122,
0,
0,
145,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-72.5,
-61,
0
],
"maxPos": [
72.5,
61,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "d96187e8-9bc6-4cfc-ab31-ebf7eea131de@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "d96187e8-9bc6-4cfc-ab31-ebf7eea131de@f9941"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,134 @@
{
"ver": "1.0.26",
"importer": "image",
"imported": true,
"uuid": "9f05739d-109b-4800-87be-bc2d1503514f",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "9f05739d-109b-4800-87be-bc2d1503514f@6c48a",
"displayName": "PlantFlower",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "9f05739d-109b-4800-87be-bc2d1503514f",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "9f05739d-109b-4800-87be-bc2d1503514f@f9941",
"displayName": "PlantFlower",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0.5,
"offsetY": -1,
"trimX": 69,
"trimY": 72,
"width": 375,
"height": 370,
"rawWidth": 512,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-187.5,
-185,
0,
187.5,
-185,
0,
-187.5,
185,
0,
187.5,
185,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
69,
440,
444,
440,
69,
70,
444,
70
],
"nuv": [
0.134765625,
0.13671875,
0.8671875,
0.13671875,
0.134765625,
0.859375,
0.8671875,
0.859375
],
"minPos": [
-187.5,
-185,
0
],
"maxPos": [
187.5,
185,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "9f05739d-109b-4800-87be-bc2d1503514f@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "9f05739d-109b-4800-87be-bc2d1503514f@f9941"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -0,0 +1,134 @@
{
"ver": "1.0.26",
"importer": "image",
"imported": true,
"uuid": "5d7bdf06-dc8a-4d8e-96ee-5267db8046ec",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "5d7bdf06-dc8a-4d8e-96ee-5267db8046ec@6c48a",
"displayName": "flower",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "5d7bdf06-dc8a-4d8e-96ee-5267db8046ec",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "5d7bdf06-dc8a-4d8e-96ee-5267db8046ec@f9941",
"displayName": "flower",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 123,
"height": 123,
"rawWidth": 123,
"rawHeight": 123,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-61.5,
-61.5,
0,
61.5,
-61.5,
0,
-61.5,
61.5,
0,
61.5,
61.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
123,
123,
123,
0,
0,
123,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-61.5,
-61.5,
0
],
"maxPos": [
61.5,
61.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "5d7bdf06-dc8a-4d8e-96ee-5267db8046ec@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "5d7bdf06-dc8a-4d8e-96ee-5267db8046ec@f9941"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -0,0 +1,134 @@
{
"ver": "1.0.26",
"importer": "image",
"imported": true,
"uuid": "9e6f29b6-1962-4782-9132-530d52f9746a",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "9e6f29b6-1962-4782-9132-530d52f9746a@6c48a",
"displayName": "glitter1",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "9e6f29b6-1962-4782-9132-530d52f9746a",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "9e6f29b6-1962-4782-9132-530d52f9746a@f9941",
"displayName": "glitter1",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": -1,
"trimX": 23,
"trimY": 24,
"width": 466,
"height": 466,
"rawWidth": 512,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-233,
-233,
0,
233,
-233,
0,
-233,
233,
0,
233,
233,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
23,
488,
489,
488,
23,
22,
489,
22
],
"nuv": [
0.044921875,
0.04296875,
0.955078125,
0.04296875,
0.044921875,
0.953125,
0.955078125,
0.953125
],
"minPos": [
-233,
-233,
0
],
"maxPos": [
233,
233,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "9e6f29b6-1962-4782-9132-530d52f9746a@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "9e6f29b6-1962-4782-9132-530d52f9746a@f9941"
}
}