diff --git a/assets/bundles/battleGame/prefab/格子锁.prefab b/assets/bundles/battleGame/prefab/格子锁.prefab index a313b24..5ea0919 100644 --- a/assets/bundles/battleGame/prefab/格子锁.prefab +++ b/assets/bundles/battleGame/prefab/格子锁.prefab @@ -23,22 +23,25 @@ }, { "__id__": 8 + }, + { + "__id__": 14 } ], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 20 }, { - "__id__": 16 + "__id__": 22 }, { - "__id__": 18 + "__id__": 24 } ], "_prefab": { - "__id__": 20 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -92,7 +95,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -21.1845703125, + "x": -45.1845703125, "y": 0, "z": 0 }, @@ -228,7 +231,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 18.5, + "x": -5.5, "y": 0, "z": 0 }, @@ -364,6 +367,142 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "box", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 15 + }, + { + "__id__": 17 + } + ], + "_prefab": { + "__id__": 19 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 37.1845703125, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 39 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3c7wrtDV1CJ6wben99cdUf" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 18 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "c284dbf4-a1a8-413d-8d01-7f5fdfaa15dd@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bX4WRHEZG/ruUMZuQIumt" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1elxSYwQBKopyaVp9y4v2w", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -374,11 +513,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", - "width": 94.369140625, + "width": 142.369140625, "height": 68 }, "_anchorPoint": { @@ -402,7 +541,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -447,7 +586,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "_resizeMode": 1, "_layoutType": 1, diff --git a/assets/bundles/popBattle/popSelect/prefab/PopSelect.prefab b/assets/bundles/popBattle/popSelect/prefab/PopSelect.prefab index 142bf3e..4848b35 100644 --- a/assets/bundles/popBattle/popSelect/prefab/PopSelect.prefab +++ b/assets/bundles/popBattle/popSelect/prefab/PopSelect.prefab @@ -35,10 +35,13 @@ }, { "__id__": 120 + }, + { + "__id__": 122 } ], "_prefab": { - "__id__": 122 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -2792,6 +2795,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5fvzPIawpA/rZjNS2LBki6" }, + { + "__type__": "41b4fluKHRF9JaZBU6rL5bO", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 123 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a2ZxVOSJtItJfVSZhI6/Td" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/res/battleGame/texture/ui/组 2871.png b/assets/res/battleGame/texture/ui/组 2871.png new file mode 100644 index 0000000..c8d71f2 Binary files /dev/null and b/assets/res/battleGame/texture/ui/组 2871.png differ diff --git a/assets/res/battleGame/texture/ui/组 2871.png.meta b/assets/res/battleGame/texture/ui/组 2871.png.meta new file mode 100644 index 0000000..6ad6d93 --- /dev/null +++ b/assets/res/battleGame/texture/ui/组 2871.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "c284dbf4-a1a8-413d-8d01-7f5fdfaa15dd", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "c284dbf4-a1a8-413d-8d01-7f5fdfaa15dd@6c48a", + "displayName": "组 2871", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "c284dbf4-a1a8-413d-8d01-7f5fdfaa15dd", + "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": "c284dbf4-a1a8-413d-8d01-7f5fdfaa15dd@f9941", + "displayName": "组 2871", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 48, + "height": 39, + "rawWidth": 48, + "rawHeight": 39, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -24, + -19.5, + 0, + 24, + -19.5, + 0, + -24, + 19.5, + 0, + 24, + 19.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 39, + 48, + 39, + 0, + 0, + 48, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -24, + -19.5, + 0 + ], + "maxPos": [ + 24, + 19.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "c284dbf4-a1a8-413d-8d01-7f5fdfaa15dd@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "c284dbf4-a1a8-413d-8d01-7f5fdfaa15dd@6c48a" + } +} diff --git a/配置表/excelList/随机buff.xlsx b/配置表/excelList/随机buff.xlsx index 896975a..f89b5e8 100644 Binary files a/配置表/excelList/随机buff.xlsx and b/配置表/excelList/随机buff.xlsx differ